diff --git a/build/Jamfile b/build/Jamfile
index ca1bf157..7dfb768a 100644
--- a/build/Jamfile
+++ b/build/Jamfile
@@ -1,6 +1,117 @@
 # copyright John Maddock 2003
 
 subproject libs/regex/build ;
+# bring in the rules for testing
+import testing ;
+
+#
+# ICU configuration:
+#
+rule check-icu-config ( )
+{
+   if ! $(gICU_CONFIG_CHECKED)
+   {
+      if $(ICU_PATH)
+      {
+         dir += $(ICU_PATH) ;
+      }
+      
+      if [ GLOB $(dir)$(SLASH)include$(SLASH)unicode : utypes.h ]
+      {
+         ECHO Building Boost.Regex with Unicode/ICU support enabled ;
+         ECHO Using ICU in $(ICU_PATH:J=" ")$(SLASH)include ;
+         gHAS_ICU = true ;
+         
+         # try and find ICU libraries, look for NT versions first:
+         if $(ICU_LINK)
+         {
+            gICU_LIBS += <linkflags>$(ICU_LINK) ;
+         }
+         else if [ GLOB $(dir)$(SLASH)lib : icuuc.* ]
+         {
+            gICU_LIBS += <find-library>icuuc ;
+         }
+         else if [ GLOB $(dir)$(SLASH)lib : libicuuc.* ]
+         {
+            gICU_LIBS += <find-library>icuuc ;
+         }
+         else if [ GLOB $(ICU_PATH)/lib : cygicuuc.dll ]
+         {
+            gICU_LIBS += <library-file>$(ICU_PATH)/lib/cygicuuc.dll ;
+         }
+         else if [ GLOB /usr/local/lib : cygicuuc.dll ]
+         {
+            gICU_LIBS += <library-file>/usr/local/lib/cygicuuc.dll ;
+         }
+         else
+         {
+            ECHO ICU shared common library not found. ;
+            ECHO HINT: Set the environment variable ICU_LINK to contain ;
+            ECHO       the linker options required to link to ICU. ;
+         }
+         
+         if $(ICU_LINK)
+         {
+            # gICU_LIBS += <linkflags>$(ICU_LINK) ;
+         }
+         else if [ GLOB $(dir)$(SLASH)lib : icuin.* ]
+         {
+            gICU_LIBS += <find-library>icuin ;
+         }
+         else if [ GLOB $(dir)$(SLASH)lib : libicui18n.* ]
+         {
+            gICU_LIBS += <find-library>icui18n ;
+         }
+         else if [ GLOB $(ICU_PATH)/lib : cygicuin.dll ]
+         {
+            gICU_LIBS += <library-file>$(ICU_PATH)/lib/cygicuin.dll ;
+         }
+         else if [ GLOB /usr/local/lib : cygicuin.dll ]
+         {
+            gICU_LIBS += <library-file>/usr/local/lib/cygicuin.dll ;
+         }
+         else
+         {
+            ECHO ICU shared i18n library not found. ;
+            ECHO HINT: Set the environment variable ICU_LINK to contain ;
+            ECHO       the linker options required to link to ICU. ;
+         }
+      }
+      else
+      {
+         ECHO ****************************************************** ;
+         ECHO ;
+         ECHO Building Boost.Regex with Unicode/ICU support disabled. ;
+         ECHO HINT: define the environment variable ICU_PATH to point to the ;
+         ECHO root directy of your ICU installation if you have one. ;
+         ECHO Couldn't find utypes.h in $(ICU_PATH:J=" ")$(SLASH)include$(SLASH)unicode ;
+         ECHO ;
+         ECHO ****************************************************** ;
+      }
+      gICU_CONFIG_CHECKED = true ;
+   }
+    if $(gHAS_ICU)
+    {
+        return true ;
+    }
+}
+
+if [ check-icu-config ]
+{
+   BOOST_REGEX_ICU_OPTS = "<define>BOOST_HAS_ICU=1" ;
+   if $(gICU_LIBS)
+   {
+      BOOST_REGEX_ICU_OPTS += $(gICU_LIBS) ;
+      # this one is required for VC++ :
+      BOOST_REGEX_ICU_TEST_OPTS = "<native-wchar_t>off" ;
+   }
+   if $(ICU_PATH)
+   {
+      BOOST_REGEX_ICU_OPTS += "<sysinclude>$(ICU_PATH)/include" ;
+      BOOST_REGEX_ICU_OPTS += "<library-path>$(ICU_PATH)/lib" ;
+   }
+   # ECHO "BOOST_REGEX_ICU_OPTS =" $(BOOST_REGEX_ICU_OPTS) ;
+}
 
 #
 # this template defines the options common to
@@ -14,6 +125,12 @@ template regex-options
      # <native-wchar_t>on
      # como requires this:
      <como-win32><*><define>BOOST_REGEX_NO_W32=1
+     $(BOOST_REGEX_ICU_OPTS)
+   ;
+template regex-test-options
+   : # sources
+   : # requirements
+     $(BOOST_REGEX_ICU_TEST_OPTS)
    ;
 
 #
@@ -37,11 +154,27 @@ template msvc-stlport-tricky
      <define>BOOST_ALL_NO_LIB=1
    ;
 
-SOURCES = c_regex_traits c_regex_traits_common cpp_regex_traits
-       cregex fileiter posix_api regex regex_debug
-       regex_synch w32_regex_traits wide_posix_api instances winstances ;
+SOURCES = 
+   c_regex_traits.cpp
+   cpp_regex_traits.cpp
+   cregex.cpp
+   fileiter.cpp
+   icu.cpp
+   instances.cpp
+   posix_api.cpp
+   regex.cpp
+   regex_debug.cpp
+   regex_raw_buffer.cpp
+   regex_traits_defaults.cpp
+   static_mutex.cpp
+   w32_regex_traits.cpp
+   wc_regex_traits.cpp
+   wide_posix_api.cpp
+   winstances.cpp 
+   usinstances.cpp ;
+   
        
-lib boost_regex : ../src/$(SOURCES).cpp <template>regex-options
+lib boost_regex : ../src/$(SOURCES) <template>regex-options
     : 
         common-variant-tag
     : 
@@ -49,7 +182,7 @@ lib boost_regex : ../src/$(SOURCES).cpp <template>regex-options
     ;
 
 
-dll boost_regex : ../src/$(SOURCES).cpp <template>regex-dll-options
+dll boost_regex : ../src/$(SOURCES) <template>regex-dll-options
     : 
         common-variant-tag
     : 
diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
index e96ba5cf..5b85116d 100644
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -2,13 +2,125 @@
 project boost/regex
     : source-location ../src
     ;
-SOURCES = c_regex_traits c_regex_traits_common cpp_regex_traits
-       cregex fileiter posix_api regex regex_debug
-       regex_synch w32_regex_traits wide_posix_api instances winstances ;
+
+#
+# ICU configuration:
+#
+local ICU_PATH = [ modules.peek : ICU_PATH ] ;
+rule check-icu-config ( )
+{
+   local ICU_PATH = [ modules.peek : ICU_PATH ] ;
+   if ! $(gICU_CONFIG_CHECKED)
+   {
+      if $(ICU_PATH)
+      {
+         dir = $(ICU_PATH) ;
+      }
+      
+      if [ GLOB $(dir)/include/unicode : utypes.h ]
+      {
+         ECHO Building Boost.Regex with Unicode/ICU support enabled ;
+         ECHO Using ICU in $(ICU_PATH:J=" ")/include ;
+         gHAS_ICU = true ;
+         
+         # try and find ICU libraries, look for NT versions first:
+         if [ GLOB $(dir)/lib : icuuc.* ]
+         {
+            gICU_CORE_LIB = icuuc ;
+         }
+         else if [ GLOB $(dir)/lib : libicuuc.* ]
+         {
+            gICU_CORE_LIB = icuuc ;
+         }
+         else if [ GLOB $(ICU_PATH)/lib : cygicuuc.dll ]
+         {
+            gICU_CORE_LIB = cygicuuc.dll ;
+         }
+         else
+         {
+            ECHO ICU shared common library not found. ;
+         }
+         
+         if [ GLOB $(dir)/lib : icuin.* ]
+         {
+            gICU_IN_LIB = icuin ;
+         }
+         else if [ GLOB $(dir)/lib : libicui18n.* ]
+         {
+            gICU_IN_LIB = icuin ;
+         }
+         else if [ GLOB $(ICU_PATH)/lib : cygicuin.dll ]
+         {
+            gICU_IN_LIB = cygicuin.dll ;
+         }
+         else
+         {
+            ECHO ICU shared i18n library not found. ;
+         }
+      }
+      else
+      {
+         ECHO ****************************************************** ;
+         ECHO ;
+         ECHO Building Boost.Regex with Unicode/ICU support disabled. ;
+         ECHO HINT: define the environment variable ICU_PATH to point to the ;
+         ECHO root directy of your ICU installation if you have one. ;
+         ECHO Couldn't find utypes.h in \"$(ICU_PATH:J=" ")/include/unicode\" ;
+         ECHO ;
+         ECHO ****************************************************** ;
+      }
+      gICU_CONFIG_CHECKED = true ;
+   }
+    if $(gHAS_ICU)
+    {
+        return true ;
+    }
+}
+
+if [ check-icu-config ]
+{
+   BOOST_REGEX_ICU_OPTS = "<define>BOOST_HAS_ICU=1" ;
+   if $(gICU_CORE_LIB)
+   {
+      lib icucore : : <name>$(gICU_CORE_LIB) <search>/$(ICU_PATH)/lib ;
+      ICU_EXTRA_SOURCE = icucore ;
+   }
+   if $(gICU_IN_LIB)
+   {
+      lib icuin : : <name>$(gICU_IN_LIB) <search>/$(ICU_PATH)/lib ;
+      ICU_EXTRA_SOURCE += icuin ;
+   }
+   if $(ICU_PATH)
+   {
+      BOOST_REGEX_ICU_OPTS += "<include>$(ICU_PATH)/include" ;
+      #BOOST_REGEX_ICU_OPTS += "<library-path>$(ICU_PATH)/lib" ;
+   }
+}
+
+SOURCES = 
+   c_regex_traits.cpp
+   cpp_regex_traits.cpp
+   cregex.cpp
+   fileiter.cpp
+   icu.cpp
+   instances.cpp
+   posix_api.cpp
+   regex.cpp
+   regex_debug.cpp
+   regex_raw_buffer.cpp
+   regex_traits_defaults.cpp
+   static_mutex.cpp
+   w32_regex_traits.cpp
+   wc_regex_traits.cpp
+   wide_posix_api.cpp
+   winstances.cpp 
+   usinstances.cpp ;
 
 
-lib boost_regex : $(SOURCES).cpp 
+lib boost_regex : ../src/$(SOURCES) $(ICU_EXTRA_SOURCE)
     :         
-        <variant>debug:<define>BOOST_REGEX_CONFIG_INFO=1
-	<link>shared:<define>BOOST_REGEX_DYN_LINK=1
+        #<link>static:<define>BOOST_REGEX_NO_LIB=1
+        #<link>static:<define>BOOST_REGEX_STATIC_LINK=1
+	     <link>shared:<define>BOOST_REGEX_DYN_LINK=1
+	     $(BOOST_REGEX_ICU_OPTS)
     ;
diff --git a/build/bcb6.mak b/build/bcb6.mak
index 151e60ab..1ff80ec1 100644
--- a/build/bcb6.mak
+++ b/build/bcb6.mak
@@ -35,7 +35,7 @@ BCROOT=$(MAKEDIR)\..
 !endif
 
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.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/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.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_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/allocator.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+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/static_mutex.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 ../../../boost/regex/config/regex_library_include.hpp
 
 all : bcb bcb\libboost_regex-bcb-s-1_32 bcb\libboost_regex-bcb-s-1_32.lib bcb\libboost_regex-bcb-mt-s-1_32 bcb\libboost_regex-bcb-mt-s-1_32.lib bcb\boost_regex-bcb-mt-1_32 bcb\boost_regex-bcb-mt-1_32.lib bcb\boost_regex-bcb-1_32 bcb\boost_regex-bcb-1_32.lib bcb\libboost_regex-bcb-mt-1_32 bcb\libboost_regex-bcb-mt-1_32.lib bcb\libboost_regex-bcb-1_32 bcb\libboost_regex-bcb-1_32.lib bcb\libboost_regex-bcb-sd-1_32 bcb\libboost_regex-bcb-sd-1_32.lib bcb\libboost_regex-bcb-mt-sd-1_32 bcb\libboost_regex-bcb-mt-sd-1_32.lib bcb\boost_regex-bcb-mt-d-1_32 bcb\boost_regex-bcb-mt-d-1_32.lib bcb\boost_regex-bcb-d-1_32 bcb\boost_regex-bcb-d-1_32.lib bcb\libboost_regex-bcb-mt-d-1_32 bcb\libboost_regex-bcb-mt-d-1_32.lib bcb\libboost_regex-bcb-d-1_32 bcb\libboost_regex-bcb-d-1_32.lib
 
@@ -77,11 +77,6 @@ bcb\libboost_regex-bcb-s-1_32\c_regex_traits.obj: ../src/c_regex_traits.cpp $(AL
 -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_32\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-s-1_32\c_regex_traits_common.obj: ../src/c_regex_traits_common.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_32\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\libboost_regex-bcb-s-1_32\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_32\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -97,6 +92,11 @@ bcb\libboost_regex-bcb-s-1_32\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 -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_32\fileiter.obj ../src/fileiter.cpp
 |
 
+bcb\libboost_regex-bcb-s-1_32\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_32\icu.obj ../src/icu.cpp
+|
+
 bcb\libboost_regex-bcb-s-1_32\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_32\instances.obj ../src/instances.cpp
@@ -117,9 +117,24 @@ bcb\libboost_regex-bcb-s-1_32\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEAD
 -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_32\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\libboost_regex-bcb-s-1_32\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-s-1_32\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_32\regex_synch.obj ../src/regex_synch.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_32\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\libboost_regex-bcb-s-1_32\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_32\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\libboost_regex-bcb-s-1_32\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_32\static_mutex.obj ../src/static_mutex.cpp
+|
+
+bcb\libboost_regex-bcb-s-1_32\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_32\usinstances.obj ../src/usinstances.cpp
 |
 
 bcb\libboost_regex-bcb-s-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -127,6 +142,11 @@ bcb\libboost_regex-bcb-s-1_32\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_32\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\libboost_regex-bcb-s-1_32\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_32\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\libboost_regex-bcb-s-1_32\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_32\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -146,10 +166,10 @@ libboost_regex-bcb-s-1_32_clean :
 	del bcb\libboost_regex-bcb-s-1_32\*.csm
 	del bcb\libboost_regex-bcb-s-1_32\*.tds
 
-bcb\libboost_regex-bcb-s-1_32.lib : bcb\libboost_regex-bcb-s-1_32\c_regex_traits.obj bcb\libboost_regex-bcb-s-1_32\c_regex_traits_common.obj bcb\libboost_regex-bcb-s-1_32\cpp_regex_traits.obj bcb\libboost_regex-bcb-s-1_32\cregex.obj bcb\libboost_regex-bcb-s-1_32\fileiter.obj bcb\libboost_regex-bcb-s-1_32\instances.obj bcb\libboost_regex-bcb-s-1_32\posix_api.obj bcb\libboost_regex-bcb-s-1_32\regex.obj bcb\libboost_regex-bcb-s-1_32\regex_debug.obj bcb\libboost_regex-bcb-s-1_32\regex_synch.obj bcb\libboost_regex-bcb-s-1_32\w32_regex_traits.obj bcb\libboost_regex-bcb-s-1_32\wide_posix_api.obj bcb\libboost_regex-bcb-s-1_32\winstances.obj
+bcb\libboost_regex-bcb-s-1_32.lib : bcb\libboost_regex-bcb-s-1_32\c_regex_traits.obj bcb\libboost_regex-bcb-s-1_32\cpp_regex_traits.obj bcb\libboost_regex-bcb-s-1_32\cregex.obj bcb\libboost_regex-bcb-s-1_32\fileiter.obj bcb\libboost_regex-bcb-s-1_32\icu.obj bcb\libboost_regex-bcb-s-1_32\instances.obj bcb\libboost_regex-bcb-s-1_32\posix_api.obj bcb\libboost_regex-bcb-s-1_32\regex.obj bcb\libboost_regex-bcb-s-1_32\regex_debug.obj bcb\libboost_regex-bcb-s-1_32\regex_raw_buffer.obj bcb\libboost_regex-bcb-s-1_32\regex_traits_defaults.obj bcb\libboost_regex-bcb-s-1_32\static_mutex.obj bcb\libboost_regex-bcb-s-1_32\usinstances.obj bcb\libboost_regex-bcb-s-1_32\w32_regex_traits.obj bcb\libboost_regex-bcb-s-1_32\wc_regex_traits.obj bcb\libboost_regex-bcb-s-1_32\wide_posix_api.obj bcb\libboost_regex-bcb-s-1_32\winstances.obj
 	if exist bcb\libboost_regex-bcb-s-1_32.lib del bcb\libboost_regex-bcb-s-1_32.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-s-1_32.lib"  +"bcb\libboost_regex-bcb-s-1_32\c_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_32\c_regex_traits_common.obj" +"bcb\libboost_regex-bcb-s-1_32\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_32\cregex.obj" +"bcb\libboost_regex-bcb-s-1_32\fileiter.obj" +"bcb\libboost_regex-bcb-s-1_32\instances.obj" +"bcb\libboost_regex-bcb-s-1_32\posix_api.obj" +"bcb\libboost_regex-bcb-s-1_32\regex.obj" +"bcb\libboost_regex-bcb-s-1_32\regex_debug.obj" +"bcb\libboost_regex-bcb-s-1_32\regex_synch.obj" +"bcb\libboost_regex-bcb-s-1_32\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_32\wide_posix_api.obj" +"bcb\libboost_regex-bcb-s-1_32\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-s-1_32.lib"  +"bcb\libboost_regex-bcb-s-1_32\c_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_32\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_32\cregex.obj" +"bcb\libboost_regex-bcb-s-1_32\fileiter.obj" +"bcb\libboost_regex-bcb-s-1_32\icu.obj" +"bcb\libboost_regex-bcb-s-1_32\instances.obj" +"bcb\libboost_regex-bcb-s-1_32\posix_api.obj" +"bcb\libboost_regex-bcb-s-1_32\regex.obj" +"bcb\libboost_regex-bcb-s-1_32\regex_debug.obj" +"bcb\libboost_regex-bcb-s-1_32\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-s-1_32\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-s-1_32\static_mutex.obj" +"bcb\libboost_regex-bcb-s-1_32\usinstances.obj" +"bcb\libboost_regex-bcb-s-1_32\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_32\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-s-1_32\wide_posix_api.obj" +"bcb\libboost_regex-bcb-s-1_32\winstances.obj"
 |
 
 ########################################################
@@ -162,11 +182,6 @@ bcb\libboost_regex-bcb-mt-s-1_32\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_32\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-mt-s-1_32\c_regex_traits_common.obj: ../src/c_regex_traits_common.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_32\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\libboost_regex-bcb-mt-s-1_32\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_32\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -182,6 +197,11 @@ bcb\libboost_regex-bcb-mt-s-1_32\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 -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_32\fileiter.obj ../src/fileiter.cpp
 |
 
+bcb\libboost_regex-bcb-mt-s-1_32\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_32\icu.obj ../src/icu.cpp
+|
+
 bcb\libboost_regex-bcb-mt-s-1_32\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_32\instances.obj ../src/instances.cpp
@@ -202,9 +222,24 @@ bcb\libboost_regex-bcb-mt-s-1_32\regex_debug.obj: ../src/regex_debug.cpp $(ALL_H
 -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_32\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\libboost_regex-bcb-mt-s-1_32\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-s-1_32\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_32\regex_synch.obj ../src/regex_synch.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_32\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\libboost_regex-bcb-mt-s-1_32\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_32\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\libboost_regex-bcb-mt-s-1_32\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_32\static_mutex.obj ../src/static_mutex.cpp
+|
+
+bcb\libboost_regex-bcb-mt-s-1_32\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_32\usinstances.obj ../src/usinstances.cpp
 |
 
 bcb\libboost_regex-bcb-mt-s-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -212,6 +247,11 @@ bcb\libboost_regex-bcb-mt-s-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.c
 -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_32\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\libboost_regex-bcb-mt-s-1_32\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_32\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\libboost_regex-bcb-mt-s-1_32\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_32\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -231,10 +271,10 @@ libboost_regex-bcb-mt-s-1_32_clean :
 	del bcb\libboost_regex-bcb-mt-s-1_32\*.csm
 	del bcb\libboost_regex-bcb-mt-s-1_32\*.tds
 
-bcb\libboost_regex-bcb-mt-s-1_32.lib : bcb\libboost_regex-bcb-mt-s-1_32\c_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_32\c_regex_traits_common.obj bcb\libboost_regex-bcb-mt-s-1_32\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_32\cregex.obj bcb\libboost_regex-bcb-mt-s-1_32\fileiter.obj bcb\libboost_regex-bcb-mt-s-1_32\instances.obj bcb\libboost_regex-bcb-mt-s-1_32\posix_api.obj bcb\libboost_regex-bcb-mt-s-1_32\regex.obj bcb\libboost_regex-bcb-mt-s-1_32\regex_debug.obj bcb\libboost_regex-bcb-mt-s-1_32\regex_synch.obj bcb\libboost_regex-bcb-mt-s-1_32\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_32\wide_posix_api.obj bcb\libboost_regex-bcb-mt-s-1_32\winstances.obj
+bcb\libboost_regex-bcb-mt-s-1_32.lib : bcb\libboost_regex-bcb-mt-s-1_32\c_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_32\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_32\cregex.obj bcb\libboost_regex-bcb-mt-s-1_32\fileiter.obj bcb\libboost_regex-bcb-mt-s-1_32\icu.obj bcb\libboost_regex-bcb-mt-s-1_32\instances.obj bcb\libboost_regex-bcb-mt-s-1_32\posix_api.obj bcb\libboost_regex-bcb-mt-s-1_32\regex.obj bcb\libboost_regex-bcb-mt-s-1_32\regex_debug.obj bcb\libboost_regex-bcb-mt-s-1_32\regex_raw_buffer.obj bcb\libboost_regex-bcb-mt-s-1_32\regex_traits_defaults.obj bcb\libboost_regex-bcb-mt-s-1_32\static_mutex.obj bcb\libboost_regex-bcb-mt-s-1_32\usinstances.obj bcb\libboost_regex-bcb-mt-s-1_32\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_32\wc_regex_traits.obj bcb\libboost_regex-bcb-mt-s-1_32\wide_posix_api.obj bcb\libboost_regex-bcb-mt-s-1_32\winstances.obj
 	if exist bcb\libboost_regex-bcb-mt-s-1_32.lib del bcb\libboost_regex-bcb-mt-s-1_32.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-s-1_32.lib"  +"bcb\libboost_regex-bcb-mt-s-1_32\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\c_regex_traits_common.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\cregex.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\fileiter.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\instances.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\posix_api.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\regex.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\regex_synch.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-s-1_32.lib"  +"bcb\libboost_regex-bcb-mt-s-1_32\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\cregex.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\fileiter.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\icu.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\instances.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\posix_api.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\regex.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\static_mutex.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\usinstances.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-s-1_32\winstances.obj"
 |
 
 ########################################################
@@ -247,11 +287,6 @@ bcb\boost_regex-bcb-mt-1_32\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_
 -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_32\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\boost_regex-bcb-mt-1_32\c_regex_traits_common.obj: ../src/c_regex_traits_common.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_32\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\boost_regex-bcb-mt-1_32\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_32\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -267,6 +302,11 @@ bcb\boost_regex-bcb-mt-1_32\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 -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_32\fileiter.obj ../src/fileiter.cpp
 |
 
+bcb\boost_regex-bcb-mt-1_32\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_32\icu.obj ../src/icu.cpp
+|
+
 bcb\boost_regex-bcb-mt-1_32\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_32\instances.obj ../src/instances.cpp
@@ -287,9 +327,24 @@ bcb\boost_regex-bcb-mt-1_32\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER
 -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_32\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\boost_regex-bcb-mt-1_32\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-1_32\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_32\regex_synch.obj ../src/regex_synch.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_32\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\boost_regex-bcb-mt-1_32\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_32\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\boost_regex-bcb-mt-1_32\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_32\static_mutex.obj ../src/static_mutex.cpp
+|
+
+bcb\boost_regex-bcb-mt-1_32\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_32\usinstances.obj ../src/usinstances.cpp
 |
 
 bcb\boost_regex-bcb-mt-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -297,6 +352,11 @@ bcb\boost_regex-bcb-mt-1_32\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_32\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\boost_regex-bcb-mt-1_32\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_32\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\boost_regex-bcb-mt-1_32\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_32\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -317,9 +377,9 @@ boost_regex-bcb-mt-1_32_clean :
 	del bcb\boost_regex-bcb-mt-1_32\*.tds
 	del bcb\*.tds
 
-bcb\boost_regex-bcb-mt-1_32.lib : bcb\boost_regex-bcb-mt-1_32\c_regex_traits.obj bcb\boost_regex-bcb-mt-1_32\c_regex_traits_common.obj bcb\boost_regex-bcb-mt-1_32\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-1_32\cregex.obj bcb\boost_regex-bcb-mt-1_32\fileiter.obj bcb\boost_regex-bcb-mt-1_32\instances.obj bcb\boost_regex-bcb-mt-1_32\posix_api.obj bcb\boost_regex-bcb-mt-1_32\regex.obj bcb\boost_regex-bcb-mt-1_32\regex_debug.obj bcb\boost_regex-bcb-mt-1_32\regex_synch.obj bcb\boost_regex-bcb-mt-1_32\w32_regex_traits.obj bcb\boost_regex-bcb-mt-1_32\wide_posix_api.obj bcb\boost_regex-bcb-mt-1_32\winstances.obj
+bcb\boost_regex-bcb-mt-1_32.lib : bcb\boost_regex-bcb-mt-1_32\c_regex_traits.obj bcb\boost_regex-bcb-mt-1_32\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-1_32\cregex.obj bcb\boost_regex-bcb-mt-1_32\fileiter.obj bcb\boost_regex-bcb-mt-1_32\icu.obj bcb\boost_regex-bcb-mt-1_32\instances.obj bcb\boost_regex-bcb-mt-1_32\posix_api.obj bcb\boost_regex-bcb-mt-1_32\regex.obj bcb\boost_regex-bcb-mt-1_32\regex_debug.obj bcb\boost_regex-bcb-mt-1_32\regex_raw_buffer.obj bcb\boost_regex-bcb-mt-1_32\regex_traits_defaults.obj bcb\boost_regex-bcb-mt-1_32\static_mutex.obj bcb\boost_regex-bcb-mt-1_32\usinstances.obj bcb\boost_regex-bcb-mt-1_32\w32_regex_traits.obj bcb\boost_regex-bcb-mt-1_32\wc_regex_traits.obj bcb\boost_regex-bcb-mt-1_32\wide_posix_api.obj bcb\boost_regex-bcb-mt-1_32\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_32.dll $(XLFLAGS)  bcb\boost_regex-bcb-mt-1_32\c_regex_traits.obj bcb\boost_regex-bcb-mt-1_32\c_regex_traits_common.obj bcb\boost_regex-bcb-mt-1_32\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-1_32\cregex.obj bcb\boost_regex-bcb-mt-1_32\fileiter.obj bcb\boost_regex-bcb-mt-1_32\instances.obj bcb\boost_regex-bcb-mt-1_32\posix_api.obj bcb\boost_regex-bcb-mt-1_32\regex.obj bcb\boost_regex-bcb-mt-1_32\regex_debug.obj bcb\boost_regex-bcb-mt-1_32\regex_synch.obj bcb\boost_regex-bcb-mt-1_32\w32_regex_traits.obj bcb\boost_regex-bcb-mt-1_32\wide_posix_api.obj bcb\boost_regex-bcb-mt-1_32\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_32.dll $(XLFLAGS)  bcb\boost_regex-bcb-mt-1_32\c_regex_traits.obj bcb\boost_regex-bcb-mt-1_32\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-1_32\cregex.obj bcb\boost_regex-bcb-mt-1_32\fileiter.obj bcb\boost_regex-bcb-mt-1_32\icu.obj bcb\boost_regex-bcb-mt-1_32\instances.obj bcb\boost_regex-bcb-mt-1_32\posix_api.obj bcb\boost_regex-bcb-mt-1_32\regex.obj bcb\boost_regex-bcb-mt-1_32\regex_debug.obj bcb\boost_regex-bcb-mt-1_32\regex_raw_buffer.obj bcb\boost_regex-bcb-mt-1_32\regex_traits_defaults.obj bcb\boost_regex-bcb-mt-1_32\static_mutex.obj bcb\boost_regex-bcb-mt-1_32\usinstances.obj bcb\boost_regex-bcb-mt-1_32\w32_regex_traits.obj bcb\boost_regex-bcb-mt-1_32\wc_regex_traits.obj bcb\boost_regex-bcb-mt-1_32\wide_posix_api.obj bcb\boost_regex-bcb-mt-1_32\winstances.obj $(LIBS)
 |
 	implib -w bcb\boost_regex-bcb-mt-1_32.lib bcb\boost_regex-bcb-mt-1_32.dll
 
@@ -333,11 +393,6 @@ bcb\boost_regex-bcb-1_32\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_HEA
 -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_32\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\boost_regex-bcb-1_32\c_regex_traits_common.obj: ../src/c_regex_traits_common.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_32\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\boost_regex-bcb-1_32\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_32\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -353,6 +408,11 @@ bcb\boost_regex-bcb-1_32\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 -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_32\fileiter.obj ../src/fileiter.cpp
 |
 
+bcb\boost_regex-bcb-1_32\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_32\icu.obj ../src/icu.cpp
+|
+
 bcb\boost_regex-bcb-1_32\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_32\instances.obj ../src/instances.cpp
@@ -373,9 +433,24 @@ bcb\boost_regex-bcb-1_32\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 -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_32\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\boost_regex-bcb-1_32\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-1_32\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_32\regex_synch.obj ../src/regex_synch.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_32\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\boost_regex-bcb-1_32\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_32\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\boost_regex-bcb-1_32\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_32\static_mutex.obj ../src/static_mutex.cpp
+|
+
+bcb\boost_regex-bcb-1_32\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_32\usinstances.obj ../src/usinstances.cpp
 |
 
 bcb\boost_regex-bcb-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -383,6 +458,11 @@ bcb\boost_regex-bcb-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL
 -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_32\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\boost_regex-bcb-1_32\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_32\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\boost_regex-bcb-1_32\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_32\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -403,9 +483,9 @@ boost_regex-bcb-1_32_clean :
 	del bcb\boost_regex-bcb-1_32\*.tds
 	del bcb\*.tds
 
-bcb\boost_regex-bcb-1_32.lib : bcb\boost_regex-bcb-1_32\c_regex_traits.obj bcb\boost_regex-bcb-1_32\c_regex_traits_common.obj bcb\boost_regex-bcb-1_32\cpp_regex_traits.obj bcb\boost_regex-bcb-1_32\cregex.obj bcb\boost_regex-bcb-1_32\fileiter.obj bcb\boost_regex-bcb-1_32\instances.obj bcb\boost_regex-bcb-1_32\posix_api.obj bcb\boost_regex-bcb-1_32\regex.obj bcb\boost_regex-bcb-1_32\regex_debug.obj bcb\boost_regex-bcb-1_32\regex_synch.obj bcb\boost_regex-bcb-1_32\w32_regex_traits.obj bcb\boost_regex-bcb-1_32\wide_posix_api.obj bcb\boost_regex-bcb-1_32\winstances.obj
+bcb\boost_regex-bcb-1_32.lib : bcb\boost_regex-bcb-1_32\c_regex_traits.obj bcb\boost_regex-bcb-1_32\cpp_regex_traits.obj bcb\boost_regex-bcb-1_32\cregex.obj bcb\boost_regex-bcb-1_32\fileiter.obj bcb\boost_regex-bcb-1_32\icu.obj bcb\boost_regex-bcb-1_32\instances.obj bcb\boost_regex-bcb-1_32\posix_api.obj bcb\boost_regex-bcb-1_32\regex.obj bcb\boost_regex-bcb-1_32\regex_debug.obj bcb\boost_regex-bcb-1_32\regex_raw_buffer.obj bcb\boost_regex-bcb-1_32\regex_traits_defaults.obj bcb\boost_regex-bcb-1_32\static_mutex.obj bcb\boost_regex-bcb-1_32\usinstances.obj bcb\boost_regex-bcb-1_32\w32_regex_traits.obj bcb\boost_regex-bcb-1_32\wc_regex_traits.obj bcb\boost_regex-bcb-1_32\wide_posix_api.obj bcb\boost_regex-bcb-1_32\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_32.dll $(XLFLAGS)  bcb\boost_regex-bcb-1_32\c_regex_traits.obj bcb\boost_regex-bcb-1_32\c_regex_traits_common.obj bcb\boost_regex-bcb-1_32\cpp_regex_traits.obj bcb\boost_regex-bcb-1_32\cregex.obj bcb\boost_regex-bcb-1_32\fileiter.obj bcb\boost_regex-bcb-1_32\instances.obj bcb\boost_regex-bcb-1_32\posix_api.obj bcb\boost_regex-bcb-1_32\regex.obj bcb\boost_regex-bcb-1_32\regex_debug.obj bcb\boost_regex-bcb-1_32\regex_synch.obj bcb\boost_regex-bcb-1_32\w32_regex_traits.obj bcb\boost_regex-bcb-1_32\wide_posix_api.obj bcb\boost_regex-bcb-1_32\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_32.dll $(XLFLAGS)  bcb\boost_regex-bcb-1_32\c_regex_traits.obj bcb\boost_regex-bcb-1_32\cpp_regex_traits.obj bcb\boost_regex-bcb-1_32\cregex.obj bcb\boost_regex-bcb-1_32\fileiter.obj bcb\boost_regex-bcb-1_32\icu.obj bcb\boost_regex-bcb-1_32\instances.obj bcb\boost_regex-bcb-1_32\posix_api.obj bcb\boost_regex-bcb-1_32\regex.obj bcb\boost_regex-bcb-1_32\regex_debug.obj bcb\boost_regex-bcb-1_32\regex_raw_buffer.obj bcb\boost_regex-bcb-1_32\regex_traits_defaults.obj bcb\boost_regex-bcb-1_32\static_mutex.obj bcb\boost_regex-bcb-1_32\usinstances.obj bcb\boost_regex-bcb-1_32\w32_regex_traits.obj bcb\boost_regex-bcb-1_32\wc_regex_traits.obj bcb\boost_regex-bcb-1_32\wide_posix_api.obj bcb\boost_regex-bcb-1_32\winstances.obj $(LIBS)
 |
 	implib -w bcb\boost_regex-bcb-1_32.lib bcb\boost_regex-bcb-1_32.dll
 
@@ -419,11 +499,6 @@ bcb\libboost_regex-bcb-mt-1_32\c_regex_traits.obj: ../src/c_regex_traits.cpp $(A
 -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_32\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-mt-1_32\c_regex_traits_common.obj: ../src/c_regex_traits_common.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_32\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\libboost_regex-bcb-mt-1_32\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_32\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -439,6 +514,11 @@ bcb\libboost_regex-bcb-mt-1_32\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 -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_32\fileiter.obj ../src/fileiter.cpp
 |
 
+bcb\libboost_regex-bcb-mt-1_32\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_32\icu.obj ../src/icu.cpp
+|
+
 bcb\libboost_regex-bcb-mt-1_32\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_32\instances.obj ../src/instances.cpp
@@ -459,9 +539,24 @@ bcb\libboost_regex-bcb-mt-1_32\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEA
 -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_32\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\libboost_regex-bcb-mt-1_32\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-1_32\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_32\regex_synch.obj ../src/regex_synch.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_32\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\libboost_regex-bcb-mt-1_32\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_32\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\libboost_regex-bcb-mt-1_32\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_32\static_mutex.obj ../src/static_mutex.cpp
+|
+
+bcb\libboost_regex-bcb-mt-1_32\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_32\usinstances.obj ../src/usinstances.cpp
 |
 
 bcb\libboost_regex-bcb-mt-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -469,6 +564,11 @@ bcb\libboost_regex-bcb-mt-1_32\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_32\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\libboost_regex-bcb-mt-1_32\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_32\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\libboost_regex-bcb-mt-1_32\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_32\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -488,10 +588,10 @@ libboost_regex-bcb-mt-1_32_clean :
 	del bcb\libboost_regex-bcb-mt-1_32\*.csm
 	del bcb\libboost_regex-bcb-mt-1_32\*.tds
 
-bcb\libboost_regex-bcb-mt-1_32.lib : bcb\libboost_regex-bcb-mt-1_32\c_regex_traits.obj bcb\libboost_regex-bcb-mt-1_32\c_regex_traits_common.obj bcb\libboost_regex-bcb-mt-1_32\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-1_32\cregex.obj bcb\libboost_regex-bcb-mt-1_32\fileiter.obj bcb\libboost_regex-bcb-mt-1_32\instances.obj bcb\libboost_regex-bcb-mt-1_32\posix_api.obj bcb\libboost_regex-bcb-mt-1_32\regex.obj bcb\libboost_regex-bcb-mt-1_32\regex_debug.obj bcb\libboost_regex-bcb-mt-1_32\regex_synch.obj bcb\libboost_regex-bcb-mt-1_32\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-1_32\wide_posix_api.obj bcb\libboost_regex-bcb-mt-1_32\winstances.obj
+bcb\libboost_regex-bcb-mt-1_32.lib : bcb\libboost_regex-bcb-mt-1_32\c_regex_traits.obj bcb\libboost_regex-bcb-mt-1_32\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-1_32\cregex.obj bcb\libboost_regex-bcb-mt-1_32\fileiter.obj bcb\libboost_regex-bcb-mt-1_32\icu.obj bcb\libboost_regex-bcb-mt-1_32\instances.obj bcb\libboost_regex-bcb-mt-1_32\posix_api.obj bcb\libboost_regex-bcb-mt-1_32\regex.obj bcb\libboost_regex-bcb-mt-1_32\regex_debug.obj bcb\libboost_regex-bcb-mt-1_32\regex_raw_buffer.obj bcb\libboost_regex-bcb-mt-1_32\regex_traits_defaults.obj bcb\libboost_regex-bcb-mt-1_32\static_mutex.obj bcb\libboost_regex-bcb-mt-1_32\usinstances.obj bcb\libboost_regex-bcb-mt-1_32\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-1_32\wc_regex_traits.obj bcb\libboost_regex-bcb-mt-1_32\wide_posix_api.obj bcb\libboost_regex-bcb-mt-1_32\winstances.obj
 	if exist bcb\libboost_regex-bcb-mt-1_32.lib del bcb\libboost_regex-bcb-mt-1_32.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-1_32.lib"  +"bcb\libboost_regex-bcb-mt-1_32\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_32\c_regex_traits_common.obj" +"bcb\libboost_regex-bcb-mt-1_32\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_32\cregex.obj" +"bcb\libboost_regex-bcb-mt-1_32\fileiter.obj" +"bcb\libboost_regex-bcb-mt-1_32\instances.obj" +"bcb\libboost_regex-bcb-mt-1_32\posix_api.obj" +"bcb\libboost_regex-bcb-mt-1_32\regex.obj" +"bcb\libboost_regex-bcb-mt-1_32\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-1_32\regex_synch.obj" +"bcb\libboost_regex-bcb-mt-1_32\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_32\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-1_32\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-1_32.lib"  +"bcb\libboost_regex-bcb-mt-1_32\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_32\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_32\cregex.obj" +"bcb\libboost_regex-bcb-mt-1_32\fileiter.obj" +"bcb\libboost_regex-bcb-mt-1_32\icu.obj" +"bcb\libboost_regex-bcb-mt-1_32\instances.obj" +"bcb\libboost_regex-bcb-mt-1_32\posix_api.obj" +"bcb\libboost_regex-bcb-mt-1_32\regex.obj" +"bcb\libboost_regex-bcb-mt-1_32\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-1_32\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-mt-1_32\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-mt-1_32\static_mutex.obj" +"bcb\libboost_regex-bcb-mt-1_32\usinstances.obj" +"bcb\libboost_regex-bcb-mt-1_32\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_32\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-1_32\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-1_32\winstances.obj"
 |
 
 ########################################################
@@ -504,11 +604,6 @@ bcb\libboost_regex-bcb-1_32\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_
 -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_32\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-1_32\c_regex_traits_common.obj: ../src/c_regex_traits_common.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_32\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\libboost_regex-bcb-1_32\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_32\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -524,6 +619,11 @@ bcb\libboost_regex-bcb-1_32\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 -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_32\fileiter.obj ../src/fileiter.cpp
 |
 
+bcb\libboost_regex-bcb-1_32\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_32\icu.obj ../src/icu.cpp
+|
+
 bcb\libboost_regex-bcb-1_32\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_32\instances.obj ../src/instances.cpp
@@ -544,9 +644,24 @@ bcb\libboost_regex-bcb-1_32\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER
 -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_32\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\libboost_regex-bcb-1_32\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-1_32\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_32\regex_synch.obj ../src/regex_synch.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_32\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\libboost_regex-bcb-1_32\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_32\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\libboost_regex-bcb-1_32\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_32\static_mutex.obj ../src/static_mutex.cpp
+|
+
+bcb\libboost_regex-bcb-1_32\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_32\usinstances.obj ../src/usinstances.cpp
 |
 
 bcb\libboost_regex-bcb-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -554,6 +669,11 @@ bcb\libboost_regex-bcb-1_32\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_32\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\libboost_regex-bcb-1_32\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_32\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\libboost_regex-bcb-1_32\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_32\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -573,10 +693,10 @@ libboost_regex-bcb-1_32_clean :
 	del bcb\libboost_regex-bcb-1_32\*.csm
 	del bcb\libboost_regex-bcb-1_32\*.tds
 
-bcb\libboost_regex-bcb-1_32.lib : bcb\libboost_regex-bcb-1_32\c_regex_traits.obj bcb\libboost_regex-bcb-1_32\c_regex_traits_common.obj bcb\libboost_regex-bcb-1_32\cpp_regex_traits.obj bcb\libboost_regex-bcb-1_32\cregex.obj bcb\libboost_regex-bcb-1_32\fileiter.obj bcb\libboost_regex-bcb-1_32\instances.obj bcb\libboost_regex-bcb-1_32\posix_api.obj bcb\libboost_regex-bcb-1_32\regex.obj bcb\libboost_regex-bcb-1_32\regex_debug.obj bcb\libboost_regex-bcb-1_32\regex_synch.obj bcb\libboost_regex-bcb-1_32\w32_regex_traits.obj bcb\libboost_regex-bcb-1_32\wide_posix_api.obj bcb\libboost_regex-bcb-1_32\winstances.obj
+bcb\libboost_regex-bcb-1_32.lib : bcb\libboost_regex-bcb-1_32\c_regex_traits.obj bcb\libboost_regex-bcb-1_32\cpp_regex_traits.obj bcb\libboost_regex-bcb-1_32\cregex.obj bcb\libboost_regex-bcb-1_32\fileiter.obj bcb\libboost_regex-bcb-1_32\icu.obj bcb\libboost_regex-bcb-1_32\instances.obj bcb\libboost_regex-bcb-1_32\posix_api.obj bcb\libboost_regex-bcb-1_32\regex.obj bcb\libboost_regex-bcb-1_32\regex_debug.obj bcb\libboost_regex-bcb-1_32\regex_raw_buffer.obj bcb\libboost_regex-bcb-1_32\regex_traits_defaults.obj bcb\libboost_regex-bcb-1_32\static_mutex.obj bcb\libboost_regex-bcb-1_32\usinstances.obj bcb\libboost_regex-bcb-1_32\w32_regex_traits.obj bcb\libboost_regex-bcb-1_32\wc_regex_traits.obj bcb\libboost_regex-bcb-1_32\wide_posix_api.obj bcb\libboost_regex-bcb-1_32\winstances.obj
 	if exist bcb\libboost_regex-bcb-1_32.lib del bcb\libboost_regex-bcb-1_32.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-1_32.lib"  +"bcb\libboost_regex-bcb-1_32\c_regex_traits.obj" +"bcb\libboost_regex-bcb-1_32\c_regex_traits_common.obj" +"bcb\libboost_regex-bcb-1_32\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-1_32\cregex.obj" +"bcb\libboost_regex-bcb-1_32\fileiter.obj" +"bcb\libboost_regex-bcb-1_32\instances.obj" +"bcb\libboost_regex-bcb-1_32\posix_api.obj" +"bcb\libboost_regex-bcb-1_32\regex.obj" +"bcb\libboost_regex-bcb-1_32\regex_debug.obj" +"bcb\libboost_regex-bcb-1_32\regex_synch.obj" +"bcb\libboost_regex-bcb-1_32\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-1_32\wide_posix_api.obj" +"bcb\libboost_regex-bcb-1_32\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-1_32.lib"  +"bcb\libboost_regex-bcb-1_32\c_regex_traits.obj" +"bcb\libboost_regex-bcb-1_32\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-1_32\cregex.obj" +"bcb\libboost_regex-bcb-1_32\fileiter.obj" +"bcb\libboost_regex-bcb-1_32\icu.obj" +"bcb\libboost_regex-bcb-1_32\instances.obj" +"bcb\libboost_regex-bcb-1_32\posix_api.obj" +"bcb\libboost_regex-bcb-1_32\regex.obj" +"bcb\libboost_regex-bcb-1_32\regex_debug.obj" +"bcb\libboost_regex-bcb-1_32\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-1_32\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-1_32\static_mutex.obj" +"bcb\libboost_regex-bcb-1_32\usinstances.obj" +"bcb\libboost_regex-bcb-1_32\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-1_32\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-1_32\wide_posix_api.obj" +"bcb\libboost_regex-bcb-1_32\winstances.obj"
 |
 
 ########################################################
@@ -589,11 +709,6 @@ bcb\libboost_regex-bcb-sd-1_32\c_regex_traits.obj: ../src/c_regex_traits.cpp $(A
 -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_32\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-sd-1_32\c_regex_traits_common.obj: ../src/c_regex_traits_common.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_32\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\libboost_regex-bcb-sd-1_32\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_32\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -609,6 +724,11 @@ bcb\libboost_regex-bcb-sd-1_32\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 -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_32\fileiter.obj ../src/fileiter.cpp
 |
 
+bcb\libboost_regex-bcb-sd-1_32\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_32\icu.obj ../src/icu.cpp
+|
+
 bcb\libboost_regex-bcb-sd-1_32\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_32\instances.obj ../src/instances.cpp
@@ -629,9 +749,24 @@ bcb\libboost_regex-bcb-sd-1_32\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEA
 -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_32\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\libboost_regex-bcb-sd-1_32\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-sd-1_32\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_32\regex_synch.obj ../src/regex_synch.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_32\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\libboost_regex-bcb-sd-1_32\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_32\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\libboost_regex-bcb-sd-1_32\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_32\static_mutex.obj ../src/static_mutex.cpp
+|
+
+bcb\libboost_regex-bcb-sd-1_32\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_32\usinstances.obj ../src/usinstances.cpp
 |
 
 bcb\libboost_regex-bcb-sd-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -639,6 +774,11 @@ bcb\libboost_regex-bcb-sd-1_32\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_32\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\libboost_regex-bcb-sd-1_32\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_32\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\libboost_regex-bcb-sd-1_32\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_32\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -658,10 +798,10 @@ libboost_regex-bcb-sd-1_32_clean :
 	del bcb\libboost_regex-bcb-sd-1_32\*.csm
 	del bcb\libboost_regex-bcb-sd-1_32\*.tds
 
-bcb\libboost_regex-bcb-sd-1_32.lib : bcb\libboost_regex-bcb-sd-1_32\c_regex_traits.obj bcb\libboost_regex-bcb-sd-1_32\c_regex_traits_common.obj bcb\libboost_regex-bcb-sd-1_32\cpp_regex_traits.obj bcb\libboost_regex-bcb-sd-1_32\cregex.obj bcb\libboost_regex-bcb-sd-1_32\fileiter.obj bcb\libboost_regex-bcb-sd-1_32\instances.obj bcb\libboost_regex-bcb-sd-1_32\posix_api.obj bcb\libboost_regex-bcb-sd-1_32\regex.obj bcb\libboost_regex-bcb-sd-1_32\regex_debug.obj bcb\libboost_regex-bcb-sd-1_32\regex_synch.obj bcb\libboost_regex-bcb-sd-1_32\w32_regex_traits.obj bcb\libboost_regex-bcb-sd-1_32\wide_posix_api.obj bcb\libboost_regex-bcb-sd-1_32\winstances.obj
+bcb\libboost_regex-bcb-sd-1_32.lib : bcb\libboost_regex-bcb-sd-1_32\c_regex_traits.obj bcb\libboost_regex-bcb-sd-1_32\cpp_regex_traits.obj bcb\libboost_regex-bcb-sd-1_32\cregex.obj bcb\libboost_regex-bcb-sd-1_32\fileiter.obj bcb\libboost_regex-bcb-sd-1_32\icu.obj bcb\libboost_regex-bcb-sd-1_32\instances.obj bcb\libboost_regex-bcb-sd-1_32\posix_api.obj bcb\libboost_regex-bcb-sd-1_32\regex.obj bcb\libboost_regex-bcb-sd-1_32\regex_debug.obj bcb\libboost_regex-bcb-sd-1_32\regex_raw_buffer.obj bcb\libboost_regex-bcb-sd-1_32\regex_traits_defaults.obj bcb\libboost_regex-bcb-sd-1_32\static_mutex.obj bcb\libboost_regex-bcb-sd-1_32\usinstances.obj bcb\libboost_regex-bcb-sd-1_32\w32_regex_traits.obj bcb\libboost_regex-bcb-sd-1_32\wc_regex_traits.obj bcb\libboost_regex-bcb-sd-1_32\wide_posix_api.obj bcb\libboost_regex-bcb-sd-1_32\winstances.obj
 	if exist bcb\libboost_regex-bcb-sd-1_32.lib del bcb\libboost_regex-bcb-sd-1_32.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-sd-1_32.lib"  +"bcb\libboost_regex-bcb-sd-1_32\c_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_32\c_regex_traits_common.obj" +"bcb\libboost_regex-bcb-sd-1_32\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_32\cregex.obj" +"bcb\libboost_regex-bcb-sd-1_32\fileiter.obj" +"bcb\libboost_regex-bcb-sd-1_32\instances.obj" +"bcb\libboost_regex-bcb-sd-1_32\posix_api.obj" +"bcb\libboost_regex-bcb-sd-1_32\regex.obj" +"bcb\libboost_regex-bcb-sd-1_32\regex_debug.obj" +"bcb\libboost_regex-bcb-sd-1_32\regex_synch.obj" +"bcb\libboost_regex-bcb-sd-1_32\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_32\wide_posix_api.obj" +"bcb\libboost_regex-bcb-sd-1_32\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-sd-1_32.lib"  +"bcb\libboost_regex-bcb-sd-1_32\c_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_32\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_32\cregex.obj" +"bcb\libboost_regex-bcb-sd-1_32\fileiter.obj" +"bcb\libboost_regex-bcb-sd-1_32\icu.obj" +"bcb\libboost_regex-bcb-sd-1_32\instances.obj" +"bcb\libboost_regex-bcb-sd-1_32\posix_api.obj" +"bcb\libboost_regex-bcb-sd-1_32\regex.obj" +"bcb\libboost_regex-bcb-sd-1_32\regex_debug.obj" +"bcb\libboost_regex-bcb-sd-1_32\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-sd-1_32\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-sd-1_32\static_mutex.obj" +"bcb\libboost_regex-bcb-sd-1_32\usinstances.obj" +"bcb\libboost_regex-bcb-sd-1_32\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_32\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-sd-1_32\wide_posix_api.obj" +"bcb\libboost_regex-bcb-sd-1_32\winstances.obj"
 |
 
 ########################################################
@@ -674,11 +814,6 @@ bcb\libboost_regex-bcb-mt-sd-1_32\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_32\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-mt-sd-1_32\c_regex_traits_common.obj: ../src/c_regex_traits_common.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_32\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\libboost_regex-bcb-mt-sd-1_32\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_32\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -694,6 +829,11 @@ bcb\libboost_regex-bcb-mt-sd-1_32\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER
 -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_32\fileiter.obj ../src/fileiter.cpp
 |
 
+bcb\libboost_regex-bcb-mt-sd-1_32\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_32\icu.obj ../src/icu.cpp
+|
+
 bcb\libboost_regex-bcb-mt-sd-1_32\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_32\instances.obj ../src/instances.cpp
@@ -714,9 +854,24 @@ bcb\libboost_regex-bcb-mt-sd-1_32\regex_debug.obj: ../src/regex_debug.cpp $(ALL_
 -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_32\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\libboost_regex-bcb-mt-sd-1_32\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-sd-1_32\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_32\regex_synch.obj ../src/regex_synch.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_32\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\libboost_regex-bcb-mt-sd-1_32\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_32\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\libboost_regex-bcb-mt-sd-1_32\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_32\static_mutex.obj ../src/static_mutex.cpp
+|
+
+bcb\libboost_regex-bcb-mt-sd-1_32\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_32\usinstances.obj ../src/usinstances.cpp
 |
 
 bcb\libboost_regex-bcb-mt-sd-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -724,6 +879,11 @@ bcb\libboost_regex-bcb-mt-sd-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.
 -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_32\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\libboost_regex-bcb-mt-sd-1_32\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_32\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\libboost_regex-bcb-mt-sd-1_32\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_32\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -743,10 +903,10 @@ libboost_regex-bcb-mt-sd-1_32_clean :
 	del bcb\libboost_regex-bcb-mt-sd-1_32\*.csm
 	del bcb\libboost_regex-bcb-mt-sd-1_32\*.tds
 
-bcb\libboost_regex-bcb-mt-sd-1_32.lib : bcb\libboost_regex-bcb-mt-sd-1_32\c_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_32\c_regex_traits_common.obj bcb\libboost_regex-bcb-mt-sd-1_32\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_32\cregex.obj bcb\libboost_regex-bcb-mt-sd-1_32\fileiter.obj bcb\libboost_regex-bcb-mt-sd-1_32\instances.obj bcb\libboost_regex-bcb-mt-sd-1_32\posix_api.obj bcb\libboost_regex-bcb-mt-sd-1_32\regex.obj bcb\libboost_regex-bcb-mt-sd-1_32\regex_debug.obj bcb\libboost_regex-bcb-mt-sd-1_32\regex_synch.obj bcb\libboost_regex-bcb-mt-sd-1_32\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_32\wide_posix_api.obj bcb\libboost_regex-bcb-mt-sd-1_32\winstances.obj
+bcb\libboost_regex-bcb-mt-sd-1_32.lib : bcb\libboost_regex-bcb-mt-sd-1_32\c_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_32\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_32\cregex.obj bcb\libboost_regex-bcb-mt-sd-1_32\fileiter.obj bcb\libboost_regex-bcb-mt-sd-1_32\icu.obj bcb\libboost_regex-bcb-mt-sd-1_32\instances.obj bcb\libboost_regex-bcb-mt-sd-1_32\posix_api.obj bcb\libboost_regex-bcb-mt-sd-1_32\regex.obj bcb\libboost_regex-bcb-mt-sd-1_32\regex_debug.obj bcb\libboost_regex-bcb-mt-sd-1_32\regex_raw_buffer.obj bcb\libboost_regex-bcb-mt-sd-1_32\regex_traits_defaults.obj bcb\libboost_regex-bcb-mt-sd-1_32\static_mutex.obj bcb\libboost_regex-bcb-mt-sd-1_32\usinstances.obj bcb\libboost_regex-bcb-mt-sd-1_32\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_32\wc_regex_traits.obj bcb\libboost_regex-bcb-mt-sd-1_32\wide_posix_api.obj bcb\libboost_regex-bcb-mt-sd-1_32\winstances.obj
 	if exist bcb\libboost_regex-bcb-mt-sd-1_32.lib del bcb\libboost_regex-bcb-mt-sd-1_32.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-sd-1_32.lib"  +"bcb\libboost_regex-bcb-mt-sd-1_32\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\c_regex_traits_common.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\cregex.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\fileiter.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\instances.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\posix_api.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\regex.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\regex_synch.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-sd-1_32.lib"  +"bcb\libboost_regex-bcb-mt-sd-1_32\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\cregex.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\fileiter.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\icu.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\instances.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\posix_api.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\regex.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\static_mutex.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\usinstances.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-sd-1_32\winstances.obj"
 |
 
 ########################################################
@@ -759,11 +919,6 @@ bcb\boost_regex-bcb-mt-d-1_32\c_regex_traits.obj: ../src/c_regex_traits.cpp $(AL
 -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_32\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\boost_regex-bcb-mt-d-1_32\c_regex_traits_common.obj: ../src/c_regex_traits_common.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_32\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\boost_regex-bcb-mt-d-1_32\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_32\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -779,6 +934,11 @@ bcb\boost_regex-bcb-mt-d-1_32\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 -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_32\fileiter.obj ../src/fileiter.cpp
 |
 
+bcb\boost_regex-bcb-mt-d-1_32\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_32\icu.obj ../src/icu.cpp
+|
+
 bcb\boost_regex-bcb-mt-d-1_32\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_32\instances.obj ../src/instances.cpp
@@ -799,9 +959,24 @@ bcb\boost_regex-bcb-mt-d-1_32\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEAD
 -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_32\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\boost_regex-bcb-mt-d-1_32\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-mt-d-1_32\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_32\regex_synch.obj ../src/regex_synch.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_32\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\boost_regex-bcb-mt-d-1_32\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_32\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\boost_regex-bcb-mt-d-1_32\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_32\static_mutex.obj ../src/static_mutex.cpp
+|
+
+bcb\boost_regex-bcb-mt-d-1_32\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_32\usinstances.obj ../src/usinstances.cpp
 |
 
 bcb\boost_regex-bcb-mt-d-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -809,6 +984,11 @@ bcb\boost_regex-bcb-mt-d-1_32\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_32\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\boost_regex-bcb-mt-d-1_32\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_32\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\boost_regex-bcb-mt-d-1_32\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_32\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -829,9 +1009,9 @@ boost_regex-bcb-mt-d-1_32_clean :
 	del bcb\boost_regex-bcb-mt-d-1_32\*.tds
 	del bcb\*.tds
 
-bcb\boost_regex-bcb-mt-d-1_32.lib : bcb\boost_regex-bcb-mt-d-1_32\c_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_32\c_regex_traits_common.obj bcb\boost_regex-bcb-mt-d-1_32\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_32\cregex.obj bcb\boost_regex-bcb-mt-d-1_32\fileiter.obj bcb\boost_regex-bcb-mt-d-1_32\instances.obj bcb\boost_regex-bcb-mt-d-1_32\posix_api.obj bcb\boost_regex-bcb-mt-d-1_32\regex.obj bcb\boost_regex-bcb-mt-d-1_32\regex_debug.obj bcb\boost_regex-bcb-mt-d-1_32\regex_synch.obj bcb\boost_regex-bcb-mt-d-1_32\w32_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_32\wide_posix_api.obj bcb\boost_regex-bcb-mt-d-1_32\winstances.obj
+bcb\boost_regex-bcb-mt-d-1_32.lib : bcb\boost_regex-bcb-mt-d-1_32\c_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_32\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_32\cregex.obj bcb\boost_regex-bcb-mt-d-1_32\fileiter.obj bcb\boost_regex-bcb-mt-d-1_32\icu.obj bcb\boost_regex-bcb-mt-d-1_32\instances.obj bcb\boost_regex-bcb-mt-d-1_32\posix_api.obj bcb\boost_regex-bcb-mt-d-1_32\regex.obj bcb\boost_regex-bcb-mt-d-1_32\regex_debug.obj bcb\boost_regex-bcb-mt-d-1_32\regex_raw_buffer.obj bcb\boost_regex-bcb-mt-d-1_32\regex_traits_defaults.obj bcb\boost_regex-bcb-mt-d-1_32\static_mutex.obj bcb\boost_regex-bcb-mt-d-1_32\usinstances.obj bcb\boost_regex-bcb-mt-d-1_32\w32_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_32\wc_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_32\wide_posix_api.obj bcb\boost_regex-bcb-mt-d-1_32\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_32.dll $(XLFLAGS)  bcb\boost_regex-bcb-mt-d-1_32\c_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_32\c_regex_traits_common.obj bcb\boost_regex-bcb-mt-d-1_32\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_32\cregex.obj bcb\boost_regex-bcb-mt-d-1_32\fileiter.obj bcb\boost_regex-bcb-mt-d-1_32\instances.obj bcb\boost_regex-bcb-mt-d-1_32\posix_api.obj bcb\boost_regex-bcb-mt-d-1_32\regex.obj bcb\boost_regex-bcb-mt-d-1_32\regex_debug.obj bcb\boost_regex-bcb-mt-d-1_32\regex_synch.obj bcb\boost_regex-bcb-mt-d-1_32\w32_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_32\wide_posix_api.obj bcb\boost_regex-bcb-mt-d-1_32\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_32.dll $(XLFLAGS)  bcb\boost_regex-bcb-mt-d-1_32\c_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_32\cpp_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_32\cregex.obj bcb\boost_regex-bcb-mt-d-1_32\fileiter.obj bcb\boost_regex-bcb-mt-d-1_32\icu.obj bcb\boost_regex-bcb-mt-d-1_32\instances.obj bcb\boost_regex-bcb-mt-d-1_32\posix_api.obj bcb\boost_regex-bcb-mt-d-1_32\regex.obj bcb\boost_regex-bcb-mt-d-1_32\regex_debug.obj bcb\boost_regex-bcb-mt-d-1_32\regex_raw_buffer.obj bcb\boost_regex-bcb-mt-d-1_32\regex_traits_defaults.obj bcb\boost_regex-bcb-mt-d-1_32\static_mutex.obj bcb\boost_regex-bcb-mt-d-1_32\usinstances.obj bcb\boost_regex-bcb-mt-d-1_32\w32_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_32\wc_regex_traits.obj bcb\boost_regex-bcb-mt-d-1_32\wide_posix_api.obj bcb\boost_regex-bcb-mt-d-1_32\winstances.obj $(LIBS)
 |
 	implib -w bcb\boost_regex-bcb-mt-d-1_32.lib bcb\boost_regex-bcb-mt-d-1_32.dll
 
@@ -845,11 +1025,6 @@ bcb\boost_regex-bcb-d-1_32\c_regex_traits.obj: ../src/c_regex_traits.cpp $(ALL_H
 -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_32\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\boost_regex-bcb-d-1_32\c_regex_traits_common.obj: ../src/c_regex_traits_common.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_32\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\boost_regex-bcb-d-1_32\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_32\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -865,6 +1040,11 @@ bcb\boost_regex-bcb-d-1_32\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 -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_32\fileiter.obj ../src/fileiter.cpp
 |
 
+bcb\boost_regex-bcb-d-1_32\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_32\icu.obj ../src/icu.cpp
+|
+
 bcb\boost_regex-bcb-d-1_32\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_32\instances.obj ../src/instances.cpp
@@ -885,9 +1065,24 @@ bcb\boost_regex-bcb-d-1_32\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEADER)
 -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_32\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\boost_regex-bcb-d-1_32\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\boost_regex-bcb-d-1_32\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_32\regex_synch.obj ../src/regex_synch.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_32\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\boost_regex-bcb-d-1_32\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_32\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\boost_regex-bcb-d-1_32\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_32\static_mutex.obj ../src/static_mutex.cpp
+|
+
+bcb\boost_regex-bcb-d-1_32\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_32\usinstances.obj ../src/usinstances.cpp
 |
 
 bcb\boost_regex-bcb-d-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -895,6 +1090,11 @@ bcb\boost_regex-bcb-d-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(A
 -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_32\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\boost_regex-bcb-d-1_32\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_32\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\boost_regex-bcb-d-1_32\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_32\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -915,9 +1115,9 @@ boost_regex-bcb-d-1_32_clean :
 	del bcb\boost_regex-bcb-d-1_32\*.tds
 	del bcb\*.tds
 
-bcb\boost_regex-bcb-d-1_32.lib : bcb\boost_regex-bcb-d-1_32\c_regex_traits.obj bcb\boost_regex-bcb-d-1_32\c_regex_traits_common.obj bcb\boost_regex-bcb-d-1_32\cpp_regex_traits.obj bcb\boost_regex-bcb-d-1_32\cregex.obj bcb\boost_regex-bcb-d-1_32\fileiter.obj bcb\boost_regex-bcb-d-1_32\instances.obj bcb\boost_regex-bcb-d-1_32\posix_api.obj bcb\boost_regex-bcb-d-1_32\regex.obj bcb\boost_regex-bcb-d-1_32\regex_debug.obj bcb\boost_regex-bcb-d-1_32\regex_synch.obj bcb\boost_regex-bcb-d-1_32\w32_regex_traits.obj bcb\boost_regex-bcb-d-1_32\wide_posix_api.obj bcb\boost_regex-bcb-d-1_32\winstances.obj
+bcb\boost_regex-bcb-d-1_32.lib : bcb\boost_regex-bcb-d-1_32\c_regex_traits.obj bcb\boost_regex-bcb-d-1_32\cpp_regex_traits.obj bcb\boost_regex-bcb-d-1_32\cregex.obj bcb\boost_regex-bcb-d-1_32\fileiter.obj bcb\boost_regex-bcb-d-1_32\icu.obj bcb\boost_regex-bcb-d-1_32\instances.obj bcb\boost_regex-bcb-d-1_32\posix_api.obj bcb\boost_regex-bcb-d-1_32\regex.obj bcb\boost_regex-bcb-d-1_32\regex_debug.obj bcb\boost_regex-bcb-d-1_32\regex_raw_buffer.obj bcb\boost_regex-bcb-d-1_32\regex_traits_defaults.obj bcb\boost_regex-bcb-d-1_32\static_mutex.obj bcb\boost_regex-bcb-d-1_32\usinstances.obj bcb\boost_regex-bcb-d-1_32\w32_regex_traits.obj bcb\boost_regex-bcb-d-1_32\wc_regex_traits.obj bcb\boost_regex-bcb-d-1_32\wide_posix_api.obj bcb\boost_regex-bcb-d-1_32\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_32.dll $(XLFLAGS)  bcb\boost_regex-bcb-d-1_32\c_regex_traits.obj bcb\boost_regex-bcb-d-1_32\c_regex_traits_common.obj bcb\boost_regex-bcb-d-1_32\cpp_regex_traits.obj bcb\boost_regex-bcb-d-1_32\cregex.obj bcb\boost_regex-bcb-d-1_32\fileiter.obj bcb\boost_regex-bcb-d-1_32\instances.obj bcb\boost_regex-bcb-d-1_32\posix_api.obj bcb\boost_regex-bcb-d-1_32\regex.obj bcb\boost_regex-bcb-d-1_32\regex_debug.obj bcb\boost_regex-bcb-d-1_32\regex_synch.obj bcb\boost_regex-bcb-d-1_32\w32_regex_traits.obj bcb\boost_regex-bcb-d-1_32\wide_posix_api.obj bcb\boost_regex-bcb-d-1_32\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_32.dll $(XLFLAGS)  bcb\boost_regex-bcb-d-1_32\c_regex_traits.obj bcb\boost_regex-bcb-d-1_32\cpp_regex_traits.obj bcb\boost_regex-bcb-d-1_32\cregex.obj bcb\boost_regex-bcb-d-1_32\fileiter.obj bcb\boost_regex-bcb-d-1_32\icu.obj bcb\boost_regex-bcb-d-1_32\instances.obj bcb\boost_regex-bcb-d-1_32\posix_api.obj bcb\boost_regex-bcb-d-1_32\regex.obj bcb\boost_regex-bcb-d-1_32\regex_debug.obj bcb\boost_regex-bcb-d-1_32\regex_raw_buffer.obj bcb\boost_regex-bcb-d-1_32\regex_traits_defaults.obj bcb\boost_regex-bcb-d-1_32\static_mutex.obj bcb\boost_regex-bcb-d-1_32\usinstances.obj bcb\boost_regex-bcb-d-1_32\w32_regex_traits.obj bcb\boost_regex-bcb-d-1_32\wc_regex_traits.obj bcb\boost_regex-bcb-d-1_32\wide_posix_api.obj bcb\boost_regex-bcb-d-1_32\winstances.obj $(LIBS)
 |
 	implib -w bcb\boost_regex-bcb-d-1_32.lib bcb\boost_regex-bcb-d-1_32.dll
 
@@ -931,11 +1131,6 @@ bcb\libboost_regex-bcb-mt-d-1_32\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_32\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-mt-d-1_32\c_regex_traits_common.obj: ../src/c_regex_traits_common.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_32\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\libboost_regex-bcb-mt-d-1_32\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_32\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -951,6 +1146,11 @@ bcb\libboost_regex-bcb-mt-d-1_32\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 -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_32\fileiter.obj ../src/fileiter.cpp
 |
 
+bcb\libboost_regex-bcb-mt-d-1_32\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_32\icu.obj ../src/icu.cpp
+|
+
 bcb\libboost_regex-bcb-mt-d-1_32\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_32\instances.obj ../src/instances.cpp
@@ -971,9 +1171,24 @@ bcb\libboost_regex-bcb-mt-d-1_32\regex_debug.obj: ../src/regex_debug.cpp $(ALL_H
 -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_32\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\libboost_regex-bcb-mt-d-1_32\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-mt-d-1_32\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_32\regex_synch.obj ../src/regex_synch.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_32\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\libboost_regex-bcb-mt-d-1_32\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_32\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\libboost_regex-bcb-mt-d-1_32\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_32\static_mutex.obj ../src/static_mutex.cpp
+|
+
+bcb\libboost_regex-bcb-mt-d-1_32\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_32\usinstances.obj ../src/usinstances.cpp
 |
 
 bcb\libboost_regex-bcb-mt-d-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -981,6 +1196,11 @@ bcb\libboost_regex-bcb-mt-d-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.c
 -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_32\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\libboost_regex-bcb-mt-d-1_32\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_32\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\libboost_regex-bcb-mt-d-1_32\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_32\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -1000,10 +1220,10 @@ libboost_regex-bcb-mt-d-1_32_clean :
 	del bcb\libboost_regex-bcb-mt-d-1_32\*.csm
 	del bcb\libboost_regex-bcb-mt-d-1_32\*.tds
 
-bcb\libboost_regex-bcb-mt-d-1_32.lib : bcb\libboost_regex-bcb-mt-d-1_32\c_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_32\c_regex_traits_common.obj bcb\libboost_regex-bcb-mt-d-1_32\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_32\cregex.obj bcb\libboost_regex-bcb-mt-d-1_32\fileiter.obj bcb\libboost_regex-bcb-mt-d-1_32\instances.obj bcb\libboost_regex-bcb-mt-d-1_32\posix_api.obj bcb\libboost_regex-bcb-mt-d-1_32\regex.obj bcb\libboost_regex-bcb-mt-d-1_32\regex_debug.obj bcb\libboost_regex-bcb-mt-d-1_32\regex_synch.obj bcb\libboost_regex-bcb-mt-d-1_32\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_32\wide_posix_api.obj bcb\libboost_regex-bcb-mt-d-1_32\winstances.obj
+bcb\libboost_regex-bcb-mt-d-1_32.lib : bcb\libboost_regex-bcb-mt-d-1_32\c_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_32\cpp_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_32\cregex.obj bcb\libboost_regex-bcb-mt-d-1_32\fileiter.obj bcb\libboost_regex-bcb-mt-d-1_32\icu.obj bcb\libboost_regex-bcb-mt-d-1_32\instances.obj bcb\libboost_regex-bcb-mt-d-1_32\posix_api.obj bcb\libboost_regex-bcb-mt-d-1_32\regex.obj bcb\libboost_regex-bcb-mt-d-1_32\regex_debug.obj bcb\libboost_regex-bcb-mt-d-1_32\regex_raw_buffer.obj bcb\libboost_regex-bcb-mt-d-1_32\regex_traits_defaults.obj bcb\libboost_regex-bcb-mt-d-1_32\static_mutex.obj bcb\libboost_regex-bcb-mt-d-1_32\usinstances.obj bcb\libboost_regex-bcb-mt-d-1_32\w32_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_32\wc_regex_traits.obj bcb\libboost_regex-bcb-mt-d-1_32\wide_posix_api.obj bcb\libboost_regex-bcb-mt-d-1_32\winstances.obj
 	if exist bcb\libboost_regex-bcb-mt-d-1_32.lib del bcb\libboost_regex-bcb-mt-d-1_32.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-d-1_32.lib"  +"bcb\libboost_regex-bcb-mt-d-1_32\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\c_regex_traits_common.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\cregex.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\fileiter.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\instances.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\posix_api.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\regex.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\regex_synch.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-mt-d-1_32.lib"  +"bcb\libboost_regex-bcb-mt-d-1_32\c_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\cregex.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\fileiter.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\icu.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\instances.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\posix_api.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\regex.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\regex_debug.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\static_mutex.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\usinstances.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\wide_posix_api.obj" +"bcb\libboost_regex-bcb-mt-d-1_32\winstances.obj"
 |
 
 ########################################################
@@ -1016,11 +1236,6 @@ bcb\libboost_regex-bcb-d-1_32\c_regex_traits.obj: ../src/c_regex_traits.cpp $(AL
 -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_32\c_regex_traits.obj ../src/c_regex_traits.cpp
 |
 
-bcb\libboost_regex-bcb-d-1_32\c_regex_traits_common.obj: ../src/c_regex_traits_common.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_32\c_regex_traits_common.obj ../src/c_regex_traits_common.cpp
-|
-
 bcb\libboost_regex-bcb-d-1_32\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_32\cpp_regex_traits.obj ../src/cpp_regex_traits.cpp
@@ -1036,6 +1251,11 @@ bcb\libboost_regex-bcb-d-1_32\fileiter.obj: ../src/fileiter.cpp $(ALL_HEADER)
 -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_32\fileiter.obj ../src/fileiter.cpp
 |
 
+bcb\libboost_regex-bcb-d-1_32\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_32\icu.obj ../src/icu.cpp
+|
+
 bcb\libboost_regex-bcb-d-1_32\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_32\instances.obj ../src/instances.cpp
@@ -1056,9 +1276,24 @@ bcb\libboost_regex-bcb-d-1_32\regex_debug.obj: ../src/regex_debug.cpp $(ALL_HEAD
 -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_32\regex_debug.obj ../src/regex_debug.cpp
 |
 
-bcb\libboost_regex-bcb-d-1_32\regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
+bcb\libboost_regex-bcb-d-1_32\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_32\regex_synch.obj ../src/regex_synch.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_32\regex_raw_buffer.obj ../src/regex_raw_buffer.cpp
+|
+
+bcb\libboost_regex-bcb-d-1_32\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_32\regex_traits_defaults.obj ../src/regex_traits_defaults.cpp
+|
+
+bcb\libboost_regex-bcb-d-1_32\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_32\static_mutex.obj ../src/static_mutex.cpp
+|
+
+bcb\libboost_regex-bcb-d-1_32\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_32\usinstances.obj ../src/usinstances.cpp
 |
 
 bcb\libboost_regex-bcb-d-1_32\w32_regex_traits.obj: ../src/w32_regex_traits.cpp $(ALL_HEADER)
@@ -1066,6 +1301,11 @@ bcb\libboost_regex-bcb-d-1_32\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_32\w32_regex_traits.obj ../src/w32_regex_traits.cpp
 |
 
+bcb\libboost_regex-bcb-d-1_32\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_32\wc_regex_traits.obj ../src/wc_regex_traits.cpp
+|
+
 bcb\libboost_regex-bcb-d-1_32\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_32\wide_posix_api.obj ../src/wide_posix_api.cpp
@@ -1085,9 +1325,9 @@ libboost_regex-bcb-d-1_32_clean :
 	del bcb\libboost_regex-bcb-d-1_32\*.csm
 	del bcb\libboost_regex-bcb-d-1_32\*.tds
 
-bcb\libboost_regex-bcb-d-1_32.lib : bcb\libboost_regex-bcb-d-1_32\c_regex_traits.obj bcb\libboost_regex-bcb-d-1_32\c_regex_traits_common.obj bcb\libboost_regex-bcb-d-1_32\cpp_regex_traits.obj bcb\libboost_regex-bcb-d-1_32\cregex.obj bcb\libboost_regex-bcb-d-1_32\fileiter.obj bcb\libboost_regex-bcb-d-1_32\instances.obj bcb\libboost_regex-bcb-d-1_32\posix_api.obj bcb\libboost_regex-bcb-d-1_32\regex.obj bcb\libboost_regex-bcb-d-1_32\regex_debug.obj bcb\libboost_regex-bcb-d-1_32\regex_synch.obj bcb\libboost_regex-bcb-d-1_32\w32_regex_traits.obj bcb\libboost_regex-bcb-d-1_32\wide_posix_api.obj bcb\libboost_regex-bcb-d-1_32\winstances.obj
+bcb\libboost_regex-bcb-d-1_32.lib : bcb\libboost_regex-bcb-d-1_32\c_regex_traits.obj bcb\libboost_regex-bcb-d-1_32\cpp_regex_traits.obj bcb\libboost_regex-bcb-d-1_32\cregex.obj bcb\libboost_regex-bcb-d-1_32\fileiter.obj bcb\libboost_regex-bcb-d-1_32\icu.obj bcb\libboost_regex-bcb-d-1_32\instances.obj bcb\libboost_regex-bcb-d-1_32\posix_api.obj bcb\libboost_regex-bcb-d-1_32\regex.obj bcb\libboost_regex-bcb-d-1_32\regex_debug.obj bcb\libboost_regex-bcb-d-1_32\regex_raw_buffer.obj bcb\libboost_regex-bcb-d-1_32\regex_traits_defaults.obj bcb\libboost_regex-bcb-d-1_32\static_mutex.obj bcb\libboost_regex-bcb-d-1_32\usinstances.obj bcb\libboost_regex-bcb-d-1_32\w32_regex_traits.obj bcb\libboost_regex-bcb-d-1_32\wc_regex_traits.obj bcb\libboost_regex-bcb-d-1_32\wide_posix_api.obj bcb\libboost_regex-bcb-d-1_32\winstances.obj
 	if exist bcb\libboost_regex-bcb-d-1_32.lib del bcb\libboost_regex-bcb-d-1_32.lib 
 	tlib @&&|
-/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-d-1_32.lib"  +"bcb\libboost_regex-bcb-d-1_32\c_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_32\c_regex_traits_common.obj" +"bcb\libboost_regex-bcb-d-1_32\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_32\cregex.obj" +"bcb\libboost_regex-bcb-d-1_32\fileiter.obj" +"bcb\libboost_regex-bcb-d-1_32\instances.obj" +"bcb\libboost_regex-bcb-d-1_32\posix_api.obj" +"bcb\libboost_regex-bcb-d-1_32\regex.obj" +"bcb\libboost_regex-bcb-d-1_32\regex_debug.obj" +"bcb\libboost_regex-bcb-d-1_32\regex_synch.obj" +"bcb\libboost_regex-bcb-d-1_32\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_32\wide_posix_api.obj" +"bcb\libboost_regex-bcb-d-1_32\winstances.obj"
+/P128 /C /u /a $(XSFLAGS) "bcb\libboost_regex-bcb-d-1_32.lib"  +"bcb\libboost_regex-bcb-d-1_32\c_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_32\cpp_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_32\cregex.obj" +"bcb\libboost_regex-bcb-d-1_32\fileiter.obj" +"bcb\libboost_regex-bcb-d-1_32\icu.obj" +"bcb\libboost_regex-bcb-d-1_32\instances.obj" +"bcb\libboost_regex-bcb-d-1_32\posix_api.obj" +"bcb\libboost_regex-bcb-d-1_32\regex.obj" +"bcb\libboost_regex-bcb-d-1_32\regex_debug.obj" +"bcb\libboost_regex-bcb-d-1_32\regex_raw_buffer.obj" +"bcb\libboost_regex-bcb-d-1_32\regex_traits_defaults.obj" +"bcb\libboost_regex-bcb-d-1_32\static_mutex.obj" +"bcb\libboost_regex-bcb-d-1_32\usinstances.obj" +"bcb\libboost_regex-bcb-d-1_32\w32_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_32\wc_regex_traits.obj" +"bcb\libboost_regex-bcb-d-1_32\wide_posix_api.obj" +"bcb\libboost_regex-bcb-d-1_32\winstances.obj"
 |
 
diff --git a/build/gcc-shared.mak b/build/gcc-shared.mak
index 65018532..646bf551 100644
--- a/build/gcc-shared.mak
+++ b/build/gcc-shared.mak
@@ -10,6 +10,7 @@
 
 #
 # the following environment variables are recognised:
+# ICU_PATH= Path to ICU installation.
 # CXXFLAGS= extra compiler options - note applies to all build variants
 # INCLUDES= additional include directories
 # LDFLAGS=  additional linker options
@@ -28,8 +29,19 @@ C1=-c -O2 -I../../../ -fPIC
 #
 C2=-c -g -I../../../ -fPIC
 
+ifeq "$(ICU_PATH)" ""
+$(warning "Building Boost.Regex without ICU / Unicode support:")
+$(warning "Hint: set ICU_PATH on the nmake command line to point ")
+$(warning "to your ICU installation if you have one.")
+else
+ICU_CXXFLAGS= -DBOOST_HAS_ICU=1 -I$(ICU_PATH)/include
+ICU_LDFLAGS= -L$(ICU_PATH)/lib
+ICU_LIBS= -licui18n -licuuc
+$(warning "Building Boost.Regex with ICU in $(ICU_PATH)")
+endif
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.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/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.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_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/allocator.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+
+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/static_mutex.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 ../../../boost/regex/config/regex_library_include.hpp
 
 all : gcc  gcc gcc/boost_regex-gcc-1_32_shared ./gcc/libboost_regex-gcc-1_32.so gcc gcc/boost_regex-gcc-d-1_32_shared ./gcc/libboost_regex-gcc-d-1_32.so
 
@@ -48,43 +60,55 @@ install : all
 #
 ########################################################
 gcc/boost_regex-gcc-1_32_shared/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/c_regex_traits.o $(C1) $(CXXFLAGS) ../src/c_regex_traits.cpp
-
-gcc/boost_regex-gcc-1_32_shared/c_regex_traits_common.o: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/c_regex_traits_common.o $(C1) $(CXXFLAGS) ../src/c_regex_traits_common.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/c_regex_traits.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/c_regex_traits.cpp
 
 gcc/boost_regex-gcc-1_32_shared/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/cpp_regex_traits.o $(C1) $(CXXFLAGS) ../src/cpp_regex_traits.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/cpp_regex_traits.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/cpp_regex_traits.cpp
 
 gcc/boost_regex-gcc-1_32_shared/cregex.o: ../src/cregex.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/cregex.o $(C1) $(CXXFLAGS) ../src/cregex.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/cregex.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/cregex.cpp
 
 gcc/boost_regex-gcc-1_32_shared/fileiter.o: ../src/fileiter.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/fileiter.o $(C1) $(CXXFLAGS) ../src/fileiter.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/fileiter.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/fileiter.cpp
+
+gcc/boost_regex-gcc-1_32_shared/icu.o: ../src/icu.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/icu.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/icu.cpp
 
 gcc/boost_regex-gcc-1_32_shared/instances.o: ../src/instances.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/instances.o $(C1) $(CXXFLAGS) ../src/instances.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/instances.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/instances.cpp
 
 gcc/boost_regex-gcc-1_32_shared/posix_api.o: ../src/posix_api.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/posix_api.o $(C1) $(CXXFLAGS) ../src/posix_api.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/posix_api.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/posix_api.cpp
 
 gcc/boost_regex-gcc-1_32_shared/regex.o: ../src/regex.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/regex.o $(C1) $(CXXFLAGS) ../src/regex.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/regex.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex.cpp
 
 gcc/boost_regex-gcc-1_32_shared/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/regex_debug.o $(C1) $(CXXFLAGS) ../src/regex_debug.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/regex_debug.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_debug.cpp
 
-gcc/boost_regex-gcc-1_32_shared/regex_synch.o: ../src/regex_synch.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/regex_synch.o $(C1) $(CXXFLAGS) ../src/regex_synch.cpp
+gcc/boost_regex-gcc-1_32_shared/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/regex_raw_buffer.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_raw_buffer.cpp
+
+gcc/boost_regex-gcc-1_32_shared/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/regex_traits_defaults.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_traits_defaults.cpp
+
+gcc/boost_regex-gcc-1_32_shared/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/static_mutex.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/static_mutex.cpp
+
+gcc/boost_regex-gcc-1_32_shared/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/usinstances.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/usinstances.cpp
 
 gcc/boost_regex-gcc-1_32_shared/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/w32_regex_traits.o $(C1) $(CXXFLAGS) ../src/w32_regex_traits.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/w32_regex_traits.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/w32_regex_traits.cpp
+
+gcc/boost_regex-gcc-1_32_shared/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/wc_regex_traits.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/wc_regex_traits.cpp
 
 gcc/boost_regex-gcc-1_32_shared/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/wide_posix_api.o $(C1) $(CXXFLAGS) ../src/wide_posix_api.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/wide_posix_api.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/wide_posix_api.cpp
 
 gcc/boost_regex-gcc-1_32_shared/winstances.o: ../src/winstances.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/winstances.o $(C1) $(CXXFLAGS) ../src/winstances.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32_shared/winstances.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/winstances.cpp
 
 gcc/boost_regex-gcc-1_32_shared : 
 	mkdir -p gcc/boost_regex-gcc-1_32_shared
@@ -92,8 +116,8 @@ gcc/boost_regex-gcc-1_32_shared :
 boost_regex-gcc-1_32_clean :
 	rm -f gcc/boost_regex-gcc-1_32_shared/*.o
 
-./gcc/libboost_regex-gcc-1_32.so : gcc/boost_regex-gcc-1_32_shared/c_regex_traits.o gcc/boost_regex-gcc-1_32_shared/c_regex_traits_common.o gcc/boost_regex-gcc-1_32_shared/cpp_regex_traits.o gcc/boost_regex-gcc-1_32_shared/cregex.o gcc/boost_regex-gcc-1_32_shared/fileiter.o gcc/boost_regex-gcc-1_32_shared/instances.o gcc/boost_regex-gcc-1_32_shared/posix_api.o gcc/boost_regex-gcc-1_32_shared/regex.o gcc/boost_regex-gcc-1_32_shared/regex_debug.o gcc/boost_regex-gcc-1_32_shared/regex_synch.o gcc/boost_regex-gcc-1_32_shared/w32_regex_traits.o gcc/boost_regex-gcc-1_32_shared/wide_posix_api.o gcc/boost_regex-gcc-1_32_shared/winstances.o
-	$(LINKER) -o gcc/libboost_regex-gcc-1_32.so $(LDFLAGS)  gcc/boost_regex-gcc-1_32_shared/c_regex_traits.o gcc/boost_regex-gcc-1_32_shared/c_regex_traits_common.o gcc/boost_regex-gcc-1_32_shared/cpp_regex_traits.o gcc/boost_regex-gcc-1_32_shared/cregex.o gcc/boost_regex-gcc-1_32_shared/fileiter.o gcc/boost_regex-gcc-1_32_shared/instances.o gcc/boost_regex-gcc-1_32_shared/posix_api.o gcc/boost_regex-gcc-1_32_shared/regex.o gcc/boost_regex-gcc-1_32_shared/regex_debug.o gcc/boost_regex-gcc-1_32_shared/regex_synch.o gcc/boost_regex-gcc-1_32_shared/w32_regex_traits.o gcc/boost_regex-gcc-1_32_shared/wide_posix_api.o gcc/boost_regex-gcc-1_32_shared/winstances.o $(LIBS)
+./gcc/libboost_regex-gcc-1_32.so : gcc/boost_regex-gcc-1_32_shared/c_regex_traits.o gcc/boost_regex-gcc-1_32_shared/cpp_regex_traits.o gcc/boost_regex-gcc-1_32_shared/cregex.o gcc/boost_regex-gcc-1_32_shared/fileiter.o gcc/boost_regex-gcc-1_32_shared/icu.o gcc/boost_regex-gcc-1_32_shared/instances.o gcc/boost_regex-gcc-1_32_shared/posix_api.o gcc/boost_regex-gcc-1_32_shared/regex.o gcc/boost_regex-gcc-1_32_shared/regex_debug.o gcc/boost_regex-gcc-1_32_shared/regex_raw_buffer.o gcc/boost_regex-gcc-1_32_shared/regex_traits_defaults.o gcc/boost_regex-gcc-1_32_shared/static_mutex.o gcc/boost_regex-gcc-1_32_shared/usinstances.o gcc/boost_regex-gcc-1_32_shared/w32_regex_traits.o gcc/boost_regex-gcc-1_32_shared/wc_regex_traits.o gcc/boost_regex-gcc-1_32_shared/wide_posix_api.o gcc/boost_regex-gcc-1_32_shared/winstances.o
+	$(LINKER) -o gcc/libboost_regex-gcc-1_32.so $(LDFLAGS)  $(ICU_LDFLAGS)  gcc/boost_regex-gcc-1_32_shared/c_regex_traits.o gcc/boost_regex-gcc-1_32_shared/cpp_regex_traits.o gcc/boost_regex-gcc-1_32_shared/cregex.o gcc/boost_regex-gcc-1_32_shared/fileiter.o gcc/boost_regex-gcc-1_32_shared/icu.o gcc/boost_regex-gcc-1_32_shared/instances.o gcc/boost_regex-gcc-1_32_shared/posix_api.o gcc/boost_regex-gcc-1_32_shared/regex.o gcc/boost_regex-gcc-1_32_shared/regex_debug.o gcc/boost_regex-gcc-1_32_shared/regex_raw_buffer.o gcc/boost_regex-gcc-1_32_shared/regex_traits_defaults.o gcc/boost_regex-gcc-1_32_shared/static_mutex.o gcc/boost_regex-gcc-1_32_shared/usinstances.o gcc/boost_regex-gcc-1_32_shared/w32_regex_traits.o gcc/boost_regex-gcc-1_32_shared/wc_regex_traits.o gcc/boost_regex-gcc-1_32_shared/wide_posix_api.o gcc/boost_regex-gcc-1_32_shared/winstances.o $(ICU_LIBS) $(LIBS)
 
 ########################################################
 #
@@ -101,43 +125,55 @@ boost_regex-gcc-1_32_clean :
 #
 ########################################################
 gcc/boost_regex-gcc-d-1_32_shared/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/c_regex_traits.o $(C2) $(CXXFLAGS) ../src/c_regex_traits.cpp
-
-gcc/boost_regex-gcc-d-1_32_shared/c_regex_traits_common.o: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/c_regex_traits_common.o $(C2) $(CXXFLAGS) ../src/c_regex_traits_common.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/c_regex_traits.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/c_regex_traits.cpp
 
 gcc/boost_regex-gcc-d-1_32_shared/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/cpp_regex_traits.o $(C2) $(CXXFLAGS) ../src/cpp_regex_traits.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/cpp_regex_traits.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/cpp_regex_traits.cpp
 
 gcc/boost_regex-gcc-d-1_32_shared/cregex.o: ../src/cregex.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/cregex.o $(C2) $(CXXFLAGS) ../src/cregex.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/cregex.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/cregex.cpp
 
 gcc/boost_regex-gcc-d-1_32_shared/fileiter.o: ../src/fileiter.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/fileiter.o $(C2) $(CXXFLAGS) ../src/fileiter.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/fileiter.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/fileiter.cpp
+
+gcc/boost_regex-gcc-d-1_32_shared/icu.o: ../src/icu.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/icu.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/icu.cpp
 
 gcc/boost_regex-gcc-d-1_32_shared/instances.o: ../src/instances.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/instances.o $(C2) $(CXXFLAGS) ../src/instances.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/instances.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/instances.cpp
 
 gcc/boost_regex-gcc-d-1_32_shared/posix_api.o: ../src/posix_api.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/posix_api.o $(C2) $(CXXFLAGS) ../src/posix_api.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/posix_api.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/posix_api.cpp
 
 gcc/boost_regex-gcc-d-1_32_shared/regex.o: ../src/regex.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/regex.o $(C2) $(CXXFLAGS) ../src/regex.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/regex.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex.cpp
 
 gcc/boost_regex-gcc-d-1_32_shared/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/regex_debug.o $(C2) $(CXXFLAGS) ../src/regex_debug.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/regex_debug.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_debug.cpp
 
-gcc/boost_regex-gcc-d-1_32_shared/regex_synch.o: ../src/regex_synch.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/regex_synch.o $(C2) $(CXXFLAGS) ../src/regex_synch.cpp
+gcc/boost_regex-gcc-d-1_32_shared/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/regex_raw_buffer.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_raw_buffer.cpp
+
+gcc/boost_regex-gcc-d-1_32_shared/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/regex_traits_defaults.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_traits_defaults.cpp
+
+gcc/boost_regex-gcc-d-1_32_shared/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/static_mutex.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/static_mutex.cpp
+
+gcc/boost_regex-gcc-d-1_32_shared/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/usinstances.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/usinstances.cpp
 
 gcc/boost_regex-gcc-d-1_32_shared/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/w32_regex_traits.o $(C2) $(CXXFLAGS) ../src/w32_regex_traits.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/w32_regex_traits.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/w32_regex_traits.cpp
+
+gcc/boost_regex-gcc-d-1_32_shared/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/wc_regex_traits.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/wc_regex_traits.cpp
 
 gcc/boost_regex-gcc-d-1_32_shared/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/wide_posix_api.o $(C2) $(CXXFLAGS) ../src/wide_posix_api.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/wide_posix_api.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/wide_posix_api.cpp
 
 gcc/boost_regex-gcc-d-1_32_shared/winstances.o: ../src/winstances.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/winstances.o $(C2) $(CXXFLAGS) ../src/winstances.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32_shared/winstances.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/winstances.cpp
 
 gcc/boost_regex-gcc-d-1_32_shared : 
 	mkdir -p gcc/boost_regex-gcc-d-1_32_shared
@@ -145,6 +181,6 @@ gcc/boost_regex-gcc-d-1_32_shared :
 boost_regex-gcc-d-1_32_clean :
 	rm -f gcc/boost_regex-gcc-d-1_32_shared/*.o
 
-./gcc/libboost_regex-gcc-d-1_32.so : gcc/boost_regex-gcc-d-1_32_shared/c_regex_traits.o gcc/boost_regex-gcc-d-1_32_shared/c_regex_traits_common.o gcc/boost_regex-gcc-d-1_32_shared/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_32_shared/cregex.o gcc/boost_regex-gcc-d-1_32_shared/fileiter.o gcc/boost_regex-gcc-d-1_32_shared/instances.o gcc/boost_regex-gcc-d-1_32_shared/posix_api.o gcc/boost_regex-gcc-d-1_32_shared/regex.o gcc/boost_regex-gcc-d-1_32_shared/regex_debug.o gcc/boost_regex-gcc-d-1_32_shared/regex_synch.o gcc/boost_regex-gcc-d-1_32_shared/w32_regex_traits.o gcc/boost_regex-gcc-d-1_32_shared/wide_posix_api.o gcc/boost_regex-gcc-d-1_32_shared/winstances.o
-	$(LINKER) -o gcc/libboost_regex-gcc-d-1_32.so $(LDFLAGS)  gcc/boost_regex-gcc-d-1_32_shared/c_regex_traits.o gcc/boost_regex-gcc-d-1_32_shared/c_regex_traits_common.o gcc/boost_regex-gcc-d-1_32_shared/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_32_shared/cregex.o gcc/boost_regex-gcc-d-1_32_shared/fileiter.o gcc/boost_regex-gcc-d-1_32_shared/instances.o gcc/boost_regex-gcc-d-1_32_shared/posix_api.o gcc/boost_regex-gcc-d-1_32_shared/regex.o gcc/boost_regex-gcc-d-1_32_shared/regex_debug.o gcc/boost_regex-gcc-d-1_32_shared/regex_synch.o gcc/boost_regex-gcc-d-1_32_shared/w32_regex_traits.o gcc/boost_regex-gcc-d-1_32_shared/wide_posix_api.o gcc/boost_regex-gcc-d-1_32_shared/winstances.o $(LIBS)
+./gcc/libboost_regex-gcc-d-1_32.so : gcc/boost_regex-gcc-d-1_32_shared/c_regex_traits.o gcc/boost_regex-gcc-d-1_32_shared/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_32_shared/cregex.o gcc/boost_regex-gcc-d-1_32_shared/fileiter.o gcc/boost_regex-gcc-d-1_32_shared/icu.o gcc/boost_regex-gcc-d-1_32_shared/instances.o gcc/boost_regex-gcc-d-1_32_shared/posix_api.o gcc/boost_regex-gcc-d-1_32_shared/regex.o gcc/boost_regex-gcc-d-1_32_shared/regex_debug.o gcc/boost_regex-gcc-d-1_32_shared/regex_raw_buffer.o gcc/boost_regex-gcc-d-1_32_shared/regex_traits_defaults.o gcc/boost_regex-gcc-d-1_32_shared/static_mutex.o gcc/boost_regex-gcc-d-1_32_shared/usinstances.o gcc/boost_regex-gcc-d-1_32_shared/w32_regex_traits.o gcc/boost_regex-gcc-d-1_32_shared/wc_regex_traits.o gcc/boost_regex-gcc-d-1_32_shared/wide_posix_api.o gcc/boost_regex-gcc-d-1_32_shared/winstances.o
+	$(LINKER) -o gcc/libboost_regex-gcc-d-1_32.so $(LDFLAGS)  $(ICU_LDFLAGS)  gcc/boost_regex-gcc-d-1_32_shared/c_regex_traits.o gcc/boost_regex-gcc-d-1_32_shared/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_32_shared/cregex.o gcc/boost_regex-gcc-d-1_32_shared/fileiter.o gcc/boost_regex-gcc-d-1_32_shared/icu.o gcc/boost_regex-gcc-d-1_32_shared/instances.o gcc/boost_regex-gcc-d-1_32_shared/posix_api.o gcc/boost_regex-gcc-d-1_32_shared/regex.o gcc/boost_regex-gcc-d-1_32_shared/regex_debug.o gcc/boost_regex-gcc-d-1_32_shared/regex_raw_buffer.o gcc/boost_regex-gcc-d-1_32_shared/regex_traits_defaults.o gcc/boost_regex-gcc-d-1_32_shared/static_mutex.o gcc/boost_regex-gcc-d-1_32_shared/usinstances.o gcc/boost_regex-gcc-d-1_32_shared/w32_regex_traits.o gcc/boost_regex-gcc-d-1_32_shared/wc_regex_traits.o gcc/boost_regex-gcc-d-1_32_shared/wide_posix_api.o gcc/boost_regex-gcc-d-1_32_shared/winstances.o $(ICU_LIBS) $(LIBS)
 
diff --git a/build/gcc.mak b/build/gcc.mak
index 818f584d..0d30b54c 100644
--- a/build/gcc.mak
+++ b/build/gcc.mak
@@ -10,6 +10,7 @@
 
 #
 # the following environment variables are recognised:
+# ICU_PATH= Path to ICU installation.
 # CXXFLAGS= extra compiler options - note applies to all build variants
 # INCLUDES= additional include directories
 # LDFLAGS=  additional linker options
@@ -28,9 +29,19 @@ C1=-c -O2 -I../../../
 #
 C2=-c -g -I../../../
 
+ifeq "$(ICU_PATH)" ""
+$(warning "Building Boost.Regex without ICU / Unicode support:")
+$(warning "Hint: set ICU_PATH on the nmake command line to point ")
+$(warning "to your ICU installation if you have one.")
+else
+ICU_CXXFLAGS= -DBOOST_HAS_ICU=1 -I$(ICU_PATH)/include
+ICU_LDFLAGS= -L$(ICU_PATH)/lib
+ICU_LIBS= -licui18n -licuuc
+$(warning "Building Boost.Regex with ICU in $(ICU_PATH)")
+endif
 
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.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/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.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_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/allocator.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+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/static_mutex.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 ../../../boost/regex/config/regex_library_include.hpp
 
 all : gcc  gcc gcc/boost_regex-gcc-1_32 ./gcc/libboost_regex-gcc-1_32.a gcc gcc/boost_regex-gcc-d-1_32 ./gcc/libboost_regex-gcc-d-1_32.a
 
@@ -49,43 +60,55 @@ install : all
 #
 ########################################################
 gcc/boost_regex-gcc-1_32/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/c_regex_traits.o $(C1) $(CXXFLAGS) ../src/c_regex_traits.cpp
-
-gcc/boost_regex-gcc-1_32/c_regex_traits_common.o: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/c_regex_traits_common.o $(C1) $(CXXFLAGS) ../src/c_regex_traits_common.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/c_regex_traits.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/c_regex_traits.cpp
 
 gcc/boost_regex-gcc-1_32/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/cpp_regex_traits.o $(C1) $(CXXFLAGS) ../src/cpp_regex_traits.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/cpp_regex_traits.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/cpp_regex_traits.cpp
 
 gcc/boost_regex-gcc-1_32/cregex.o: ../src/cregex.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/cregex.o $(C1) $(CXXFLAGS) ../src/cregex.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/cregex.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/cregex.cpp
 
 gcc/boost_regex-gcc-1_32/fileiter.o: ../src/fileiter.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/fileiter.o $(C1) $(CXXFLAGS) ../src/fileiter.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/fileiter.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/fileiter.cpp
+
+gcc/boost_regex-gcc-1_32/icu.o: ../src/icu.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/icu.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/icu.cpp
 
 gcc/boost_regex-gcc-1_32/instances.o: ../src/instances.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/instances.o $(C1) $(CXXFLAGS) ../src/instances.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/instances.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/instances.cpp
 
 gcc/boost_regex-gcc-1_32/posix_api.o: ../src/posix_api.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/posix_api.o $(C1) $(CXXFLAGS) ../src/posix_api.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/posix_api.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/posix_api.cpp
 
 gcc/boost_regex-gcc-1_32/regex.o: ../src/regex.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/regex.o $(C1) $(CXXFLAGS) ../src/regex.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/regex.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex.cpp
 
 gcc/boost_regex-gcc-1_32/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/regex_debug.o $(C1) $(CXXFLAGS) ../src/regex_debug.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/regex_debug.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_debug.cpp
 
-gcc/boost_regex-gcc-1_32/regex_synch.o: ../src/regex_synch.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/regex_synch.o $(C1) $(CXXFLAGS) ../src/regex_synch.cpp
+gcc/boost_regex-gcc-1_32/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/regex_raw_buffer.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_raw_buffer.cpp
+
+gcc/boost_regex-gcc-1_32/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/regex_traits_defaults.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_traits_defaults.cpp
+
+gcc/boost_regex-gcc-1_32/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/static_mutex.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/static_mutex.cpp
+
+gcc/boost_regex-gcc-1_32/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/usinstances.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/usinstances.cpp
 
 gcc/boost_regex-gcc-1_32/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/w32_regex_traits.o $(C1) $(CXXFLAGS) ../src/w32_regex_traits.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/w32_regex_traits.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/w32_regex_traits.cpp
+
+gcc/boost_regex-gcc-1_32/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/wc_regex_traits.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/wc_regex_traits.cpp
 
 gcc/boost_regex-gcc-1_32/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/wide_posix_api.o $(C1) $(CXXFLAGS) ../src/wide_posix_api.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/wide_posix_api.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/wide_posix_api.cpp
 
 gcc/boost_regex-gcc-1_32/winstances.o: ../src/winstances.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/winstances.o $(C1) $(CXXFLAGS) ../src/winstances.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-1_32/winstances.o $(C1) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/winstances.cpp
 
 gcc/boost_regex-gcc-1_32 : 
 	mkdir -p gcc/boost_regex-gcc-1_32
@@ -93,8 +116,8 @@ gcc/boost_regex-gcc-1_32 :
 boost_regex-gcc-1_32_clean :
 	rm -f gcc/boost_regex-gcc-1_32/*.o
 
-./gcc/libboost_regex-gcc-1_32.a : gcc/boost_regex-gcc-1_32/c_regex_traits.o gcc/boost_regex-gcc-1_32/c_regex_traits_common.o gcc/boost_regex-gcc-1_32/cpp_regex_traits.o gcc/boost_regex-gcc-1_32/cregex.o gcc/boost_regex-gcc-1_32/fileiter.o gcc/boost_regex-gcc-1_32/instances.o gcc/boost_regex-gcc-1_32/posix_api.o gcc/boost_regex-gcc-1_32/regex.o gcc/boost_regex-gcc-1_32/regex_debug.o gcc/boost_regex-gcc-1_32/regex_synch.o gcc/boost_regex-gcc-1_32/w32_regex_traits.o gcc/boost_regex-gcc-1_32/wide_posix_api.o gcc/boost_regex-gcc-1_32/winstances.o
-	ar -r gcc/libboost_regex-gcc-1_32.a  gcc/boost_regex-gcc-1_32/c_regex_traits.o gcc/boost_regex-gcc-1_32/c_regex_traits_common.o gcc/boost_regex-gcc-1_32/cpp_regex_traits.o gcc/boost_regex-gcc-1_32/cregex.o gcc/boost_regex-gcc-1_32/fileiter.o gcc/boost_regex-gcc-1_32/instances.o gcc/boost_regex-gcc-1_32/posix_api.o gcc/boost_regex-gcc-1_32/regex.o gcc/boost_regex-gcc-1_32/regex_debug.o gcc/boost_regex-gcc-1_32/regex_synch.o gcc/boost_regex-gcc-1_32/w32_regex_traits.o gcc/boost_regex-gcc-1_32/wide_posix_api.o gcc/boost_regex-gcc-1_32/winstances.o
+./gcc/libboost_regex-gcc-1_32.a : gcc/boost_regex-gcc-1_32/c_regex_traits.o gcc/boost_regex-gcc-1_32/cpp_regex_traits.o gcc/boost_regex-gcc-1_32/cregex.o gcc/boost_regex-gcc-1_32/fileiter.o gcc/boost_regex-gcc-1_32/icu.o gcc/boost_regex-gcc-1_32/instances.o gcc/boost_regex-gcc-1_32/posix_api.o gcc/boost_regex-gcc-1_32/regex.o gcc/boost_regex-gcc-1_32/regex_debug.o gcc/boost_regex-gcc-1_32/regex_raw_buffer.o gcc/boost_regex-gcc-1_32/regex_traits_defaults.o gcc/boost_regex-gcc-1_32/static_mutex.o gcc/boost_regex-gcc-1_32/usinstances.o gcc/boost_regex-gcc-1_32/w32_regex_traits.o gcc/boost_regex-gcc-1_32/wc_regex_traits.o gcc/boost_regex-gcc-1_32/wide_posix_api.o gcc/boost_regex-gcc-1_32/winstances.o
+	ar -r gcc/libboost_regex-gcc-1_32.a  gcc/boost_regex-gcc-1_32/c_regex_traits.o gcc/boost_regex-gcc-1_32/cpp_regex_traits.o gcc/boost_regex-gcc-1_32/cregex.o gcc/boost_regex-gcc-1_32/fileiter.o gcc/boost_regex-gcc-1_32/icu.o gcc/boost_regex-gcc-1_32/instances.o gcc/boost_regex-gcc-1_32/posix_api.o gcc/boost_regex-gcc-1_32/regex.o gcc/boost_regex-gcc-1_32/regex_debug.o gcc/boost_regex-gcc-1_32/regex_raw_buffer.o gcc/boost_regex-gcc-1_32/regex_traits_defaults.o gcc/boost_regex-gcc-1_32/static_mutex.o gcc/boost_regex-gcc-1_32/usinstances.o gcc/boost_regex-gcc-1_32/w32_regex_traits.o gcc/boost_regex-gcc-1_32/wc_regex_traits.o gcc/boost_regex-gcc-1_32/wide_posix_api.o gcc/boost_regex-gcc-1_32/winstances.o
 	-ar -s gcc/libboost_regex-gcc-1_32.a
 
 ########################################################
@@ -103,43 +126,55 @@ boost_regex-gcc-1_32_clean :
 #
 ########################################################
 gcc/boost_regex-gcc-d-1_32/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/c_regex_traits.o $(C2) $(CXXFLAGS) ../src/c_regex_traits.cpp
-
-gcc/boost_regex-gcc-d-1_32/c_regex_traits_common.o: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/c_regex_traits_common.o $(C2) $(CXXFLAGS) ../src/c_regex_traits_common.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/c_regex_traits.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/c_regex_traits.cpp
 
 gcc/boost_regex-gcc-d-1_32/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/cpp_regex_traits.o $(C2) $(CXXFLAGS) ../src/cpp_regex_traits.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/cpp_regex_traits.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/cpp_regex_traits.cpp
 
 gcc/boost_regex-gcc-d-1_32/cregex.o: ../src/cregex.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/cregex.o $(C2) $(CXXFLAGS) ../src/cregex.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/cregex.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/cregex.cpp
 
 gcc/boost_regex-gcc-d-1_32/fileiter.o: ../src/fileiter.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/fileiter.o $(C2) $(CXXFLAGS) ../src/fileiter.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/fileiter.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/fileiter.cpp
+
+gcc/boost_regex-gcc-d-1_32/icu.o: ../src/icu.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/icu.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/icu.cpp
 
 gcc/boost_regex-gcc-d-1_32/instances.o: ../src/instances.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/instances.o $(C2) $(CXXFLAGS) ../src/instances.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/instances.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/instances.cpp
 
 gcc/boost_regex-gcc-d-1_32/posix_api.o: ../src/posix_api.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/posix_api.o $(C2) $(CXXFLAGS) ../src/posix_api.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/posix_api.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/posix_api.cpp
 
 gcc/boost_regex-gcc-d-1_32/regex.o: ../src/regex.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/regex.o $(C2) $(CXXFLAGS) ../src/regex.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/regex.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex.cpp
 
 gcc/boost_regex-gcc-d-1_32/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/regex_debug.o $(C2) $(CXXFLAGS) ../src/regex_debug.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/regex_debug.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_debug.cpp
 
-gcc/boost_regex-gcc-d-1_32/regex_synch.o: ../src/regex_synch.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/regex_synch.o $(C2) $(CXXFLAGS) ../src/regex_synch.cpp
+gcc/boost_regex-gcc-d-1_32/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/regex_raw_buffer.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_raw_buffer.cpp
+
+gcc/boost_regex-gcc-d-1_32/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/regex_traits_defaults.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/regex_traits_defaults.cpp
+
+gcc/boost_regex-gcc-d-1_32/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/static_mutex.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/static_mutex.cpp
+
+gcc/boost_regex-gcc-d-1_32/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/usinstances.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/usinstances.cpp
 
 gcc/boost_regex-gcc-d-1_32/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/w32_regex_traits.o $(C2) $(CXXFLAGS) ../src/w32_regex_traits.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/w32_regex_traits.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/w32_regex_traits.cpp
+
+gcc/boost_regex-gcc-d-1_32/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/wc_regex_traits.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/wc_regex_traits.cpp
 
 gcc/boost_regex-gcc-d-1_32/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/wide_posix_api.o $(C2) $(CXXFLAGS) ../src/wide_posix_api.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/wide_posix_api.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/wide_posix_api.cpp
 
 gcc/boost_regex-gcc-d-1_32/winstances.o: ../src/winstances.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/winstances.o $(C2) $(CXXFLAGS) ../src/winstances.cpp
+	$(CXX) $(INCLUDES) -o gcc/boost_regex-gcc-d-1_32/winstances.o $(C2) $(CXXFLAGS) $(ICU_CXXFLAGS) ../src/winstances.cpp
 
 gcc/boost_regex-gcc-d-1_32 : 
 	mkdir -p gcc/boost_regex-gcc-d-1_32
@@ -147,7 +182,7 @@ gcc/boost_regex-gcc-d-1_32 :
 boost_regex-gcc-d-1_32_clean :
 	rm -f gcc/boost_regex-gcc-d-1_32/*.o
 
-./gcc/libboost_regex-gcc-d-1_32.a : gcc/boost_regex-gcc-d-1_32/c_regex_traits.o gcc/boost_regex-gcc-d-1_32/c_regex_traits_common.o gcc/boost_regex-gcc-d-1_32/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_32/cregex.o gcc/boost_regex-gcc-d-1_32/fileiter.o gcc/boost_regex-gcc-d-1_32/instances.o gcc/boost_regex-gcc-d-1_32/posix_api.o gcc/boost_regex-gcc-d-1_32/regex.o gcc/boost_regex-gcc-d-1_32/regex_debug.o gcc/boost_regex-gcc-d-1_32/regex_synch.o gcc/boost_regex-gcc-d-1_32/w32_regex_traits.o gcc/boost_regex-gcc-d-1_32/wide_posix_api.o gcc/boost_regex-gcc-d-1_32/winstances.o
-	ar -r gcc/libboost_regex-gcc-d-1_32.a  gcc/boost_regex-gcc-d-1_32/c_regex_traits.o gcc/boost_regex-gcc-d-1_32/c_regex_traits_common.o gcc/boost_regex-gcc-d-1_32/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_32/cregex.o gcc/boost_regex-gcc-d-1_32/fileiter.o gcc/boost_regex-gcc-d-1_32/instances.o gcc/boost_regex-gcc-d-1_32/posix_api.o gcc/boost_regex-gcc-d-1_32/regex.o gcc/boost_regex-gcc-d-1_32/regex_debug.o gcc/boost_regex-gcc-d-1_32/regex_synch.o gcc/boost_regex-gcc-d-1_32/w32_regex_traits.o gcc/boost_regex-gcc-d-1_32/wide_posix_api.o gcc/boost_regex-gcc-d-1_32/winstances.o
+./gcc/libboost_regex-gcc-d-1_32.a : gcc/boost_regex-gcc-d-1_32/c_regex_traits.o gcc/boost_regex-gcc-d-1_32/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_32/cregex.o gcc/boost_regex-gcc-d-1_32/fileiter.o gcc/boost_regex-gcc-d-1_32/icu.o gcc/boost_regex-gcc-d-1_32/instances.o gcc/boost_regex-gcc-d-1_32/posix_api.o gcc/boost_regex-gcc-d-1_32/regex.o gcc/boost_regex-gcc-d-1_32/regex_debug.o gcc/boost_regex-gcc-d-1_32/regex_raw_buffer.o gcc/boost_regex-gcc-d-1_32/regex_traits_defaults.o gcc/boost_regex-gcc-d-1_32/static_mutex.o gcc/boost_regex-gcc-d-1_32/usinstances.o gcc/boost_regex-gcc-d-1_32/w32_regex_traits.o gcc/boost_regex-gcc-d-1_32/wc_regex_traits.o gcc/boost_regex-gcc-d-1_32/wide_posix_api.o gcc/boost_regex-gcc-d-1_32/winstances.o
+	ar -r gcc/libboost_regex-gcc-d-1_32.a  gcc/boost_regex-gcc-d-1_32/c_regex_traits.o gcc/boost_regex-gcc-d-1_32/cpp_regex_traits.o gcc/boost_regex-gcc-d-1_32/cregex.o gcc/boost_regex-gcc-d-1_32/fileiter.o gcc/boost_regex-gcc-d-1_32/icu.o gcc/boost_regex-gcc-d-1_32/instances.o gcc/boost_regex-gcc-d-1_32/posix_api.o gcc/boost_regex-gcc-d-1_32/regex.o gcc/boost_regex-gcc-d-1_32/regex_debug.o gcc/boost_regex-gcc-d-1_32/regex_raw_buffer.o gcc/boost_regex-gcc-d-1_32/regex_traits_defaults.o gcc/boost_regex-gcc-d-1_32/static_mutex.o gcc/boost_regex-gcc-d-1_32/usinstances.o gcc/boost_regex-gcc-d-1_32/w32_regex_traits.o gcc/boost_regex-gcc-d-1_32/wc_regex_traits.o gcc/boost_regex-gcc-d-1_32/wide_posix_api.o gcc/boost_regex-gcc-d-1_32/winstances.o
 	-ar -s gcc/libboost_regex-gcc-d-1_32.a
 
diff --git a/build/gcc_gen.sh b/build/gcc_gen.sh
index 90a0b760..37e2099e 100644
--- a/build/gcc_gen.sh
+++ b/build/gcc_gen.sh
@@ -55,7 +55,7 @@ EOF
 		obj="$subdir/$obj_dir/$obj"
 		all_obj="$all_obj $obj"
 		echo "$obj: $file \$(ALL_HEADER)" >> $tout
-		echo "	\$(CXX) \$(INCLUDES) -o $obj $opts \$(CXXFLAGS) $file" >> $tout
+		echo "	\$(CXX) \$(INCLUDES) -o $obj $opts \$(CXXFLAGS) \$(ICU_CXXFLAGS) $file" >> $tout
 		echo "" >> $tout
 	done
 #
@@ -73,7 +73,7 @@ EOF
 #	 now for the main target for this library:
           if test "$gcc_shared" == "yes"; then
 		echo ./$subdir/lib$libname.so : $all_obj >> $tout
-		echo "	\$(LINKER) -o $subdir/lib$libname.so \$(LDFLAGS) $all_obj \$(LIBS)" >> $tout
+		echo "	\$(LINKER) -o $subdir/lib$libname.so \$(LDFLAGS)  \$(ICU_LDFLAGS) $all_obj \$(ICU_LIBS) \$(LIBS)" >> $tout
 	else
 		echo ./$subdir/lib$libname.a : $all_obj >> $tout
 		echo "	ar -r $subdir/lib$libname.a $all_obj" >> $tout
@@ -115,6 +115,7 @@ function gcc_gen()
 
 #
 # the following environment variables are recognised:
+# ICU_PATH= Path to ICU installation.
 # CXXFLAGS= extra compiler options - note applies to all build variants
 # INCLUDES= additional include directories
 # LDFLAGS=  additional linker options
@@ -133,6 +134,16 @@ C1=-c -O2 -I../../../
 #
 C2=-c -g -I../../../
 
+ifeq "\$(ICU_PATH)" ""
+\$(warning "Building Boost.Regex without ICU / Unicode support:")
+\$(warning "Hint: set ICU_PATH on the nmake command line to point ")
+\$(warning "to your ICU installation if you have one.")
+else
+ICU_CXXFLAGS= -DBOOST_HAS_ICU=1 -I\$(ICU_PATH)/include
+ICU_LDFLAGS= -L\$(ICU_PATH)/lib
+ICU_LIBS= -licui18n -licuuc
+\$(warning "Building Boost.Regex with ICU in \$(ICU_PATH)")
+endif
 
 EOF
 	echo "" >> $out
@@ -184,6 +195,7 @@ function gcc_gen_shared()
 
 #
 # the following environment variables are recognised:
+# ICU_PATH= Path to ICU installation.
 # CXXFLAGS= extra compiler options - note applies to all build variants
 # INCLUDES= additional include directories
 # LDFLAGS=  additional linker options
@@ -202,6 +214,17 @@ C1=-c -O2 -I../../../ -fPIC
 #
 C2=-c -g -I../../../ -fPIC
 
+ifeq "\$(ICU_PATH)" ""
+\$(warning "Building Boost.Regex without ICU / Unicode support:")
+\$(warning "Hint: set ICU_PATH on the nmake command line to point ")
+\$(warning "to your ICU installation if you have one.")
+else
+ICU_CXXFLAGS= -DBOOST_HAS_ICU=1 -I\$(ICU_PATH)/include
+ICU_LDFLAGS= -L\$(ICU_PATH)/lib
+ICU_LIBS= -licui18n -licuuc
+\$(warning "Building Boost.Regex with ICU in \$(ICU_PATH)")
+endif
+
 EOF
 	echo "" >> $out
 	echo "ALL_HEADER=$header" >> $out
@@ -236,3 +259,4 @@ gcc_gen_shared
 rm -f $tout $iout
 
 
+
diff --git a/build/generic.mak b/build/generic.mak
index 8c68457d..0535a9ab 100644
--- a/build/generic.mak
+++ b/build/generic.mak
@@ -26,7 +26,7 @@ C1=-c -O2 -I../../../
 
 
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.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/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.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_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/allocator.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+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/static_mutex.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 ../../../boost/regex/config/regex_library_include.hpp
 
 all : $(DIRNAME)  $(DIRNAME) $(DIRNAME)/boost_regex ./$(DIRNAME)/libboost_regex.so
 
@@ -47,9 +47,6 @@ install : all
 $(DIRNAME)/boost_regex/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/c_regex_traits.o $(C1) $(CXXFLAGS) ../src/c_regex_traits.cpp
 
-$(DIRNAME)/boost_regex/c_regex_traits_common.o: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/c_regex_traits_common.o $(C1) $(CXXFLAGS) ../src/c_regex_traits_common.cpp
-
 $(DIRNAME)/boost_regex/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/cpp_regex_traits.o $(C1) $(CXXFLAGS) ../src/cpp_regex_traits.cpp
 
@@ -59,6 +56,9 @@ $(DIRNAME)/boost_regex/cregex.o: ../src/cregex.cpp $(ALL_HEADER)
 $(DIRNAME)/boost_regex/fileiter.o: ../src/fileiter.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/fileiter.o $(C1) $(CXXFLAGS) ../src/fileiter.cpp
 
+$(DIRNAME)/boost_regex/icu.o: ../src/icu.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/icu.o $(C1) $(CXXFLAGS) ../src/icu.cpp
+
 $(DIRNAME)/boost_regex/instances.o: ../src/instances.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/instances.o $(C1) $(CXXFLAGS) ../src/instances.cpp
 
@@ -71,12 +71,24 @@ $(DIRNAME)/boost_regex/regex.o: ../src/regex.cpp $(ALL_HEADER)
 $(DIRNAME)/boost_regex/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/regex_debug.o $(C1) $(CXXFLAGS) ../src/regex_debug.cpp
 
-$(DIRNAME)/boost_regex/regex_synch.o: ../src/regex_synch.cpp $(ALL_HEADER)
-	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/regex_synch.o $(C1) $(CXXFLAGS) ../src/regex_synch.cpp
+$(DIRNAME)/boost_regex/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/regex_raw_buffer.o $(C1) $(CXXFLAGS) ../src/regex_raw_buffer.cpp
+
+$(DIRNAME)/boost_regex/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/regex_traits_defaults.o $(C1) $(CXXFLAGS) ../src/regex_traits_defaults.cpp
+
+$(DIRNAME)/boost_regex/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/static_mutex.o $(C1) $(CXXFLAGS) ../src/static_mutex.cpp
+
+$(DIRNAME)/boost_regex/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/usinstances.o $(C1) $(CXXFLAGS) ../src/usinstances.cpp
 
 $(DIRNAME)/boost_regex/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/w32_regex_traits.o $(C1) $(CXXFLAGS) ../src/w32_regex_traits.cpp
 
+$(DIRNAME)/boost_regex/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/wc_regex_traits.o $(C1) $(CXXFLAGS) ../src/wc_regex_traits.cpp
+
 $(DIRNAME)/boost_regex/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	$(CXX) $(INCLUDES) -o $(DIRNAME)/boost_regex/wide_posix_api.o $(C1) $(CXXFLAGS) ../src/wide_posix_api.cpp
 
@@ -89,6 +101,6 @@ $(DIRNAME)/boost_regex :
 boost_regex_clean :
 	rm -f $(DIRNAME)/boost_regex/*.o
 
-./$(DIRNAME)/libboost_regex.so : $(DIRNAME)/boost_regex/c_regex_traits.o $(DIRNAME)/boost_regex/c_regex_traits_common.o $(DIRNAME)/boost_regex/cpp_regex_traits.o $(DIRNAME)/boost_regex/cregex.o $(DIRNAME)/boost_regex/fileiter.o $(DIRNAME)/boost_regex/instances.o $(DIRNAME)/boost_regex/posix_api.o $(DIRNAME)/boost_regex/regex.o $(DIRNAME)/boost_regex/regex_debug.o $(DIRNAME)/boost_regex/regex_synch.o $(DIRNAME)/boost_regex/w32_regex_traits.o $(DIRNAME)/boost_regex/wide_posix_api.o $(DIRNAME)/boost_regex/winstances.o
-	$(LINKER) $(LDFLAGS) -o $(DIRNAME)/libboost_regex.so  $(DIRNAME)/boost_regex/c_regex_traits.o $(DIRNAME)/boost_regex/c_regex_traits_common.o $(DIRNAME)/boost_regex/cpp_regex_traits.o $(DIRNAME)/boost_regex/cregex.o $(DIRNAME)/boost_regex/fileiter.o $(DIRNAME)/boost_regex/instances.o $(DIRNAME)/boost_regex/posix_api.o $(DIRNAME)/boost_regex/regex.o $(DIRNAME)/boost_regex/regex_debug.o $(DIRNAME)/boost_regex/regex_synch.o $(DIRNAME)/boost_regex/w32_regex_traits.o $(DIRNAME)/boost_regex/wide_posix_api.o $(DIRNAME)/boost_regex/winstances.o $(LIBS)
+./$(DIRNAME)/libboost_regex.so : $(DIRNAME)/boost_regex/c_regex_traits.o $(DIRNAME)/boost_regex/cpp_regex_traits.o $(DIRNAME)/boost_regex/cregex.o $(DIRNAME)/boost_regex/fileiter.o $(DIRNAME)/boost_regex/icu.o $(DIRNAME)/boost_regex/instances.o $(DIRNAME)/boost_regex/posix_api.o $(DIRNAME)/boost_regex/regex.o $(DIRNAME)/boost_regex/regex_debug.o $(DIRNAME)/boost_regex/regex_raw_buffer.o $(DIRNAME)/boost_regex/regex_traits_defaults.o $(DIRNAME)/boost_regex/static_mutex.o $(DIRNAME)/boost_regex/usinstances.o $(DIRNAME)/boost_regex/w32_regex_traits.o $(DIRNAME)/boost_regex/wc_regex_traits.o $(DIRNAME)/boost_regex/wide_posix_api.o $(DIRNAME)/boost_regex/winstances.o
+	$(LINKER) $(LDFLAGS) -o $(DIRNAME)/libboost_regex.so  $(DIRNAME)/boost_regex/c_regex_traits.o $(DIRNAME)/boost_regex/cpp_regex_traits.o $(DIRNAME)/boost_regex/cregex.o $(DIRNAME)/boost_regex/fileiter.o $(DIRNAME)/boost_regex/icu.o $(DIRNAME)/boost_regex/instances.o $(DIRNAME)/boost_regex/posix_api.o $(DIRNAME)/boost_regex/regex.o $(DIRNAME)/boost_regex/regex_debug.o $(DIRNAME)/boost_regex/regex_raw_buffer.o $(DIRNAME)/boost_regex/regex_traits_defaults.o $(DIRNAME)/boost_regex/static_mutex.o $(DIRNAME)/boost_regex/usinstances.o $(DIRNAME)/boost_regex/w32_regex_traits.o $(DIRNAME)/boost_regex/wc_regex_traits.o $(DIRNAME)/boost_regex/wide_posix_api.o $(DIRNAME)/boost_regex/winstances.o $(LIBS)
 
diff --git a/build/sunpro.mak b/build/sunpro.mak
index e12f527b..081917b7 100644
--- a/build/sunpro.mak
+++ b/build/sunpro.mak
@@ -34,7 +34,7 @@ SUNWS_CACHE_NAME=SunWS_cache
 
 
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.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/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.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_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/allocator.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+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/static_mutex.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 ../../../boost/regex/config/regex_library_include.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
 
@@ -54,9 +54,6 @@ sunpro :
 sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits.o ../src/c_regex_traits.cpp
 
-sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits_common.o: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits_common.o ../src/c_regex_traits_common.cpp
-
 sunpro/libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o ../src/cpp_regex_traits.cpp
 
@@ -66,6 +63,9 @@ sunpro/libboost_regex$(LIBSUFFIX)/cregex.o: ../src/cregex.cpp $(ALL_HEADER)
 sunpro/libboost_regex$(LIBSUFFIX)/fileiter.o: ../src/fileiter.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/fileiter.o ../src/fileiter.cpp
 
+sunpro/libboost_regex$(LIBSUFFIX)/icu.o: ../src/icu.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/icu.o ../src/icu.cpp
+
 sunpro/libboost_regex$(LIBSUFFIX)/instances.o: ../src/instances.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/instances.o ../src/instances.cpp
 
@@ -78,12 +78,24 @@ sunpro/libboost_regex$(LIBSUFFIX)/regex.o: ../src/regex.cpp $(ALL_HEADER)
 sunpro/libboost_regex$(LIBSUFFIX)/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/regex_debug.o ../src/regex_debug.cpp
 
-sunpro/libboost_regex$(LIBSUFFIX)/regex_synch.o: ../src/regex_synch.cpp $(ALL_HEADER)
-	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/regex_synch.o ../src/regex_synch.cpp
+sunpro/libboost_regex$(LIBSUFFIX)/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/regex_raw_buffer.o ../src/regex_raw_buffer.cpp
+
+sunpro/libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o ../src/regex_traits_defaults.cpp
+
+sunpro/libboost_regex$(LIBSUFFIX)/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/static_mutex.o ../src/static_mutex.cpp
+
+sunpro/libboost_regex$(LIBSUFFIX)/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/usinstances.o ../src/usinstances.cpp
 
 sunpro/libboost_regex$(LIBSUFFIX)/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/w32_regex_traits.o ../src/w32_regex_traits.cpp
 
+sunpro/libboost_regex$(LIBSUFFIX)/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/wc_regex_traits.o ../src/wc_regex_traits.cpp
+
 sunpro/libboost_regex$(LIBSUFFIX)/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX)/wide_posix_api.o ../src/wide_posix_api.cpp
 
@@ -97,8 +109,8 @@ libboost_regex$(LIBSUFFIX)_clean :
 	rm -f sunpro/libboost_regex$(LIBSUFFIX)/*.o
 	rm -fr sunpro/libboost_regex$(LIBSUFFIX)/$(SUNWS_CACHE_NAME)
 
-sunpro/libboost_regex$(LIBSUFFIX).a : sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits_common.o sunpro/libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/cregex.o sunpro/libboost_regex$(LIBSUFFIX)/fileiter.o sunpro/libboost_regex$(LIBSUFFIX)/instances.o sunpro/libboost_regex$(LIBSUFFIX)/posix_api.o sunpro/libboost_regex$(LIBSUFFIX)/regex.o sunpro/libboost_regex$(LIBSUFFIX)/regex_debug.o sunpro/libboost_regex$(LIBSUFFIX)/regex_synch.o sunpro/libboost_regex$(LIBSUFFIX)/w32_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/wide_posix_api.o sunpro/libboost_regex$(LIBSUFFIX)/winstances.o
-	CC -xar $(CXXFLAGS) $(LDFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX).a  sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits_common.o sunpro/libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/cregex.o sunpro/libboost_regex$(LIBSUFFIX)/fileiter.o sunpro/libboost_regex$(LIBSUFFIX)/instances.o sunpro/libboost_regex$(LIBSUFFIX)/posix_api.o sunpro/libboost_regex$(LIBSUFFIX)/regex.o sunpro/libboost_regex$(LIBSUFFIX)/regex_debug.o sunpro/libboost_regex$(LIBSUFFIX)/regex_synch.o sunpro/libboost_regex$(LIBSUFFIX)/w32_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/wide_posix_api.o sunpro/libboost_regex$(LIBSUFFIX)/winstances.o
+sunpro/libboost_regex$(LIBSUFFIX).a : sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/cregex.o sunpro/libboost_regex$(LIBSUFFIX)/fileiter.o sunpro/libboost_regex$(LIBSUFFIX)/icu.o sunpro/libboost_regex$(LIBSUFFIX)/instances.o sunpro/libboost_regex$(LIBSUFFIX)/posix_api.o sunpro/libboost_regex$(LIBSUFFIX)/regex.o sunpro/libboost_regex$(LIBSUFFIX)/regex_debug.o sunpro/libboost_regex$(LIBSUFFIX)/regex_raw_buffer.o sunpro/libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o sunpro/libboost_regex$(LIBSUFFIX)/static_mutex.o sunpro/libboost_regex$(LIBSUFFIX)/usinstances.o sunpro/libboost_regex$(LIBSUFFIX)/w32_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/wc_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/wide_posix_api.o sunpro/libboost_regex$(LIBSUFFIX)/winstances.o
+	CC -xar $(CXXFLAGS) $(LDFLAGS) -o sunpro/libboost_regex$(LIBSUFFIX).a  sunpro/libboost_regex$(LIBSUFFIX)/c_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/cregex.o sunpro/libboost_regex$(LIBSUFFIX)/fileiter.o sunpro/libboost_regex$(LIBSUFFIX)/icu.o sunpro/libboost_regex$(LIBSUFFIX)/instances.o sunpro/libboost_regex$(LIBSUFFIX)/posix_api.o sunpro/libboost_regex$(LIBSUFFIX)/regex.o sunpro/libboost_regex$(LIBSUFFIX)/regex_debug.o sunpro/libboost_regex$(LIBSUFFIX)/regex_raw_buffer.o sunpro/libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o sunpro/libboost_regex$(LIBSUFFIX)/static_mutex.o sunpro/libboost_regex$(LIBSUFFIX)/usinstances.o sunpro/libboost_regex$(LIBSUFFIX)/w32_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/wc_regex_traits.o sunpro/libboost_regex$(LIBSUFFIX)/wide_posix_api.o sunpro/libboost_regex$(LIBSUFFIX)/winstances.o
 
 ########################################################
 #
@@ -108,9 +120,6 @@ sunpro/libboost_regex$(LIBSUFFIX).a : sunpro/libboost_regex$(LIBSUFFIX)/c_regex_
 sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o ../src/c_regex_traits.cpp
 
-sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits_common.o: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits_common.o ../src/c_regex_traits_common.cpp
-
 sunpro/libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o ../src/cpp_regex_traits.cpp
 
@@ -120,6 +129,9 @@ sunpro/libboost_regex_mt$(LIBSUFFIX)/cregex.o: ../src/cregex.cpp $(ALL_HEADER)
 sunpro/libboost_regex_mt$(LIBSUFFIX)/fileiter.o: ../src/fileiter.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/fileiter.o ../src/fileiter.cpp
 
+sunpro/libboost_regex_mt$(LIBSUFFIX)/icu.o: ../src/icu.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/icu.o ../src/icu.cpp
+
 sunpro/libboost_regex_mt$(LIBSUFFIX)/instances.o: ../src/instances.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/instances.o ../src/instances.cpp
 
@@ -132,12 +144,24 @@ sunpro/libboost_regex_mt$(LIBSUFFIX)/regex.o: ../src/regex.cpp $(ALL_HEADER)
 sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_debug.o ../src/regex_debug.cpp
 
-sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_synch.o: ../src/regex_synch.cpp $(ALL_HEADER)
-	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_synch.o ../src/regex_synch.cpp
+sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_raw_buffer.o ../src/regex_raw_buffer.cpp
+
+sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o ../src/regex_traits_defaults.cpp
+
+sunpro/libboost_regex_mt$(LIBSUFFIX)/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/static_mutex.o ../src/static_mutex.cpp
+
+sunpro/libboost_regex_mt$(LIBSUFFIX)/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/usinstances.o ../src/usinstances.cpp
 
 sunpro/libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o ../src/w32_regex_traits.cpp
 
+sunpro/libboost_regex_mt$(LIBSUFFIX)/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/wc_regex_traits.o ../src/wc_regex_traits.cpp
+
 sunpro/libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o ../src/wide_posix_api.cpp
 
@@ -151,8 +175,8 @@ libboost_regex_mt$(LIBSUFFIX)_clean :
 	rm -f sunpro/libboost_regex_mt$(LIBSUFFIX)/*.o
 	rm -fr sunpro/libboost_regex_mt$(LIBSUFFIX)/$(SUNWS_CACHE_NAME)
 
-sunpro/libboost_regex_mt$(LIBSUFFIX).a : sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits_common.o sunpro/libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/libboost_regex_mt$(LIBSUFFIX)/instances.o sunpro/libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_synch.o sunpro/libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o sunpro/libboost_regex_mt$(LIBSUFFIX)/winstances.o
-	CC -xar $(CXXFLAGS) $(LDFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX).a  sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits_common.o sunpro/libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/libboost_regex_mt$(LIBSUFFIX)/instances.o sunpro/libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_synch.o sunpro/libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o sunpro/libboost_regex_mt$(LIBSUFFIX)/winstances.o
+sunpro/libboost_regex_mt$(LIBSUFFIX).a : sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/libboost_regex_mt$(LIBSUFFIX)/icu.o sunpro/libboost_regex_mt$(LIBSUFFIX)/instances.o sunpro/libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_raw_buffer.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o sunpro/libboost_regex_mt$(LIBSUFFIX)/static_mutex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/usinstances.o sunpro/libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/wc_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o sunpro/libboost_regex_mt$(LIBSUFFIX)/winstances.o
+	CC -xar $(CXXFLAGS) $(LDFLAGS) -o sunpro/libboost_regex_mt$(LIBSUFFIX).a  sunpro/libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/libboost_regex_mt$(LIBSUFFIX)/icu.o sunpro/libboost_regex_mt$(LIBSUFFIX)/instances.o sunpro/libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_raw_buffer.o sunpro/libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o sunpro/libboost_regex_mt$(LIBSUFFIX)/static_mutex.o sunpro/libboost_regex_mt$(LIBSUFFIX)/usinstances.o sunpro/libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/wc_regex_traits.o sunpro/libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o sunpro/libboost_regex_mt$(LIBSUFFIX)/winstances.o
 
 ########################################################
 #
@@ -162,9 +186,6 @@ sunpro/libboost_regex_mt$(LIBSUFFIX).a : sunpro/libboost_regex_mt$(LIBSUFFIX)/c_
 sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits.o ../src/c_regex_traits.cpp
 
-sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits_common.o: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits_common.o ../src/c_regex_traits_common.cpp
-
 sunpro/shared_libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o ../src/cpp_regex_traits.cpp
 
@@ -174,6 +195,9 @@ sunpro/shared_libboost_regex$(LIBSUFFIX)/cregex.o: ../src/cregex.cpp $(ALL_HEADE
 sunpro/shared_libboost_regex$(LIBSUFFIX)/fileiter.o: ../src/fileiter.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/fileiter.o ../src/fileiter.cpp
 
+sunpro/shared_libboost_regex$(LIBSUFFIX)/icu.o: ../src/icu.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/icu.o ../src/icu.cpp
+
 sunpro/shared_libboost_regex$(LIBSUFFIX)/instances.o: ../src/instances.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/instances.o ../src/instances.cpp
 
@@ -186,12 +210,24 @@ sunpro/shared_libboost_regex$(LIBSUFFIX)/regex.o: ../src/regex.cpp $(ALL_HEADER)
 sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_debug.o ../src/regex_debug.cpp
 
-sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_synch.o: ../src/regex_synch.cpp $(ALL_HEADER)
-	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_synch.o ../src/regex_synch.cpp
+sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_raw_buffer.o ../src/regex_raw_buffer.cpp
+
+sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o ../src/regex_traits_defaults.cpp
+
+sunpro/shared_libboost_regex$(LIBSUFFIX)/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/static_mutex.o ../src/static_mutex.cpp
+
+sunpro/shared_libboost_regex$(LIBSUFFIX)/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/usinstances.o ../src/usinstances.cpp
 
 sunpro/shared_libboost_regex$(LIBSUFFIX)/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/w32_regex_traits.o ../src/w32_regex_traits.cpp
 
+sunpro/shared_libboost_regex$(LIBSUFFIX)/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/wc_regex_traits.o ../src/wc_regex_traits.cpp
+
 sunpro/shared_libboost_regex$(LIBSUFFIX)/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex$(LIBSUFFIX)/wide_posix_api.o ../src/wide_posix_api.cpp
 
@@ -205,8 +241,8 @@ libboost_regex$(LIBSUFFIX)_clean_shared :
 	rm -f sunpro/shared_libboost_regex$(LIBSUFFIX)/*.o
 	rm -fr sunpro/shared_libboost_regex$(LIBSUFFIX)/$(SUNWS_CACHE_NAME)
 
-sunpro/libboost_regex$(LIBSUFFIX).so : sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits_common.o sunpro/shared_libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex$(LIBSUFFIX)/instances.o sunpro/shared_libboost_regex$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_synch.o sunpro/shared_libboost_regex$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/wide_posix_api.o sunpro/shared_libboost_regex$(LIBSUFFIX)/winstances.o
-	CC -KPIC -O2 -I../../../ -G -o sunpro/libboost_regex$(LIBSUFFIX).so $(LDFLAGS)  sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits_common.o sunpro/shared_libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex$(LIBSUFFIX)/instances.o sunpro/shared_libboost_regex$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_synch.o sunpro/shared_libboost_regex$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/wide_posix_api.o sunpro/shared_libboost_regex$(LIBSUFFIX)/winstances.o $(LIBS)
+sunpro/libboost_regex$(LIBSUFFIX).so : sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex$(LIBSUFFIX)/icu.o sunpro/shared_libboost_regex$(LIBSUFFIX)/instances.o sunpro/shared_libboost_regex$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_raw_buffer.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o sunpro/shared_libboost_regex$(LIBSUFFIX)/static_mutex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/usinstances.o sunpro/shared_libboost_regex$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/wc_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/wide_posix_api.o sunpro/shared_libboost_regex$(LIBSUFFIX)/winstances.o
+	CC -KPIC -O2 -I../../../ -G -o sunpro/libboost_regex$(LIBSUFFIX).so $(LDFLAGS)  sunpro/shared_libboost_regex$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex$(LIBSUFFIX)/icu.o sunpro/shared_libboost_regex$(LIBSUFFIX)/instances.o sunpro/shared_libboost_regex$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_raw_buffer.o sunpro/shared_libboost_regex$(LIBSUFFIX)/regex_traits_defaults.o sunpro/shared_libboost_regex$(LIBSUFFIX)/static_mutex.o sunpro/shared_libboost_regex$(LIBSUFFIX)/usinstances.o sunpro/shared_libboost_regex$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/wc_regex_traits.o sunpro/shared_libboost_regex$(LIBSUFFIX)/wide_posix_api.o sunpro/shared_libboost_regex$(LIBSUFFIX)/winstances.o $(LIBS)
 
 ########################################################
 #
@@ -216,9 +252,6 @@ sunpro/libboost_regex$(LIBSUFFIX).so : sunpro/shared_libboost_regex$(LIBSUFFIX)/
 sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o: ../src/c_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o ../src/c_regex_traits.cpp
 
-sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits_common.o: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits_common.o ../src/c_regex_traits_common.cpp
-
 sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o: ../src/cpp_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o ../src/cpp_regex_traits.cpp
 
@@ -228,6 +261,9 @@ sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cregex.o: ../src/cregex.cpp $(ALL_HE
 sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/fileiter.o: ../src/fileiter.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/fileiter.o ../src/fileiter.cpp
 
+sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/icu.o: ../src/icu.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/icu.o ../src/icu.cpp
+
 sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/instances.o: ../src/instances.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/instances.o ../src/instances.cpp
 
@@ -240,12 +276,24 @@ sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex.o: ../src/regex.cpp $(ALL_HEAD
 sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_debug.o: ../src/regex_debug.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_debug.o ../src/regex_debug.cpp
 
-sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_synch.o: ../src/regex_synch.cpp $(ALL_HEADER)
-	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_synch.o ../src/regex_synch.cpp
+sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_raw_buffer.o: ../src/regex_raw_buffer.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_raw_buffer.o ../src/regex_raw_buffer.cpp
+
+sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o: ../src/regex_traits_defaults.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o ../src/regex_traits_defaults.cpp
+
+sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/static_mutex.o: ../src/static_mutex.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/static_mutex.o ../src/static_mutex.cpp
+
+sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/usinstances.o: ../src/usinstances.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/usinstances.o ../src/usinstances.cpp
 
 sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o: ../src/w32_regex_traits.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o ../src/w32_regex_traits.cpp
 
+sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wc_regex_traits.o: ../src/wc_regex_traits.cpp $(ALL_HEADER)
+	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wc_regex_traits.o ../src/wc_regex_traits.cpp
+
 sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o: ../src/wide_posix_api.cpp $(ALL_HEADER)
 	CC -c $(INCLUDES) -KPIC -O2 -mt -I../../../ $(CXXFLAGS) -o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o ../src/wide_posix_api.cpp
 
@@ -259,6 +307,6 @@ libboost_regex_mt$(LIBSUFFIX)_clean_shared :
 	rm -f sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/*.o
 	rm -fr sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/$(SUNWS_CACHE_NAME)
 
-sunpro/libboost_regex_mt$(LIBSUFFIX).so : sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits_common.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/instances.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_synch.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/winstances.o
-	CC -KPIC -O2 -mt -I../../../ -G -o sunpro/libboost_regex_mt$(LIBSUFFIX).so $(LDFLAGS)  sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits_common.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/instances.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_synch.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/winstances.o $(LIBS)
+sunpro/libboost_regex_mt$(LIBSUFFIX).so : sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/icu.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/instances.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_raw_buffer.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/static_mutex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/usinstances.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wc_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/winstances.o
+	CC -KPIC -O2 -mt -I../../../ -G -o sunpro/libboost_regex_mt$(LIBSUFFIX).so $(LDFLAGS)  sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/c_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cpp_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/cregex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/fileiter.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/icu.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/instances.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_debug.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_raw_buffer.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/regex_traits_defaults.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/static_mutex.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/usinstances.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/w32_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wc_regex_traits.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/wide_posix_api.o sunpro/shared_libboost_regex_mt$(LIBSUFFIX)/winstances.o $(LIBS)
 
diff --git a/build/vc6-stlport.mak b/build/vc6-stlport.mak
index 89a7be23..a978f946 100644
--- a/build/vc6-stlport.mak
+++ b/build/vc6-stlport.mak
@@ -8,6 +8,10 @@
 #   brings libraries up to date and copies binaries to your VC6 /lib and /bin directories (recomended)
 #
 
+#
+# ICU setup:
+#
+ICU_PATH=
 #
 # Add additional compiler options here:
 #
@@ -39,8 +43,20 @@ NULL=nul
 !ERROR Variable STLPORT_PATH not set.
 !ENDIF
 
+!IF "$(ICU_PATH)" == ""
+ICU_COMPILE_OPTS=
+ICU_LINK_OPTS=
+!MESSAGE Building Boost.Regex without ICU / Unicode support:
+!MESSAGE Hint: set ICU_PATH on the nmake command line to point 
+!MESSAGE to your ICU installation if you have one.
+!ELSE
+ICU_COMPILE_OPTS= -DBOOST_HAS_ICU=1 -I$(ICU_PATH)\include
+ICU_LINK_OPTS= /LIBPATH:$(ICU_PATH)\lib icuin.lib icuuc.lib
+!MESSAGE Building Boost.Regex with ICU in $(ICU_PATH)
+!ENDIF
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.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/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.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_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/allocator.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+
+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/static_mutex.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 ../../../boost/regex/config/regex_library_include.hpp
 
 all : main_dir libboost_regex-vc6-mt-sp-1_32_dir ./vc6-stlport/libboost_regex-vc6-mt-sp-1_32.lib boost_regex-vc6-mt-p-1_32_dir ./vc6-stlport/boost_regex-vc6-mt-p-1_32.lib libboost_regex-vc6-mt-p-1_32_dir ./vc6-stlport/libboost_regex-vc6-mt-p-1_32.lib boost_regex-vc6-mt-gdp-1_32_dir ./vc6-stlport/boost_regex-vc6-mt-gdp-1_32.lib libboost_regex-vc6-mt-sgdp-1_32_dir ./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.lib libboost_regex-vc6-mt-gdp-1_32_dir ./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32.lib
 
@@ -72,43 +88,55 @@ stlport_check : $(STLPORT_PATH)\stlport\string
 #
 ########################################################
 vc6-stlport/libboost_regex-vc6-mt-sp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/c_regex_traits.cpp
-
-vc6-stlport/libboost_regex-vc6-mt-sp-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/c_regex_traits.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/cregex.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/fileiter.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-sp-1_32/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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/icu.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/instances.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/posix_api.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/regex.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/regex_debug.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/regex_synch.cpp
+vc6-stlport/libboost_regex-vc6-mt-sp-1_32/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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-sp-1_32/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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-sp-1_32/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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/static_mutex.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-sp-1_32/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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/usinstances.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-sp-1_32/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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/wide_posix_api.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sp-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc6-mt-sp-1_32_dir :
 	@if not exist "vc6-stlport\libboost_regex-vc6-mt-sp-1_32\$(NULL)" mkdir vc6-stlport\libboost_regex-vc6-mt-sp-1_32
@@ -119,8 +147,8 @@ libboost_regex-vc6-mt-sp-1_32_clean :
 	del vc6-stlport\libboost_regex-vc6-mt-sp-1_32\*.exp
 	del vc6-stlport\libboost_regex-vc6-mt-sp-1_32\*.pch
 
-./vc6-stlport/libboost_regex-vc6-mt-sp-1_32.lib : vc6-stlport/libboost_regex-vc6-mt-sp-1_32/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/c_regex_traits_common.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/instances.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex_synch.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/winstances.obj
-	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-sp-1_32.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-sp-1_32/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/c_regex_traits_common.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/instances.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex_synch.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/winstances.obj
+./vc6-stlport/libboost_regex-vc6-mt-sp-1_32.lib : vc6-stlport/libboost_regex-vc6-mt-sp-1_32/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/icu.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/instances.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/winstances.obj
+	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-sp-1_32.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-sp-1_32/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/icu.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/instances.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sp-1_32/winstances.obj
 
 ########################################################
 #
@@ -128,43 +156,55 @@ libboost_regex-vc6-mt-sp-1_32_clean :
 #
 ########################################################
 vc6-stlport/boost_regex-vc6-mt-p-1_32/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) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/c_regex_traits.cpp
-
-vc6-stlport/boost_regex-vc6-mt-p-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/c_regex_traits.cpp
 
 vc6-stlport/boost_regex-vc6-mt-p-1_32/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) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc6-stlport/boost_regex-vc6-mt-p-1_32/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) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/cregex.cpp
 
 vc6-stlport/boost_regex-vc6-mt-p-1_32/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) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/fileiter.cpp
+
+vc6-stlport/boost_regex-vc6-mt-p-1_32/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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/icu.cpp
 
 vc6-stlport/boost_regex-vc6-mt-p-1_32/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) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/instances.cpp
 
 vc6-stlport/boost_regex-vc6-mt-p-1_32/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) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/posix_api.cpp
 
 vc6-stlport/boost_regex-vc6-mt-p-1_32/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) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/regex.cpp
 
 vc6-stlport/boost_regex-vc6-mt-p-1_32/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) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/regex_debug.cpp
 
-vc6-stlport/boost_regex-vc6-mt-p-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/regex_synch.cpp
+vc6-stlport/boost_regex-vc6-mt-p-1_32/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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc6-stlport/boost_regex-vc6-mt-p-1_32/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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc6-stlport/boost_regex-vc6-mt-p-1_32/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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/static_mutex.cpp
+
+vc6-stlport/boost_regex-vc6-mt-p-1_32/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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/usinstances.cpp
 
 vc6-stlport/boost_regex-vc6-mt-p-1_32/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) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc6-stlport/boost_regex-vc6-mt-p-1_32/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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc6-stlport/boost_regex-vc6-mt-p-1_32/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) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/wide_posix_api.cpp
 
 vc6-stlport/boost_regex-vc6-mt-p-1_32/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) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-p-1_32.pdb ../src/winstances.cpp
 
 boost_regex-vc6-mt-p-1_32_dir :
 	@if not exist "vc6-stlport\boost_regex-vc6-mt-p-1_32\$(NULL)" mkdir vc6-stlport\boost_regex-vc6-mt-p-1_32
@@ -175,8 +215,8 @@ boost_regex-vc6-mt-p-1_32_clean :
 	del vc6-stlport\boost_regex-vc6-mt-p-1_32\*.exp
 	del vc6-stlport\boost_regex-vc6-mt-p-1_32\*.pch
 
-./vc6-stlport/boost_regex-vc6-mt-p-1_32.lib : vc6-stlport/boost_regex-vc6-mt-p-1_32/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/c_regex_traits_common.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/cregex.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/fileiter.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/instances.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/regex.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/regex_synch.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/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_32.pdb" /debug /machine:I386 /out:"vc6-stlport/boost_regex-vc6-mt-p-1_32.dll" /implib:"vc6-stlport/boost_regex-vc6-mt-p-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc6-stlport/boost_regex-vc6-mt-p-1_32/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/c_regex_traits_common.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/cregex.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/fileiter.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/instances.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/regex.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/regex_synch.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/winstances.obj
+./vc6-stlport/boost_regex-vc6-mt-p-1_32.lib : vc6-stlport/boost_regex-vc6-mt-p-1_32/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/cregex.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/fileiter.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/icu.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/instances.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/regex.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/regex_raw_buffer.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/regex_traits_defaults.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/static_mutex.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/usinstances.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/wc_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/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_32.pdb" /debug /machine:I386 /out:"vc6-stlport/boost_regex-vc6-mt-p-1_32.dll" /implib:"vc6-stlport/boost_regex-vc6-mt-p-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS) $(ICU_LINK_OPTS)  vc6-stlport/boost_regex-vc6-mt-p-1_32/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/cregex.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/fileiter.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/icu.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/instances.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/regex.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/regex_raw_buffer.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/regex_traits_defaults.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/static_mutex.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/usinstances.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/wc_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-p-1_32/winstances.obj
 
 ########################################################
 #
@@ -184,43 +224,55 @@ boost_regex-vc6-mt-p-1_32_clean :
 #
 ########################################################
 vc6-stlport/libboost_regex-vc6-mt-p-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/c_regex_traits.cpp
-
-vc6-stlport/libboost_regex-vc6-mt-p-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/c_regex_traits.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-p-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-p-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/cregex.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-p-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/fileiter.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-p-1_32/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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/icu.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-p-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/instances.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-p-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/posix_api.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-p-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/regex.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-p-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/regex_debug.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/regex_synch.cpp
+vc6-stlport/libboost_regex-vc6-mt-p-1_32/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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-p-1_32/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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-p-1_32/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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/static_mutex.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-p-1_32/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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/usinstances.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-p-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-p-1_32/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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-p-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/wide_posix_api.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-p-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-p-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-p-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc6-mt-p-1_32_dir :
 	@if not exist "vc6-stlport\libboost_regex-vc6-mt-p-1_32\$(NULL)" mkdir vc6-stlport\libboost_regex-vc6-mt-p-1_32
@@ -231,8 +283,8 @@ libboost_regex-vc6-mt-p-1_32_clean :
 	del vc6-stlport\libboost_regex-vc6-mt-p-1_32\*.exp
 	del vc6-stlport\libboost_regex-vc6-mt-p-1_32\*.pch
 
-./vc6-stlport/libboost_regex-vc6-mt-p-1_32.lib : vc6-stlport/libboost_regex-vc6-mt-p-1_32/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/c_regex_traits_common.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/cregex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/instances.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex_synch.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/winstances.obj
-	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-p-1_32.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-p-1_32/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/c_regex_traits_common.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/cregex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/instances.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex_synch.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/winstances.obj
+./vc6-stlport/libboost_regex-vc6-mt-p-1_32.lib : vc6-stlport/libboost_regex-vc6-mt-p-1_32/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/cregex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/icu.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/instances.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/winstances.obj
+	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-p-1_32.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-p-1_32/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/cregex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/icu.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/instances.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-p-1_32/winstances.obj
 
 ########################################################
 #
@@ -240,43 +292,55 @@ libboost_regex-vc6-mt-p-1_32_clean :
 #
 ########################################################
 vc6-stlport/boost_regex-vc6-mt-gdp-1_32/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) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/c_regex_traits.cpp
-
-vc6-stlport/boost_regex-vc6-mt-gdp-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/c_regex_traits.cpp
 
 vc6-stlport/boost_regex-vc6-mt-gdp-1_32/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) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc6-stlport/boost_regex-vc6-mt-gdp-1_32/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) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/cregex.cpp
 
 vc6-stlport/boost_regex-vc6-mt-gdp-1_32/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) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/fileiter.cpp
+
+vc6-stlport/boost_regex-vc6-mt-gdp-1_32/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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/icu.cpp
 
 vc6-stlport/boost_regex-vc6-mt-gdp-1_32/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) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/instances.cpp
 
 vc6-stlport/boost_regex-vc6-mt-gdp-1_32/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) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/posix_api.cpp
 
 vc6-stlport/boost_regex-vc6-mt-gdp-1_32/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) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/regex.cpp
 
 vc6-stlport/boost_regex-vc6-mt-gdp-1_32/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) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/regex_debug.cpp
 
-vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/regex_synch.cpp
+vc6-stlport/boost_regex-vc6-mt-gdp-1_32/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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc6-stlport/boost_regex-vc6-mt-gdp-1_32/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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc6-stlport/boost_regex-vc6-mt-gdp-1_32/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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/static_mutex.cpp
+
+vc6-stlport/boost_regex-vc6-mt-gdp-1_32/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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/usinstances.cpp
 
 vc6-stlport/boost_regex-vc6-mt-gdp-1_32/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) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc6-stlport/boost_regex-vc6-mt-gdp-1_32/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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc6-stlport/boost_regex-vc6-mt-gdp-1_32/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) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/wide_posix_api.cpp
 
 vc6-stlport/boost_regex-vc6-mt-gdp-1_32/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) -Y- -Fo./vc6-stlport/boost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc6-stlport/boost_regex-vc6-mt-gdp-1_32.pdb ../src/winstances.cpp
 
 boost_regex-vc6-mt-gdp-1_32_dir :
 	@if not exist "vc6-stlport\boost_regex-vc6-mt-gdp-1_32\$(NULL)" mkdir vc6-stlport\boost_regex-vc6-mt-gdp-1_32
@@ -287,8 +351,8 @@ boost_regex-vc6-mt-gdp-1_32_clean :
 	del vc6-stlport\boost_regex-vc6-mt-gdp-1_32\*.exp
 	del vc6-stlport\boost_regex-vc6-mt-gdp-1_32\*.pch
 
-./vc6-stlport/boost_regex-vc6-mt-gdp-1_32.lib : vc6-stlport/boost_regex-vc6-mt-gdp-1_32/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/c_regex_traits_common.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/cregex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/fileiter.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/instances.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex_synch.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/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_32.pdb" /debug /machine:I386 /out:"vc6-stlport/boost_regex-vc6-mt-gdp-1_32.dll" /implib:"vc6-stlport/boost_regex-vc6-mt-gdp-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc6-stlport/boost_regex-vc6-mt-gdp-1_32/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/c_regex_traits_common.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/cregex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/fileiter.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/instances.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex_synch.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/winstances.obj
+./vc6-stlport/boost_regex-vc6-mt-gdp-1_32.lib : vc6-stlport/boost_regex-vc6-mt-gdp-1_32/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/cregex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/fileiter.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/icu.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/instances.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex_raw_buffer.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex_traits_defaults.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/static_mutex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/usinstances.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/wc_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/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_32.pdb" /debug /machine:I386 /out:"vc6-stlport/boost_regex-vc6-mt-gdp-1_32.dll" /implib:"vc6-stlport/boost_regex-vc6-mt-gdp-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS) $(ICU_LINK_OPTS)  vc6-stlport/boost_regex-vc6-mt-gdp-1_32/c_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/cpp_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/cregex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/fileiter.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/icu.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/instances.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex_debug.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex_raw_buffer.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/regex_traits_defaults.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/static_mutex.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/usinstances.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/w32_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/wc_regex_traits.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/wide_posix_api.obj vc6-stlport/boost_regex-vc6-mt-gdp-1_32/winstances.obj
 
 ########################################################
 #
@@ -296,43 +360,55 @@ boost_regex-vc6-mt-gdp-1_32_clean :
 #
 ########################################################
 vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/c_regex_traits.cpp
-
-vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/c_regex_traits.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/cregex.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/fileiter.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/icu.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/instances.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/posix_api.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/regex.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/regex_debug.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/regex_synch.cpp
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/static_mutex.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/usinstances.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/wide_posix_api.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc6-mt-sgdp-1_32_dir :
 	@if not exist "vc6-stlport\libboost_regex-vc6-mt-sgdp-1_32\$(NULL)" mkdir vc6-stlport\libboost_regex-vc6-mt-sgdp-1_32
@@ -343,8 +419,8 @@ libboost_regex-vc6-mt-sgdp-1_32_clean :
 	del vc6-stlport\libboost_regex-vc6-mt-sgdp-1_32\*.exp
 	del vc6-stlport\libboost_regex-vc6-mt-sgdp-1_32\*.pch
 
-./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.lib : vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/c_regex_traits_common.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/instances.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex_synch.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/winstances.obj
-	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/c_regex_traits_common.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/instances.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex_synch.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/winstances.obj
+./vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.lib : vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/icu.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/instances.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/winstances.obj
+	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/cregex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/icu.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/instances.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-sgdp-1_32/winstances.obj
 
 ########################################################
 #
@@ -352,43 +428,55 @@ libboost_regex-vc6-mt-sgdp-1_32_clean :
 #
 ########################################################
 vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/c_regex_traits.cpp
-
-vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/c_regex_traits.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/cregex.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/fileiter.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/icu.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/instances.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/posix_api.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/regex.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/regex_debug.cpp
 
-vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/regex_synch.cpp
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/static_mutex.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/usinstances.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/wide_posix_api.cpp
 
 vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/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) -Y- -Fo./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc6-stlport/libboost_regex-vc6-mt-gdp-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc6-mt-gdp-1_32_dir :
 	@if not exist "vc6-stlport\libboost_regex-vc6-mt-gdp-1_32\$(NULL)" mkdir vc6-stlport\libboost_regex-vc6-mt-gdp-1_32
@@ -399,6 +487,6 @@ libboost_regex-vc6-mt-gdp-1_32_clean :
 	del vc6-stlport\libboost_regex-vc6-mt-gdp-1_32\*.exp
 	del vc6-stlport\libboost_regex-vc6-mt-gdp-1_32\*.pch
 
-./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32.lib : vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/c_regex_traits_common.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/cregex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/instances.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex_synch.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/winstances.obj
-	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-gdp-1_32.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/c_regex_traits_common.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/cregex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/instances.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex_synch.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/winstances.obj
+./vc6-stlport/libboost_regex-vc6-mt-gdp-1_32.lib : vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/cregex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/icu.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/instances.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/winstances.obj
+	link -lib /nologo /out:vc6-stlport/libboost_regex-vc6-mt-gdp-1_32.lib $(XSFLAGS)  vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/c_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/cpp_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/cregex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/fileiter.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/icu.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/instances.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex_debug.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex_raw_buffer.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/regex_traits_defaults.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/static_mutex.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/usinstances.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/w32_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/wc_regex_traits.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/wide_posix_api.obj vc6-stlport/libboost_regex-vc6-mt-gdp-1_32/winstances.obj
 
diff --git a/build/vc6.mak b/build/vc6.mak
index ee502c7a..d3f0374f 100644
--- a/build/vc6.mak
+++ b/build/vc6.mak
@@ -8,6 +8,10 @@
 #   brings libraries up to date and copies binaries to your VC6 /lib and /bin directories (recomended)
 #
 
+#
+# path to ICU library installation goes here:
+#
+ICU_PATH=
 #
 # Add additional compiler options here:
 #
@@ -35,8 +39,20 @@ NULL=nul
 !ERROR Variable MSVCDIR not set.
 !ENDIF
 
+!IF "$(ICU_PATH)" == ""
+ICU_COMPILE_OPTS=
+ICU_LINK_OPTS=
+!MESSAGE Building Boost.Regex without ICU / Unicode support:
+!MESSAGE Hint: set ICU_PATH on the nmake command line to point 
+!MESSAGE to your ICU installation if you have one.
+!ELSE
+ICU_COMPILE_OPTS= -DBOOST_HAS_ICU=1 -I$(ICU_PATH)\include
+ICU_LINK_OPTS= /LIBPATH:$(ICU_PATH)\lib icuin.lib icuuc.lib
+!MESSAGE Building Boost.Regex with ICU in $(ICU_PATH)
+!ENDIF
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.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/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.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_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/allocator.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+
+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/static_mutex.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 ../../../boost/regex/config/regex_library_include.hpp
 
 all : main_dir libboost_regex-vc6-s-1_32_dir ./vc6/libboost_regex-vc6-s-1_32.lib libboost_regex-vc6-mt-s-1_32_dir ./vc6/libboost_regex-vc6-mt-s-1_32.lib libboost_regex-vc6-sgd-1_32_dir ./vc6/libboost_regex-vc6-sgd-1_32.lib libboost_regex-vc6-mt-sgd-1_32_dir ./vc6/libboost_regex-vc6-mt-sgd-1_32.lib boost_regex-vc6-mt-gd-1_32_dir ./vc6/boost_regex-vc6-mt-gd-1_32.lib boost_regex-vc6-mt-1_32_dir ./vc6/boost_regex-vc6-mt-1_32.lib libboost_regex-vc6-mt-1_32_dir ./vc6/libboost_regex-vc6-mt-1_32.lib libboost_regex-vc6-mt-gd-1_32_dir ./vc6/libboost_regex-vc6-mt-gd-1_32.lib
 
@@ -68,43 +84,55 @@ main_dir :
 #
 ########################################################
 vc6/libboost_regex-vc6-s-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/c_regex_traits.cpp
-
-vc6/libboost_regex-vc6-s-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/c_regex_traits.cpp
 
 vc6/libboost_regex-vc6-s-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc6/libboost_regex-vc6-s-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/cregex.cpp
 
 vc6/libboost_regex-vc6-s-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/fileiter.cpp
+
+vc6/libboost_regex-vc6-s-1_32/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_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/icu.cpp
 
 vc6/libboost_regex-vc6-s-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/instances.cpp
 
 vc6/libboost_regex-vc6-s-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/posix_api.cpp
 
 vc6/libboost_regex-vc6-s-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/regex.cpp
 
 vc6/libboost_regex-vc6-s-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/regex_debug.cpp
 
-vc6/libboost_regex-vc6-s-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /c /nologo /ML /W3 /GX /O2 /GB /GF /Gy /I..\..\..\ /DWIN32 /DNDEBUG /D_MBCS /D_LIB /FD   $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/regex_synch.cpp
+vc6/libboost_regex-vc6-s-1_32/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_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc6/libboost_regex-vc6-s-1_32/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_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc6/libboost_regex-vc6-s-1_32/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_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/static_mutex.cpp
+
+vc6/libboost_regex-vc6-s-1_32/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_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/usinstances.cpp
 
 vc6/libboost_regex-vc6-s-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc6/libboost_regex-vc6-s-1_32/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_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc6/libboost_regex-vc6-s-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/wide_posix_api.cpp
 
 vc6/libboost_regex-vc6-s-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-s-1_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-s-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc6-s-1_32_dir :
 	@if not exist "vc6\libboost_regex-vc6-s-1_32\$(NULL)" mkdir vc6\libboost_regex-vc6-s-1_32
@@ -115,8 +143,8 @@ libboost_regex-vc6-s-1_32_clean :
 	del vc6\libboost_regex-vc6-s-1_32\*.exp
 	del vc6\libboost_regex-vc6-s-1_32\*.pch
 
-./vc6/libboost_regex-vc6-s-1_32.lib : vc6/libboost_regex-vc6-s-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-s-1_32/c_regex_traits_common.obj vc6/libboost_regex-vc6-s-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-s-1_32/cregex.obj vc6/libboost_regex-vc6-s-1_32/fileiter.obj vc6/libboost_regex-vc6-s-1_32/instances.obj vc6/libboost_regex-vc6-s-1_32/posix_api.obj vc6/libboost_regex-vc6-s-1_32/regex.obj vc6/libboost_regex-vc6-s-1_32/regex_debug.obj vc6/libboost_regex-vc6-s-1_32/regex_synch.obj vc6/libboost_regex-vc6-s-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-s-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-s-1_32/winstances.obj
-	link -lib /nologo /out:vc6/libboost_regex-vc6-s-1_32.lib $(XSFLAGS)  vc6/libboost_regex-vc6-s-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-s-1_32/c_regex_traits_common.obj vc6/libboost_regex-vc6-s-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-s-1_32/cregex.obj vc6/libboost_regex-vc6-s-1_32/fileiter.obj vc6/libboost_regex-vc6-s-1_32/instances.obj vc6/libboost_regex-vc6-s-1_32/posix_api.obj vc6/libboost_regex-vc6-s-1_32/regex.obj vc6/libboost_regex-vc6-s-1_32/regex_debug.obj vc6/libboost_regex-vc6-s-1_32/regex_synch.obj vc6/libboost_regex-vc6-s-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-s-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-s-1_32/winstances.obj
+./vc6/libboost_regex-vc6-s-1_32.lib : vc6/libboost_regex-vc6-s-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-s-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-s-1_32/cregex.obj vc6/libboost_regex-vc6-s-1_32/fileiter.obj vc6/libboost_regex-vc6-s-1_32/icu.obj vc6/libboost_regex-vc6-s-1_32/instances.obj vc6/libboost_regex-vc6-s-1_32/posix_api.obj vc6/libboost_regex-vc6-s-1_32/regex.obj vc6/libboost_regex-vc6-s-1_32/regex_debug.obj vc6/libboost_regex-vc6-s-1_32/regex_raw_buffer.obj vc6/libboost_regex-vc6-s-1_32/regex_traits_defaults.obj vc6/libboost_regex-vc6-s-1_32/static_mutex.obj vc6/libboost_regex-vc6-s-1_32/usinstances.obj vc6/libboost_regex-vc6-s-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-s-1_32/wc_regex_traits.obj vc6/libboost_regex-vc6-s-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-s-1_32/winstances.obj
+	link -lib /nologo /out:vc6/libboost_regex-vc6-s-1_32.lib $(XSFLAGS)  vc6/libboost_regex-vc6-s-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-s-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-s-1_32/cregex.obj vc6/libboost_regex-vc6-s-1_32/fileiter.obj vc6/libboost_regex-vc6-s-1_32/icu.obj vc6/libboost_regex-vc6-s-1_32/instances.obj vc6/libboost_regex-vc6-s-1_32/posix_api.obj vc6/libboost_regex-vc6-s-1_32/regex.obj vc6/libboost_regex-vc6-s-1_32/regex_debug.obj vc6/libboost_regex-vc6-s-1_32/regex_raw_buffer.obj vc6/libboost_regex-vc6-s-1_32/regex_traits_defaults.obj vc6/libboost_regex-vc6-s-1_32/static_mutex.obj vc6/libboost_regex-vc6-s-1_32/usinstances.obj vc6/libboost_regex-vc6-s-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-s-1_32/wc_regex_traits.obj vc6/libboost_regex-vc6-s-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-s-1_32/winstances.obj
 
 ########################################################
 #
@@ -124,43 +152,55 @@ libboost_regex-vc6-s-1_32_clean :
 #
 ########################################################
 vc6/libboost_regex-vc6-mt-s-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/c_regex_traits.cpp
-
-vc6/libboost_regex-vc6-mt-s-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/c_regex_traits.cpp
 
 vc6/libboost_regex-vc6-mt-s-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc6/libboost_regex-vc6-mt-s-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/cregex.cpp
 
 vc6/libboost_regex-vc6-mt-s-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/fileiter.cpp
+
+vc6/libboost_regex-vc6-mt-s-1_32/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_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/icu.cpp
 
 vc6/libboost_regex-vc6-mt-s-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/instances.cpp
 
 vc6/libboost_regex-vc6-mt-s-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/posix_api.cpp
 
 vc6/libboost_regex-vc6-mt-s-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/regex.cpp
 
 vc6/libboost_regex-vc6-mt-s-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/regex_debug.cpp
 
-vc6/libboost_regex-vc6-mt-s-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/regex_synch.cpp
+vc6/libboost_regex-vc6-mt-s-1_32/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_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc6/libboost_regex-vc6-mt-s-1_32/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_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc6/libboost_regex-vc6-mt-s-1_32/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_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/static_mutex.cpp
+
+vc6/libboost_regex-vc6-mt-s-1_32/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_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/usinstances.cpp
 
 vc6/libboost_regex-vc6-mt-s-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc6/libboost_regex-vc6-mt-s-1_32/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_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc6/libboost_regex-vc6-mt-s-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/wide_posix_api.cpp
 
 vc6/libboost_regex-vc6-mt-s-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-s-1_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-s-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc6-mt-s-1_32_dir :
 	@if not exist "vc6\libboost_regex-vc6-mt-s-1_32\$(NULL)" mkdir vc6\libboost_regex-vc6-mt-s-1_32
@@ -171,8 +211,8 @@ libboost_regex-vc6-mt-s-1_32_clean :
 	del vc6\libboost_regex-vc6-mt-s-1_32\*.exp
 	del vc6\libboost_regex-vc6-mt-s-1_32\*.pch
 
-./vc6/libboost_regex-vc6-mt-s-1_32.lib : vc6/libboost_regex-vc6-mt-s-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_32/c_regex_traits_common.obj vc6/libboost_regex-vc6-mt-s-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_32/cregex.obj vc6/libboost_regex-vc6-mt-s-1_32/fileiter.obj vc6/libboost_regex-vc6-mt-s-1_32/instances.obj vc6/libboost_regex-vc6-mt-s-1_32/posix_api.obj vc6/libboost_regex-vc6-mt-s-1_32/regex.obj vc6/libboost_regex-vc6-mt-s-1_32/regex_debug.obj vc6/libboost_regex-vc6-mt-s-1_32/regex_synch.obj vc6/libboost_regex-vc6-mt-s-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-mt-s-1_32/winstances.obj
-	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-s-1_32.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-s-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_32/c_regex_traits_common.obj vc6/libboost_regex-vc6-mt-s-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_32/cregex.obj vc6/libboost_regex-vc6-mt-s-1_32/fileiter.obj vc6/libboost_regex-vc6-mt-s-1_32/instances.obj vc6/libboost_regex-vc6-mt-s-1_32/posix_api.obj vc6/libboost_regex-vc6-mt-s-1_32/regex.obj vc6/libboost_regex-vc6-mt-s-1_32/regex_debug.obj vc6/libboost_regex-vc6-mt-s-1_32/regex_synch.obj vc6/libboost_regex-vc6-mt-s-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-mt-s-1_32/winstances.obj
+./vc6/libboost_regex-vc6-mt-s-1_32.lib : vc6/libboost_regex-vc6-mt-s-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_32/cregex.obj vc6/libboost_regex-vc6-mt-s-1_32/fileiter.obj vc6/libboost_regex-vc6-mt-s-1_32/icu.obj vc6/libboost_regex-vc6-mt-s-1_32/instances.obj vc6/libboost_regex-vc6-mt-s-1_32/posix_api.obj vc6/libboost_regex-vc6-mt-s-1_32/regex.obj vc6/libboost_regex-vc6-mt-s-1_32/regex_debug.obj vc6/libboost_regex-vc6-mt-s-1_32/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-s-1_32/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-s-1_32/static_mutex.obj vc6/libboost_regex-vc6-mt-s-1_32/usinstances.obj vc6/libboost_regex-vc6-mt-s-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_32/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-mt-s-1_32/winstances.obj
+	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-s-1_32.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-s-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_32/cregex.obj vc6/libboost_regex-vc6-mt-s-1_32/fileiter.obj vc6/libboost_regex-vc6-mt-s-1_32/icu.obj vc6/libboost_regex-vc6-mt-s-1_32/instances.obj vc6/libboost_regex-vc6-mt-s-1_32/posix_api.obj vc6/libboost_regex-vc6-mt-s-1_32/regex.obj vc6/libboost_regex-vc6-mt-s-1_32/regex_debug.obj vc6/libboost_regex-vc6-mt-s-1_32/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-s-1_32/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-s-1_32/static_mutex.obj vc6/libboost_regex-vc6-mt-s-1_32/usinstances.obj vc6/libboost_regex-vc6-mt-s-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_32/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-s-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-mt-s-1_32/winstances.obj
 
 ########################################################
 #
@@ -180,43 +220,55 @@ libboost_regex-vc6-mt-s-1_32_clean :
 #
 ########################################################
 vc6/libboost_regex-vc6-sgd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/c_regex_traits.cpp
-
-vc6/libboost_regex-vc6-sgd-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/c_regex_traits.cpp
 
 vc6/libboost_regex-vc6-sgd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc6/libboost_regex-vc6-sgd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/cregex.cpp
 
 vc6/libboost_regex-vc6-sgd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/fileiter.cpp
+
+vc6/libboost_regex-vc6-sgd-1_32/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_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/icu.cpp
 
 vc6/libboost_regex-vc6-sgd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/instances.cpp
 
 vc6/libboost_regex-vc6-sgd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/posix_api.cpp
 
 vc6/libboost_regex-vc6-sgd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/regex.cpp
 
 vc6/libboost_regex-vc6-sgd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/regex_debug.cpp
 
-vc6/libboost_regex-vc6-sgd-1_32/regex_synch.obj: ../src/regex_synch.cpp $(ALL_HEADER)
-	cl $(INCLUDES) /nologo /MLd /W3 /Gm /GX /Zi /Od /I..\..\..\ /DWIN32 /D_DEBUG /D_MBCS /D_LIB /FD /GX /c  $(CXXFLAGS) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/regex_synch.cpp
+vc6/libboost_regex-vc6-sgd-1_32/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_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc6/libboost_regex-vc6-sgd-1_32/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_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc6/libboost_regex-vc6-sgd-1_32/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_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/static_mutex.cpp
+
+vc6/libboost_regex-vc6-sgd-1_32/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_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/usinstances.cpp
 
 vc6/libboost_regex-vc6-sgd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc6/libboost_regex-vc6-sgd-1_32/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_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc6/libboost_regex-vc6-sgd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/wide_posix_api.cpp
 
 vc6/libboost_regex-vc6-sgd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-sgd-1_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-sgd-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc6-sgd-1_32_dir :
 	@if not exist "vc6\libboost_regex-vc6-sgd-1_32\$(NULL)" mkdir vc6\libboost_regex-vc6-sgd-1_32
@@ -227,8 +279,8 @@ libboost_regex-vc6-sgd-1_32_clean :
 	del vc6\libboost_regex-vc6-sgd-1_32\*.exp
 	del vc6\libboost_regex-vc6-sgd-1_32\*.pch
 
-./vc6/libboost_regex-vc6-sgd-1_32.lib : vc6/libboost_regex-vc6-sgd-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_32/c_regex_traits_common.obj vc6/libboost_regex-vc6-sgd-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_32/cregex.obj vc6/libboost_regex-vc6-sgd-1_32/fileiter.obj vc6/libboost_regex-vc6-sgd-1_32/instances.obj vc6/libboost_regex-vc6-sgd-1_32/posix_api.obj vc6/libboost_regex-vc6-sgd-1_32/regex.obj vc6/libboost_regex-vc6-sgd-1_32/regex_debug.obj vc6/libboost_regex-vc6-sgd-1_32/regex_synch.obj vc6/libboost_regex-vc6-sgd-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-sgd-1_32/winstances.obj
-	link -lib /nologo /out:vc6/libboost_regex-vc6-sgd-1_32.lib $(XSFLAGS)  vc6/libboost_regex-vc6-sgd-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_32/c_regex_traits_common.obj vc6/libboost_regex-vc6-sgd-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_32/cregex.obj vc6/libboost_regex-vc6-sgd-1_32/fileiter.obj vc6/libboost_regex-vc6-sgd-1_32/instances.obj vc6/libboost_regex-vc6-sgd-1_32/posix_api.obj vc6/libboost_regex-vc6-sgd-1_32/regex.obj vc6/libboost_regex-vc6-sgd-1_32/regex_debug.obj vc6/libboost_regex-vc6-sgd-1_32/regex_synch.obj vc6/libboost_regex-vc6-sgd-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-sgd-1_32/winstances.obj
+./vc6/libboost_regex-vc6-sgd-1_32.lib : vc6/libboost_regex-vc6-sgd-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_32/cregex.obj vc6/libboost_regex-vc6-sgd-1_32/fileiter.obj vc6/libboost_regex-vc6-sgd-1_32/icu.obj vc6/libboost_regex-vc6-sgd-1_32/instances.obj vc6/libboost_regex-vc6-sgd-1_32/posix_api.obj vc6/libboost_regex-vc6-sgd-1_32/regex.obj vc6/libboost_regex-vc6-sgd-1_32/regex_debug.obj vc6/libboost_regex-vc6-sgd-1_32/regex_raw_buffer.obj vc6/libboost_regex-vc6-sgd-1_32/regex_traits_defaults.obj vc6/libboost_regex-vc6-sgd-1_32/static_mutex.obj vc6/libboost_regex-vc6-sgd-1_32/usinstances.obj vc6/libboost_regex-vc6-sgd-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_32/wc_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-sgd-1_32/winstances.obj
+	link -lib /nologo /out:vc6/libboost_regex-vc6-sgd-1_32.lib $(XSFLAGS)  vc6/libboost_regex-vc6-sgd-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_32/cregex.obj vc6/libboost_regex-vc6-sgd-1_32/fileiter.obj vc6/libboost_regex-vc6-sgd-1_32/icu.obj vc6/libboost_regex-vc6-sgd-1_32/instances.obj vc6/libboost_regex-vc6-sgd-1_32/posix_api.obj vc6/libboost_regex-vc6-sgd-1_32/regex.obj vc6/libboost_regex-vc6-sgd-1_32/regex_debug.obj vc6/libboost_regex-vc6-sgd-1_32/regex_raw_buffer.obj vc6/libboost_regex-vc6-sgd-1_32/regex_traits_defaults.obj vc6/libboost_regex-vc6-sgd-1_32/static_mutex.obj vc6/libboost_regex-vc6-sgd-1_32/usinstances.obj vc6/libboost_regex-vc6-sgd-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_32/wc_regex_traits.obj vc6/libboost_regex-vc6-sgd-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-sgd-1_32/winstances.obj
 
 ########################################################
 #
@@ -236,43 +288,55 @@ libboost_regex-vc6-sgd-1_32_clean :
 #
 ########################################################
 vc6/libboost_regex-vc6-mt-sgd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/c_regex_traits.cpp
-
-vc6/libboost_regex-vc6-mt-sgd-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/c_regex_traits.cpp
 
 vc6/libboost_regex-vc6-mt-sgd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc6/libboost_regex-vc6-mt-sgd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/cregex.cpp
 
 vc6/libboost_regex-vc6-mt-sgd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/fileiter.cpp
+
+vc6/libboost_regex-vc6-mt-sgd-1_32/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_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/icu.cpp
 
 vc6/libboost_regex-vc6-mt-sgd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/instances.cpp
 
 vc6/libboost_regex-vc6-mt-sgd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/posix_api.cpp
 
 vc6/libboost_regex-vc6-mt-sgd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/regex.cpp
 
 vc6/libboost_regex-vc6-mt-sgd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/regex_debug.cpp
 
-vc6/libboost_regex-vc6-mt-sgd-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/regex_synch.cpp
+vc6/libboost_regex-vc6-mt-sgd-1_32/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_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc6/libboost_regex-vc6-mt-sgd-1_32/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_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc6/libboost_regex-vc6-mt-sgd-1_32/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_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/static_mutex.cpp
+
+vc6/libboost_regex-vc6-mt-sgd-1_32/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_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/usinstances.cpp
 
 vc6/libboost_regex-vc6-mt-sgd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc6/libboost_regex-vc6-mt-sgd-1_32/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_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc6/libboost_regex-vc6-mt-sgd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/wide_posix_api.cpp
 
 vc6/libboost_regex-vc6-mt-sgd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-sgd-1_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-sgd-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc6-mt-sgd-1_32_dir :
 	@if not exist "vc6\libboost_regex-vc6-mt-sgd-1_32\$(NULL)" mkdir vc6\libboost_regex-vc6-mt-sgd-1_32
@@ -283,8 +347,8 @@ libboost_regex-vc6-mt-sgd-1_32_clean :
 	del vc6\libboost_regex-vc6-mt-sgd-1_32\*.exp
 	del vc6\libboost_regex-vc6-mt-sgd-1_32\*.pch
 
-./vc6/libboost_regex-vc6-mt-sgd-1_32.lib : vc6/libboost_regex-vc6-mt-sgd-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_32/c_regex_traits_common.obj vc6/libboost_regex-vc6-mt-sgd-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_32/cregex.obj vc6/libboost_regex-vc6-mt-sgd-1_32/fileiter.obj vc6/libboost_regex-vc6-mt-sgd-1_32/instances.obj vc6/libboost_regex-vc6-mt-sgd-1_32/posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_32/regex.obj vc6/libboost_regex-vc6-mt-sgd-1_32/regex_debug.obj vc6/libboost_regex-vc6-mt-sgd-1_32/regex_synch.obj vc6/libboost_regex-vc6-mt-sgd-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_32/winstances.obj
-	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-sgd-1_32.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-sgd-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_32/c_regex_traits_common.obj vc6/libboost_regex-vc6-mt-sgd-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_32/cregex.obj vc6/libboost_regex-vc6-mt-sgd-1_32/fileiter.obj vc6/libboost_regex-vc6-mt-sgd-1_32/instances.obj vc6/libboost_regex-vc6-mt-sgd-1_32/posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_32/regex.obj vc6/libboost_regex-vc6-mt-sgd-1_32/regex_debug.obj vc6/libboost_regex-vc6-mt-sgd-1_32/regex_synch.obj vc6/libboost_regex-vc6-mt-sgd-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_32/winstances.obj
+./vc6/libboost_regex-vc6-mt-sgd-1_32.lib : vc6/libboost_regex-vc6-mt-sgd-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_32/cregex.obj vc6/libboost_regex-vc6-mt-sgd-1_32/fileiter.obj vc6/libboost_regex-vc6-mt-sgd-1_32/icu.obj vc6/libboost_regex-vc6-mt-sgd-1_32/instances.obj vc6/libboost_regex-vc6-mt-sgd-1_32/posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_32/regex.obj vc6/libboost_regex-vc6-mt-sgd-1_32/regex_debug.obj vc6/libboost_regex-vc6-mt-sgd-1_32/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-sgd-1_32/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-sgd-1_32/static_mutex.obj vc6/libboost_regex-vc6-mt-sgd-1_32/usinstances.obj vc6/libboost_regex-vc6-mt-sgd-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_32/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_32/winstances.obj
+	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-sgd-1_32.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-sgd-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_32/cregex.obj vc6/libboost_regex-vc6-mt-sgd-1_32/fileiter.obj vc6/libboost_regex-vc6-mt-sgd-1_32/icu.obj vc6/libboost_regex-vc6-mt-sgd-1_32/instances.obj vc6/libboost_regex-vc6-mt-sgd-1_32/posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_32/regex.obj vc6/libboost_regex-vc6-mt-sgd-1_32/regex_debug.obj vc6/libboost_regex-vc6-mt-sgd-1_32/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-sgd-1_32/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-sgd-1_32/static_mutex.obj vc6/libboost_regex-vc6-mt-sgd-1_32/usinstances.obj vc6/libboost_regex-vc6-mt-sgd-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_32/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-sgd-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-mt-sgd-1_32/winstances.obj
 
 ########################################################
 #
@@ -292,43 +356,55 @@ libboost_regex-vc6-mt-sgd-1_32_clean :
 #
 ########################################################
 vc6/boost_regex-vc6-mt-gd-1_32/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) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/c_regex_traits.cpp
-
-vc6/boost_regex-vc6-mt-gd-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/c_regex_traits.cpp
 
 vc6/boost_regex-vc6-mt-gd-1_32/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) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc6/boost_regex-vc6-mt-gd-1_32/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) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/cregex.cpp
 
 vc6/boost_regex-vc6-mt-gd-1_32/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) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/fileiter.cpp
+
+vc6/boost_regex-vc6-mt-gd-1_32/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_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/icu.cpp
 
 vc6/boost_regex-vc6-mt-gd-1_32/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) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/instances.cpp
 
 vc6/boost_regex-vc6-mt-gd-1_32/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) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/posix_api.cpp
 
 vc6/boost_regex-vc6-mt-gd-1_32/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) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/regex.cpp
 
 vc6/boost_regex-vc6-mt-gd-1_32/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) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/regex_debug.cpp
 
-vc6/boost_regex-vc6-mt-gd-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/regex_synch.cpp
+vc6/boost_regex-vc6-mt-gd-1_32/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_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc6/boost_regex-vc6-mt-gd-1_32/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_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc6/boost_regex-vc6-mt-gd-1_32/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_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/static_mutex.cpp
+
+vc6/boost_regex-vc6-mt-gd-1_32/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_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/usinstances.cpp
 
 vc6/boost_regex-vc6-mt-gd-1_32/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) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc6/boost_regex-vc6-mt-gd-1_32/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_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc6/boost_regex-vc6-mt-gd-1_32/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) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/wide_posix_api.cpp
 
 vc6/boost_regex-vc6-mt-gd-1_32/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) -Y- -Fo./vc6/boost_regex-vc6-mt-gd-1_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc6/boost_regex-vc6-mt-gd-1_32.pdb ../src/winstances.cpp
 
 boost_regex-vc6-mt-gd-1_32_dir :
 	@if not exist "vc6\boost_regex-vc6-mt-gd-1_32\$(NULL)" mkdir vc6\boost_regex-vc6-mt-gd-1_32
@@ -339,8 +415,8 @@ boost_regex-vc6-mt-gd-1_32_clean :
 	del vc6\boost_regex-vc6-mt-gd-1_32\*.exp
 	del vc6\boost_regex-vc6-mt-gd-1_32\*.pch
 
-./vc6/boost_regex-vc6-mt-gd-1_32.lib : vc6/boost_regex-vc6-mt-gd-1_32/c_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_32/c_regex_traits_common.obj vc6/boost_regex-vc6-mt-gd-1_32/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_32/cregex.obj vc6/boost_regex-vc6-mt-gd-1_32/fileiter.obj vc6/boost_regex-vc6-mt-gd-1_32/instances.obj vc6/boost_regex-vc6-mt-gd-1_32/posix_api.obj vc6/boost_regex-vc6-mt-gd-1_32/regex.obj vc6/boost_regex-vc6-mt-gd-1_32/regex_debug.obj vc6/boost_regex-vc6-mt-gd-1_32/regex_synch.obj vc6/boost_regex-vc6-mt-gd-1_32/w32_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_32/wide_posix_api.obj vc6/boost_regex-vc6-mt-gd-1_32/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_32.pdb" /debug /machine:I386 /out:"vc6/boost_regex-vc6-mt-gd-1_32.dll" /implib:"vc6/boost_regex-vc6-mt-gd-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc6/boost_regex-vc6-mt-gd-1_32/c_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_32/c_regex_traits_common.obj vc6/boost_regex-vc6-mt-gd-1_32/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_32/cregex.obj vc6/boost_regex-vc6-mt-gd-1_32/fileiter.obj vc6/boost_regex-vc6-mt-gd-1_32/instances.obj vc6/boost_regex-vc6-mt-gd-1_32/posix_api.obj vc6/boost_regex-vc6-mt-gd-1_32/regex.obj vc6/boost_regex-vc6-mt-gd-1_32/regex_debug.obj vc6/boost_regex-vc6-mt-gd-1_32/regex_synch.obj vc6/boost_regex-vc6-mt-gd-1_32/w32_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_32/wide_posix_api.obj vc6/boost_regex-vc6-mt-gd-1_32/winstances.obj
+./vc6/boost_regex-vc6-mt-gd-1_32.lib : vc6/boost_regex-vc6-mt-gd-1_32/c_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_32/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_32/cregex.obj vc6/boost_regex-vc6-mt-gd-1_32/fileiter.obj vc6/boost_regex-vc6-mt-gd-1_32/icu.obj vc6/boost_regex-vc6-mt-gd-1_32/instances.obj vc6/boost_regex-vc6-mt-gd-1_32/posix_api.obj vc6/boost_regex-vc6-mt-gd-1_32/regex.obj vc6/boost_regex-vc6-mt-gd-1_32/regex_debug.obj vc6/boost_regex-vc6-mt-gd-1_32/regex_raw_buffer.obj vc6/boost_regex-vc6-mt-gd-1_32/regex_traits_defaults.obj vc6/boost_regex-vc6-mt-gd-1_32/static_mutex.obj vc6/boost_regex-vc6-mt-gd-1_32/usinstances.obj vc6/boost_regex-vc6-mt-gd-1_32/w32_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_32/wc_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_32/wide_posix_api.obj vc6/boost_regex-vc6-mt-gd-1_32/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_32.pdb" /debug /machine:I386 /out:"vc6/boost_regex-vc6-mt-gd-1_32.dll" /implib:"vc6/boost_regex-vc6-mt-gd-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS) $(ICU_LINK_OPTS)  vc6/boost_regex-vc6-mt-gd-1_32/c_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_32/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_32/cregex.obj vc6/boost_regex-vc6-mt-gd-1_32/fileiter.obj vc6/boost_regex-vc6-mt-gd-1_32/icu.obj vc6/boost_regex-vc6-mt-gd-1_32/instances.obj vc6/boost_regex-vc6-mt-gd-1_32/posix_api.obj vc6/boost_regex-vc6-mt-gd-1_32/regex.obj vc6/boost_regex-vc6-mt-gd-1_32/regex_debug.obj vc6/boost_regex-vc6-mt-gd-1_32/regex_raw_buffer.obj vc6/boost_regex-vc6-mt-gd-1_32/regex_traits_defaults.obj vc6/boost_regex-vc6-mt-gd-1_32/static_mutex.obj vc6/boost_regex-vc6-mt-gd-1_32/usinstances.obj vc6/boost_regex-vc6-mt-gd-1_32/w32_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_32/wc_regex_traits.obj vc6/boost_regex-vc6-mt-gd-1_32/wide_posix_api.obj vc6/boost_regex-vc6-mt-gd-1_32/winstances.obj
 
 ########################################################
 #
@@ -348,43 +424,55 @@ boost_regex-vc6-mt-gd-1_32_clean :
 #
 ########################################################
 vc6/boost_regex-vc6-mt-1_32/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) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/c_regex_traits.cpp
-
-vc6/boost_regex-vc6-mt-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/c_regex_traits.cpp
 
 vc6/boost_regex-vc6-mt-1_32/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) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc6/boost_regex-vc6-mt-1_32/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) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/cregex.cpp
 
 vc6/boost_regex-vc6-mt-1_32/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) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/fileiter.cpp
+
+vc6/boost_regex-vc6-mt-1_32/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_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/icu.cpp
 
 vc6/boost_regex-vc6-mt-1_32/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) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/instances.cpp
 
 vc6/boost_regex-vc6-mt-1_32/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) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/posix_api.cpp
 
 vc6/boost_regex-vc6-mt-1_32/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) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/regex.cpp
 
 vc6/boost_regex-vc6-mt-1_32/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) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/regex_debug.cpp
 
-vc6/boost_regex-vc6-mt-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/regex_synch.cpp
+vc6/boost_regex-vc6-mt-1_32/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_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc6/boost_regex-vc6-mt-1_32/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_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc6/boost_regex-vc6-mt-1_32/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_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/static_mutex.cpp
+
+vc6/boost_regex-vc6-mt-1_32/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_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/usinstances.cpp
 
 vc6/boost_regex-vc6-mt-1_32/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) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc6/boost_regex-vc6-mt-1_32/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_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc6/boost_regex-vc6-mt-1_32/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) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/wide_posix_api.cpp
 
 vc6/boost_regex-vc6-mt-1_32/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) -Y- -Fo./vc6/boost_regex-vc6-mt-1_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc6/boost_regex-vc6-mt-1_32.pdb ../src/winstances.cpp
 
 boost_regex-vc6-mt-1_32_dir :
 	@if not exist "vc6\boost_regex-vc6-mt-1_32\$(NULL)" mkdir vc6\boost_regex-vc6-mt-1_32
@@ -395,8 +483,8 @@ boost_regex-vc6-mt-1_32_clean :
 	del vc6\boost_regex-vc6-mt-1_32\*.exp
 	del vc6\boost_regex-vc6-mt-1_32\*.pch
 
-./vc6/boost_regex-vc6-mt-1_32.lib : vc6/boost_regex-vc6-mt-1_32/c_regex_traits.obj vc6/boost_regex-vc6-mt-1_32/c_regex_traits_common.obj vc6/boost_regex-vc6-mt-1_32/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-1_32/cregex.obj vc6/boost_regex-vc6-mt-1_32/fileiter.obj vc6/boost_regex-vc6-mt-1_32/instances.obj vc6/boost_regex-vc6-mt-1_32/posix_api.obj vc6/boost_regex-vc6-mt-1_32/regex.obj vc6/boost_regex-vc6-mt-1_32/regex_debug.obj vc6/boost_regex-vc6-mt-1_32/regex_synch.obj vc6/boost_regex-vc6-mt-1_32/w32_regex_traits.obj vc6/boost_regex-vc6-mt-1_32/wide_posix_api.obj vc6/boost_regex-vc6-mt-1_32/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_32.pdb" /debug /machine:I386 /out:"vc6/boost_regex-vc6-mt-1_32.dll" /implib:"vc6/boost_regex-vc6-mt-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc6/boost_regex-vc6-mt-1_32/c_regex_traits.obj vc6/boost_regex-vc6-mt-1_32/c_regex_traits_common.obj vc6/boost_regex-vc6-mt-1_32/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-1_32/cregex.obj vc6/boost_regex-vc6-mt-1_32/fileiter.obj vc6/boost_regex-vc6-mt-1_32/instances.obj vc6/boost_regex-vc6-mt-1_32/posix_api.obj vc6/boost_regex-vc6-mt-1_32/regex.obj vc6/boost_regex-vc6-mt-1_32/regex_debug.obj vc6/boost_regex-vc6-mt-1_32/regex_synch.obj vc6/boost_regex-vc6-mt-1_32/w32_regex_traits.obj vc6/boost_regex-vc6-mt-1_32/wide_posix_api.obj vc6/boost_regex-vc6-mt-1_32/winstances.obj
+./vc6/boost_regex-vc6-mt-1_32.lib : vc6/boost_regex-vc6-mt-1_32/c_regex_traits.obj vc6/boost_regex-vc6-mt-1_32/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-1_32/cregex.obj vc6/boost_regex-vc6-mt-1_32/fileiter.obj vc6/boost_regex-vc6-mt-1_32/icu.obj vc6/boost_regex-vc6-mt-1_32/instances.obj vc6/boost_regex-vc6-mt-1_32/posix_api.obj vc6/boost_regex-vc6-mt-1_32/regex.obj vc6/boost_regex-vc6-mt-1_32/regex_debug.obj vc6/boost_regex-vc6-mt-1_32/regex_raw_buffer.obj vc6/boost_regex-vc6-mt-1_32/regex_traits_defaults.obj vc6/boost_regex-vc6-mt-1_32/static_mutex.obj vc6/boost_regex-vc6-mt-1_32/usinstances.obj vc6/boost_regex-vc6-mt-1_32/w32_regex_traits.obj vc6/boost_regex-vc6-mt-1_32/wc_regex_traits.obj vc6/boost_regex-vc6-mt-1_32/wide_posix_api.obj vc6/boost_regex-vc6-mt-1_32/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_32.pdb" /debug /machine:I386 /out:"vc6/boost_regex-vc6-mt-1_32.dll" /implib:"vc6/boost_regex-vc6-mt-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS) $(ICU_LINK_OPTS)  vc6/boost_regex-vc6-mt-1_32/c_regex_traits.obj vc6/boost_regex-vc6-mt-1_32/cpp_regex_traits.obj vc6/boost_regex-vc6-mt-1_32/cregex.obj vc6/boost_regex-vc6-mt-1_32/fileiter.obj vc6/boost_regex-vc6-mt-1_32/icu.obj vc6/boost_regex-vc6-mt-1_32/instances.obj vc6/boost_regex-vc6-mt-1_32/posix_api.obj vc6/boost_regex-vc6-mt-1_32/regex.obj vc6/boost_regex-vc6-mt-1_32/regex_debug.obj vc6/boost_regex-vc6-mt-1_32/regex_raw_buffer.obj vc6/boost_regex-vc6-mt-1_32/regex_traits_defaults.obj vc6/boost_regex-vc6-mt-1_32/static_mutex.obj vc6/boost_regex-vc6-mt-1_32/usinstances.obj vc6/boost_regex-vc6-mt-1_32/w32_regex_traits.obj vc6/boost_regex-vc6-mt-1_32/wc_regex_traits.obj vc6/boost_regex-vc6-mt-1_32/wide_posix_api.obj vc6/boost_regex-vc6-mt-1_32/winstances.obj
 
 ########################################################
 #
@@ -404,43 +492,55 @@ boost_regex-vc6-mt-1_32_clean :
 #
 ########################################################
 vc6/libboost_regex-vc6-mt-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/c_regex_traits.cpp
-
-vc6/libboost_regex-vc6-mt-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/c_regex_traits.cpp
 
 vc6/libboost_regex-vc6-mt-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc6/libboost_regex-vc6-mt-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/cregex.cpp
 
 vc6/libboost_regex-vc6-mt-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/fileiter.cpp
+
+vc6/libboost_regex-vc6-mt-1_32/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_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/icu.cpp
 
 vc6/libboost_regex-vc6-mt-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/instances.cpp
 
 vc6/libboost_regex-vc6-mt-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/posix_api.cpp
 
 vc6/libboost_regex-vc6-mt-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/regex.cpp
 
 vc6/libboost_regex-vc6-mt-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/regex_debug.cpp
 
-vc6/libboost_regex-vc6-mt-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/regex_synch.cpp
+vc6/libboost_regex-vc6-mt-1_32/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_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc6/libboost_regex-vc6-mt-1_32/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_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc6/libboost_regex-vc6-mt-1_32/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_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/static_mutex.cpp
+
+vc6/libboost_regex-vc6-mt-1_32/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_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/usinstances.cpp
 
 vc6/libboost_regex-vc6-mt-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc6/libboost_regex-vc6-mt-1_32/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_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc6/libboost_regex-vc6-mt-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/wide_posix_api.cpp
 
 vc6/libboost_regex-vc6-mt-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-1_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc6-mt-1_32_dir :
 	@if not exist "vc6\libboost_regex-vc6-mt-1_32\$(NULL)" mkdir vc6\libboost_regex-vc6-mt-1_32
@@ -451,8 +551,8 @@ libboost_regex-vc6-mt-1_32_clean :
 	del vc6\libboost_regex-vc6-mt-1_32\*.exp
 	del vc6\libboost_regex-vc6-mt-1_32\*.pch
 
-./vc6/libboost_regex-vc6-mt-1_32.lib : vc6/libboost_regex-vc6-mt-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-mt-1_32/c_regex_traits_common.obj vc6/libboost_regex-vc6-mt-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-1_32/cregex.obj vc6/libboost_regex-vc6-mt-1_32/fileiter.obj vc6/libboost_regex-vc6-mt-1_32/instances.obj vc6/libboost_regex-vc6-mt-1_32/posix_api.obj vc6/libboost_regex-vc6-mt-1_32/regex.obj vc6/libboost_regex-vc6-mt-1_32/regex_debug.obj vc6/libboost_regex-vc6-mt-1_32/regex_synch.obj vc6/libboost_regex-vc6-mt-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-mt-1_32/winstances.obj
-	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-1_32.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-mt-1_32/c_regex_traits_common.obj vc6/libboost_regex-vc6-mt-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-1_32/cregex.obj vc6/libboost_regex-vc6-mt-1_32/fileiter.obj vc6/libboost_regex-vc6-mt-1_32/instances.obj vc6/libboost_regex-vc6-mt-1_32/posix_api.obj vc6/libboost_regex-vc6-mt-1_32/regex.obj vc6/libboost_regex-vc6-mt-1_32/regex_debug.obj vc6/libboost_regex-vc6-mt-1_32/regex_synch.obj vc6/libboost_regex-vc6-mt-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-mt-1_32/winstances.obj
+./vc6/libboost_regex-vc6-mt-1_32.lib : vc6/libboost_regex-vc6-mt-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-mt-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-1_32/cregex.obj vc6/libboost_regex-vc6-mt-1_32/fileiter.obj vc6/libboost_regex-vc6-mt-1_32/icu.obj vc6/libboost_regex-vc6-mt-1_32/instances.obj vc6/libboost_regex-vc6-mt-1_32/posix_api.obj vc6/libboost_regex-vc6-mt-1_32/regex.obj vc6/libboost_regex-vc6-mt-1_32/regex_debug.obj vc6/libboost_regex-vc6-mt-1_32/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-1_32/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-1_32/static_mutex.obj vc6/libboost_regex-vc6-mt-1_32/usinstances.obj vc6/libboost_regex-vc6-mt-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-1_32/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-mt-1_32/winstances.obj
+	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-1_32.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-mt-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-1_32/cregex.obj vc6/libboost_regex-vc6-mt-1_32/fileiter.obj vc6/libboost_regex-vc6-mt-1_32/icu.obj vc6/libboost_regex-vc6-mt-1_32/instances.obj vc6/libboost_regex-vc6-mt-1_32/posix_api.obj vc6/libboost_regex-vc6-mt-1_32/regex.obj vc6/libboost_regex-vc6-mt-1_32/regex_debug.obj vc6/libboost_regex-vc6-mt-1_32/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-1_32/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-1_32/static_mutex.obj vc6/libboost_regex-vc6-mt-1_32/usinstances.obj vc6/libboost_regex-vc6-mt-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-1_32/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-mt-1_32/winstances.obj
 
 ########################################################
 #
@@ -460,43 +560,55 @@ libboost_regex-vc6-mt-1_32_clean :
 #
 ########################################################
 vc6/libboost_regex-vc6-mt-gd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/c_regex_traits.cpp
-
-vc6/libboost_regex-vc6-mt-gd-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/c_regex_traits.cpp
 
 vc6/libboost_regex-vc6-mt-gd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc6/libboost_regex-vc6-mt-gd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/cregex.cpp
 
 vc6/libboost_regex-vc6-mt-gd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/fileiter.cpp
+
+vc6/libboost_regex-vc6-mt-gd-1_32/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_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/icu.cpp
 
 vc6/libboost_regex-vc6-mt-gd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/instances.cpp
 
 vc6/libboost_regex-vc6-mt-gd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/posix_api.cpp
 
 vc6/libboost_regex-vc6-mt-gd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/regex.cpp
 
 vc6/libboost_regex-vc6-mt-gd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/regex_debug.cpp
 
-vc6/libboost_regex-vc6-mt-gd-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/regex_synch.cpp
+vc6/libboost_regex-vc6-mt-gd-1_32/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_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc6/libboost_regex-vc6-mt-gd-1_32/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_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc6/libboost_regex-vc6-mt-gd-1_32/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_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/static_mutex.cpp
+
+vc6/libboost_regex-vc6-mt-gd-1_32/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_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/usinstances.cpp
 
 vc6/libboost_regex-vc6-mt-gd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc6/libboost_regex-vc6-mt-gd-1_32/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_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc6/libboost_regex-vc6-mt-gd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/wide_posix_api.cpp
 
 vc6/libboost_regex-vc6-mt-gd-1_32/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) -Y- -Fo./vc6/libboost_regex-vc6-mt-gd-1_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc6/libboost_regex-vc6-mt-gd-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc6-mt-gd-1_32_dir :
 	@if not exist "vc6\libboost_regex-vc6-mt-gd-1_32\$(NULL)" mkdir vc6\libboost_regex-vc6-mt-gd-1_32
@@ -507,6 +619,6 @@ libboost_regex-vc6-mt-gd-1_32_clean :
 	del vc6\libboost_regex-vc6-mt-gd-1_32\*.exp
 	del vc6\libboost_regex-vc6-mt-gd-1_32\*.pch
 
-./vc6/libboost_regex-vc6-mt-gd-1_32.lib : vc6/libboost_regex-vc6-mt-gd-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_32/c_regex_traits_common.obj vc6/libboost_regex-vc6-mt-gd-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_32/cregex.obj vc6/libboost_regex-vc6-mt-gd-1_32/fileiter.obj vc6/libboost_regex-vc6-mt-gd-1_32/instances.obj vc6/libboost_regex-vc6-mt-gd-1_32/posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_32/regex.obj vc6/libboost_regex-vc6-mt-gd-1_32/regex_debug.obj vc6/libboost_regex-vc6-mt-gd-1_32/regex_synch.obj vc6/libboost_regex-vc6-mt-gd-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_32/winstances.obj
-	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-gd-1_32.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-gd-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_32/c_regex_traits_common.obj vc6/libboost_regex-vc6-mt-gd-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_32/cregex.obj vc6/libboost_regex-vc6-mt-gd-1_32/fileiter.obj vc6/libboost_regex-vc6-mt-gd-1_32/instances.obj vc6/libboost_regex-vc6-mt-gd-1_32/posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_32/regex.obj vc6/libboost_regex-vc6-mt-gd-1_32/regex_debug.obj vc6/libboost_regex-vc6-mt-gd-1_32/regex_synch.obj vc6/libboost_regex-vc6-mt-gd-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_32/winstances.obj
+./vc6/libboost_regex-vc6-mt-gd-1_32.lib : vc6/libboost_regex-vc6-mt-gd-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_32/cregex.obj vc6/libboost_regex-vc6-mt-gd-1_32/fileiter.obj vc6/libboost_regex-vc6-mt-gd-1_32/icu.obj vc6/libboost_regex-vc6-mt-gd-1_32/instances.obj vc6/libboost_regex-vc6-mt-gd-1_32/posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_32/regex.obj vc6/libboost_regex-vc6-mt-gd-1_32/regex_debug.obj vc6/libboost_regex-vc6-mt-gd-1_32/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-gd-1_32/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-gd-1_32/static_mutex.obj vc6/libboost_regex-vc6-mt-gd-1_32/usinstances.obj vc6/libboost_regex-vc6-mt-gd-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_32/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_32/winstances.obj
+	link -lib /nologo /out:vc6/libboost_regex-vc6-mt-gd-1_32.lib $(XSFLAGS)  vc6/libboost_regex-vc6-mt-gd-1_32/c_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_32/cpp_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_32/cregex.obj vc6/libboost_regex-vc6-mt-gd-1_32/fileiter.obj vc6/libboost_regex-vc6-mt-gd-1_32/icu.obj vc6/libboost_regex-vc6-mt-gd-1_32/instances.obj vc6/libboost_regex-vc6-mt-gd-1_32/posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_32/regex.obj vc6/libboost_regex-vc6-mt-gd-1_32/regex_debug.obj vc6/libboost_regex-vc6-mt-gd-1_32/regex_raw_buffer.obj vc6/libboost_regex-vc6-mt-gd-1_32/regex_traits_defaults.obj vc6/libboost_regex-vc6-mt-gd-1_32/static_mutex.obj vc6/libboost_regex-vc6-mt-gd-1_32/usinstances.obj vc6/libboost_regex-vc6-mt-gd-1_32/w32_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_32/wc_regex_traits.obj vc6/libboost_regex-vc6-mt-gd-1_32/wide_posix_api.obj vc6/libboost_regex-vc6-mt-gd-1_32/winstances.obj
 
diff --git a/build/vc7-stlport.mak b/build/vc7-stlport.mak
index 623d71c5..f259f7b3 100644
--- a/build/vc7-stlport.mak
+++ b/build/vc7-stlport.mak
@@ -8,6 +8,10 @@
 #   brings libraries up to date and copies binaries to your VC6 /lib and /bin directories (recomended)
 #
 
+#
+# ICU setup:
+#
+ICU_PATH=
 #
 # Add additional compiler options here:
 #
@@ -39,8 +43,20 @@ NULL=nul
 !ERROR Variable STLPORT_PATH not set.
 !ENDIF
 
+!IF "$(ICU_PATH)" == ""
+ICU_COMPILE_OPTS=
+ICU_LINK_OPTS=
+!MESSAGE Building Boost.Regex without ICU / Unicode support:
+!MESSAGE Hint: set ICU_PATH on the nmake command line to point 
+!MESSAGE to your ICU installation if you have one.
+!ELSE
+ICU_COMPILE_OPTS= -DBOOST_HAS_ICU=1 -I$(ICU_PATH)\include
+ICU_LINK_OPTS= /LIBPATH:$(ICU_PATH)\lib icuin.lib icuuc.lib
+!MESSAGE Building Boost.Regex with ICU in $(ICU_PATH)
+!ENDIF
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.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/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.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_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/allocator.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+
+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/static_mutex.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 ../../../boost/regex/config/regex_library_include.hpp
 
 all : main_dir libboost_regex-vc7-mt-sp-1_32_dir ./vc7-stlport/libboost_regex-vc7-mt-sp-1_32.lib boost_regex-vc7-mt-p-1_32_dir ./vc7-stlport/boost_regex-vc7-mt-p-1_32.lib libboost_regex-vc7-mt-p-1_32_dir ./vc7-stlport/libboost_regex-vc7-mt-p-1_32.lib boost_regex-vc7-mt-gdp-1_32_dir ./vc7-stlport/boost_regex-vc7-mt-gdp-1_32.lib libboost_regex-vc7-mt-sgdp-1_32_dir ./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.lib libboost_regex-vc7-mt-gdp-1_32_dir ./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32.lib
 
@@ -72,43 +88,55 @@ stlport_check : $(STLPORT_PATH)\stlport\string
 #
 ########################################################
 vc7-stlport/libboost_regex-vc7-mt-sp-1_32/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) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/c_regex_traits.cpp
-
-vc7-stlport/libboost_regex-vc7-mt-sp-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/c_regex_traits.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sp-1_32/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) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sp-1_32/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) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/cregex.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sp-1_32/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) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/fileiter.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-sp-1_32/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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/icu.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sp-1_32/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) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/instances.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sp-1_32/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) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/posix_api.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sp-1_32/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) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/regex.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sp-1_32/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) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/regex_debug.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/regex_synch.cpp
+vc7-stlport/libboost_regex-vc7-mt-sp-1_32/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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-sp-1_32/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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-sp-1_32/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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/static_mutex.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-sp-1_32/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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/usinstances.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sp-1_32/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) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-sp-1_32/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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sp-1_32/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) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/wide_posix_api.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sp-1_32/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) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sp-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc7-mt-sp-1_32_dir :
 	@if not exist "vc7-stlport\libboost_regex-vc7-mt-sp-1_32\$(NULL)" mkdir vc7-stlport\libboost_regex-vc7-mt-sp-1_32
@@ -119,8 +147,8 @@ libboost_regex-vc7-mt-sp-1_32_clean :
 	del vc7-stlport\libboost_regex-vc7-mt-sp-1_32\*.exp
 	del vc7-stlport\libboost_regex-vc7-mt-sp-1_32\*.pch
 
-./vc7-stlport/libboost_regex-vc7-mt-sp-1_32.lib : vc7-stlport/libboost_regex-vc7-mt-sp-1_32/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/c_regex_traits_common.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/instances.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex_synch.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/winstances.obj
-	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-sp-1_32.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-sp-1_32/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/c_regex_traits_common.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/instances.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex_synch.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/winstances.obj
+./vc7-stlport/libboost_regex-vc7-mt-sp-1_32.lib : vc7-stlport/libboost_regex-vc7-mt-sp-1_32/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/icu.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/instances.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/winstances.obj
+	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-sp-1_32.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-sp-1_32/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/icu.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/instances.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sp-1_32/winstances.obj
 
 ########################################################
 #
@@ -128,43 +156,55 @@ libboost_regex-vc7-mt-sp-1_32_clean :
 #
 ########################################################
 vc7-stlport/boost_regex-vc7-mt-p-1_32/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) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/c_regex_traits.cpp
-
-vc7-stlport/boost_regex-vc7-mt-p-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/c_regex_traits.cpp
 
 vc7-stlport/boost_regex-vc7-mt-p-1_32/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) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc7-stlport/boost_regex-vc7-mt-p-1_32/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) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/cregex.cpp
 
 vc7-stlport/boost_regex-vc7-mt-p-1_32/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) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/fileiter.cpp
+
+vc7-stlport/boost_regex-vc7-mt-p-1_32/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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/icu.cpp
 
 vc7-stlport/boost_regex-vc7-mt-p-1_32/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) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/instances.cpp
 
 vc7-stlport/boost_regex-vc7-mt-p-1_32/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) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/posix_api.cpp
 
 vc7-stlport/boost_regex-vc7-mt-p-1_32/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) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/regex.cpp
 
 vc7-stlport/boost_regex-vc7-mt-p-1_32/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) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/regex_debug.cpp
 
-vc7-stlport/boost_regex-vc7-mt-p-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/regex_synch.cpp
+vc7-stlport/boost_regex-vc7-mt-p-1_32/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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc7-stlport/boost_regex-vc7-mt-p-1_32/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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc7-stlport/boost_regex-vc7-mt-p-1_32/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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/static_mutex.cpp
+
+vc7-stlport/boost_regex-vc7-mt-p-1_32/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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/usinstances.cpp
 
 vc7-stlport/boost_regex-vc7-mt-p-1_32/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) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc7-stlport/boost_regex-vc7-mt-p-1_32/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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc7-stlport/boost_regex-vc7-mt-p-1_32/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) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/wide_posix_api.cpp
 
 vc7-stlport/boost_regex-vc7-mt-p-1_32/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) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-p-1_32.pdb ../src/winstances.cpp
 
 boost_regex-vc7-mt-p-1_32_dir :
 	@if not exist "vc7-stlport\boost_regex-vc7-mt-p-1_32\$(NULL)" mkdir vc7-stlport\boost_regex-vc7-mt-p-1_32
@@ -175,8 +215,8 @@ boost_regex-vc7-mt-p-1_32_clean :
 	del vc7-stlport\boost_regex-vc7-mt-p-1_32\*.exp
 	del vc7-stlport\boost_regex-vc7-mt-p-1_32\*.pch
 
-./vc7-stlport/boost_regex-vc7-mt-p-1_32.lib : vc7-stlport/boost_regex-vc7-mt-p-1_32/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/c_regex_traits_common.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/cregex.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/fileiter.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/instances.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/regex.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/regex_synch.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/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_32.pdb" /debug /machine:I386 /out:"vc7-stlport/boost_regex-vc7-mt-p-1_32.dll" /implib:"vc7-stlport/boost_regex-vc7-mt-p-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc7-stlport/boost_regex-vc7-mt-p-1_32/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/c_regex_traits_common.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/cregex.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/fileiter.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/instances.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/regex.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/regex_synch.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/winstances.obj
+./vc7-stlport/boost_regex-vc7-mt-p-1_32.lib : vc7-stlport/boost_regex-vc7-mt-p-1_32/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/cregex.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/fileiter.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/icu.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/instances.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/regex.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/regex_raw_buffer.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/regex_traits_defaults.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/static_mutex.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/usinstances.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/wc_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/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_32.pdb" /debug /machine:I386 /out:"vc7-stlport/boost_regex-vc7-mt-p-1_32.dll" /implib:"vc7-stlport/boost_regex-vc7-mt-p-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS) $(ICU_LINK_OPTS)  vc7-stlport/boost_regex-vc7-mt-p-1_32/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/cregex.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/fileiter.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/icu.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/instances.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/regex.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/regex_raw_buffer.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/regex_traits_defaults.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/static_mutex.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/usinstances.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/wc_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-p-1_32/winstances.obj
 
 ########################################################
 #
@@ -184,43 +224,55 @@ boost_regex-vc7-mt-p-1_32_clean :
 #
 ########################################################
 vc7-stlport/libboost_regex-vc7-mt-p-1_32/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) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/c_regex_traits.cpp
-
-vc7-stlport/libboost_regex-vc7-mt-p-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/c_regex_traits.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-p-1_32/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) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-p-1_32/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) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/cregex.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-p-1_32/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) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/fileiter.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-p-1_32/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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/icu.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-p-1_32/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) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/instances.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-p-1_32/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) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/posix_api.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-p-1_32/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) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/regex.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-p-1_32/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) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/regex_debug.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/regex_synch.cpp
+vc7-stlport/libboost_regex-vc7-mt-p-1_32/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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-p-1_32/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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-p-1_32/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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/static_mutex.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-p-1_32/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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/usinstances.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-p-1_32/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) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-p-1_32/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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-p-1_32/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) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/wide_posix_api.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-p-1_32/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) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-p-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-p-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc7-mt-p-1_32_dir :
 	@if not exist "vc7-stlport\libboost_regex-vc7-mt-p-1_32\$(NULL)" mkdir vc7-stlport\libboost_regex-vc7-mt-p-1_32
@@ -231,8 +283,8 @@ libboost_regex-vc7-mt-p-1_32_clean :
 	del vc7-stlport\libboost_regex-vc7-mt-p-1_32\*.exp
 	del vc7-stlport\libboost_regex-vc7-mt-p-1_32\*.pch
 
-./vc7-stlport/libboost_regex-vc7-mt-p-1_32.lib : vc7-stlport/libboost_regex-vc7-mt-p-1_32/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/c_regex_traits_common.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/cregex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/instances.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex_synch.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/winstances.obj
-	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-p-1_32.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-p-1_32/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/c_regex_traits_common.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/cregex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/instances.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex_synch.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/winstances.obj
+./vc7-stlport/libboost_regex-vc7-mt-p-1_32.lib : vc7-stlport/libboost_regex-vc7-mt-p-1_32/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/cregex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/icu.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/instances.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/winstances.obj
+	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-p-1_32.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-p-1_32/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/cregex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/icu.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/instances.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-p-1_32/winstances.obj
 
 ########################################################
 #
@@ -240,43 +292,55 @@ libboost_regex-vc7-mt-p-1_32_clean :
 #
 ########################################################
 vc7-stlport/boost_regex-vc7-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/c_regex_traits.cpp
-
-vc7-stlport/boost_regex-vc7-mt-gdp-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/c_regex_traits.cpp
 
 vc7-stlport/boost_regex-vc7-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc7-stlport/boost_regex-vc7-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/cregex.cpp
 
 vc7-stlport/boost_regex-vc7-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/fileiter.cpp
+
+vc7-stlport/boost_regex-vc7-mt-gdp-1_32/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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/icu.cpp
 
 vc7-stlport/boost_regex-vc7-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/instances.cpp
 
 vc7-stlport/boost_regex-vc7-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/posix_api.cpp
 
 vc7-stlport/boost_regex-vc7-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/regex.cpp
 
 vc7-stlport/boost_regex-vc7-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/regex_debug.cpp
 
-vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex_synch.obj: ../src/regex_synch.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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/regex_synch.cpp
+vc7-stlport/boost_regex-vc7-mt-gdp-1_32/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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc7-stlport/boost_regex-vc7-mt-gdp-1_32/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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc7-stlport/boost_regex-vc7-mt-gdp-1_32/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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/static_mutex.cpp
+
+vc7-stlport/boost_regex-vc7-mt-gdp-1_32/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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/usinstances.cpp
 
 vc7-stlport/boost_regex-vc7-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc7-stlport/boost_regex-vc7-mt-gdp-1_32/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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc7-stlport/boost_regex-vc7-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/wide_posix_api.cpp
 
 vc7-stlport/boost_regex-vc7-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/boost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc7-stlport/boost_regex-vc7-mt-gdp-1_32.pdb ../src/winstances.cpp
 
 boost_regex-vc7-mt-gdp-1_32_dir :
 	@if not exist "vc7-stlport\boost_regex-vc7-mt-gdp-1_32\$(NULL)" mkdir vc7-stlport\boost_regex-vc7-mt-gdp-1_32
@@ -287,8 +351,8 @@ boost_regex-vc7-mt-gdp-1_32_clean :
 	del vc7-stlport\boost_regex-vc7-mt-gdp-1_32\*.exp
 	del vc7-stlport\boost_regex-vc7-mt-gdp-1_32\*.pch
 
-./vc7-stlport/boost_regex-vc7-mt-gdp-1_32.lib : vc7-stlport/boost_regex-vc7-mt-gdp-1_32/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/c_regex_traits_common.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/cregex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/fileiter.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/instances.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex_synch.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/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_32.pdb" /debug /machine:I386 /out:"vc7-stlport/boost_regex-vc7-mt-gdp-1_32.dll" /implib:"vc7-stlport/boost_regex-vc7-mt-gdp-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc7-stlport/boost_regex-vc7-mt-gdp-1_32/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/c_regex_traits_common.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/cregex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/fileiter.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/instances.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex_synch.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/winstances.obj
+./vc7-stlport/boost_regex-vc7-mt-gdp-1_32.lib : vc7-stlport/boost_regex-vc7-mt-gdp-1_32/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/cregex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/fileiter.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/icu.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/instances.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex_raw_buffer.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex_traits_defaults.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/static_mutex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/usinstances.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/wc_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/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_32.pdb" /debug /machine:I386 /out:"vc7-stlport/boost_regex-vc7-mt-gdp-1_32.dll" /implib:"vc7-stlport/boost_regex-vc7-mt-gdp-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS) $(ICU_LINK_OPTS)  vc7-stlport/boost_regex-vc7-mt-gdp-1_32/c_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/cpp_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/cregex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/fileiter.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/icu.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/instances.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex_debug.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex_raw_buffer.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/regex_traits_defaults.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/static_mutex.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/usinstances.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/w32_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/wc_regex_traits.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/wide_posix_api.obj vc7-stlport/boost_regex-vc7-mt-gdp-1_32/winstances.obj
 
 ########################################################
 #
@@ -296,43 +360,55 @@ boost_regex-vc7-mt-gdp-1_32_clean :
 #
 ########################################################
 vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/c_regex_traits.cpp
-
-vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/c_regex_traits.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/cregex.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/fileiter.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/icu.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/instances.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/posix_api.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/regex.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/regex_debug.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex_synch.obj: ../src/regex_synch.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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/regex_synch.cpp
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/static_mutex.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/usinstances.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/wide_posix_api.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc7-mt-sgdp-1_32_dir :
 	@if not exist "vc7-stlport\libboost_regex-vc7-mt-sgdp-1_32\$(NULL)" mkdir vc7-stlport\libboost_regex-vc7-mt-sgdp-1_32
@@ -343,8 +419,8 @@ libboost_regex-vc7-mt-sgdp-1_32_clean :
 	del vc7-stlport\libboost_regex-vc7-mt-sgdp-1_32\*.exp
 	del vc7-stlport\libboost_regex-vc7-mt-sgdp-1_32\*.pch
 
-./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.lib : vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/c_regex_traits_common.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/instances.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex_synch.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/winstances.obj
-	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/c_regex_traits_common.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/instances.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex_synch.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/winstances.obj
+./vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.lib : vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/icu.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/instances.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/winstances.obj
+	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/cregex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/icu.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/instances.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-sgdp-1_32/winstances.obj
 
 ########################################################
 #
@@ -352,43 +428,55 @@ libboost_regex-vc7-mt-sgdp-1_32_clean :
 #
 ########################################################
 vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/c_regex_traits.cpp
-
-vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/c_regex_traits.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/cregex.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/fileiter.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/icu.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/instances.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/posix_api.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/regex.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/regex_debug.cpp
 
-vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex_synch.obj: ../src/regex_synch.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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/regex_synch.cpp
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/static_mutex.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/usinstances.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/wide_posix_api.cpp
 
 vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc7-stlport/libboost_regex-vc7-mt-gdp-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc7-mt-gdp-1_32_dir :
 	@if not exist "vc7-stlport\libboost_regex-vc7-mt-gdp-1_32\$(NULL)" mkdir vc7-stlport\libboost_regex-vc7-mt-gdp-1_32
@@ -399,6 +487,6 @@ libboost_regex-vc7-mt-gdp-1_32_clean :
 	del vc7-stlport\libboost_regex-vc7-mt-gdp-1_32\*.exp
 	del vc7-stlport\libboost_regex-vc7-mt-gdp-1_32\*.pch
 
-./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32.lib : vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/c_regex_traits_common.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/cregex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/instances.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex_synch.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/winstances.obj
-	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-gdp-1_32.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/c_regex_traits_common.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/cregex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/instances.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex_synch.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/winstances.obj
+./vc7-stlport/libboost_regex-vc7-mt-gdp-1_32.lib : vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/cregex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/icu.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/instances.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/winstances.obj
+	link -lib /nologo /out:vc7-stlport/libboost_regex-vc7-mt-gdp-1_32.lib $(XSFLAGS)  vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/c_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/cpp_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/cregex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/fileiter.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/icu.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/instances.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex_debug.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex_raw_buffer.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/regex_traits_defaults.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/static_mutex.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/usinstances.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/w32_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/wc_regex_traits.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/wide_posix_api.obj vc7-stlport/libboost_regex-vc7-mt-gdp-1_32/winstances.obj
 
diff --git a/build/vc7.mak b/build/vc7.mak
index d552e810..f39548d4 100644
--- a/build/vc7.mak
+++ b/build/vc7.mak
@@ -8,6 +8,10 @@
 #   brings libraries up to date and copies binaries to your VC6 /lib and /bin directories (recomended)
 #
 
+#
+# path to ICU library installation goes here:
+#
+ICU_PATH=
 #
 # Add additional compiler options here:
 #
@@ -35,8 +39,20 @@ NULL=nul
 !ERROR Variable MSVCDIR not set.
 !ENDIF
 
+!IF "$(ICU_PATH)" == ""
+ICU_COMPILE_OPTS=
+ICU_LINK_OPTS=
+!MESSAGE Building Boost.Regex without ICU / Unicode support:
+!MESSAGE Hint: set ICU_PATH on the nmake command line to point 
+!MESSAGE to your ICU installation if you have one.
+!ELSE
+ICU_COMPILE_OPTS= -DBOOST_HAS_ICU=1 -I$(ICU_PATH)\include
+ICU_LINK_OPTS= /LIBPATH:$(ICU_PATH)\lib icuin.lib icuuc.lib
+!MESSAGE Building Boost.Regex with ICU in $(ICU_PATH)
+!ENDIF
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.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/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.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_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/allocator.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+
+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/static_mutex.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 ../../../boost/regex/config/regex_library_include.hpp
 
 all : main_dir libboost_regex-vc7-s-1_32_dir ./vc7/libboost_regex-vc7-s-1_32.lib libboost_regex-vc7-mt-s-1_32_dir ./vc7/libboost_regex-vc7-mt-s-1_32.lib libboost_regex-vc7-sgd-1_32_dir ./vc7/libboost_regex-vc7-sgd-1_32.lib libboost_regex-vc7-mt-sgd-1_32_dir ./vc7/libboost_regex-vc7-mt-sgd-1_32.lib boost_regex-vc7-mt-gd-1_32_dir ./vc7/boost_regex-vc7-mt-gd-1_32.lib boost_regex-vc7-mt-1_32_dir ./vc7/boost_regex-vc7-mt-1_32.lib libboost_regex-vc7-mt-1_32_dir ./vc7/libboost_regex-vc7-mt-1_32.lib libboost_regex-vc7-mt-gd-1_32_dir ./vc7/libboost_regex-vc7-mt-gd-1_32.lib
 
@@ -68,43 +84,55 @@ main_dir :
 #
 ########################################################
 vc7/libboost_regex-vc7-s-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/c_regex_traits.cpp
-
-vc7/libboost_regex-vc7-s-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/c_regex_traits.cpp
 
 vc7/libboost_regex-vc7-s-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc7/libboost_regex-vc7-s-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/cregex.cpp
 
 vc7/libboost_regex-vc7-s-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/fileiter.cpp
+
+vc7/libboost_regex-vc7-s-1_32/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_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/icu.cpp
 
 vc7/libboost_regex-vc7-s-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/instances.cpp
 
 vc7/libboost_regex-vc7-s-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/posix_api.cpp
 
 vc7/libboost_regex-vc7-s-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/regex.cpp
 
 vc7/libboost_regex-vc7-s-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/regex_debug.cpp
 
-vc7/libboost_regex-vc7-s-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/regex_synch.cpp
+vc7/libboost_regex-vc7-s-1_32/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_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc7/libboost_regex-vc7-s-1_32/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_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc7/libboost_regex-vc7-s-1_32/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_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/static_mutex.cpp
+
+vc7/libboost_regex-vc7-s-1_32/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_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/usinstances.cpp
 
 vc7/libboost_regex-vc7-s-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc7/libboost_regex-vc7-s-1_32/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_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc7/libboost_regex-vc7-s-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/wide_posix_api.cpp
 
 vc7/libboost_regex-vc7-s-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-s-1_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-s-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc7-s-1_32_dir :
 	@if not exist "vc7\libboost_regex-vc7-s-1_32\$(NULL)" mkdir vc7\libboost_regex-vc7-s-1_32
@@ -115,8 +143,8 @@ libboost_regex-vc7-s-1_32_clean :
 	del vc7\libboost_regex-vc7-s-1_32\*.exp
 	del vc7\libboost_regex-vc7-s-1_32\*.pch
 
-./vc7/libboost_regex-vc7-s-1_32.lib : vc7/libboost_regex-vc7-s-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-s-1_32/c_regex_traits_common.obj vc7/libboost_regex-vc7-s-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-s-1_32/cregex.obj vc7/libboost_regex-vc7-s-1_32/fileiter.obj vc7/libboost_regex-vc7-s-1_32/instances.obj vc7/libboost_regex-vc7-s-1_32/posix_api.obj vc7/libboost_regex-vc7-s-1_32/regex.obj vc7/libboost_regex-vc7-s-1_32/regex_debug.obj vc7/libboost_regex-vc7-s-1_32/regex_synch.obj vc7/libboost_regex-vc7-s-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-s-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-s-1_32/winstances.obj
-	link -lib /nologo /out:vc7/libboost_regex-vc7-s-1_32.lib $(XSFLAGS)  vc7/libboost_regex-vc7-s-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-s-1_32/c_regex_traits_common.obj vc7/libboost_regex-vc7-s-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-s-1_32/cregex.obj vc7/libboost_regex-vc7-s-1_32/fileiter.obj vc7/libboost_regex-vc7-s-1_32/instances.obj vc7/libboost_regex-vc7-s-1_32/posix_api.obj vc7/libboost_regex-vc7-s-1_32/regex.obj vc7/libboost_regex-vc7-s-1_32/regex_debug.obj vc7/libboost_regex-vc7-s-1_32/regex_synch.obj vc7/libboost_regex-vc7-s-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-s-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-s-1_32/winstances.obj
+./vc7/libboost_regex-vc7-s-1_32.lib : vc7/libboost_regex-vc7-s-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-s-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-s-1_32/cregex.obj vc7/libboost_regex-vc7-s-1_32/fileiter.obj vc7/libboost_regex-vc7-s-1_32/icu.obj vc7/libboost_regex-vc7-s-1_32/instances.obj vc7/libboost_regex-vc7-s-1_32/posix_api.obj vc7/libboost_regex-vc7-s-1_32/regex.obj vc7/libboost_regex-vc7-s-1_32/regex_debug.obj vc7/libboost_regex-vc7-s-1_32/regex_raw_buffer.obj vc7/libboost_regex-vc7-s-1_32/regex_traits_defaults.obj vc7/libboost_regex-vc7-s-1_32/static_mutex.obj vc7/libboost_regex-vc7-s-1_32/usinstances.obj vc7/libboost_regex-vc7-s-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-s-1_32/wc_regex_traits.obj vc7/libboost_regex-vc7-s-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-s-1_32/winstances.obj
+	link -lib /nologo /out:vc7/libboost_regex-vc7-s-1_32.lib $(XSFLAGS)  vc7/libboost_regex-vc7-s-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-s-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-s-1_32/cregex.obj vc7/libboost_regex-vc7-s-1_32/fileiter.obj vc7/libboost_regex-vc7-s-1_32/icu.obj vc7/libboost_regex-vc7-s-1_32/instances.obj vc7/libboost_regex-vc7-s-1_32/posix_api.obj vc7/libboost_regex-vc7-s-1_32/regex.obj vc7/libboost_regex-vc7-s-1_32/regex_debug.obj vc7/libboost_regex-vc7-s-1_32/regex_raw_buffer.obj vc7/libboost_regex-vc7-s-1_32/regex_traits_defaults.obj vc7/libboost_regex-vc7-s-1_32/static_mutex.obj vc7/libboost_regex-vc7-s-1_32/usinstances.obj vc7/libboost_regex-vc7-s-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-s-1_32/wc_regex_traits.obj vc7/libboost_regex-vc7-s-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-s-1_32/winstances.obj
 
 ########################################################
 #
@@ -124,43 +152,55 @@ libboost_regex-vc7-s-1_32_clean :
 #
 ########################################################
 vc7/libboost_regex-vc7-mt-s-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/c_regex_traits.cpp
-
-vc7/libboost_regex-vc7-mt-s-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/c_regex_traits.cpp
 
 vc7/libboost_regex-vc7-mt-s-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc7/libboost_regex-vc7-mt-s-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/cregex.cpp
 
 vc7/libboost_regex-vc7-mt-s-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/fileiter.cpp
+
+vc7/libboost_regex-vc7-mt-s-1_32/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_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/icu.cpp
 
 vc7/libboost_regex-vc7-mt-s-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/instances.cpp
 
 vc7/libboost_regex-vc7-mt-s-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/posix_api.cpp
 
 vc7/libboost_regex-vc7-mt-s-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/regex.cpp
 
 vc7/libboost_regex-vc7-mt-s-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/regex_debug.cpp
 
-vc7/libboost_regex-vc7-mt-s-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/regex_synch.cpp
+vc7/libboost_regex-vc7-mt-s-1_32/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_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc7/libboost_regex-vc7-mt-s-1_32/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_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc7/libboost_regex-vc7-mt-s-1_32/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_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/static_mutex.cpp
+
+vc7/libboost_regex-vc7-mt-s-1_32/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_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/usinstances.cpp
 
 vc7/libboost_regex-vc7-mt-s-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc7/libboost_regex-vc7-mt-s-1_32/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_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc7/libboost_regex-vc7-mt-s-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/wide_posix_api.cpp
 
 vc7/libboost_regex-vc7-mt-s-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-s-1_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-s-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc7-mt-s-1_32_dir :
 	@if not exist "vc7\libboost_regex-vc7-mt-s-1_32\$(NULL)" mkdir vc7\libboost_regex-vc7-mt-s-1_32
@@ -171,8 +211,8 @@ libboost_regex-vc7-mt-s-1_32_clean :
 	del vc7\libboost_regex-vc7-mt-s-1_32\*.exp
 	del vc7\libboost_regex-vc7-mt-s-1_32\*.pch
 
-./vc7/libboost_regex-vc7-mt-s-1_32.lib : vc7/libboost_regex-vc7-mt-s-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_32/c_regex_traits_common.obj vc7/libboost_regex-vc7-mt-s-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_32/cregex.obj vc7/libboost_regex-vc7-mt-s-1_32/fileiter.obj vc7/libboost_regex-vc7-mt-s-1_32/instances.obj vc7/libboost_regex-vc7-mt-s-1_32/posix_api.obj vc7/libboost_regex-vc7-mt-s-1_32/regex.obj vc7/libboost_regex-vc7-mt-s-1_32/regex_debug.obj vc7/libboost_regex-vc7-mt-s-1_32/regex_synch.obj vc7/libboost_regex-vc7-mt-s-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-mt-s-1_32/winstances.obj
-	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-s-1_32.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-s-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_32/c_regex_traits_common.obj vc7/libboost_regex-vc7-mt-s-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_32/cregex.obj vc7/libboost_regex-vc7-mt-s-1_32/fileiter.obj vc7/libboost_regex-vc7-mt-s-1_32/instances.obj vc7/libboost_regex-vc7-mt-s-1_32/posix_api.obj vc7/libboost_regex-vc7-mt-s-1_32/regex.obj vc7/libboost_regex-vc7-mt-s-1_32/regex_debug.obj vc7/libboost_regex-vc7-mt-s-1_32/regex_synch.obj vc7/libboost_regex-vc7-mt-s-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-mt-s-1_32/winstances.obj
+./vc7/libboost_regex-vc7-mt-s-1_32.lib : vc7/libboost_regex-vc7-mt-s-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_32/cregex.obj vc7/libboost_regex-vc7-mt-s-1_32/fileiter.obj vc7/libboost_regex-vc7-mt-s-1_32/icu.obj vc7/libboost_regex-vc7-mt-s-1_32/instances.obj vc7/libboost_regex-vc7-mt-s-1_32/posix_api.obj vc7/libboost_regex-vc7-mt-s-1_32/regex.obj vc7/libboost_regex-vc7-mt-s-1_32/regex_debug.obj vc7/libboost_regex-vc7-mt-s-1_32/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-s-1_32/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-s-1_32/static_mutex.obj vc7/libboost_regex-vc7-mt-s-1_32/usinstances.obj vc7/libboost_regex-vc7-mt-s-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_32/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-mt-s-1_32/winstances.obj
+	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-s-1_32.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-s-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_32/cregex.obj vc7/libboost_regex-vc7-mt-s-1_32/fileiter.obj vc7/libboost_regex-vc7-mt-s-1_32/icu.obj vc7/libboost_regex-vc7-mt-s-1_32/instances.obj vc7/libboost_regex-vc7-mt-s-1_32/posix_api.obj vc7/libboost_regex-vc7-mt-s-1_32/regex.obj vc7/libboost_regex-vc7-mt-s-1_32/regex_debug.obj vc7/libboost_regex-vc7-mt-s-1_32/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-s-1_32/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-s-1_32/static_mutex.obj vc7/libboost_regex-vc7-mt-s-1_32/usinstances.obj vc7/libboost_regex-vc7-mt-s-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_32/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-s-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-mt-s-1_32/winstances.obj
 
 ########################################################
 #
@@ -180,43 +220,55 @@ libboost_regex-vc7-mt-s-1_32_clean :
 #
 ########################################################
 vc7/libboost_regex-vc7-sgd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/c_regex_traits.cpp
-
-vc7/libboost_regex-vc7-sgd-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/c_regex_traits.cpp
 
 vc7/libboost_regex-vc7-sgd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc7/libboost_regex-vc7-sgd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/cregex.cpp
 
 vc7/libboost_regex-vc7-sgd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/fileiter.cpp
+
+vc7/libboost_regex-vc7-sgd-1_32/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_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/icu.cpp
 
 vc7/libboost_regex-vc7-sgd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/instances.cpp
 
 vc7/libboost_regex-vc7-sgd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/posix_api.cpp
 
 vc7/libboost_regex-vc7-sgd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/regex.cpp
 
 vc7/libboost_regex-vc7-sgd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/regex_debug.cpp
 
-vc7/libboost_regex-vc7-sgd-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/regex_synch.cpp
+vc7/libboost_regex-vc7-sgd-1_32/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_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc7/libboost_regex-vc7-sgd-1_32/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_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc7/libboost_regex-vc7-sgd-1_32/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_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/static_mutex.cpp
+
+vc7/libboost_regex-vc7-sgd-1_32/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_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/usinstances.cpp
 
 vc7/libboost_regex-vc7-sgd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc7/libboost_regex-vc7-sgd-1_32/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_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc7/libboost_regex-vc7-sgd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/wide_posix_api.cpp
 
 vc7/libboost_regex-vc7-sgd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-sgd-1_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-sgd-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc7-sgd-1_32_dir :
 	@if not exist "vc7\libboost_regex-vc7-sgd-1_32\$(NULL)" mkdir vc7\libboost_regex-vc7-sgd-1_32
@@ -227,8 +279,8 @@ libboost_regex-vc7-sgd-1_32_clean :
 	del vc7\libboost_regex-vc7-sgd-1_32\*.exp
 	del vc7\libboost_regex-vc7-sgd-1_32\*.pch
 
-./vc7/libboost_regex-vc7-sgd-1_32.lib : vc7/libboost_regex-vc7-sgd-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_32/c_regex_traits_common.obj vc7/libboost_regex-vc7-sgd-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_32/cregex.obj vc7/libboost_regex-vc7-sgd-1_32/fileiter.obj vc7/libboost_regex-vc7-sgd-1_32/instances.obj vc7/libboost_regex-vc7-sgd-1_32/posix_api.obj vc7/libboost_regex-vc7-sgd-1_32/regex.obj vc7/libboost_regex-vc7-sgd-1_32/regex_debug.obj vc7/libboost_regex-vc7-sgd-1_32/regex_synch.obj vc7/libboost_regex-vc7-sgd-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-sgd-1_32/winstances.obj
-	link -lib /nologo /out:vc7/libboost_regex-vc7-sgd-1_32.lib $(XSFLAGS)  vc7/libboost_regex-vc7-sgd-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_32/c_regex_traits_common.obj vc7/libboost_regex-vc7-sgd-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_32/cregex.obj vc7/libboost_regex-vc7-sgd-1_32/fileiter.obj vc7/libboost_regex-vc7-sgd-1_32/instances.obj vc7/libboost_regex-vc7-sgd-1_32/posix_api.obj vc7/libboost_regex-vc7-sgd-1_32/regex.obj vc7/libboost_regex-vc7-sgd-1_32/regex_debug.obj vc7/libboost_regex-vc7-sgd-1_32/regex_synch.obj vc7/libboost_regex-vc7-sgd-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-sgd-1_32/winstances.obj
+./vc7/libboost_regex-vc7-sgd-1_32.lib : vc7/libboost_regex-vc7-sgd-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_32/cregex.obj vc7/libboost_regex-vc7-sgd-1_32/fileiter.obj vc7/libboost_regex-vc7-sgd-1_32/icu.obj vc7/libboost_regex-vc7-sgd-1_32/instances.obj vc7/libboost_regex-vc7-sgd-1_32/posix_api.obj vc7/libboost_regex-vc7-sgd-1_32/regex.obj vc7/libboost_regex-vc7-sgd-1_32/regex_debug.obj vc7/libboost_regex-vc7-sgd-1_32/regex_raw_buffer.obj vc7/libboost_regex-vc7-sgd-1_32/regex_traits_defaults.obj vc7/libboost_regex-vc7-sgd-1_32/static_mutex.obj vc7/libboost_regex-vc7-sgd-1_32/usinstances.obj vc7/libboost_regex-vc7-sgd-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_32/wc_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-sgd-1_32/winstances.obj
+	link -lib /nologo /out:vc7/libboost_regex-vc7-sgd-1_32.lib $(XSFLAGS)  vc7/libboost_regex-vc7-sgd-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_32/cregex.obj vc7/libboost_regex-vc7-sgd-1_32/fileiter.obj vc7/libboost_regex-vc7-sgd-1_32/icu.obj vc7/libboost_regex-vc7-sgd-1_32/instances.obj vc7/libboost_regex-vc7-sgd-1_32/posix_api.obj vc7/libboost_regex-vc7-sgd-1_32/regex.obj vc7/libboost_regex-vc7-sgd-1_32/regex_debug.obj vc7/libboost_regex-vc7-sgd-1_32/regex_raw_buffer.obj vc7/libboost_regex-vc7-sgd-1_32/regex_traits_defaults.obj vc7/libboost_regex-vc7-sgd-1_32/static_mutex.obj vc7/libboost_regex-vc7-sgd-1_32/usinstances.obj vc7/libboost_regex-vc7-sgd-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_32/wc_regex_traits.obj vc7/libboost_regex-vc7-sgd-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-sgd-1_32/winstances.obj
 
 ########################################################
 #
@@ -236,43 +288,55 @@ libboost_regex-vc7-sgd-1_32_clean :
 #
 ########################################################
 vc7/libboost_regex-vc7-mt-sgd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/c_regex_traits.cpp
-
-vc7/libboost_regex-vc7-mt-sgd-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/c_regex_traits.cpp
 
 vc7/libboost_regex-vc7-mt-sgd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc7/libboost_regex-vc7-mt-sgd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/cregex.cpp
 
 vc7/libboost_regex-vc7-mt-sgd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/fileiter.cpp
+
+vc7/libboost_regex-vc7-mt-sgd-1_32/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_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/icu.cpp
 
 vc7/libboost_regex-vc7-mt-sgd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/instances.cpp
 
 vc7/libboost_regex-vc7-mt-sgd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/posix_api.cpp
 
 vc7/libboost_regex-vc7-mt-sgd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/regex.cpp
 
 vc7/libboost_regex-vc7-mt-sgd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/regex_debug.cpp
 
-vc7/libboost_regex-vc7-mt-sgd-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/regex_synch.cpp
+vc7/libboost_regex-vc7-mt-sgd-1_32/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_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc7/libboost_regex-vc7-mt-sgd-1_32/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_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc7/libboost_regex-vc7-mt-sgd-1_32/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_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/static_mutex.cpp
+
+vc7/libboost_regex-vc7-mt-sgd-1_32/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_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/usinstances.cpp
 
 vc7/libboost_regex-vc7-mt-sgd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc7/libboost_regex-vc7-mt-sgd-1_32/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_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc7/libboost_regex-vc7-mt-sgd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/wide_posix_api.cpp
 
 vc7/libboost_regex-vc7-mt-sgd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-sgd-1_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-sgd-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc7-mt-sgd-1_32_dir :
 	@if not exist "vc7\libboost_regex-vc7-mt-sgd-1_32\$(NULL)" mkdir vc7\libboost_regex-vc7-mt-sgd-1_32
@@ -283,8 +347,8 @@ libboost_regex-vc7-mt-sgd-1_32_clean :
 	del vc7\libboost_regex-vc7-mt-sgd-1_32\*.exp
 	del vc7\libboost_regex-vc7-mt-sgd-1_32\*.pch
 
-./vc7/libboost_regex-vc7-mt-sgd-1_32.lib : vc7/libboost_regex-vc7-mt-sgd-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_32/c_regex_traits_common.obj vc7/libboost_regex-vc7-mt-sgd-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_32/cregex.obj vc7/libboost_regex-vc7-mt-sgd-1_32/fileiter.obj vc7/libboost_regex-vc7-mt-sgd-1_32/instances.obj vc7/libboost_regex-vc7-mt-sgd-1_32/posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_32/regex.obj vc7/libboost_regex-vc7-mt-sgd-1_32/regex_debug.obj vc7/libboost_regex-vc7-mt-sgd-1_32/regex_synch.obj vc7/libboost_regex-vc7-mt-sgd-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_32/winstances.obj
-	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-sgd-1_32.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-sgd-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_32/c_regex_traits_common.obj vc7/libboost_regex-vc7-mt-sgd-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_32/cregex.obj vc7/libboost_regex-vc7-mt-sgd-1_32/fileiter.obj vc7/libboost_regex-vc7-mt-sgd-1_32/instances.obj vc7/libboost_regex-vc7-mt-sgd-1_32/posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_32/regex.obj vc7/libboost_regex-vc7-mt-sgd-1_32/regex_debug.obj vc7/libboost_regex-vc7-mt-sgd-1_32/regex_synch.obj vc7/libboost_regex-vc7-mt-sgd-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_32/winstances.obj
+./vc7/libboost_regex-vc7-mt-sgd-1_32.lib : vc7/libboost_regex-vc7-mt-sgd-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_32/cregex.obj vc7/libboost_regex-vc7-mt-sgd-1_32/fileiter.obj vc7/libboost_regex-vc7-mt-sgd-1_32/icu.obj vc7/libboost_regex-vc7-mt-sgd-1_32/instances.obj vc7/libboost_regex-vc7-mt-sgd-1_32/posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_32/regex.obj vc7/libboost_regex-vc7-mt-sgd-1_32/regex_debug.obj vc7/libboost_regex-vc7-mt-sgd-1_32/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-sgd-1_32/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-sgd-1_32/static_mutex.obj vc7/libboost_regex-vc7-mt-sgd-1_32/usinstances.obj vc7/libboost_regex-vc7-mt-sgd-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_32/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_32/winstances.obj
+	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-sgd-1_32.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-sgd-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_32/cregex.obj vc7/libboost_regex-vc7-mt-sgd-1_32/fileiter.obj vc7/libboost_regex-vc7-mt-sgd-1_32/icu.obj vc7/libboost_regex-vc7-mt-sgd-1_32/instances.obj vc7/libboost_regex-vc7-mt-sgd-1_32/posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_32/regex.obj vc7/libboost_regex-vc7-mt-sgd-1_32/regex_debug.obj vc7/libboost_regex-vc7-mt-sgd-1_32/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-sgd-1_32/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-sgd-1_32/static_mutex.obj vc7/libboost_regex-vc7-mt-sgd-1_32/usinstances.obj vc7/libboost_regex-vc7-mt-sgd-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_32/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-sgd-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-mt-sgd-1_32/winstances.obj
 
 ########################################################
 #
@@ -292,43 +356,55 @@ libboost_regex-vc7-mt-sgd-1_32_clean :
 #
 ########################################################
 vc7/boost_regex-vc7-mt-gd-1_32/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) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/c_regex_traits.cpp
-
-vc7/boost_regex-vc7-mt-gd-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/c_regex_traits.cpp
 
 vc7/boost_regex-vc7-mt-gd-1_32/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) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc7/boost_regex-vc7-mt-gd-1_32/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) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/cregex.cpp
 
 vc7/boost_regex-vc7-mt-gd-1_32/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) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/fileiter.cpp
+
+vc7/boost_regex-vc7-mt-gd-1_32/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_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/icu.cpp
 
 vc7/boost_regex-vc7-mt-gd-1_32/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) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/instances.cpp
 
 vc7/boost_regex-vc7-mt-gd-1_32/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) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/posix_api.cpp
 
 vc7/boost_regex-vc7-mt-gd-1_32/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) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/regex.cpp
 
 vc7/boost_regex-vc7-mt-gd-1_32/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) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/regex_debug.cpp
 
-vc7/boost_regex-vc7-mt-gd-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/regex_synch.cpp
+vc7/boost_regex-vc7-mt-gd-1_32/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_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc7/boost_regex-vc7-mt-gd-1_32/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_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc7/boost_regex-vc7-mt-gd-1_32/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_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/static_mutex.cpp
+
+vc7/boost_regex-vc7-mt-gd-1_32/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_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/usinstances.cpp
 
 vc7/boost_regex-vc7-mt-gd-1_32/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) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc7/boost_regex-vc7-mt-gd-1_32/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_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc7/boost_regex-vc7-mt-gd-1_32/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) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/wide_posix_api.cpp
 
 vc7/boost_regex-vc7-mt-gd-1_32/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) -Y- -Fo./vc7/boost_regex-vc7-mt-gd-1_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc7/boost_regex-vc7-mt-gd-1_32.pdb ../src/winstances.cpp
 
 boost_regex-vc7-mt-gd-1_32_dir :
 	@if not exist "vc7\boost_regex-vc7-mt-gd-1_32\$(NULL)" mkdir vc7\boost_regex-vc7-mt-gd-1_32
@@ -339,8 +415,8 @@ boost_regex-vc7-mt-gd-1_32_clean :
 	del vc7\boost_regex-vc7-mt-gd-1_32\*.exp
 	del vc7\boost_regex-vc7-mt-gd-1_32\*.pch
 
-./vc7/boost_regex-vc7-mt-gd-1_32.lib : vc7/boost_regex-vc7-mt-gd-1_32/c_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_32/c_regex_traits_common.obj vc7/boost_regex-vc7-mt-gd-1_32/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_32/cregex.obj vc7/boost_regex-vc7-mt-gd-1_32/fileiter.obj vc7/boost_regex-vc7-mt-gd-1_32/instances.obj vc7/boost_regex-vc7-mt-gd-1_32/posix_api.obj vc7/boost_regex-vc7-mt-gd-1_32/regex.obj vc7/boost_regex-vc7-mt-gd-1_32/regex_debug.obj vc7/boost_regex-vc7-mt-gd-1_32/regex_synch.obj vc7/boost_regex-vc7-mt-gd-1_32/w32_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_32/wide_posix_api.obj vc7/boost_regex-vc7-mt-gd-1_32/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_32.pdb" /debug /machine:I386 /out:"vc7/boost_regex-vc7-mt-gd-1_32.dll" /implib:"vc7/boost_regex-vc7-mt-gd-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc7/boost_regex-vc7-mt-gd-1_32/c_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_32/c_regex_traits_common.obj vc7/boost_regex-vc7-mt-gd-1_32/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_32/cregex.obj vc7/boost_regex-vc7-mt-gd-1_32/fileiter.obj vc7/boost_regex-vc7-mt-gd-1_32/instances.obj vc7/boost_regex-vc7-mt-gd-1_32/posix_api.obj vc7/boost_regex-vc7-mt-gd-1_32/regex.obj vc7/boost_regex-vc7-mt-gd-1_32/regex_debug.obj vc7/boost_regex-vc7-mt-gd-1_32/regex_synch.obj vc7/boost_regex-vc7-mt-gd-1_32/w32_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_32/wide_posix_api.obj vc7/boost_regex-vc7-mt-gd-1_32/winstances.obj
+./vc7/boost_regex-vc7-mt-gd-1_32.lib : vc7/boost_regex-vc7-mt-gd-1_32/c_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_32/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_32/cregex.obj vc7/boost_regex-vc7-mt-gd-1_32/fileiter.obj vc7/boost_regex-vc7-mt-gd-1_32/icu.obj vc7/boost_regex-vc7-mt-gd-1_32/instances.obj vc7/boost_regex-vc7-mt-gd-1_32/posix_api.obj vc7/boost_regex-vc7-mt-gd-1_32/regex.obj vc7/boost_regex-vc7-mt-gd-1_32/regex_debug.obj vc7/boost_regex-vc7-mt-gd-1_32/regex_raw_buffer.obj vc7/boost_regex-vc7-mt-gd-1_32/regex_traits_defaults.obj vc7/boost_regex-vc7-mt-gd-1_32/static_mutex.obj vc7/boost_regex-vc7-mt-gd-1_32/usinstances.obj vc7/boost_regex-vc7-mt-gd-1_32/w32_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_32/wc_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_32/wide_posix_api.obj vc7/boost_regex-vc7-mt-gd-1_32/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_32.pdb" /debug /machine:I386 /out:"vc7/boost_regex-vc7-mt-gd-1_32.dll" /implib:"vc7/boost_regex-vc7-mt-gd-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS) $(ICU_LINK_OPTS)  vc7/boost_regex-vc7-mt-gd-1_32/c_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_32/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_32/cregex.obj vc7/boost_regex-vc7-mt-gd-1_32/fileiter.obj vc7/boost_regex-vc7-mt-gd-1_32/icu.obj vc7/boost_regex-vc7-mt-gd-1_32/instances.obj vc7/boost_regex-vc7-mt-gd-1_32/posix_api.obj vc7/boost_regex-vc7-mt-gd-1_32/regex.obj vc7/boost_regex-vc7-mt-gd-1_32/regex_debug.obj vc7/boost_regex-vc7-mt-gd-1_32/regex_raw_buffer.obj vc7/boost_regex-vc7-mt-gd-1_32/regex_traits_defaults.obj vc7/boost_regex-vc7-mt-gd-1_32/static_mutex.obj vc7/boost_regex-vc7-mt-gd-1_32/usinstances.obj vc7/boost_regex-vc7-mt-gd-1_32/w32_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_32/wc_regex_traits.obj vc7/boost_regex-vc7-mt-gd-1_32/wide_posix_api.obj vc7/boost_regex-vc7-mt-gd-1_32/winstances.obj
 
 ########################################################
 #
@@ -348,43 +424,55 @@ boost_regex-vc7-mt-gd-1_32_clean :
 #
 ########################################################
 vc7/boost_regex-vc7-mt-1_32/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) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/c_regex_traits.cpp
-
-vc7/boost_regex-vc7-mt-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/c_regex_traits.cpp
 
 vc7/boost_regex-vc7-mt-1_32/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) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc7/boost_regex-vc7-mt-1_32/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) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/cregex.cpp
 
 vc7/boost_regex-vc7-mt-1_32/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) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/fileiter.cpp
+
+vc7/boost_regex-vc7-mt-1_32/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_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/icu.cpp
 
 vc7/boost_regex-vc7-mt-1_32/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) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/instances.cpp
 
 vc7/boost_regex-vc7-mt-1_32/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) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/posix_api.cpp
 
 vc7/boost_regex-vc7-mt-1_32/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) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/regex.cpp
 
 vc7/boost_regex-vc7-mt-1_32/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) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/regex_debug.cpp
 
-vc7/boost_regex-vc7-mt-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/regex_synch.cpp
+vc7/boost_regex-vc7-mt-1_32/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_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc7/boost_regex-vc7-mt-1_32/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_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc7/boost_regex-vc7-mt-1_32/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_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/static_mutex.cpp
+
+vc7/boost_regex-vc7-mt-1_32/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_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/usinstances.cpp
 
 vc7/boost_regex-vc7-mt-1_32/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) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc7/boost_regex-vc7-mt-1_32/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_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc7/boost_regex-vc7-mt-1_32/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) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/wide_posix_api.cpp
 
 vc7/boost_regex-vc7-mt-1_32/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) -Y- -Fo./vc7/boost_regex-vc7-mt-1_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc7/boost_regex-vc7-mt-1_32.pdb ../src/winstances.cpp
 
 boost_regex-vc7-mt-1_32_dir :
 	@if not exist "vc7\boost_regex-vc7-mt-1_32\$(NULL)" mkdir vc7\boost_regex-vc7-mt-1_32
@@ -395,8 +483,8 @@ boost_regex-vc7-mt-1_32_clean :
 	del vc7\boost_regex-vc7-mt-1_32\*.exp
 	del vc7\boost_regex-vc7-mt-1_32\*.pch
 
-./vc7/boost_regex-vc7-mt-1_32.lib : vc7/boost_regex-vc7-mt-1_32/c_regex_traits.obj vc7/boost_regex-vc7-mt-1_32/c_regex_traits_common.obj vc7/boost_regex-vc7-mt-1_32/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-1_32/cregex.obj vc7/boost_regex-vc7-mt-1_32/fileiter.obj vc7/boost_regex-vc7-mt-1_32/instances.obj vc7/boost_regex-vc7-mt-1_32/posix_api.obj vc7/boost_regex-vc7-mt-1_32/regex.obj vc7/boost_regex-vc7-mt-1_32/regex_debug.obj vc7/boost_regex-vc7-mt-1_32/regex_synch.obj vc7/boost_regex-vc7-mt-1_32/w32_regex_traits.obj vc7/boost_regex-vc7-mt-1_32/wide_posix_api.obj vc7/boost_regex-vc7-mt-1_32/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_32.pdb" /debug /machine:I386 /out:"vc7/boost_regex-vc7-mt-1_32.dll" /implib:"vc7/boost_regex-vc7-mt-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc7/boost_regex-vc7-mt-1_32/c_regex_traits.obj vc7/boost_regex-vc7-mt-1_32/c_regex_traits_common.obj vc7/boost_regex-vc7-mt-1_32/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-1_32/cregex.obj vc7/boost_regex-vc7-mt-1_32/fileiter.obj vc7/boost_regex-vc7-mt-1_32/instances.obj vc7/boost_regex-vc7-mt-1_32/posix_api.obj vc7/boost_regex-vc7-mt-1_32/regex.obj vc7/boost_regex-vc7-mt-1_32/regex_debug.obj vc7/boost_regex-vc7-mt-1_32/regex_synch.obj vc7/boost_regex-vc7-mt-1_32/w32_regex_traits.obj vc7/boost_regex-vc7-mt-1_32/wide_posix_api.obj vc7/boost_regex-vc7-mt-1_32/winstances.obj
+./vc7/boost_regex-vc7-mt-1_32.lib : vc7/boost_regex-vc7-mt-1_32/c_regex_traits.obj vc7/boost_regex-vc7-mt-1_32/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-1_32/cregex.obj vc7/boost_regex-vc7-mt-1_32/fileiter.obj vc7/boost_regex-vc7-mt-1_32/icu.obj vc7/boost_regex-vc7-mt-1_32/instances.obj vc7/boost_regex-vc7-mt-1_32/posix_api.obj vc7/boost_regex-vc7-mt-1_32/regex.obj vc7/boost_regex-vc7-mt-1_32/regex_debug.obj vc7/boost_regex-vc7-mt-1_32/regex_raw_buffer.obj vc7/boost_regex-vc7-mt-1_32/regex_traits_defaults.obj vc7/boost_regex-vc7-mt-1_32/static_mutex.obj vc7/boost_regex-vc7-mt-1_32/usinstances.obj vc7/boost_regex-vc7-mt-1_32/w32_regex_traits.obj vc7/boost_regex-vc7-mt-1_32/wc_regex_traits.obj vc7/boost_regex-vc7-mt-1_32/wide_posix_api.obj vc7/boost_regex-vc7-mt-1_32/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_32.pdb" /debug /machine:I386 /out:"vc7/boost_regex-vc7-mt-1_32.dll" /implib:"vc7/boost_regex-vc7-mt-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS) $(ICU_LINK_OPTS)  vc7/boost_regex-vc7-mt-1_32/c_regex_traits.obj vc7/boost_regex-vc7-mt-1_32/cpp_regex_traits.obj vc7/boost_regex-vc7-mt-1_32/cregex.obj vc7/boost_regex-vc7-mt-1_32/fileiter.obj vc7/boost_regex-vc7-mt-1_32/icu.obj vc7/boost_regex-vc7-mt-1_32/instances.obj vc7/boost_regex-vc7-mt-1_32/posix_api.obj vc7/boost_regex-vc7-mt-1_32/regex.obj vc7/boost_regex-vc7-mt-1_32/regex_debug.obj vc7/boost_regex-vc7-mt-1_32/regex_raw_buffer.obj vc7/boost_regex-vc7-mt-1_32/regex_traits_defaults.obj vc7/boost_regex-vc7-mt-1_32/static_mutex.obj vc7/boost_regex-vc7-mt-1_32/usinstances.obj vc7/boost_regex-vc7-mt-1_32/w32_regex_traits.obj vc7/boost_regex-vc7-mt-1_32/wc_regex_traits.obj vc7/boost_regex-vc7-mt-1_32/wide_posix_api.obj vc7/boost_regex-vc7-mt-1_32/winstances.obj
 
 ########################################################
 #
@@ -404,43 +492,55 @@ boost_regex-vc7-mt-1_32_clean :
 #
 ########################################################
 vc7/libboost_regex-vc7-mt-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/c_regex_traits.cpp
-
-vc7/libboost_regex-vc7-mt-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/c_regex_traits.cpp
 
 vc7/libboost_regex-vc7-mt-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc7/libboost_regex-vc7-mt-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/cregex.cpp
 
 vc7/libboost_regex-vc7-mt-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/fileiter.cpp
+
+vc7/libboost_regex-vc7-mt-1_32/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_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/icu.cpp
 
 vc7/libboost_regex-vc7-mt-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/instances.cpp
 
 vc7/libboost_regex-vc7-mt-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/posix_api.cpp
 
 vc7/libboost_regex-vc7-mt-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/regex.cpp
 
 vc7/libboost_regex-vc7-mt-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/regex_debug.cpp
 
-vc7/libboost_regex-vc7-mt-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/regex_synch.cpp
+vc7/libboost_regex-vc7-mt-1_32/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_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc7/libboost_regex-vc7-mt-1_32/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_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc7/libboost_regex-vc7-mt-1_32/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_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/static_mutex.cpp
+
+vc7/libboost_regex-vc7-mt-1_32/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_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/usinstances.cpp
 
 vc7/libboost_regex-vc7-mt-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc7/libboost_regex-vc7-mt-1_32/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_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc7/libboost_regex-vc7-mt-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/wide_posix_api.cpp
 
 vc7/libboost_regex-vc7-mt-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-1_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc7-mt-1_32_dir :
 	@if not exist "vc7\libboost_regex-vc7-mt-1_32\$(NULL)" mkdir vc7\libboost_regex-vc7-mt-1_32
@@ -451,8 +551,8 @@ libboost_regex-vc7-mt-1_32_clean :
 	del vc7\libboost_regex-vc7-mt-1_32\*.exp
 	del vc7\libboost_regex-vc7-mt-1_32\*.pch
 
-./vc7/libboost_regex-vc7-mt-1_32.lib : vc7/libboost_regex-vc7-mt-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-mt-1_32/c_regex_traits_common.obj vc7/libboost_regex-vc7-mt-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-1_32/cregex.obj vc7/libboost_regex-vc7-mt-1_32/fileiter.obj vc7/libboost_regex-vc7-mt-1_32/instances.obj vc7/libboost_regex-vc7-mt-1_32/posix_api.obj vc7/libboost_regex-vc7-mt-1_32/regex.obj vc7/libboost_regex-vc7-mt-1_32/regex_debug.obj vc7/libboost_regex-vc7-mt-1_32/regex_synch.obj vc7/libboost_regex-vc7-mt-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-mt-1_32/winstances.obj
-	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-1_32.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-mt-1_32/c_regex_traits_common.obj vc7/libboost_regex-vc7-mt-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-1_32/cregex.obj vc7/libboost_regex-vc7-mt-1_32/fileiter.obj vc7/libboost_regex-vc7-mt-1_32/instances.obj vc7/libboost_regex-vc7-mt-1_32/posix_api.obj vc7/libboost_regex-vc7-mt-1_32/regex.obj vc7/libboost_regex-vc7-mt-1_32/regex_debug.obj vc7/libboost_regex-vc7-mt-1_32/regex_synch.obj vc7/libboost_regex-vc7-mt-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-mt-1_32/winstances.obj
+./vc7/libboost_regex-vc7-mt-1_32.lib : vc7/libboost_regex-vc7-mt-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-mt-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-1_32/cregex.obj vc7/libboost_regex-vc7-mt-1_32/fileiter.obj vc7/libboost_regex-vc7-mt-1_32/icu.obj vc7/libboost_regex-vc7-mt-1_32/instances.obj vc7/libboost_regex-vc7-mt-1_32/posix_api.obj vc7/libboost_regex-vc7-mt-1_32/regex.obj vc7/libboost_regex-vc7-mt-1_32/regex_debug.obj vc7/libboost_regex-vc7-mt-1_32/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-1_32/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-1_32/static_mutex.obj vc7/libboost_regex-vc7-mt-1_32/usinstances.obj vc7/libboost_regex-vc7-mt-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-1_32/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-mt-1_32/winstances.obj
+	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-1_32.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-mt-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-1_32/cregex.obj vc7/libboost_regex-vc7-mt-1_32/fileiter.obj vc7/libboost_regex-vc7-mt-1_32/icu.obj vc7/libboost_regex-vc7-mt-1_32/instances.obj vc7/libboost_regex-vc7-mt-1_32/posix_api.obj vc7/libboost_regex-vc7-mt-1_32/regex.obj vc7/libboost_regex-vc7-mt-1_32/regex_debug.obj vc7/libboost_regex-vc7-mt-1_32/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-1_32/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-1_32/static_mutex.obj vc7/libboost_regex-vc7-mt-1_32/usinstances.obj vc7/libboost_regex-vc7-mt-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-1_32/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-mt-1_32/winstances.obj
 
 ########################################################
 #
@@ -460,43 +560,55 @@ libboost_regex-vc7-mt-1_32_clean :
 #
 ########################################################
 vc7/libboost_regex-vc7-mt-gd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/c_regex_traits.cpp
-
-vc7/libboost_regex-vc7-mt-gd-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/c_regex_traits.cpp
 
 vc7/libboost_regex-vc7-mt-gd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc7/libboost_regex-vc7-mt-gd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/cregex.cpp
 
 vc7/libboost_regex-vc7-mt-gd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/fileiter.cpp
+
+vc7/libboost_regex-vc7-mt-gd-1_32/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_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/icu.cpp
 
 vc7/libboost_regex-vc7-mt-gd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/instances.cpp
 
 vc7/libboost_regex-vc7-mt-gd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/posix_api.cpp
 
 vc7/libboost_regex-vc7-mt-gd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/regex.cpp
 
 vc7/libboost_regex-vc7-mt-gd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/regex_debug.cpp
 
-vc7/libboost_regex-vc7-mt-gd-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/regex_synch.cpp
+vc7/libboost_regex-vc7-mt-gd-1_32/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_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc7/libboost_regex-vc7-mt-gd-1_32/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_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc7/libboost_regex-vc7-mt-gd-1_32/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_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/static_mutex.cpp
+
+vc7/libboost_regex-vc7-mt-gd-1_32/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_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/usinstances.cpp
 
 vc7/libboost_regex-vc7-mt-gd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc7/libboost_regex-vc7-mt-gd-1_32/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_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc7/libboost_regex-vc7-mt-gd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/wide_posix_api.cpp
 
 vc7/libboost_regex-vc7-mt-gd-1_32/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) -Y- -Fo./vc7/libboost_regex-vc7-mt-gd-1_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc7/libboost_regex-vc7-mt-gd-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc7-mt-gd-1_32_dir :
 	@if not exist "vc7\libboost_regex-vc7-mt-gd-1_32\$(NULL)" mkdir vc7\libboost_regex-vc7-mt-gd-1_32
@@ -507,6 +619,6 @@ libboost_regex-vc7-mt-gd-1_32_clean :
 	del vc7\libboost_regex-vc7-mt-gd-1_32\*.exp
 	del vc7\libboost_regex-vc7-mt-gd-1_32\*.pch
 
-./vc7/libboost_regex-vc7-mt-gd-1_32.lib : vc7/libboost_regex-vc7-mt-gd-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_32/c_regex_traits_common.obj vc7/libboost_regex-vc7-mt-gd-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_32/cregex.obj vc7/libboost_regex-vc7-mt-gd-1_32/fileiter.obj vc7/libboost_regex-vc7-mt-gd-1_32/instances.obj vc7/libboost_regex-vc7-mt-gd-1_32/posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_32/regex.obj vc7/libboost_regex-vc7-mt-gd-1_32/regex_debug.obj vc7/libboost_regex-vc7-mt-gd-1_32/regex_synch.obj vc7/libboost_regex-vc7-mt-gd-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_32/winstances.obj
-	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-gd-1_32.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-gd-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_32/c_regex_traits_common.obj vc7/libboost_regex-vc7-mt-gd-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_32/cregex.obj vc7/libboost_regex-vc7-mt-gd-1_32/fileiter.obj vc7/libboost_regex-vc7-mt-gd-1_32/instances.obj vc7/libboost_regex-vc7-mt-gd-1_32/posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_32/regex.obj vc7/libboost_regex-vc7-mt-gd-1_32/regex_debug.obj vc7/libboost_regex-vc7-mt-gd-1_32/regex_synch.obj vc7/libboost_regex-vc7-mt-gd-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_32/winstances.obj
+./vc7/libboost_regex-vc7-mt-gd-1_32.lib : vc7/libboost_regex-vc7-mt-gd-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_32/cregex.obj vc7/libboost_regex-vc7-mt-gd-1_32/fileiter.obj vc7/libboost_regex-vc7-mt-gd-1_32/icu.obj vc7/libboost_regex-vc7-mt-gd-1_32/instances.obj vc7/libboost_regex-vc7-mt-gd-1_32/posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_32/regex.obj vc7/libboost_regex-vc7-mt-gd-1_32/regex_debug.obj vc7/libboost_regex-vc7-mt-gd-1_32/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-gd-1_32/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-gd-1_32/static_mutex.obj vc7/libboost_regex-vc7-mt-gd-1_32/usinstances.obj vc7/libboost_regex-vc7-mt-gd-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_32/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_32/winstances.obj
+	link -lib /nologo /out:vc7/libboost_regex-vc7-mt-gd-1_32.lib $(XSFLAGS)  vc7/libboost_regex-vc7-mt-gd-1_32/c_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_32/cpp_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_32/cregex.obj vc7/libboost_regex-vc7-mt-gd-1_32/fileiter.obj vc7/libboost_regex-vc7-mt-gd-1_32/icu.obj vc7/libboost_regex-vc7-mt-gd-1_32/instances.obj vc7/libboost_regex-vc7-mt-gd-1_32/posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_32/regex.obj vc7/libboost_regex-vc7-mt-gd-1_32/regex_debug.obj vc7/libboost_regex-vc7-mt-gd-1_32/regex_raw_buffer.obj vc7/libboost_regex-vc7-mt-gd-1_32/regex_traits_defaults.obj vc7/libboost_regex-vc7-mt-gd-1_32/static_mutex.obj vc7/libboost_regex-vc7-mt-gd-1_32/usinstances.obj vc7/libboost_regex-vc7-mt-gd-1_32/w32_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_32/wc_regex_traits.obj vc7/libboost_regex-vc7-mt-gd-1_32/wide_posix_api.obj vc7/libboost_regex-vc7-mt-gd-1_32/winstances.obj
 
diff --git a/build/vc71-stlport.mak b/build/vc71-stlport.mak
index 7a98316e..6e0d4ea4 100644
--- a/build/vc71-stlport.mak
+++ b/build/vc71-stlport.mak
@@ -8,6 +8,10 @@
 #   brings libraries up to date and copies binaries to your VC6 /lib and /bin directories (recomended)
 #
 
+#
+# ICU setup:
+#
+ICU_PATH=
 #
 # Add additional compiler options here:
 #
@@ -39,8 +43,20 @@ NULL=nul
 !ERROR Variable STLPORT_PATH not set.
 !ENDIF
 
+!IF "$(ICU_PATH)" == ""
+ICU_COMPILE_OPTS=
+ICU_LINK_OPTS=
+!MESSAGE Building Boost.Regex without ICU / Unicode support:
+!MESSAGE Hint: set ICU_PATH on the nmake command line to point 
+!MESSAGE to your ICU installation if you have one.
+!ELSE
+ICU_COMPILE_OPTS= -DBOOST_HAS_ICU=1 -I$(ICU_PATH)\include
+ICU_LINK_OPTS= /LIBPATH:$(ICU_PATH)\lib icuin.lib icuuc.lib
+!MESSAGE Building Boost.Regex with ICU in $(ICU_PATH)
+!ENDIF
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.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/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.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_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/allocator.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+
+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/static_mutex.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 ../../../boost/regex/config/regex_library_include.hpp
 
 all : main_dir libboost_regex-vc71-mt-sp-1_32_dir ./vc71-stlport/libboost_regex-vc71-mt-sp-1_32.lib boost_regex-vc71-mt-p-1_32_dir ./vc71-stlport/boost_regex-vc71-mt-p-1_32.lib libboost_regex-vc71-mt-p-1_32_dir ./vc71-stlport/libboost_regex-vc71-mt-p-1_32.lib boost_regex-vc71-mt-gdp-1_32_dir ./vc71-stlport/boost_regex-vc71-mt-gdp-1_32.lib libboost_regex-vc71-mt-sgdp-1_32_dir ./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.lib libboost_regex-vc71-mt-gdp-1_32_dir ./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32.lib
 
@@ -72,43 +88,55 @@ stlport_check : $(STLPORT_PATH)\stlport\string
 #
 ########################################################
 vc71-stlport/libboost_regex-vc71-mt-sp-1_32/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) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/c_regex_traits.cpp
-
-vc71-stlport/libboost_regex-vc71-mt-sp-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/c_regex_traits.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sp-1_32/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) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sp-1_32/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) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/cregex.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sp-1_32/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) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/fileiter.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-sp-1_32/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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/icu.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sp-1_32/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) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/instances.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sp-1_32/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) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/posix_api.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sp-1_32/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) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/regex.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sp-1_32/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) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/regex_debug.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/regex_synch.cpp
+vc71-stlport/libboost_regex-vc71-mt-sp-1_32/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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-sp-1_32/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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-sp-1_32/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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/static_mutex.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-sp-1_32/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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/usinstances.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sp-1_32/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) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-sp-1_32/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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sp-1_32/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) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/wide_posix_api.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sp-1_32/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) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sp-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc71-mt-sp-1_32_dir :
 	@if not exist "vc71-stlport\libboost_regex-vc71-mt-sp-1_32\$(NULL)" mkdir vc71-stlport\libboost_regex-vc71-mt-sp-1_32
@@ -119,8 +147,8 @@ libboost_regex-vc71-mt-sp-1_32_clean :
 	del vc71-stlport\libboost_regex-vc71-mt-sp-1_32\*.exp
 	del vc71-stlport\libboost_regex-vc71-mt-sp-1_32\*.pch
 
-./vc71-stlport/libboost_regex-vc71-mt-sp-1_32.lib : vc71-stlport/libboost_regex-vc71-mt-sp-1_32/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/c_regex_traits_common.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/instances.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex_synch.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/winstances.obj
-	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-sp-1_32.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-sp-1_32/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/c_regex_traits_common.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/instances.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex_synch.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/winstances.obj
+./vc71-stlport/libboost_regex-vc71-mt-sp-1_32.lib : vc71-stlport/libboost_regex-vc71-mt-sp-1_32/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/icu.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/instances.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/winstances.obj
+	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-sp-1_32.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-sp-1_32/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/icu.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/instances.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sp-1_32/winstances.obj
 
 ########################################################
 #
@@ -128,43 +156,55 @@ libboost_regex-vc71-mt-sp-1_32_clean :
 #
 ########################################################
 vc71-stlport/boost_regex-vc71-mt-p-1_32/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) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/c_regex_traits.cpp
-
-vc71-stlport/boost_regex-vc71-mt-p-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/c_regex_traits.cpp
 
 vc71-stlport/boost_regex-vc71-mt-p-1_32/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) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc71-stlport/boost_regex-vc71-mt-p-1_32/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) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/cregex.cpp
 
 vc71-stlport/boost_regex-vc71-mt-p-1_32/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) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/fileiter.cpp
+
+vc71-stlport/boost_regex-vc71-mt-p-1_32/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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/icu.cpp
 
 vc71-stlport/boost_regex-vc71-mt-p-1_32/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) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/instances.cpp
 
 vc71-stlport/boost_regex-vc71-mt-p-1_32/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) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/posix_api.cpp
 
 vc71-stlport/boost_regex-vc71-mt-p-1_32/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) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/regex.cpp
 
 vc71-stlport/boost_regex-vc71-mt-p-1_32/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) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/regex_debug.cpp
 
-vc71-stlport/boost_regex-vc71-mt-p-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/regex_synch.cpp
+vc71-stlport/boost_regex-vc71-mt-p-1_32/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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc71-stlport/boost_regex-vc71-mt-p-1_32/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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc71-stlport/boost_regex-vc71-mt-p-1_32/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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/static_mutex.cpp
+
+vc71-stlport/boost_regex-vc71-mt-p-1_32/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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/usinstances.cpp
 
 vc71-stlport/boost_regex-vc71-mt-p-1_32/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) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc71-stlport/boost_regex-vc71-mt-p-1_32/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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc71-stlport/boost_regex-vc71-mt-p-1_32/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) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/wide_posix_api.cpp
 
 vc71-stlport/boost_regex-vc71-mt-p-1_32/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) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-p-1_32.pdb ../src/winstances.cpp
 
 boost_regex-vc71-mt-p-1_32_dir :
 	@if not exist "vc71-stlport\boost_regex-vc71-mt-p-1_32\$(NULL)" mkdir vc71-stlport\boost_regex-vc71-mt-p-1_32
@@ -175,8 +215,8 @@ boost_regex-vc71-mt-p-1_32_clean :
 	del vc71-stlport\boost_regex-vc71-mt-p-1_32\*.exp
 	del vc71-stlport\boost_regex-vc71-mt-p-1_32\*.pch
 
-./vc71-stlport/boost_regex-vc71-mt-p-1_32.lib : vc71-stlport/boost_regex-vc71-mt-p-1_32/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/c_regex_traits_common.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/cregex.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/fileiter.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/instances.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/regex.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/regex_synch.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/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_32.pdb" /debug /machine:I386 /out:"vc71-stlport/boost_regex-vc71-mt-p-1_32.dll" /implib:"vc71-stlport/boost_regex-vc71-mt-p-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc71-stlport/boost_regex-vc71-mt-p-1_32/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/c_regex_traits_common.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/cregex.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/fileiter.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/instances.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/regex.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/regex_synch.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/winstances.obj
+./vc71-stlport/boost_regex-vc71-mt-p-1_32.lib : vc71-stlport/boost_regex-vc71-mt-p-1_32/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/cregex.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/fileiter.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/icu.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/instances.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/regex.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/regex_raw_buffer.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/regex_traits_defaults.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/static_mutex.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/usinstances.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/wc_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/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_32.pdb" /debug /machine:I386 /out:"vc71-stlport/boost_regex-vc71-mt-p-1_32.dll" /implib:"vc71-stlport/boost_regex-vc71-mt-p-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS) $(ICU_LINK_OPTS)  vc71-stlport/boost_regex-vc71-mt-p-1_32/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/cregex.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/fileiter.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/icu.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/instances.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/regex.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/regex_raw_buffer.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/regex_traits_defaults.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/static_mutex.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/usinstances.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/wc_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-p-1_32/winstances.obj
 
 ########################################################
 #
@@ -184,43 +224,55 @@ boost_regex-vc71-mt-p-1_32_clean :
 #
 ########################################################
 vc71-stlport/libboost_regex-vc71-mt-p-1_32/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) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/c_regex_traits.cpp
-
-vc71-stlport/libboost_regex-vc71-mt-p-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/c_regex_traits.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-p-1_32/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) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-p-1_32/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) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/cregex.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-p-1_32/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) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/fileiter.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-p-1_32/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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/icu.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-p-1_32/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) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/instances.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-p-1_32/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) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/posix_api.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-p-1_32/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) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/regex.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-p-1_32/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) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/regex_debug.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/regex_synch.cpp
+vc71-stlport/libboost_regex-vc71-mt-p-1_32/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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-p-1_32/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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-p-1_32/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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/static_mutex.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-p-1_32/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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/usinstances.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-p-1_32/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) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-p-1_32/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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-p-1_32/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) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/wide_posix_api.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-p-1_32/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) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-p-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-p-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc71-mt-p-1_32_dir :
 	@if not exist "vc71-stlport\libboost_regex-vc71-mt-p-1_32\$(NULL)" mkdir vc71-stlport\libboost_regex-vc71-mt-p-1_32
@@ -231,8 +283,8 @@ libboost_regex-vc71-mt-p-1_32_clean :
 	del vc71-stlport\libboost_regex-vc71-mt-p-1_32\*.exp
 	del vc71-stlport\libboost_regex-vc71-mt-p-1_32\*.pch
 
-./vc71-stlport/libboost_regex-vc71-mt-p-1_32.lib : vc71-stlport/libboost_regex-vc71-mt-p-1_32/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/c_regex_traits_common.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/cregex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/instances.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex_synch.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/winstances.obj
-	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-p-1_32.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-p-1_32/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/c_regex_traits_common.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/cregex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/instances.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex_synch.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/winstances.obj
+./vc71-stlport/libboost_regex-vc71-mt-p-1_32.lib : vc71-stlport/libboost_regex-vc71-mt-p-1_32/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/cregex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/icu.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/instances.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/winstances.obj
+	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-p-1_32.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-p-1_32/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/cregex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/icu.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/instances.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-p-1_32/winstances.obj
 
 ########################################################
 #
@@ -240,43 +292,55 @@ libboost_regex-vc71-mt-p-1_32_clean :
 #
 ########################################################
 vc71-stlport/boost_regex-vc71-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/c_regex_traits.cpp
-
-vc71-stlport/boost_regex-vc71-mt-gdp-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/c_regex_traits.cpp
 
 vc71-stlport/boost_regex-vc71-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc71-stlport/boost_regex-vc71-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/cregex.cpp
 
 vc71-stlport/boost_regex-vc71-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/fileiter.cpp
+
+vc71-stlport/boost_regex-vc71-mt-gdp-1_32/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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/icu.cpp
 
 vc71-stlport/boost_regex-vc71-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/instances.cpp
 
 vc71-stlport/boost_regex-vc71-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/posix_api.cpp
 
 vc71-stlport/boost_regex-vc71-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/regex.cpp
 
 vc71-stlport/boost_regex-vc71-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/regex_debug.cpp
 
-vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex_synch.obj: ../src/regex_synch.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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/regex_synch.cpp
+vc71-stlport/boost_regex-vc71-mt-gdp-1_32/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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc71-stlport/boost_regex-vc71-mt-gdp-1_32/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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc71-stlport/boost_regex-vc71-mt-gdp-1_32/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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/static_mutex.cpp
+
+vc71-stlport/boost_regex-vc71-mt-gdp-1_32/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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/usinstances.cpp
 
 vc71-stlport/boost_regex-vc71-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc71-stlport/boost_regex-vc71-mt-gdp-1_32/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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc71-stlport/boost_regex-vc71-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/wide_posix_api.cpp
 
 vc71-stlport/boost_regex-vc71-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/boost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc71-stlport/boost_regex-vc71-mt-gdp-1_32.pdb ../src/winstances.cpp
 
 boost_regex-vc71-mt-gdp-1_32_dir :
 	@if not exist "vc71-stlport\boost_regex-vc71-mt-gdp-1_32\$(NULL)" mkdir vc71-stlport\boost_regex-vc71-mt-gdp-1_32
@@ -287,8 +351,8 @@ boost_regex-vc71-mt-gdp-1_32_clean :
 	del vc71-stlport\boost_regex-vc71-mt-gdp-1_32\*.exp
 	del vc71-stlport\boost_regex-vc71-mt-gdp-1_32\*.pch
 
-./vc71-stlport/boost_regex-vc71-mt-gdp-1_32.lib : vc71-stlport/boost_regex-vc71-mt-gdp-1_32/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/c_regex_traits_common.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/cregex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/fileiter.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/instances.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex_synch.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/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_32.pdb" /debug /machine:I386 /out:"vc71-stlport/boost_regex-vc71-mt-gdp-1_32.dll" /implib:"vc71-stlport/boost_regex-vc71-mt-gdp-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc71-stlport/boost_regex-vc71-mt-gdp-1_32/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/c_regex_traits_common.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/cregex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/fileiter.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/instances.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex_synch.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/winstances.obj
+./vc71-stlport/boost_regex-vc71-mt-gdp-1_32.lib : vc71-stlport/boost_regex-vc71-mt-gdp-1_32/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/cregex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/fileiter.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/icu.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/instances.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex_raw_buffer.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex_traits_defaults.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/static_mutex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/usinstances.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/wc_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/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_32.pdb" /debug /machine:I386 /out:"vc71-stlport/boost_regex-vc71-mt-gdp-1_32.dll" /implib:"vc71-stlport/boost_regex-vc71-mt-gdp-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS) $(ICU_LINK_OPTS)  vc71-stlport/boost_regex-vc71-mt-gdp-1_32/c_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/cpp_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/cregex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/fileiter.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/icu.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/instances.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex_debug.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex_raw_buffer.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/regex_traits_defaults.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/static_mutex.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/usinstances.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/w32_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/wc_regex_traits.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/wide_posix_api.obj vc71-stlport/boost_regex-vc71-mt-gdp-1_32/winstances.obj
 
 ########################################################
 #
@@ -296,43 +360,55 @@ boost_regex-vc71-mt-gdp-1_32_clean :
 #
 ########################################################
 vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/c_regex_traits.cpp
-
-vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/c_regex_traits.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/cregex.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/fileiter.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/icu.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/instances.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/posix_api.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/regex.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/regex_debug.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex_synch.obj: ../src/regex_synch.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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/regex_synch.cpp
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/static_mutex.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/usinstances.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/wide_posix_api.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc71-mt-sgdp-1_32_dir :
 	@if not exist "vc71-stlport\libboost_regex-vc71-mt-sgdp-1_32\$(NULL)" mkdir vc71-stlport\libboost_regex-vc71-mt-sgdp-1_32
@@ -343,8 +419,8 @@ libboost_regex-vc71-mt-sgdp-1_32_clean :
 	del vc71-stlport\libboost_regex-vc71-mt-sgdp-1_32\*.exp
 	del vc71-stlport\libboost_regex-vc71-mt-sgdp-1_32\*.pch
 
-./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.lib : vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/c_regex_traits_common.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/instances.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex_synch.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/winstances.obj
-	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/c_regex_traits_common.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/instances.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex_synch.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/winstances.obj
+./vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.lib : vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/icu.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/instances.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/winstances.obj
+	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/cregex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/icu.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/instances.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-sgdp-1_32/winstances.obj
 
 ########################################################
 #
@@ -352,43 +428,55 @@ libboost_regex-vc71-mt-sgdp-1_32_clean :
 #
 ########################################################
 vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/c_regex_traits.cpp
-
-vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/c_regex_traits.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/cregex.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/fileiter.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/icu.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/instances.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/posix_api.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/regex.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/regex_debug.cpp
 
-vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex_synch.obj: ../src/regex_synch.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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/regex_synch.cpp
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/static_mutex.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/usinstances.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/wide_posix_api.cpp
 
 vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/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 /c $(CXXFLAGS) -Y- -Fo./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc71-stlport/libboost_regex-vc71-mt-gdp-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc71-mt-gdp-1_32_dir :
 	@if not exist "vc71-stlport\libboost_regex-vc71-mt-gdp-1_32\$(NULL)" mkdir vc71-stlport\libboost_regex-vc71-mt-gdp-1_32
@@ -399,6 +487,6 @@ libboost_regex-vc71-mt-gdp-1_32_clean :
 	del vc71-stlport\libboost_regex-vc71-mt-gdp-1_32\*.exp
 	del vc71-stlport\libboost_regex-vc71-mt-gdp-1_32\*.pch
 
-./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32.lib : vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/c_regex_traits_common.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/cregex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/instances.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex_synch.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/winstances.obj
-	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-gdp-1_32.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/c_regex_traits_common.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/cregex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/instances.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex_synch.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/winstances.obj
+./vc71-stlport/libboost_regex-vc71-mt-gdp-1_32.lib : vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/cregex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/icu.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/instances.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/winstances.obj
+	link -lib /nologo /out:vc71-stlport/libboost_regex-vc71-mt-gdp-1_32.lib $(XSFLAGS)  vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/c_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/cpp_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/cregex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/fileiter.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/icu.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/instances.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex_debug.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex_raw_buffer.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/regex_traits_defaults.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/static_mutex.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/usinstances.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/w32_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/wc_regex_traits.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/wide_posix_api.obj vc71-stlport/libboost_regex-vc71-mt-gdp-1_32/winstances.obj
 
diff --git a/build/vc71.mak b/build/vc71.mak
index 49281696..93a26be0 100644
--- a/build/vc71.mak
+++ b/build/vc71.mak
@@ -8,6 +8,10 @@
 #   brings libraries up to date and copies binaries to your VC6 /lib and /bin directories (recomended)
 #
 
+#
+# path to ICU library installation goes here:
+#
+ICU_PATH=
 #
 # Add additional compiler options here:
 #
@@ -35,8 +39,20 @@ NULL=nul
 !ERROR Variable MSVCDIR not set.
 !ENDIF
 
+!IF "$(ICU_PATH)" == ""
+ICU_COMPILE_OPTS=
+ICU_LINK_OPTS=
+!MESSAGE Building Boost.Regex without ICU / Unicode support:
+!MESSAGE Hint: set ICU_PATH on the nmake command line to point 
+!MESSAGE to your ICU installation if you have one.
+!ELSE
+ICU_COMPILE_OPTS= -DBOOST_HAS_ICU=1 -I$(ICU_PATH)\include
+ICU_LINK_OPTS= /LIBPATH:$(ICU_PATH)\lib icuin.lib icuuc.lib
+!MESSAGE Building Boost.Regex with ICU in $(ICU_PATH)
+!ENDIF
 
-ALL_HEADER= ../../../boost/regex/config.hpp ../../../boost/regex/pattern_except.hpp ../../../boost/regex/regex_traits.hpp ../../../boost/regex/user.hpp ../../../boost/regex/v3/cregex.hpp ../../../boost/regex/v3/fileiter.hpp ../../../boost/regex/v3/instances.hpp ../../../boost/regex/v3/regex.hpp ../../../boost/regex/v3/regex_compile.hpp ../../../boost/regex/v3/regex_cstring.hpp ../../../boost/regex/v3/regex_format.hpp ../../../boost/regex/v3/regex_fwd.hpp ../../../boost/regex/v3/regex_kmp.hpp ../../../boost/regex/v3/regex_library_include.hpp ../../../boost/regex/v3/regex_match.hpp ../../../boost/regex/v3/regex_raw_buffer.hpp ../../../boost/regex/v3/regex_split.hpp ../../../boost/regex/v3/regex_stack.hpp ../../../boost/regex/v3/regex_synch.hpp ../../../boost/regex/v3/regex_traits.hpp ../../../boost/regex/v4/basic_regex.hpp ../../../boost/regex/v4/char_regex_traits.hpp ../../../boost/regex/v4/cregex.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/regbase.hpp ../../../boost/regex/v4/regex.hpp ../../../boost/regex/v4/regex_compile.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_synch.hpp ../../../boost/regex/v4/regex_token_iterator.hpp ../../../boost/regex/v4/regex_traits.hpp ../../../boost/regex/v4/states.hpp ../../../boost/regex/v4/sub_match.hpp ../../../boost/regex/config/allocator.hpp ../../../boost/regex/config/borland.hpp ../../../boost/regex/config/cstring.hpp ../../../boost/regex/config/cwchar.hpp ../../../boost/regex/config/regex_library_include.hpp
+
+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/static_mutex.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 ../../../boost/regex/config/regex_library_include.hpp
 
 all : main_dir libboost_regex-vc71-s-1_32_dir ./vc71/libboost_regex-vc71-s-1_32.lib libboost_regex-vc71-mt-s-1_32_dir ./vc71/libboost_regex-vc71-mt-s-1_32.lib libboost_regex-vc71-sgd-1_32_dir ./vc71/libboost_regex-vc71-sgd-1_32.lib libboost_regex-vc71-mt-sgd-1_32_dir ./vc71/libboost_regex-vc71-mt-sgd-1_32.lib boost_regex-vc71-mt-gd-1_32_dir ./vc71/boost_regex-vc71-mt-gd-1_32.lib boost_regex-vc71-mt-1_32_dir ./vc71/boost_regex-vc71-mt-1_32.lib libboost_regex-vc71-mt-1_32_dir ./vc71/libboost_regex-vc71-mt-1_32.lib libboost_regex-vc71-mt-gd-1_32_dir ./vc71/libboost_regex-vc71-mt-gd-1_32.lib
 
@@ -68,43 +84,55 @@ main_dir :
 #
 ########################################################
 vc71/libboost_regex-vc71-s-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/c_regex_traits.cpp
-
-vc71/libboost_regex-vc71-s-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/c_regex_traits.cpp
 
 vc71/libboost_regex-vc71-s-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc71/libboost_regex-vc71-s-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/cregex.cpp
 
 vc71/libboost_regex-vc71-s-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/fileiter.cpp
+
+vc71/libboost_regex-vc71-s-1_32/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_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/icu.cpp
 
 vc71/libboost_regex-vc71-s-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/instances.cpp
 
 vc71/libboost_regex-vc71-s-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/posix_api.cpp
 
 vc71/libboost_regex-vc71-s-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/regex.cpp
 
 vc71/libboost_regex-vc71-s-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/regex_debug.cpp
 
-vc71/libboost_regex-vc71-s-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/regex_synch.cpp
+vc71/libboost_regex-vc71-s-1_32/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_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc71/libboost_regex-vc71-s-1_32/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_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc71/libboost_regex-vc71-s-1_32/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_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/static_mutex.cpp
+
+vc71/libboost_regex-vc71-s-1_32/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_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/usinstances.cpp
 
 vc71/libboost_regex-vc71-s-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc71/libboost_regex-vc71-s-1_32/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_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc71/libboost_regex-vc71-s-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/wide_posix_api.cpp
 
 vc71/libboost_regex-vc71-s-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-s-1_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-s-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc71-s-1_32_dir :
 	@if not exist "vc71\libboost_regex-vc71-s-1_32\$(NULL)" mkdir vc71\libboost_regex-vc71-s-1_32
@@ -115,8 +143,8 @@ libboost_regex-vc71-s-1_32_clean :
 	del vc71\libboost_regex-vc71-s-1_32\*.exp
 	del vc71\libboost_regex-vc71-s-1_32\*.pch
 
-./vc71/libboost_regex-vc71-s-1_32.lib : vc71/libboost_regex-vc71-s-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-s-1_32/c_regex_traits_common.obj vc71/libboost_regex-vc71-s-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-s-1_32/cregex.obj vc71/libboost_regex-vc71-s-1_32/fileiter.obj vc71/libboost_regex-vc71-s-1_32/instances.obj vc71/libboost_regex-vc71-s-1_32/posix_api.obj vc71/libboost_regex-vc71-s-1_32/regex.obj vc71/libboost_regex-vc71-s-1_32/regex_debug.obj vc71/libboost_regex-vc71-s-1_32/regex_synch.obj vc71/libboost_regex-vc71-s-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-s-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-s-1_32/winstances.obj
-	link -lib /nologo /out:vc71/libboost_regex-vc71-s-1_32.lib $(XSFLAGS)  vc71/libboost_regex-vc71-s-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-s-1_32/c_regex_traits_common.obj vc71/libboost_regex-vc71-s-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-s-1_32/cregex.obj vc71/libboost_regex-vc71-s-1_32/fileiter.obj vc71/libboost_regex-vc71-s-1_32/instances.obj vc71/libboost_regex-vc71-s-1_32/posix_api.obj vc71/libboost_regex-vc71-s-1_32/regex.obj vc71/libboost_regex-vc71-s-1_32/regex_debug.obj vc71/libboost_regex-vc71-s-1_32/regex_synch.obj vc71/libboost_regex-vc71-s-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-s-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-s-1_32/winstances.obj
+./vc71/libboost_regex-vc71-s-1_32.lib : vc71/libboost_regex-vc71-s-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-s-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-s-1_32/cregex.obj vc71/libboost_regex-vc71-s-1_32/fileiter.obj vc71/libboost_regex-vc71-s-1_32/icu.obj vc71/libboost_regex-vc71-s-1_32/instances.obj vc71/libboost_regex-vc71-s-1_32/posix_api.obj vc71/libboost_regex-vc71-s-1_32/regex.obj vc71/libboost_regex-vc71-s-1_32/regex_debug.obj vc71/libboost_regex-vc71-s-1_32/regex_raw_buffer.obj vc71/libboost_regex-vc71-s-1_32/regex_traits_defaults.obj vc71/libboost_regex-vc71-s-1_32/static_mutex.obj vc71/libboost_regex-vc71-s-1_32/usinstances.obj vc71/libboost_regex-vc71-s-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-s-1_32/wc_regex_traits.obj vc71/libboost_regex-vc71-s-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-s-1_32/winstances.obj
+	link -lib /nologo /out:vc71/libboost_regex-vc71-s-1_32.lib $(XSFLAGS)  vc71/libboost_regex-vc71-s-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-s-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-s-1_32/cregex.obj vc71/libboost_regex-vc71-s-1_32/fileiter.obj vc71/libboost_regex-vc71-s-1_32/icu.obj vc71/libboost_regex-vc71-s-1_32/instances.obj vc71/libboost_regex-vc71-s-1_32/posix_api.obj vc71/libboost_regex-vc71-s-1_32/regex.obj vc71/libboost_regex-vc71-s-1_32/regex_debug.obj vc71/libboost_regex-vc71-s-1_32/regex_raw_buffer.obj vc71/libboost_regex-vc71-s-1_32/regex_traits_defaults.obj vc71/libboost_regex-vc71-s-1_32/static_mutex.obj vc71/libboost_regex-vc71-s-1_32/usinstances.obj vc71/libboost_regex-vc71-s-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-s-1_32/wc_regex_traits.obj vc71/libboost_regex-vc71-s-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-s-1_32/winstances.obj
 
 ########################################################
 #
@@ -124,43 +152,55 @@ libboost_regex-vc71-s-1_32_clean :
 #
 ########################################################
 vc71/libboost_regex-vc71-mt-s-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/c_regex_traits.cpp
-
-vc71/libboost_regex-vc71-mt-s-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/c_regex_traits.cpp
 
 vc71/libboost_regex-vc71-mt-s-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc71/libboost_regex-vc71-mt-s-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/cregex.cpp
 
 vc71/libboost_regex-vc71-mt-s-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/fileiter.cpp
+
+vc71/libboost_regex-vc71-mt-s-1_32/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_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/icu.cpp
 
 vc71/libboost_regex-vc71-mt-s-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/instances.cpp
 
 vc71/libboost_regex-vc71-mt-s-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/posix_api.cpp
 
 vc71/libboost_regex-vc71-mt-s-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/regex.cpp
 
 vc71/libboost_regex-vc71-mt-s-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/regex_debug.cpp
 
-vc71/libboost_regex-vc71-mt-s-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/regex_synch.cpp
+vc71/libboost_regex-vc71-mt-s-1_32/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_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc71/libboost_regex-vc71-mt-s-1_32/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_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc71/libboost_regex-vc71-mt-s-1_32/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_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/static_mutex.cpp
+
+vc71/libboost_regex-vc71-mt-s-1_32/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_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/usinstances.cpp
 
 vc71/libboost_regex-vc71-mt-s-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc71/libboost_regex-vc71-mt-s-1_32/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_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc71/libboost_regex-vc71-mt-s-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/wide_posix_api.cpp
 
 vc71/libboost_regex-vc71-mt-s-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-s-1_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-s-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc71-mt-s-1_32_dir :
 	@if not exist "vc71\libboost_regex-vc71-mt-s-1_32\$(NULL)" mkdir vc71\libboost_regex-vc71-mt-s-1_32
@@ -171,8 +211,8 @@ libboost_regex-vc71-mt-s-1_32_clean :
 	del vc71\libboost_regex-vc71-mt-s-1_32\*.exp
 	del vc71\libboost_regex-vc71-mt-s-1_32\*.pch
 
-./vc71/libboost_regex-vc71-mt-s-1_32.lib : vc71/libboost_regex-vc71-mt-s-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_32/c_regex_traits_common.obj vc71/libboost_regex-vc71-mt-s-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_32/cregex.obj vc71/libboost_regex-vc71-mt-s-1_32/fileiter.obj vc71/libboost_regex-vc71-mt-s-1_32/instances.obj vc71/libboost_regex-vc71-mt-s-1_32/posix_api.obj vc71/libboost_regex-vc71-mt-s-1_32/regex.obj vc71/libboost_regex-vc71-mt-s-1_32/regex_debug.obj vc71/libboost_regex-vc71-mt-s-1_32/regex_synch.obj vc71/libboost_regex-vc71-mt-s-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-mt-s-1_32/winstances.obj
-	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-s-1_32.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-s-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_32/c_regex_traits_common.obj vc71/libboost_regex-vc71-mt-s-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_32/cregex.obj vc71/libboost_regex-vc71-mt-s-1_32/fileiter.obj vc71/libboost_regex-vc71-mt-s-1_32/instances.obj vc71/libboost_regex-vc71-mt-s-1_32/posix_api.obj vc71/libboost_regex-vc71-mt-s-1_32/regex.obj vc71/libboost_regex-vc71-mt-s-1_32/regex_debug.obj vc71/libboost_regex-vc71-mt-s-1_32/regex_synch.obj vc71/libboost_regex-vc71-mt-s-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-mt-s-1_32/winstances.obj
+./vc71/libboost_regex-vc71-mt-s-1_32.lib : vc71/libboost_regex-vc71-mt-s-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_32/cregex.obj vc71/libboost_regex-vc71-mt-s-1_32/fileiter.obj vc71/libboost_regex-vc71-mt-s-1_32/icu.obj vc71/libboost_regex-vc71-mt-s-1_32/instances.obj vc71/libboost_regex-vc71-mt-s-1_32/posix_api.obj vc71/libboost_regex-vc71-mt-s-1_32/regex.obj vc71/libboost_regex-vc71-mt-s-1_32/regex_debug.obj vc71/libboost_regex-vc71-mt-s-1_32/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-s-1_32/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-s-1_32/static_mutex.obj vc71/libboost_regex-vc71-mt-s-1_32/usinstances.obj vc71/libboost_regex-vc71-mt-s-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_32/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-mt-s-1_32/winstances.obj
+	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-s-1_32.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-s-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_32/cregex.obj vc71/libboost_regex-vc71-mt-s-1_32/fileiter.obj vc71/libboost_regex-vc71-mt-s-1_32/icu.obj vc71/libboost_regex-vc71-mt-s-1_32/instances.obj vc71/libboost_regex-vc71-mt-s-1_32/posix_api.obj vc71/libboost_regex-vc71-mt-s-1_32/regex.obj vc71/libboost_regex-vc71-mt-s-1_32/regex_debug.obj vc71/libboost_regex-vc71-mt-s-1_32/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-s-1_32/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-s-1_32/static_mutex.obj vc71/libboost_regex-vc71-mt-s-1_32/usinstances.obj vc71/libboost_regex-vc71-mt-s-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_32/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-s-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-mt-s-1_32/winstances.obj
 
 ########################################################
 #
@@ -180,43 +220,55 @@ libboost_regex-vc71-mt-s-1_32_clean :
 #
 ########################################################
 vc71/libboost_regex-vc71-sgd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/c_regex_traits.cpp
-
-vc71/libboost_regex-vc71-sgd-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/c_regex_traits.cpp
 
 vc71/libboost_regex-vc71-sgd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc71/libboost_regex-vc71-sgd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/cregex.cpp
 
 vc71/libboost_regex-vc71-sgd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/fileiter.cpp
+
+vc71/libboost_regex-vc71-sgd-1_32/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_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/icu.cpp
 
 vc71/libboost_regex-vc71-sgd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/instances.cpp
 
 vc71/libboost_regex-vc71-sgd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/posix_api.cpp
 
 vc71/libboost_regex-vc71-sgd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/regex.cpp
 
 vc71/libboost_regex-vc71-sgd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/regex_debug.cpp
 
-vc71/libboost_regex-vc71-sgd-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/regex_synch.cpp
+vc71/libboost_regex-vc71-sgd-1_32/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_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc71/libboost_regex-vc71-sgd-1_32/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_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc71/libboost_regex-vc71-sgd-1_32/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_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/static_mutex.cpp
+
+vc71/libboost_regex-vc71-sgd-1_32/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_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/usinstances.cpp
 
 vc71/libboost_regex-vc71-sgd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc71/libboost_regex-vc71-sgd-1_32/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_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc71/libboost_regex-vc71-sgd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/wide_posix_api.cpp
 
 vc71/libboost_regex-vc71-sgd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-sgd-1_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-sgd-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc71-sgd-1_32_dir :
 	@if not exist "vc71\libboost_regex-vc71-sgd-1_32\$(NULL)" mkdir vc71\libboost_regex-vc71-sgd-1_32
@@ -227,8 +279,8 @@ libboost_regex-vc71-sgd-1_32_clean :
 	del vc71\libboost_regex-vc71-sgd-1_32\*.exp
 	del vc71\libboost_regex-vc71-sgd-1_32\*.pch
 
-./vc71/libboost_regex-vc71-sgd-1_32.lib : vc71/libboost_regex-vc71-sgd-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_32/c_regex_traits_common.obj vc71/libboost_regex-vc71-sgd-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_32/cregex.obj vc71/libboost_regex-vc71-sgd-1_32/fileiter.obj vc71/libboost_regex-vc71-sgd-1_32/instances.obj vc71/libboost_regex-vc71-sgd-1_32/posix_api.obj vc71/libboost_regex-vc71-sgd-1_32/regex.obj vc71/libboost_regex-vc71-sgd-1_32/regex_debug.obj vc71/libboost_regex-vc71-sgd-1_32/regex_synch.obj vc71/libboost_regex-vc71-sgd-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-sgd-1_32/winstances.obj
-	link -lib /nologo /out:vc71/libboost_regex-vc71-sgd-1_32.lib $(XSFLAGS)  vc71/libboost_regex-vc71-sgd-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_32/c_regex_traits_common.obj vc71/libboost_regex-vc71-sgd-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_32/cregex.obj vc71/libboost_regex-vc71-sgd-1_32/fileiter.obj vc71/libboost_regex-vc71-sgd-1_32/instances.obj vc71/libboost_regex-vc71-sgd-1_32/posix_api.obj vc71/libboost_regex-vc71-sgd-1_32/regex.obj vc71/libboost_regex-vc71-sgd-1_32/regex_debug.obj vc71/libboost_regex-vc71-sgd-1_32/regex_synch.obj vc71/libboost_regex-vc71-sgd-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-sgd-1_32/winstances.obj
+./vc71/libboost_regex-vc71-sgd-1_32.lib : vc71/libboost_regex-vc71-sgd-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_32/cregex.obj vc71/libboost_regex-vc71-sgd-1_32/fileiter.obj vc71/libboost_regex-vc71-sgd-1_32/icu.obj vc71/libboost_regex-vc71-sgd-1_32/instances.obj vc71/libboost_regex-vc71-sgd-1_32/posix_api.obj vc71/libboost_regex-vc71-sgd-1_32/regex.obj vc71/libboost_regex-vc71-sgd-1_32/regex_debug.obj vc71/libboost_regex-vc71-sgd-1_32/regex_raw_buffer.obj vc71/libboost_regex-vc71-sgd-1_32/regex_traits_defaults.obj vc71/libboost_regex-vc71-sgd-1_32/static_mutex.obj vc71/libboost_regex-vc71-sgd-1_32/usinstances.obj vc71/libboost_regex-vc71-sgd-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_32/wc_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-sgd-1_32/winstances.obj
+	link -lib /nologo /out:vc71/libboost_regex-vc71-sgd-1_32.lib $(XSFLAGS)  vc71/libboost_regex-vc71-sgd-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_32/cregex.obj vc71/libboost_regex-vc71-sgd-1_32/fileiter.obj vc71/libboost_regex-vc71-sgd-1_32/icu.obj vc71/libboost_regex-vc71-sgd-1_32/instances.obj vc71/libboost_regex-vc71-sgd-1_32/posix_api.obj vc71/libboost_regex-vc71-sgd-1_32/regex.obj vc71/libboost_regex-vc71-sgd-1_32/regex_debug.obj vc71/libboost_regex-vc71-sgd-1_32/regex_raw_buffer.obj vc71/libboost_regex-vc71-sgd-1_32/regex_traits_defaults.obj vc71/libboost_regex-vc71-sgd-1_32/static_mutex.obj vc71/libboost_regex-vc71-sgd-1_32/usinstances.obj vc71/libboost_regex-vc71-sgd-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_32/wc_regex_traits.obj vc71/libboost_regex-vc71-sgd-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-sgd-1_32/winstances.obj
 
 ########################################################
 #
@@ -236,43 +288,55 @@ libboost_regex-vc71-sgd-1_32_clean :
 #
 ########################################################
 vc71/libboost_regex-vc71-mt-sgd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/c_regex_traits.cpp
-
-vc71/libboost_regex-vc71-mt-sgd-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/c_regex_traits.cpp
 
 vc71/libboost_regex-vc71-mt-sgd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc71/libboost_regex-vc71-mt-sgd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/cregex.cpp
 
 vc71/libboost_regex-vc71-mt-sgd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/fileiter.cpp
+
+vc71/libboost_regex-vc71-mt-sgd-1_32/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_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/icu.cpp
 
 vc71/libboost_regex-vc71-mt-sgd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/instances.cpp
 
 vc71/libboost_regex-vc71-mt-sgd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/posix_api.cpp
 
 vc71/libboost_regex-vc71-mt-sgd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/regex.cpp
 
 vc71/libboost_regex-vc71-mt-sgd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/regex_debug.cpp
 
-vc71/libboost_regex-vc71-mt-sgd-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/regex_synch.cpp
+vc71/libboost_regex-vc71-mt-sgd-1_32/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_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc71/libboost_regex-vc71-mt-sgd-1_32/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_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc71/libboost_regex-vc71-mt-sgd-1_32/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_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/static_mutex.cpp
+
+vc71/libboost_regex-vc71-mt-sgd-1_32/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_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/usinstances.cpp
 
 vc71/libboost_regex-vc71-mt-sgd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc71/libboost_regex-vc71-mt-sgd-1_32/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_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc71/libboost_regex-vc71-mt-sgd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/wide_posix_api.cpp
 
 vc71/libboost_regex-vc71-mt-sgd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-sgd-1_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-sgd-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc71-mt-sgd-1_32_dir :
 	@if not exist "vc71\libboost_regex-vc71-mt-sgd-1_32\$(NULL)" mkdir vc71\libboost_regex-vc71-mt-sgd-1_32
@@ -283,8 +347,8 @@ libboost_regex-vc71-mt-sgd-1_32_clean :
 	del vc71\libboost_regex-vc71-mt-sgd-1_32\*.exp
 	del vc71\libboost_regex-vc71-mt-sgd-1_32\*.pch
 
-./vc71/libboost_regex-vc71-mt-sgd-1_32.lib : vc71/libboost_regex-vc71-mt-sgd-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_32/c_regex_traits_common.obj vc71/libboost_regex-vc71-mt-sgd-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_32/cregex.obj vc71/libboost_regex-vc71-mt-sgd-1_32/fileiter.obj vc71/libboost_regex-vc71-mt-sgd-1_32/instances.obj vc71/libboost_regex-vc71-mt-sgd-1_32/posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_32/regex.obj vc71/libboost_regex-vc71-mt-sgd-1_32/regex_debug.obj vc71/libboost_regex-vc71-mt-sgd-1_32/regex_synch.obj vc71/libboost_regex-vc71-mt-sgd-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_32/winstances.obj
-	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-sgd-1_32.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-sgd-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_32/c_regex_traits_common.obj vc71/libboost_regex-vc71-mt-sgd-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_32/cregex.obj vc71/libboost_regex-vc71-mt-sgd-1_32/fileiter.obj vc71/libboost_regex-vc71-mt-sgd-1_32/instances.obj vc71/libboost_regex-vc71-mt-sgd-1_32/posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_32/regex.obj vc71/libboost_regex-vc71-mt-sgd-1_32/regex_debug.obj vc71/libboost_regex-vc71-mt-sgd-1_32/regex_synch.obj vc71/libboost_regex-vc71-mt-sgd-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_32/winstances.obj
+./vc71/libboost_regex-vc71-mt-sgd-1_32.lib : vc71/libboost_regex-vc71-mt-sgd-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_32/cregex.obj vc71/libboost_regex-vc71-mt-sgd-1_32/fileiter.obj vc71/libboost_regex-vc71-mt-sgd-1_32/icu.obj vc71/libboost_regex-vc71-mt-sgd-1_32/instances.obj vc71/libboost_regex-vc71-mt-sgd-1_32/posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_32/regex.obj vc71/libboost_regex-vc71-mt-sgd-1_32/regex_debug.obj vc71/libboost_regex-vc71-mt-sgd-1_32/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-sgd-1_32/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-sgd-1_32/static_mutex.obj vc71/libboost_regex-vc71-mt-sgd-1_32/usinstances.obj vc71/libboost_regex-vc71-mt-sgd-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_32/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_32/winstances.obj
+	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-sgd-1_32.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-sgd-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_32/cregex.obj vc71/libboost_regex-vc71-mt-sgd-1_32/fileiter.obj vc71/libboost_regex-vc71-mt-sgd-1_32/icu.obj vc71/libboost_regex-vc71-mt-sgd-1_32/instances.obj vc71/libboost_regex-vc71-mt-sgd-1_32/posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_32/regex.obj vc71/libboost_regex-vc71-mt-sgd-1_32/regex_debug.obj vc71/libboost_regex-vc71-mt-sgd-1_32/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-sgd-1_32/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-sgd-1_32/static_mutex.obj vc71/libboost_regex-vc71-mt-sgd-1_32/usinstances.obj vc71/libboost_regex-vc71-mt-sgd-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_32/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-sgd-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-mt-sgd-1_32/winstances.obj
 
 ########################################################
 #
@@ -292,43 +356,55 @@ libboost_regex-vc71-mt-sgd-1_32_clean :
 #
 ########################################################
 vc71/boost_regex-vc71-mt-gd-1_32/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) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/c_regex_traits.cpp
-
-vc71/boost_regex-vc71-mt-gd-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/c_regex_traits.cpp
 
 vc71/boost_regex-vc71-mt-gd-1_32/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) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc71/boost_regex-vc71-mt-gd-1_32/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) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/cregex.cpp
 
 vc71/boost_regex-vc71-mt-gd-1_32/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) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/fileiter.cpp
+
+vc71/boost_regex-vc71-mt-gd-1_32/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_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/icu.cpp
 
 vc71/boost_regex-vc71-mt-gd-1_32/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) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/instances.cpp
 
 vc71/boost_regex-vc71-mt-gd-1_32/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) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/posix_api.cpp
 
 vc71/boost_regex-vc71-mt-gd-1_32/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) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/regex.cpp
 
 vc71/boost_regex-vc71-mt-gd-1_32/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) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/regex_debug.cpp
 
-vc71/boost_regex-vc71-mt-gd-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/regex_synch.cpp
+vc71/boost_regex-vc71-mt-gd-1_32/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_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc71/boost_regex-vc71-mt-gd-1_32/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_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc71/boost_regex-vc71-mt-gd-1_32/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_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/static_mutex.cpp
+
+vc71/boost_regex-vc71-mt-gd-1_32/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_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/usinstances.cpp
 
 vc71/boost_regex-vc71-mt-gd-1_32/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) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc71/boost_regex-vc71-mt-gd-1_32/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_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc71/boost_regex-vc71-mt-gd-1_32/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) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/wide_posix_api.cpp
 
 vc71/boost_regex-vc71-mt-gd-1_32/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) -Y- -Fo./vc71/boost_regex-vc71-mt-gd-1_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc71/boost_regex-vc71-mt-gd-1_32.pdb ../src/winstances.cpp
 
 boost_regex-vc71-mt-gd-1_32_dir :
 	@if not exist "vc71\boost_regex-vc71-mt-gd-1_32\$(NULL)" mkdir vc71\boost_regex-vc71-mt-gd-1_32
@@ -339,8 +415,8 @@ boost_regex-vc71-mt-gd-1_32_clean :
 	del vc71\boost_regex-vc71-mt-gd-1_32\*.exp
 	del vc71\boost_regex-vc71-mt-gd-1_32\*.pch
 
-./vc71/boost_regex-vc71-mt-gd-1_32.lib : vc71/boost_regex-vc71-mt-gd-1_32/c_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_32/c_regex_traits_common.obj vc71/boost_regex-vc71-mt-gd-1_32/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_32/cregex.obj vc71/boost_regex-vc71-mt-gd-1_32/fileiter.obj vc71/boost_regex-vc71-mt-gd-1_32/instances.obj vc71/boost_regex-vc71-mt-gd-1_32/posix_api.obj vc71/boost_regex-vc71-mt-gd-1_32/regex.obj vc71/boost_regex-vc71-mt-gd-1_32/regex_debug.obj vc71/boost_regex-vc71-mt-gd-1_32/regex_synch.obj vc71/boost_regex-vc71-mt-gd-1_32/w32_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_32/wide_posix_api.obj vc71/boost_regex-vc71-mt-gd-1_32/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_32.pdb" /debug /machine:I386 /out:"vc71/boost_regex-vc71-mt-gd-1_32.dll" /implib:"vc71/boost_regex-vc71-mt-gd-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc71/boost_regex-vc71-mt-gd-1_32/c_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_32/c_regex_traits_common.obj vc71/boost_regex-vc71-mt-gd-1_32/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_32/cregex.obj vc71/boost_regex-vc71-mt-gd-1_32/fileiter.obj vc71/boost_regex-vc71-mt-gd-1_32/instances.obj vc71/boost_regex-vc71-mt-gd-1_32/posix_api.obj vc71/boost_regex-vc71-mt-gd-1_32/regex.obj vc71/boost_regex-vc71-mt-gd-1_32/regex_debug.obj vc71/boost_regex-vc71-mt-gd-1_32/regex_synch.obj vc71/boost_regex-vc71-mt-gd-1_32/w32_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_32/wide_posix_api.obj vc71/boost_regex-vc71-mt-gd-1_32/winstances.obj
+./vc71/boost_regex-vc71-mt-gd-1_32.lib : vc71/boost_regex-vc71-mt-gd-1_32/c_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_32/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_32/cregex.obj vc71/boost_regex-vc71-mt-gd-1_32/fileiter.obj vc71/boost_regex-vc71-mt-gd-1_32/icu.obj vc71/boost_regex-vc71-mt-gd-1_32/instances.obj vc71/boost_regex-vc71-mt-gd-1_32/posix_api.obj vc71/boost_regex-vc71-mt-gd-1_32/regex.obj vc71/boost_regex-vc71-mt-gd-1_32/regex_debug.obj vc71/boost_regex-vc71-mt-gd-1_32/regex_raw_buffer.obj vc71/boost_regex-vc71-mt-gd-1_32/regex_traits_defaults.obj vc71/boost_regex-vc71-mt-gd-1_32/static_mutex.obj vc71/boost_regex-vc71-mt-gd-1_32/usinstances.obj vc71/boost_regex-vc71-mt-gd-1_32/w32_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_32/wc_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_32/wide_posix_api.obj vc71/boost_regex-vc71-mt-gd-1_32/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_32.pdb" /debug /machine:I386 /out:"vc71/boost_regex-vc71-mt-gd-1_32.dll" /implib:"vc71/boost_regex-vc71-mt-gd-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS) $(ICU_LINK_OPTS)  vc71/boost_regex-vc71-mt-gd-1_32/c_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_32/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_32/cregex.obj vc71/boost_regex-vc71-mt-gd-1_32/fileiter.obj vc71/boost_regex-vc71-mt-gd-1_32/icu.obj vc71/boost_regex-vc71-mt-gd-1_32/instances.obj vc71/boost_regex-vc71-mt-gd-1_32/posix_api.obj vc71/boost_regex-vc71-mt-gd-1_32/regex.obj vc71/boost_regex-vc71-mt-gd-1_32/regex_debug.obj vc71/boost_regex-vc71-mt-gd-1_32/regex_raw_buffer.obj vc71/boost_regex-vc71-mt-gd-1_32/regex_traits_defaults.obj vc71/boost_regex-vc71-mt-gd-1_32/static_mutex.obj vc71/boost_regex-vc71-mt-gd-1_32/usinstances.obj vc71/boost_regex-vc71-mt-gd-1_32/w32_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_32/wc_regex_traits.obj vc71/boost_regex-vc71-mt-gd-1_32/wide_posix_api.obj vc71/boost_regex-vc71-mt-gd-1_32/winstances.obj
 
 ########################################################
 #
@@ -348,43 +424,55 @@ boost_regex-vc71-mt-gd-1_32_clean :
 #
 ########################################################
 vc71/boost_regex-vc71-mt-1_32/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) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/c_regex_traits.cpp
-
-vc71/boost_regex-vc71-mt-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/c_regex_traits.cpp
 
 vc71/boost_regex-vc71-mt-1_32/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) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc71/boost_regex-vc71-mt-1_32/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) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/cregex.cpp
 
 vc71/boost_regex-vc71-mt-1_32/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) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/fileiter.cpp
+
+vc71/boost_regex-vc71-mt-1_32/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_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/icu.cpp
 
 vc71/boost_regex-vc71-mt-1_32/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) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/instances.cpp
 
 vc71/boost_regex-vc71-mt-1_32/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) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/posix_api.cpp
 
 vc71/boost_regex-vc71-mt-1_32/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) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/regex.cpp
 
 vc71/boost_regex-vc71-mt-1_32/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) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/regex_debug.cpp
 
-vc71/boost_regex-vc71-mt-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/regex_synch.cpp
+vc71/boost_regex-vc71-mt-1_32/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_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc71/boost_regex-vc71-mt-1_32/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_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc71/boost_regex-vc71-mt-1_32/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_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/static_mutex.cpp
+
+vc71/boost_regex-vc71-mt-1_32/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_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/usinstances.cpp
 
 vc71/boost_regex-vc71-mt-1_32/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) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc71/boost_regex-vc71-mt-1_32/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_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc71/boost_regex-vc71-mt-1_32/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) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/wide_posix_api.cpp
 
 vc71/boost_regex-vc71-mt-1_32/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) -Y- -Fo./vc71/boost_regex-vc71-mt-1_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc71/boost_regex-vc71-mt-1_32.pdb ../src/winstances.cpp
 
 boost_regex-vc71-mt-1_32_dir :
 	@if not exist "vc71\boost_regex-vc71-mt-1_32\$(NULL)" mkdir vc71\boost_regex-vc71-mt-1_32
@@ -395,8 +483,8 @@ boost_regex-vc71-mt-1_32_clean :
 	del vc71\boost_regex-vc71-mt-1_32\*.exp
 	del vc71\boost_regex-vc71-mt-1_32\*.pch
 
-./vc71/boost_regex-vc71-mt-1_32.lib : vc71/boost_regex-vc71-mt-1_32/c_regex_traits.obj vc71/boost_regex-vc71-mt-1_32/c_regex_traits_common.obj vc71/boost_regex-vc71-mt-1_32/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-1_32/cregex.obj vc71/boost_regex-vc71-mt-1_32/fileiter.obj vc71/boost_regex-vc71-mt-1_32/instances.obj vc71/boost_regex-vc71-mt-1_32/posix_api.obj vc71/boost_regex-vc71-mt-1_32/regex.obj vc71/boost_regex-vc71-mt-1_32/regex_debug.obj vc71/boost_regex-vc71-mt-1_32/regex_synch.obj vc71/boost_regex-vc71-mt-1_32/w32_regex_traits.obj vc71/boost_regex-vc71-mt-1_32/wide_posix_api.obj vc71/boost_regex-vc71-mt-1_32/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_32.pdb" /debug /machine:I386 /out:"vc71/boost_regex-vc71-mt-1_32.dll" /implib:"vc71/boost_regex-vc71-mt-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS)  vc71/boost_regex-vc71-mt-1_32/c_regex_traits.obj vc71/boost_regex-vc71-mt-1_32/c_regex_traits_common.obj vc71/boost_regex-vc71-mt-1_32/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-1_32/cregex.obj vc71/boost_regex-vc71-mt-1_32/fileiter.obj vc71/boost_regex-vc71-mt-1_32/instances.obj vc71/boost_regex-vc71-mt-1_32/posix_api.obj vc71/boost_regex-vc71-mt-1_32/regex.obj vc71/boost_regex-vc71-mt-1_32/regex_debug.obj vc71/boost_regex-vc71-mt-1_32/regex_synch.obj vc71/boost_regex-vc71-mt-1_32/w32_regex_traits.obj vc71/boost_regex-vc71-mt-1_32/wide_posix_api.obj vc71/boost_regex-vc71-mt-1_32/winstances.obj
+./vc71/boost_regex-vc71-mt-1_32.lib : vc71/boost_regex-vc71-mt-1_32/c_regex_traits.obj vc71/boost_regex-vc71-mt-1_32/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-1_32/cregex.obj vc71/boost_regex-vc71-mt-1_32/fileiter.obj vc71/boost_regex-vc71-mt-1_32/icu.obj vc71/boost_regex-vc71-mt-1_32/instances.obj vc71/boost_regex-vc71-mt-1_32/posix_api.obj vc71/boost_regex-vc71-mt-1_32/regex.obj vc71/boost_regex-vc71-mt-1_32/regex_debug.obj vc71/boost_regex-vc71-mt-1_32/regex_raw_buffer.obj vc71/boost_regex-vc71-mt-1_32/regex_traits_defaults.obj vc71/boost_regex-vc71-mt-1_32/static_mutex.obj vc71/boost_regex-vc71-mt-1_32/usinstances.obj vc71/boost_regex-vc71-mt-1_32/w32_regex_traits.obj vc71/boost_regex-vc71-mt-1_32/wc_regex_traits.obj vc71/boost_regex-vc71-mt-1_32/wide_posix_api.obj vc71/boost_regex-vc71-mt-1_32/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_32.pdb" /debug /machine:I386 /out:"vc71/boost_regex-vc71-mt-1_32.dll" /implib:"vc71/boost_regex-vc71-mt-1_32.lib" /LIBPATH:$(STLPORT_PATH)\lib $(XLFLAGS) $(ICU_LINK_OPTS)  vc71/boost_regex-vc71-mt-1_32/c_regex_traits.obj vc71/boost_regex-vc71-mt-1_32/cpp_regex_traits.obj vc71/boost_regex-vc71-mt-1_32/cregex.obj vc71/boost_regex-vc71-mt-1_32/fileiter.obj vc71/boost_regex-vc71-mt-1_32/icu.obj vc71/boost_regex-vc71-mt-1_32/instances.obj vc71/boost_regex-vc71-mt-1_32/posix_api.obj vc71/boost_regex-vc71-mt-1_32/regex.obj vc71/boost_regex-vc71-mt-1_32/regex_debug.obj vc71/boost_regex-vc71-mt-1_32/regex_raw_buffer.obj vc71/boost_regex-vc71-mt-1_32/regex_traits_defaults.obj vc71/boost_regex-vc71-mt-1_32/static_mutex.obj vc71/boost_regex-vc71-mt-1_32/usinstances.obj vc71/boost_regex-vc71-mt-1_32/w32_regex_traits.obj vc71/boost_regex-vc71-mt-1_32/wc_regex_traits.obj vc71/boost_regex-vc71-mt-1_32/wide_posix_api.obj vc71/boost_regex-vc71-mt-1_32/winstances.obj
 
 ########################################################
 #
@@ -404,43 +492,55 @@ boost_regex-vc71-mt-1_32_clean :
 #
 ########################################################
 vc71/libboost_regex-vc71-mt-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/c_regex_traits.cpp
-
-vc71/libboost_regex-vc71-mt-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/c_regex_traits.cpp
 
 vc71/libboost_regex-vc71-mt-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc71/libboost_regex-vc71-mt-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/cregex.cpp
 
 vc71/libboost_regex-vc71-mt-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/fileiter.cpp
+
+vc71/libboost_regex-vc71-mt-1_32/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_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/icu.cpp
 
 vc71/libboost_regex-vc71-mt-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/instances.cpp
 
 vc71/libboost_regex-vc71-mt-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/posix_api.cpp
 
 vc71/libboost_regex-vc71-mt-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/regex.cpp
 
 vc71/libboost_regex-vc71-mt-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/regex_debug.cpp
 
-vc71/libboost_regex-vc71-mt-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/regex_synch.cpp
+vc71/libboost_regex-vc71-mt-1_32/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_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc71/libboost_regex-vc71-mt-1_32/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_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc71/libboost_regex-vc71-mt-1_32/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_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/static_mutex.cpp
+
+vc71/libboost_regex-vc71-mt-1_32/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_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/usinstances.cpp
 
 vc71/libboost_regex-vc71-mt-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc71/libboost_regex-vc71-mt-1_32/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_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc71/libboost_regex-vc71-mt-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/wide_posix_api.cpp
 
 vc71/libboost_regex-vc71-mt-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-1_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc71-mt-1_32_dir :
 	@if not exist "vc71\libboost_regex-vc71-mt-1_32\$(NULL)" mkdir vc71\libboost_regex-vc71-mt-1_32
@@ -451,8 +551,8 @@ libboost_regex-vc71-mt-1_32_clean :
 	del vc71\libboost_regex-vc71-mt-1_32\*.exp
 	del vc71\libboost_regex-vc71-mt-1_32\*.pch
 
-./vc71/libboost_regex-vc71-mt-1_32.lib : vc71/libboost_regex-vc71-mt-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-mt-1_32/c_regex_traits_common.obj vc71/libboost_regex-vc71-mt-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-1_32/cregex.obj vc71/libboost_regex-vc71-mt-1_32/fileiter.obj vc71/libboost_regex-vc71-mt-1_32/instances.obj vc71/libboost_regex-vc71-mt-1_32/posix_api.obj vc71/libboost_regex-vc71-mt-1_32/regex.obj vc71/libboost_regex-vc71-mt-1_32/regex_debug.obj vc71/libboost_regex-vc71-mt-1_32/regex_synch.obj vc71/libboost_regex-vc71-mt-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-mt-1_32/winstances.obj
-	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-1_32.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-mt-1_32/c_regex_traits_common.obj vc71/libboost_regex-vc71-mt-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-1_32/cregex.obj vc71/libboost_regex-vc71-mt-1_32/fileiter.obj vc71/libboost_regex-vc71-mt-1_32/instances.obj vc71/libboost_regex-vc71-mt-1_32/posix_api.obj vc71/libboost_regex-vc71-mt-1_32/regex.obj vc71/libboost_regex-vc71-mt-1_32/regex_debug.obj vc71/libboost_regex-vc71-mt-1_32/regex_synch.obj vc71/libboost_regex-vc71-mt-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-mt-1_32/winstances.obj
+./vc71/libboost_regex-vc71-mt-1_32.lib : vc71/libboost_regex-vc71-mt-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-mt-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-1_32/cregex.obj vc71/libboost_regex-vc71-mt-1_32/fileiter.obj vc71/libboost_regex-vc71-mt-1_32/icu.obj vc71/libboost_regex-vc71-mt-1_32/instances.obj vc71/libboost_regex-vc71-mt-1_32/posix_api.obj vc71/libboost_regex-vc71-mt-1_32/regex.obj vc71/libboost_regex-vc71-mt-1_32/regex_debug.obj vc71/libboost_regex-vc71-mt-1_32/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-1_32/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-1_32/static_mutex.obj vc71/libboost_regex-vc71-mt-1_32/usinstances.obj vc71/libboost_regex-vc71-mt-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-1_32/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-mt-1_32/winstances.obj
+	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-1_32.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-mt-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-1_32/cregex.obj vc71/libboost_regex-vc71-mt-1_32/fileiter.obj vc71/libboost_regex-vc71-mt-1_32/icu.obj vc71/libboost_regex-vc71-mt-1_32/instances.obj vc71/libboost_regex-vc71-mt-1_32/posix_api.obj vc71/libboost_regex-vc71-mt-1_32/regex.obj vc71/libboost_regex-vc71-mt-1_32/regex_debug.obj vc71/libboost_regex-vc71-mt-1_32/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-1_32/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-1_32/static_mutex.obj vc71/libboost_regex-vc71-mt-1_32/usinstances.obj vc71/libboost_regex-vc71-mt-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-1_32/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-mt-1_32/winstances.obj
 
 ########################################################
 #
@@ -460,43 +560,55 @@ libboost_regex-vc71-mt-1_32_clean :
 #
 ########################################################
 vc71/libboost_regex-vc71-mt-gd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/c_regex_traits.cpp
-
-vc71/libboost_regex-vc71-mt-gd-1_32/c_regex_traits_common.obj: ../src/c_regex_traits_common.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) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/c_regex_traits_common.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/c_regex_traits.cpp
 
 vc71/libboost_regex-vc71-mt-gd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/cpp_regex_traits.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/cpp_regex_traits.cpp
 
 vc71/libboost_regex-vc71-mt-gd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/cregex.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/cregex.cpp
 
 vc71/libboost_regex-vc71-mt-gd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/fileiter.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/fileiter.cpp
+
+vc71/libboost_regex-vc71-mt-gd-1_32/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_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/icu.cpp
 
 vc71/libboost_regex-vc71-mt-gd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/instances.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/instances.cpp
 
 vc71/libboost_regex-vc71-mt-gd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/posix_api.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/posix_api.cpp
 
 vc71/libboost_regex-vc71-mt-gd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/regex.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/regex.cpp
 
 vc71/libboost_regex-vc71-mt-gd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/regex_debug.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/regex_debug.cpp
 
-vc71/libboost_regex-vc71-mt-gd-1_32/regex_synch.obj: ../src/regex_synch.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) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/regex_synch.cpp
+vc71/libboost_regex-vc71-mt-gd-1_32/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_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/regex_raw_buffer.cpp
+
+vc71/libboost_regex-vc71-mt-gd-1_32/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_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/regex_traits_defaults.cpp
+
+vc71/libboost_regex-vc71-mt-gd-1_32/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_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/static_mutex.cpp
+
+vc71/libboost_regex-vc71-mt-gd-1_32/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_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/usinstances.cpp
 
 vc71/libboost_regex-vc71-mt-gd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/w32_regex_traits.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/w32_regex_traits.cpp
+
+vc71/libboost_regex-vc71-mt-gd-1_32/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_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/wc_regex_traits.cpp
 
 vc71/libboost_regex-vc71-mt-gd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/wide_posix_api.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/wide_posix_api.cpp
 
 vc71/libboost_regex-vc71-mt-gd-1_32/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) -Y- -Fo./vc71/libboost_regex-vc71-mt-gd-1_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/winstances.cpp
+	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_32/ -Fdvc71/libboost_regex-vc71-mt-gd-1_32.pdb ../src/winstances.cpp
 
 libboost_regex-vc71-mt-gd-1_32_dir :
 	@if not exist "vc71\libboost_regex-vc71-mt-gd-1_32\$(NULL)" mkdir vc71\libboost_regex-vc71-mt-gd-1_32
@@ -507,6 +619,6 @@ libboost_regex-vc71-mt-gd-1_32_clean :
 	del vc71\libboost_regex-vc71-mt-gd-1_32\*.exp
 	del vc71\libboost_regex-vc71-mt-gd-1_32\*.pch
 
-./vc71/libboost_regex-vc71-mt-gd-1_32.lib : vc71/libboost_regex-vc71-mt-gd-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_32/c_regex_traits_common.obj vc71/libboost_regex-vc71-mt-gd-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_32/cregex.obj vc71/libboost_regex-vc71-mt-gd-1_32/fileiter.obj vc71/libboost_regex-vc71-mt-gd-1_32/instances.obj vc71/libboost_regex-vc71-mt-gd-1_32/posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_32/regex.obj vc71/libboost_regex-vc71-mt-gd-1_32/regex_debug.obj vc71/libboost_regex-vc71-mt-gd-1_32/regex_synch.obj vc71/libboost_regex-vc71-mt-gd-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_32/winstances.obj
-	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-gd-1_32.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-gd-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_32/c_regex_traits_common.obj vc71/libboost_regex-vc71-mt-gd-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_32/cregex.obj vc71/libboost_regex-vc71-mt-gd-1_32/fileiter.obj vc71/libboost_regex-vc71-mt-gd-1_32/instances.obj vc71/libboost_regex-vc71-mt-gd-1_32/posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_32/regex.obj vc71/libboost_regex-vc71-mt-gd-1_32/regex_debug.obj vc71/libboost_regex-vc71-mt-gd-1_32/regex_synch.obj vc71/libboost_regex-vc71-mt-gd-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_32/winstances.obj
+./vc71/libboost_regex-vc71-mt-gd-1_32.lib : vc71/libboost_regex-vc71-mt-gd-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_32/cregex.obj vc71/libboost_regex-vc71-mt-gd-1_32/fileiter.obj vc71/libboost_regex-vc71-mt-gd-1_32/icu.obj vc71/libboost_regex-vc71-mt-gd-1_32/instances.obj vc71/libboost_regex-vc71-mt-gd-1_32/posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_32/regex.obj vc71/libboost_regex-vc71-mt-gd-1_32/regex_debug.obj vc71/libboost_regex-vc71-mt-gd-1_32/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-gd-1_32/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-gd-1_32/static_mutex.obj vc71/libboost_regex-vc71-mt-gd-1_32/usinstances.obj vc71/libboost_regex-vc71-mt-gd-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_32/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_32/winstances.obj
+	link -lib /nologo /out:vc71/libboost_regex-vc71-mt-gd-1_32.lib $(XSFLAGS)  vc71/libboost_regex-vc71-mt-gd-1_32/c_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_32/cpp_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_32/cregex.obj vc71/libboost_regex-vc71-mt-gd-1_32/fileiter.obj vc71/libboost_regex-vc71-mt-gd-1_32/icu.obj vc71/libboost_regex-vc71-mt-gd-1_32/instances.obj vc71/libboost_regex-vc71-mt-gd-1_32/posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_32/regex.obj vc71/libboost_regex-vc71-mt-gd-1_32/regex_debug.obj vc71/libboost_regex-vc71-mt-gd-1_32/regex_raw_buffer.obj vc71/libboost_regex-vc71-mt-gd-1_32/regex_traits_defaults.obj vc71/libboost_regex-vc71-mt-gd-1_32/static_mutex.obj vc71/libboost_regex-vc71-mt-gd-1_32/usinstances.obj vc71/libboost_regex-vc71-mt-gd-1_32/w32_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_32/wc_regex_traits.obj vc71/libboost_regex-vc71-mt-gd-1_32/wide_posix_api.obj vc71/libboost_regex-vc71-mt-gd-1_32/winstances.obj
 
diff --git a/build/vc_gen.sh b/build/vc_gen.sh
index 8756c98c..a22af770 100644
--- a/build/vc_gen.sh
+++ b/build/vc_gen.sh
@@ -46,7 +46,7 @@ EOF
 		obj="$subdir$stlport_suffix/$libname/$obj"
 		all_obj="$all_obj $obj"
 		echo "$obj: $file \$(ALL_HEADER)" >> $tout
-		echo "	cl \$(INCLUDES) $opts \$(CXXFLAGS) -Y- -Fo./$subdir$stlport_suffix/$libname/ -Fd$subdir$stlport_suffix/$libname.pdb $file" >> $tout
+		echo "	cl \$(INCLUDES) $opts \$(CXXFLAGS) \$(ICU_COMPILE_OPTS) -Y- -Fo./$subdir$stlport_suffix/$libname/ -Fd$subdir$stlport_suffix/$libname.pdb $file" >> $tout
 		echo "" >> $tout
 	done
 #
@@ -96,7 +96,7 @@ EOF
 		obj="$subdir$stlport_suffix/$libname/$obj"
 		all_obj="$all_obj $obj"
 		echo "$obj: $file \$(ALL_HEADER)" >> $tout
-		echo "	cl \$(INCLUDES) $opts \$(CXXFLAGS) -Y- -Fo./$subdir$stlport_suffix/$libname/ -Fd$subdir$stlport_suffix/$libname.pdb $file" >> $tout
+		echo "	cl \$(INCLUDES) $opts \$(CXXFLAGS) \$(ICU_COMPILE_OPTS) -Y- -Fo./$subdir$stlport_suffix/$libname/ -Fd$subdir$stlport_suffix/$libname.pdb $file" >> $tout
 		echo "" >> $tout
 	done
 #
@@ -116,7 +116,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) $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 "" >> $tout
 }
 
@@ -181,6 +181,10 @@ function vc6_gen()
 #   brings libraries up to date and copies binaries to your VC6 /lib and /bin directories (recomended)
 #
 
+#
+# path to ICU library installation goes here:
+#
+ICU_PATH=
 #
 # Add additional compiler options here:
 #
@@ -208,6 +212,18 @@ NULL=nul
 !ERROR Variable MSVCDIR not set.
 !ENDIF
 
+!IF "\$(ICU_PATH)" == ""
+ICU_COMPILE_OPTS=
+ICU_LINK_OPTS=
+!MESSAGE Building Boost.Regex without ICU / Unicode support:
+!MESSAGE Hint: set ICU_PATH on the nmake command line to point 
+!MESSAGE to your ICU installation if you have one.
+!ELSE
+ICU_COMPILE_OPTS= -DBOOST_HAS_ICU=1 -I\$(ICU_PATH)\\include
+ICU_LINK_OPTS= /LIBPATH:\$(ICU_PATH)\\lib icuin.lib icuuc.lib
+!MESSAGE Building Boost.Regex with ICU in \$(ICU_PATH)
+!ENDIF
+
 EOF
 	echo "" >> $out
 	echo "ALL_HEADER=$header" >> $out
@@ -289,6 +305,10 @@ function vc6_stlp_gen()
 #   brings libraries up to date and copies binaries to your VC6 /lib and /bin directories (recomended)
 #
 
+#
+# ICU setup:
+#
+ICU_PATH=
 #
 # Add additional compiler options here:
 #
@@ -320,6 +340,18 @@ NULL=nul
 !ERROR Variable STLPORT_PATH not set.
 !ENDIF
 
+!IF "\$(ICU_PATH)" == ""
+ICU_COMPILE_OPTS=
+ICU_LINK_OPTS=
+!MESSAGE Building Boost.Regex without ICU / Unicode support:
+!MESSAGE Hint: set ICU_PATH on the nmake command line to point 
+!MESSAGE to your ICU installation if you have one.
+!ELSE
+ICU_COMPILE_OPTS= -DBOOST_HAS_ICU=1 -I\$(ICU_PATH)\\include
+ICU_LINK_OPTS= /LIBPATH:\$(ICU_PATH)\\lib icuin.lib icuuc.lib
+!MESSAGE Building Boost.Regex with ICU in \$(ICU_PATH)
+!ENDIF
+
 EOF
 	echo "" >> $out
 	echo "ALL_HEADER=$header" >> $out
@@ -368,8 +400,6 @@ subdir="vc7"
 vc6_gen
 #
 # generate vc7-stlport makefile:
-debug_extra="/GX /RTC1"
-release_extra=""
 is_stlport="yes"
 out="vc7-stlport.mak"
 no_single="yes"
@@ -377,8 +407,6 @@ subdir="vc7"
 vc6_stlp_gen
 #
 # generate vc71 makefile:
-debug_extra="/GX /RTC1 /Zc:wchar_t"
-release_extra="/Zc:wchar_t"
 is_stlport="no"
 out="vc71.mak"
 no_single="no"
@@ -386,8 +414,6 @@ subdir="vc71"
 vc6_gen
 #
 # generate vc71-stlport makefile:
-debug_extra="/GX /RTC1"
-release_extra=""
 is_stlport="yes"
 out="vc71-stlport.mak"
 no_single="yes"
@@ -406,4 +432,3 @@ rm -f $tout $iout
 
 
 
-
diff --git a/doc/Attic/bad_expression.html b/doc/Attic/bad_expression.html
index ee19c3a2..aee75368 100644
--- a/doc/Attic/bad_expression.html
+++ b/doc/Attic/bad_expression.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
    <head>
-      <title>Boost.Regex: bad_expression</title>
+      <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">
@@ -15,7 +15,7 @@
             </td>
             <td width="353">
                <h1 align="center">Boost.Regex</h1>
-               <h2 align="center">class bad_expression</h2>
+               <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>
@@ -27,51 +27,55 @@
       <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>bad_expression</code> defines the type of objects thrown as 
+      <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> bad_pattern : <b>public</b> std::runtime_error
+<b>class</b> regex_error : <b>public</b> std::runtime_error
 {
 <b>public</b>:
-   <b>explicit</b> bad_pattern(<b>const</b> std::string&amp; s) : std::runtime_error(s){};
-};
-
-<b>class</b> bad_expression : <b>public</b> bad_pattern
-{
-<b>public</b>:
-   bad_expression(<b>const</b> std::string&amp; s) : bad_pattern(s) {}
+   <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>
-bad_expression(const string&amp; what_arg);
-</pre>
-      <p><b>Effects:</b> Constructs an object of class <code>bad_expression</code>.</p>
-      <b></b>
-      <p><b>Postcondition:</b> <code>strcmp(what(), what_arg.c_str()) == 0</code>.</p>
-      <p>Footnotes: the class <i>bad_pattern</i> forms the base class for all 
-         pattern-matching exceptions, of which <i>bad_expression</i> is one. The choice 
-         of <i>std::runtime_error</i> as the base class for <i>bad_pattern</i> 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).</p>
+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 Oct 2003 
+         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 --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
    </body>
 </html>
+
diff --git a/doc/Attic/basic_regex.html b/doc/Attic/basic_regex.html
index c72500c1..c7a25d2e 100644
--- a/doc/Attic/basic_regex.html
+++ b/doc/Attic/basic_regex.html
@@ -29,23 +29,22 @@
 #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 three template parameters:</p>
+         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.</p>
+         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>.</p>
-      <p><b><i>Allocator</i></b>: the allocator class used to allocate memory by the 
-         class.</p>
+         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 allocators, you 
-         won't need to use anything other than these:</p>
+         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;, <b>class</b> Allocator = std::allocator&lt;charT&gt;  &gt;
+<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;
+<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 
@@ -53,60 +52,60 @@
       <pre>
 namespace boost{
 
-template &lt;class charT,
-          class traits = regex_traits&lt;charT&gt;,
-          class Allocator = allocator&lt;charT&gt; &gt;
-class basic_regex
-{
-public:
+template &lt;class  charT, class traits = regex_traits&lt;charT&gt; &gt;
+class basic_regex {
+   public:          
    // types:
    typedef          charT                                value_type;
-   typedef          implementation defined               const_iterator;
-   typedef          const_iterator                       iterator;
-   typedef typename Allocator::reference                 reference;
-   typedef typename Allocator::const_reference           const_reference;
-   typedef typename Allocator::difference_type           difference_type;
-   typedef typename Allocator::size_type                 size_type;
-   typedef          Allocator                            allocator_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:
-   static const regex_constants::syntax_option_type normal = regex_constants::normal;
-   static const regex_constants::syntax_option_type icase = regex_constants::icase;
-   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 ECMAScript = normal;
-   static const regex_constants::syntax_option_type JavaScript = normal;
-   static const regex_constants::syntax_option_type JScript = normal;
-   // these flags are optional, if the functionality is supported
-   // then the flags shall take these names.
-   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;
+   // 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;
 
    // construct/copy/destroy:
-   explicit <A href="#c1">basic_regex</A>(const Allocator&amp; a = Allocator());
-   explicit <A href="#c2">basic_regex</A>(const charT* p, flag_type f = regex_constants::normal,
-                        const Allocator&amp; a = Allocator());
-   <A href="#c3">basic_regex</A>(const charT* p1, const charT* p2, flag_type f = regex_constants::normal,
-               const Allocator&amp; a = Allocator());
-   <A href="#c4">basic_regex</A>(const charT* p, size_type len, flag_type f,
-               const Allocator&amp; a = Allocator());
+   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,
-                        const Allocator&amp; a = Allocator());
+   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,
-               const Allocator&amp; a = Allocator());
+   <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;);
@@ -134,7 +133,6 @@ public:
                        flag_type f = regex_constants::normal);
 
    // const operations:
-   Allocator <A href="#m7">get_allocator</A>() const;
    flag_type <A href="#m8">flags</A>() const;
    basic_string&lt;charT&gt; <A href="#m9">str</A>() const;
    int <A href="#m10">compare</A>(basic_regex&amp;) const;
@@ -145,33 +143,33 @@ public:
    void <A href="#m13">swap</A>(basic_regex&amp;) throw();
 };
 
-template &lt;class charT, class traits, class Allocator&gt;
-bool <A href="#o4">operator</A> == (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
-template &lt;class charT, class traits, class Allocator&gt;
-bool <A href="#o5">operator</A> != (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
-template &lt;class charT, class traits, class Allocator&gt;
-bool <A href="#o7">operator</A> &lt; (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                 const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
-template &lt;class charT, class traits, class Allocator&gt;
-bool <A href="#o8">operator</A> &lt;= (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
-template &lt;class charT, class traits, class Allocator&gt;
-bool <A href="#o9">operator</A> &gt;= (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
-template &lt;class charT, class traits, class Allocator&gt;
-bool <A href="#o10">operator</A> &gt; (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                 const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
+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, class Allocator&gt;
+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, Allocator&gt;&amp; e);
+                const basic_regex&lt;charT, re_traits&gt;&amp; e);
 
-template &lt;class charT, class traits, class Allocator&gt;
-void <A href="#o12">swap</A>(basic_regex&lt;charT, traits, Allocator&gt;&amp; e1,
-          basic_regex&lt;charT, traits, Allocator&gt;&amp; e2);
+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;
@@ -182,21 +180,34 @@ typedef basic_regex&lt;wchar_t&gt; wregex;
       <p>Class&nbsp;<em>basic_regex</em> has the following public member functions:</p>
       <h4>basic_regex constants</h4>
       <pre>
-static const regex_constants::syntax_option_type normal = regex_constants::normal;
-static const regex_constants::syntax_option_type icase = regex_constants::icase;
-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 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;
+// 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">
@@ -204,11 +215,7 @@ static const regex_constants::syntax_option_type perl = regex_constants::perl;
          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>
-      <p>In all <code>basic_regex</code> constructors, a copy of the <code>Allocator</code>
-         argument is used for any memory allocation performed by the constructor or 
-         member functions during the lifetime of the object.</p>
-      <pre>
-basic_regex(const Allocator&amp; a = Allocator());
+      <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>
@@ -252,7 +259,7 @@ basic_regex(const Allocator&amp; a = Allocator());
             </table>
          </center>
       </div>
-      <pre> <A name=c2></A>basic_regex(const charT* p, flag_type f = regex_constants::normal, const Allocator&amp; a = Allocator());
+      <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>
@@ -322,7 +329,7 @@ basic_regex(const Allocator&amp; a = Allocator());
       <pre>
  
 </pre>
-      <PRE><A name=c3></A>basic_regex(const charT* p1, const charT* p2, flag_type f = regex_constants::normal, const Allocator&amp; a = Allocator());</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.</p>
@@ -390,8 +397,7 @@ basic_regex(const Allocator&amp; a = Allocator());
       <pre>
  
 </pre>
-      <pre><A name=c4></A>
-basic_regex(const charT* p, size_type len, flag_type f, const Allocator&amp; a = Allocator());
+      <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 
@@ -457,11 +463,7 @@ basic_regex(const charT* p, size_type len, flag_type f, const Allocator&amp; a =
             </table>
          </center>
       </div>
-      <pre>
-  
-</pre>
-      <pre><A name=c5></A>
-basic_regex(const basic_regex&amp; e);
+      <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 
@@ -522,14 +524,9 @@ basic_regex(const basic_regex&amp; e);
             </table>
          </center>
       </div>
-      <pre>
- 
-</pre>
-      <pre>
+      <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, const Allocator&amp; a = Allocator());
+<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.</p>
@@ -594,14 +591,9 @@ basic_regex(const basic_string&lt;charT, ST, SA&gt;&amp; s,
             </table>
          </center>
       </div>
-      <pre>
- 
-</pre>
-      <pre>
+      <pre><BR>
 template &lt;class ForwardIterator&gt;
-<A name=c7></A>
-basic_regex(ForwardIterator first, ForwardIterator last,
-            flag_type f = regex_constants::normal, const Allocator&amp; a = Allocator());
+<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.</p>
@@ -667,15 +659,11 @@ basic_regex(ForwardIterator first, ForwardIterator last,
             </table>
          </center>
       </div>
-      <pre>
-  
-</pre>
       <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><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>
@@ -685,23 +673,23 @@ 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></A>
+      <pre>
 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></A>
+      <pre>
 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></A>
+      <pre>
 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></A>
+      <pre>
 size_type max_size() const;
 </pre>
       <p><b>Effects:</b> Returns the maximum length of the sequence of characters 
@@ -716,7 +704,7 @@ bool empty() const;
       <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></A>
+      <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>
@@ -803,11 +791,7 @@ basic_regex&amp; assign(InputIterator first, InputIterator last,
          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>Allocator get_allocator() const;
-</pre>
-      <p><b>Effects:</b> Returns a copy of the Allocator that was passed to the object's 
-         constructor.</p>
-      <pre><A name=m8></A>flag_type flags() const;
+      <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>
@@ -834,7 +818,7 @@ locale_type getloc() const;
             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></A>
+      <pre>
 void swap(basic_regex&amp; e) throw();
 </pre>
       <p><b>Effects:</b> Swaps the contents of the two regular expressions.</p>
@@ -847,66 +831,65 @@ void swap(basic_regex&amp; e) throw();
          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, class Allocator&gt;
-bool operator == (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
+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, class Allocator&gt;
-bool operator != (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
+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, class Allocator&gt;
-bool operator &lt; (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                 const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
+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, class Allocator&gt;
-bool operator &lt;= (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
+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, class Allocator&gt;
-bool operator &gt;= (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
+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, class Allocator&gt;
-bool operator &gt; (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                 const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
+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, class Allocator&gt;
+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, Allocator&gt;&amp; e);
+                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, class Allocator&gt;
-void swap(basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-          basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
+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 
+      <p>Revised 7 Aug 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         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 --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
diff --git a/doc/Attic/captures.html b/doc/Attic/captures.html
index 95f0dd09..fe0232f8 100644
--- a/doc/Attic/captures.html
+++ b/doc/Attic/captures.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
    <head>
-      <title>Boost.Regex: Index</title>
+      <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>
diff --git a/doc/Attic/character_class_names.html b/doc/Attic/character_class_names.html
new file mode 100644
index 00000000..576e45d0
--- /dev/null
+++ b/doc/Attic/character_class_names.html
@@ -0,0 +1,326 @@
+<!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
new file mode 100644
index 00000000..c553f1ed
--- /dev/null
+++ b/doc/Attic/collating_names.html
@@ -0,0 +1,368 @@
+<!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
new file mode 100644
index 00000000..ed598933
--- /dev/null
+++ b/doc/Attic/concepts.html
@@ -0,0 +1,453 @@
+<!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
index 3d61b272..9da777e7 100644
--- a/doc/Attic/configuration.html
+++ b/doc/Attic/configuration.html
@@ -1,225 +1,155 @@
 <!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>
-
-<dt><a href="#locale">Locale and traits class selection</a></dt>
-
-<dt><a href="#linkage">Linkage Options</a></dt>
-
-<dt><a href="#algorithm">Algorithm Selection</a></dt>
-
-<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 the default behavior on non-windows
-platforms, but MS Windows platforms normally use the Win32 API for
-locale support.</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.</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_C_LOCALE unless
-BOOST_REGEX_USE_CPP_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_V3</td>
-<td>Tells boost.regex to use the boost-1.30.0 matching algorithm,
-define only if you need maximum compatibility with previous
-behavior.</td>
-</tr>
-
-<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 
+   <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 --> 
-         24 Oct 2003 
+         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 --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-</body>
+   </body>
 </html>
-
-
diff --git a/doc/Attic/error_type.html b/doc/Attic/error_type.html
new file mode 100644
index 00000000..1f2754b8
--- /dev/null
+++ b/doc/Attic/error_type.html
@@ -0,0 +1,140 @@
+<!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 <a href="mailto:jm@regex.fsnet.co.uk">John Maddock</a>&nbsp;1998-<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></I></P>
+      <P align="left"><I>Permission to use, copy, modify, distribute and sell this software 
+            and its documentation for any purpose is hereby granted without fee, provided 
+            that the above copyright notice appear in all copies and that both that 
+            copyright notice and this permission notice appear in supporting documentation. 
+            Dr John Maddock makes no representations about the suitability of this software 
+            for any purpose. It is provided "as is" without express or implied warranty.</I></P>
+   </body>
+</html>
diff --git a/doc/Attic/examples.html b/doc/Attic/examples.html
index e1fd5ba9..8f73b69a 100644
--- a/doc/Attic/examples.html
+++ b/doc/Attic/examples.html
@@ -25,36 +25,71 @@
       <BR>
       <BR>
       <HR>
-      <P>There are three demo applications that ship with this library, they all come 
-         with makefiles for Borland, Microsoft and gcc compilers, otherwise you will 
-         have to create your own makefiles.</P>
-      <H5>regress.exe:</H5>
+      <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>Files: <A href="../test/regress/parse.cpp">parse.cpp</A>, <A href="../test/regress/regress.cpp">
-            regress.cpp</A>, <A href="../test/regress/tests.cpp">tests.cpp</A>.</P>
-      <H5>jgrep.exe</H5>
+      <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>jgrep.exe</H4>
       <P>A simple grep implementation, run with no command line options to find out its 
          usage. Look at <A href="../src/fileiter.cpp">fileiter.cpp</A>/fileiter.hpp and 
          the mapfile class to see an example of a "smart" bidirectional iterator that 
          can be used with boost.regex or any other STL algorithm.</P>
       <P>Files: <A href="../example/jgrep/jgrep.cpp">jgrep.cpp</A>, <A href="../example/jgrep/main.cpp">
             main.cpp</A>.</P>
-      <H5>timer.exe</H5>
+      <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>
-      <H5>Code snippets</H5>
+      <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>: 
@@ -66,30 +101,20 @@
       <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_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_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 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         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 --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
    </body>
 </html>
-
diff --git a/doc/Attic/format_boost_syntax.html b/doc/Attic/format_boost_syntax.html
new file mode 100644
index 00000000..d497ddeb
--- /dev/null
+++ b/doc/Attic/format_boost_syntax.html
@@ -0,0 +1,163 @@
+<!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
new file mode 100644
index 00000000..481a141a
--- /dev/null
+++ b/doc/Attic/format_perl_syntax.html
@@ -0,0 +1,150 @@
+<!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
new file mode 100644
index 00000000..ee0a331b
--- /dev/null
+++ b/doc/Attic/format_sed_syntax.html
@@ -0,0 +1,109 @@
+<!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
index e77aa82b..c7061d21 100644
--- a/doc/Attic/format_syntax.html
+++ b/doc/Attic/format_syntax.html
@@ -1,263 +1,52 @@
 <!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: 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></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">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 extended,
-the extended syntax is a superset of the others so this is covered
-first.</p>
-
-<p><b><i>Extended format syntax</i></b></p>
-
-<p>In format strings, all characters are treated as literals
-except: ()$\?:</p>
-
-<p>To use any of these as literals you must prefix them with the
-escape character \</p>
-
-<p>The following special sequences are recognized:&nbsp;<br>
- &nbsp;<br>
- <i>Grouping:</i></p>
-
-<p>Use the parenthesis characters ( and ) to group sub-expressions
-within the format string, use \( and \) to represent literal '('
-and ')'.&nbsp;<br>
- &nbsp;<br>
- <i>Sub-expression expansions:</i></p>
-
-<p>The following Perl like expressions expand to a particular
-matched sub-expression:<br>
- &nbsp;</p>
-
-<p></p>
-
-<table id="Table2" cellspacing="0" cellpadding="7" width="100%"
-border="0">
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="40%">$`</td>
-<td valign="top" width="43%">Expands to all the text from the end
-of the previous match to the start of the current match, if there
-was no previous match in the current operation, then everything
-from the start of the input string to the start of the match.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="40%">$'</td>
-<td valign="top" width="43%">Expands to all the text from the end
-of the match to the end of the input string.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="40%">$&amp;</td>
-<td valign="top" width="43%">Expands to all of the current
-match.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="40%">$0</td>
-<td valign="top" width="43%">Expands to all of the current
-match.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="40%">$N</td>
-<td valign="top" width="43%">Expands to the text that matched
-sub-expression <i>N</i>.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-</table>
-
-<br>
-<br>
- 
-
-<p><i>Conditional expressions:</i></p>
-
-<p>Conditional expressions allow two different format strings to be
-selected dependent upon whether a sub-expression participated in
-the match or not:</p>
-
-<p>?Ntrue_expression:false_expression</p>
-
-<p>Executes true_expression if sub-expression <i>N</i> participated
-in the match, otherwise executes false_expression.</p>
-
-<p>Example: suppose we search for "(while)|(for)" then the format
-string "?1WHILE:FOR" would output what matched, but in upper
-case.&nbsp;<br>
- &nbsp;<br>
- <i>Escape sequences:</i></p>
-
-<p>The following escape sequences are also allowed:<br>
-</p>
-
-<p></p>
-
-<table id="Table3" cellspacing="0" cellpadding="7" width="100%"
-border="0">
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="40%">\a</td>
-<td valign="top" width="43%">The bell character.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="40%">\f</td>
-<td valign="top" width="43%">The form feed character.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="40%">\n</td>
-<td valign="top" width="43%">The newline character.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="40%">\r</td>
-<td valign="top" width="43%">The carriage return character.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="40%">\t</td>
-<td valign="top" width="43%">The tab character.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="40%">\v</td>
-<td valign="top" width="43%">A vertical tab character.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="40%">\x</td>
-<td valign="top" width="43%">A hexadecimal character - for example
-\x0D.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="40%">\x{}</td>
-<td valign="top" width="43%">A possible Unicode hexadecimal
-character - for example \x{1A0}</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="40%">\cx</td>
-<td valign="top" width="43%">The ASCII escape character x, for
-example \c@ is equivalent to escape-@.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="40%">\e</td>
-<td valign="top" width="43%">The ASCII escape character.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="40%">\dd</td>
-<td valign="top" width="43%">An octal character constant, for
-example \10.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-</table>
-
-<br>
-<br>
- 
-
-<p><b><i>Perl format strings</i></b></p>
-
-<p>Perl format strings are the same as the default syntax except
-that the characters ()?: have no special meaning.</p>
-
-<p><b><i>Sed format strings</i></b></p>
-
-<p>Sed format strings use only the characters \ and &amp; as
-special characters.</p>
-
-<p>\n where n is a digit, is expanded to the nth
-sub-expression.</p>
-
-<p>&amp; is expanded to the whole of the match (equivalent to
-\0).</p>
-
-<p>Other escape sequences are expanded as per the default
-syntax.</p>
-
-<p></p>
-
-<hr>
+   <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 Oct 2003 
+         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 --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            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>
+   </body>
 </html>
-
-
diff --git a/doc/Attic/headers.html b/doc/Attic/headers.html
index c58f8662..031d33fe 100644
--- a/doc/Attic/headers.html
+++ b/doc/Attic/headers.html
@@ -25,9 +25,9 @@
       <HR>
       <p></p>
       <P>There are two main headers used by this library: &lt;boost/regex.hpp&gt; 
-         provides full access to the entire library, while &lt;boost/cregex.hpp&gt; 
-         provides access to just the high level class RegEx, and the POSIX API 
-         functions.
+         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 
@@ -35,16 +35,14 @@
       <P>
          <HR>
       <P></P>
-      <p>Revised 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         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 --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
    </body>
 </html>
-
diff --git a/doc/Attic/history.html b/doc/Attic/history.html
index 03a8abce..6f3618e5 100644
--- a/doc/Attic/history.html
+++ b/doc/Attic/history.html
@@ -24,6 +24,26 @@
       </P>
       <HR>
       <p></p>
+      <P>Boost 1.33.0.</P>
+      <UL>
+         <LI>
+         Completely rewritten expression parsing code, and traits class support; now 
+         conforms to the standardization proposal.
+         <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></UL>
       <P>Boost 1.32.1.</P>
       <UL>
          <LI>
@@ -59,12 +79,12 @@
       <P>
          <HR>
       <P></P>
-      <p>Revised 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         22 Dec 2003 
+         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 -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
diff --git a/doc/Attic/icu_strings.html b/doc/Attic/icu_strings.html
new file mode 100644
index 00000000..45c5bffb
--- /dev/null
+++ b/doc/Attic/icu_strings.html
@@ -0,0 +1,467 @@
+<!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.hmtl">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/install.html b/doc/Attic/install.html
index 92241e2b..ffc1e996 100644
--- a/doc/Attic/install.html
+++ b/doc/Attic/install.html
@@ -1,23 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
    <head>
-      <title>Boost.Regex: Index</title>
+      <title>Boost.Regex: Installation</title>
       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
+      <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" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
+               <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" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
+                  <h3><A href="index.html"><IMG height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></A></h3>
                </td>
             </TR>
          </TABLE>
@@ -41,8 +40,23 @@
          or archive file before you can use it, instructions for specific platforms are 
          as follows:
       </P>
-      <P><B><A name="bcb"></A>Borland C++ Builder:</B>
-      </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; To do that 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 you might use:</P>
+      <PRE>bjam -sICU_PATH=/usr/local -sTOOLS=<A href="../../../more/getting_started.html#Tools" >my-compiler</A></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>.</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 
@@ -84,7 +98,7 @@
       </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 staically 
+         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>
@@ -94,7 +108,7 @@
          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>
-      <P><B><A name="vc"></A>Microsoft Visual C++ 6</B><STRONG> and 7</STRONG></P>
+      <H3><A name="vc"></A>Microsoft Visual C++ 6 and 7</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>
@@ -117,14 +131,17 @@
       <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 
+      <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>
@@ -155,26 +172,28 @@
             modify the makefile to add /Zc:wchar_t before building the library.
          </LI>
       </UL>
-      <P><B><A name="gcc"></A>GCC(2.95 and 3.x)</B>
-      </P>
-      <P>The best way to&nbsp;build with gcc is using the <A href="../../../more/getting_started.html">
-            normal boost Jamfile in &lt;boost&gt;/libs/regex/build</A>, 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:
+      <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-gcc-1_32.a and 
-         libboost_regex-gcc-d-1_32.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-gcc-1_32.a to your list 
-         of library files.
+         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&nbsp;libboost_regex-gcc-1_32.so and 
-         libboost_regex-gcc-d-1_32.so.</P>
+      <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>
@@ -183,7 +202,7 @@
       <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>
-      <P><B><A name="sun"></A>Sun Workshop 6.1</B></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>
@@ -206,29 +225,22 @@
          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>
-      <P><B><A name="other"></A>Other compilers:</B>
-      </P>
-      <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.
-      <P>
-         Alternatively you can using the <A href="../../../more/getting_started.html">Jam 
-            based build system</A>: cd into &lt;boost&gt;/libs/regex/build and run:<PRE>bjam -sTOOLS=mytoolset</PRE>
-      <P>
-         If you need to configure the library for your platform, then refer to the <A href="../../config/config.htm">
-            config library documentation</A>
-      .
-      <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 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         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 -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--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
index 069295c8..df9762e9 100644
--- a/doc/Attic/introduction.html
+++ b/doc/Attic/introduction.html
@@ -42,8 +42,7 @@
       <pre><B>namespace </B>boost{
 
 <B>template</B> &lt;<B>class</B> charT, 
-<B>          class</B> traits = regex_traits&lt;charT&gt;, 
-          <B>class</B> Allocator = std::allocator&lt;charT&gt; &gt;
+<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;
diff --git a/doc/Attic/localisation.html b/doc/Attic/localisation.html
index 07e9b0a1..31bd8663 100644
--- a/doc/Attic/localisation.html
+++ b/doc/Attic/localisation.html
@@ -1,1023 +1,808 @@
 <!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: Localisation</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">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 there is a single global locale as
-defined by the user's control panel settings, and returned by
-GetUserDefaultLCID. 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>Note that this API sets the dll name for <i>both</i> the narrow
-and wide character specializations of w32_regex_traits.</p>
-
-<p>This model does not currently support thread specific locales
-(via SetThreadLocale under Windows NT), 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 is the default model when the library is compiled under an
-operating system other than Win32, and 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. Front end
-localization requires a POSIX message catalogue. 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 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::c_regex_traits&lt;char&gt;::set_message_catalogue("mycatalogue");</p>
-
-<p>Note that this API sets the dll name for <i>both</i> the narrow
-and wide character specializations of c_regex_traits. If your run
-time library does not support POSIX message catalogues, then you
-can either provide your own implementation of &lt;nl_types.h&gt; or
-define BOOST_RE_NO_CAT to disable front-end localization via
-message catalogues.</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 only in effect if the library is built with the
-pre-processor symbol BOOST_REGEX_USE_CPP_LOCALE defined. 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;. This model is the one which closest fits the
-ethos of the C++ standard library, however it is the model which
-will produce the slowest code, and which is the least well
-supported by current standard library implementations, for example
-I have yet to find an implementation of std::locale which supports
-either message catalogues, or locales other than "C" or
-"POSIX".</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 or 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 
+   <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 --> 
-         24 Oct 2003 
+         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 --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-</body>
+   </body>
 </html>
-
-
diff --git a/doc/Attic/match_flag_type.html b/doc/Attic/match_flag_type.html
index eaf44bb6..fec767e4 100644
--- a/doc/Attic/match_flag_type.html
+++ b/doc/Attic/match_flag_type.html
@@ -28,12 +28,12 @@
       <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 descibed in more 
+         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>implementation-specific-bitmask-type</EM> match_flag_type;
+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;
@@ -70,10 +70,10 @@ static const match_flag_type format_all;
       <table id="Table2" cellspacing="1" cellpadding="7" width="100%" border="0">
          <tr>
             <td valign="top" width="50%">
-               <p>Element</p>
+               <p><STRONG>Element</STRONG></p>
             </td>
             <td valign="top" width="50%">
-               <p>Effect if set</p>
+               <p><STRONG>Effect if set</STRONG></p>
             </td>
          </tr>
          <tr>
@@ -88,12 +88,12 @@ static const match_flag_type format_all;
          </tr>
          <tr>
             <td valign="top" width="50%">match_not_bob</td>
-            <td valign="top" width="50%">Specifies that the expression "\A" should not match 
-               against the sub-sequence [first,first).</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 
+            <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>
@@ -119,8 +119,8 @@ static const match_flag_type format_all;
                <p>match_not_bow</p>
             </td>
             <td valign="top" width="50%">
-               <p>Specifies that the expression "\b" should not be matched against the 
-                  sub-sequence [first,first).</p>
+               <p>Specifies that the expressions "\&lt;" and&nbsp;"\b" should not be matched 
+                  against the sub-sequence [first,first).</p>
             </td>
          </tr>
          <tr>
@@ -128,8 +128,8 @@ static const match_flag_type format_all;
                <p>match_not_eow</p>
             </td>
             <td valign="top" width="50%">
-               <p>Specifies that the expression "\b" should not be matched against the 
-                  sub-sequence [last,last).</p>
+               <p>Specifies that the expressions "\&gt;" and&nbsp;"\b" should not be matched 
+                  against the sub-sequence [last,last).</p>
             </td>
          </tr>
          <tr>
@@ -138,7 +138,10 @@ static const match_flag_type format_all;
             </td>
             <td valign="top" width="50%">
                <p>Specifies that if more than one match is possible then any match is an 
-                  acceptable result.</p>
+                  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>
@@ -280,3 +283,4 @@ static const match_flag_type format_all;
             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
index 7309a327..f158c0f8 100644
--- a/doc/Attic/match_results.html
+++ b/doc/Attic/match_results.html
@@ -51,7 +51,7 @@
       <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 = allocator&lt;sub_match&lt;BidirectionalIterator&gt; &gt;
+          class Allocator = std::allocator&lt;sub_match&lt;BidirectionalIterator&gt; &gt;
 class match_results;
 
 typedef match_results&lt;const char*&gt; cmatch;
@@ -60,7 +60,7 @@ typedef match_results&lt;string::const_iterator&gt; smatch;
 typedef match_results&lt;wstring::const_iterator&gt; wsmatch;
 
 template &lt;class BidirectionalIterator,
-          class Allocator = allocator&lt;sub_match&lt;BidirectionalIterator&gt; &gt;
+          class Allocator = std::allocator&lt;sub_match&lt;BidirectionalIterator&gt; &gt;
 class match_results
 { 
 public: 
@@ -455,4 +455,3 @@ void swap(match_results&lt;BidirectionalIterator, Allocator&gt;&amp; m1,
             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
new file mode 100644
index 00000000..f1d733b7
--- /dev/null
+++ b/doc/Attic/mfc_strings.html
@@ -0,0 +1,294 @@
+<!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
new file mode 100644
index 00000000..5196abcf
--- /dev/null
+++ b/doc/Attic/non_standard_strings.html
@@ -0,0 +1,53 @@
+<!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/redistributables.html b/doc/Attic/redistributables.html
index db2492e1..cdad4739 100644
--- a/doc/Attic/redistributables.html
+++ b/doc/Attic/redistributables.html
@@ -32,51 +32,22 @@
          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 following 
-         formula:<BR>
+         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></P>
-      <P>BOOST_LIB_PREFIX<BR>
-         + "boost_regex_"<BR>
-         + BOOST_LIB_TOOLSET<BR>
-         + "_"<BR>
-         + BOOST_LIB_THREAD_OPT<BR>
-         + BOOST_LIB_RT_OPT<BR>
-         + BOOST_LIB_DEBUG_OPT<BR>
-         <BR>
-         These are defined as:</P>
-      <P>BOOST_LIB_PREFIX: Either "lib" if this is a static link library, 
-         or&nbsp;nothing for dynamic / shared&nbsp;libraries.<BR>
-         <BR>
-         BOOST_LIB_TOOLSET: The compiler toolset name (vc6, vc7, bcb5 etc).<BR>
-         <BR>
-         BOOST_LIB_THREAD_OPT: "s" for single thread builds,<BR>
-         "m" for multithread builds.<BR>
-         <BR>
-         BOOST_LIB_RT_OPT: "s" for static runtime,<BR>
-         "d" for dynamic runtime.<BR>
-         <BR>
-         BOOST_LIB_LINK_OPT: "s" for static link,<BR>
-         "i" for dynamic link.<BR>
-         <BR>
-         BOOST_LIB_DEBUG_OPT: nothing for release builds,<BR>
-         "d" for debug builds,<BR>
-         "dd" for debug-diagnostic builds (_STLP_DEBUG).</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 statically 
-      link even though you're using the dll version of your run time library, or if 
-      you need to debug boost.regex.
       <P>
          <HR>
       <P></P>
-      <p>Revised 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         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 --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
diff --git a/doc/Attic/regex_grep.html b/doc/Attic/regex_grep.html
index f4c23f26..30afa48a 100644
--- a/doc/Attic/regex_grep.html
+++ b/doc/Attic/regex_grep.html
@@ -37,11 +37,11 @@
          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, <b>class</b> Allocator&gt;
+<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, Allocator&gt;&amp; e,
+                         <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 
@@ -49,16 +49,16 @@
          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> Allocator, <b>class</b> traits&gt;
+<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, Allocator&gt;&amp; e, 
+              <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> Allocator, <b>class</b> charT, <b>class</b> traits&gt;
+<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, Allocator&gt;&amp; e, 
+              <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 
@@ -101,23 +101,19 @@
       <br>
       <br>
       <p>The algorithm finds all of the non-overlapping matches of the expression e, for 
-         each match it fills a <a href="#reg_match">match_results</a>&lt;iterator, 
-         Allocator&gt; structure, which contains information on what matched, and calls 
-         the predicate foo, passing the match_results&lt;iterator, Allocator&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>
+         each match it fills a <a href="#reg_match">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, typename expression_type::alloc_type::template rebind&lt;sub_match&lt;BidirectionalIterator&gt; &gt;::other&gt;&amp; m);
+ <b>  bool</b> <b>operator</b>()(<b>const</b> match_results&lt;iterator_type&gt;&amp; m);
 };
 </pre>
-      <p>Note that in almost every case the allocator parameter can be omitted, when 
-         specifying the <a href="match_results.html">match_results</a> type, 
-         alternatively one of the typedefs cmatch, wcmatch, smatch or wsmatch can be 
-         used.</p>
       <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 
@@ -370,7 +366,7 @@ index[std::string(what[5].first, what[5].second) + std::string(what[6].first, wh
       <hr>
       <p>Revised 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         04 Feb 2004 
+         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>
diff --git a/doc/Attic/regex_iterator.html b/doc/Attic/regex_iterator.html
index c4f99994..3bde1c1d 100644
--- a/doc/Attic/regex_iterator.html
+++ b/doc/Attic/regex_iterator.html
@@ -37,12 +37,11 @@
       <pre>
 template &lt;class BidirectionalIterator, 
           class charT = iterator_traits&lt;BidirectionalIterator&gt;::value_type,
-          class traits = regex_traits&lt;charT&gt;,
-          class Allocator = allocator&lt;charT&gt; &gt;
+          class traits = regex_traits&lt;charT&gt; &gt;
 class regex_iterator 
 {
 public:
-   typedef          <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator&gt;                   regex_type;
+   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;
@@ -63,12 +62,23 @@ public:
    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
+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>
@@ -300,6 +310,20 @@ regex_iterator operator++(int);
          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>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 
@@ -419,12 +443,12 @@ color=
 }
 </pre>
       <hr>
-      <p>Revised 
+      <p>Revised&nbsp;&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         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 -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--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>
diff --git a/doc/Attic/regex_match.html b/doc/Attic/regex_match.html
index dc007760..31c5eba6 100644
--- a/doc/Attic/regex_match.html
+++ b/doc/Attic/regex_match.html
@@ -42,46 +42,44 @@
          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, class Allocator2&gt;
+         <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, Allocator2&gt;&amp; e,
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default);
-                 
-template &lt;class BidirectionalIterator, class charT, class traits, class Allocator2&gt;
+                 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, Allocator2&gt;&amp; e,
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default);
-                 
-template &lt;class charT, class Allocator, class traits, class Allocator2&gt;
+                 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, Allocator2&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, class Allocator2&gt;
+                 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, Allocator2&gt;&amp; e, 
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default);
-                 
-template &lt;class charT, class traits, class Allocator2&gt;
+                 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, Allocator2&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, class Allocator2&gt;
+                 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, Allocator2&gt;&amp; e,
+                 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, class Allocator2&gt;
+         <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, Allocator2&gt;&amp; e,
+                 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>
@@ -237,36 +235,36 @@ bool regex_match(BidirectionalIterator first, BidirectionalIterator last,
       <P></P>
       <DIV></DIV>
       <PRE>&nbsp;</PRE>
-      <PRE><A name=f2></A>template &lt;class BidirectionalIterator, class charT, class traits, class Allocator2&gt;
+      <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, Allocator2&gt;&amp; e,
+                 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, class Allocator2&gt;
+      <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, Allocator2&gt;&amp; e,
+                 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, class Allocator2&gt;
+      <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, Allocator2&gt;&amp; e, 
+                 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, class Allocator2&gt;
+      <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, Allocator2&gt;&amp; e,
+                 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, class Allocator2&gt;
+      <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, Allocator2&gt;&amp; e,
+                 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>.
@@ -307,13 +305,12 @@ regex expression(<FONT color=#000080>"([0-9]+)(\\-| |$)(.*)"</FONT>);
       <P>
          <HR></PRE>
       <P></P>
-      <p>Revised 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         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 --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
diff --git a/doc/Attic/regex_replace.html b/doc/Attic/regex_replace.html
index f7a9c267..8ae8bb01 100644
--- a/doc/Attic/regex_replace.html
+++ b/doc/Attic/regex_replace.html
@@ -35,29 +35,27 @@
          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 Allocator, class charT&gt;
+         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, Allocator&gt;&amp; e,
+                           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 Allocator, class charT&gt;
+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, Allocator&gt;&amp; e,
+                            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 Allocator, class charT&gt;
+         <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, Allocator&gt;&amp; e,
+                           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, 
@@ -126,9 +124,9 @@ OutputIterator regex_replace(OutputIterator out,
             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 Allocator, class charT&gt;
+      <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, Allocator&gt;&amp; e,
+                            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>, 
@@ -245,13 +243,12 @@ boost::regex e1, e2;
 <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 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         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 --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
diff --git a/doc/Attic/regex_search.html b/doc/Attic/regex_search.html
index aab58a63..22691687 100644
--- a/doc/Attic/regex_search.html
+++ b/doc/Attic/regex_search.html
@@ -35,55 +35,47 @@
          match could conceivably start at that position. The algorithm is defined as 
          follows:
          <PRE>template &lt;class BidirectionalIterator, 
-          class Allocator, class charT,
-          class traits, class Allocator2&gt;
+          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, Allocator2&gt;&amp; e,
+                  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, class Allocator2&gt; 
+          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, Allocator2&gt;&amp; e, 
+                  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, 
-         class Allocator2&gt; 
+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, Allocator2&gt;&amp; e,
+                  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 Allocator,
-          class charT, class traits&gt;                
+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, Allocator&gt;&amp; e, 
+                  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; 
+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, Allocator&gt;&amp; e, 
+                  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;
+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, Allocator&gt;&amp; e,
+                  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, class Allocator2&gt;
+         <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, Allocator2&gt;&amp; e,
+                  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>
@@ -234,38 +226,36 @@ bool regex_search(BidirectionalIterator first, BidirectionalIterator last,
                </TD></TR></TABLE>
          </CENTER>
       </DIV>
-      <PRE><A name=f2></A>template &lt;class charT, class Allocator, class traits, class Allocator2&gt;
+      <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, Allocator2&gt;&amp; e,
+                  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, class Allocator2&gt;
+          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, Allocator2&gt;&amp; e,
+                  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 Allocator, class charT,
-          class traits&gt;
+      <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, Allocator&gt;&amp; e,
+                  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 Allocator, class traits&gt;
+      <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, Allocator&gt;&amp; e,
+                  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 Allocator, class charT,
-          class traits&gt;
+      <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, Allocator&gt;&amp; e,
+                  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>.
@@ -314,7 +304,7 @@ void</B> IndexClasses(map_type&amp; m, <B>const</B> std::string&amp; file)
       <HR>
       <p>Revised 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         04 Feb 2004 
+         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>
diff --git a/doc/Attic/regex_split.html b/doc/Attic/regex_split.html
index 8fb0ba7d..a3b7b293 100644
--- a/doc/Attic/regex_split.html
+++ b/doc/Attic/regex_split.html
@@ -35,17 +35,17 @@
       <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, <B>class</B> Alloc2&gt;
+      <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, Alloc2&gt;&amp; e,
+&nbsp;<B>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;const</B> basic_regex&lt;charT, Traits2&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, <B>class</B> Alloc2&gt;
+<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, Alloc2&gt;&amp; e,
+&nbsp;<B>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;const</B> basic_regex&lt;charT, Traits2&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;
@@ -132,9 +132,9 @@ boost::regex e(<FONT color=#000080>"&lt;\\s*A\\s+[^&gt;]*href\\s*=\\s*\"([^\"]*)
    <B>return</B> 0;
 }</PRE>
       <HR>
-      <p>Revised 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         04 Feb 2004 
+         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>
diff --git a/doc/Attic/regex_token_iterator.html b/doc/Attic/regex_token_iterator.html
index 947ff37a..9bd59050 100644
--- a/doc/Attic/regex_token_iterator.html
+++ b/doc/Attic/regex_token_iterator.html
@@ -41,14 +41,12 @@
       <PRE>
 template &lt;class BidirectionalIterator, 
           class charT = iterator_traits&lt;BidirectionalIterator&gt;::value_type,
-          class traits = regex_traits&lt;charT&gt;,
-          class Allocator = allocator&lt;charT&gt; &gt;
+          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, Allocator&gt;                   regex_type;
-   typedef          <A href="sub_match.html">sub_match</A>                     
-             &lt;BidirectionalIterator&gt;                                     value_type;
+   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;
@@ -78,6 +76,48 @@ typedef regex_token_iterator&lt;std::string::const_iterator&gt;   sregex_token_i
 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>
@@ -171,7 +211,54 @@ regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const reg
       <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>
-         <H3>Examples</H3>
+         <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>
@@ -280,14 +367,15 @@ boost::regex e(<FONT color=#0000ff>"&lt;\\s*A\\s+[^&gt;]*href\\s*=\\s*\"([^\"]*)
 }
 </pre>
       <HR>
-      <p>Revised 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         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 -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
    </body>
 </html>
+
diff --git a/doc/Attic/regex_traits.html b/doc/Attic/regex_traits.html
index 052ee99f..dc1708f7 100644
--- a/doc/Attic/regex_traits.html
+++ b/doc/Attic/regex_traits.html
@@ -23,22 +23,63 @@
          </TABLE>
       </P>
       <HR>
-      <p></p>
-      <P>
-         Under construction: the current design will be replaced by that specified in 
-         the <A href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1429.htm">regular 
-            expression standardization proposal</A>, the current (obsolete) design has 
-         it's <A href="http://cvs.sourceforge.net/viewcvs.py/*checkout*/boost/boost/libs/regex/Attic/traits_class_ref.htm?rev=1.11">
-            documentation archived online</A>.</P>
-      <P>
-         <HR>
+      <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 Oct 2003 
+         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 -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--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>
diff --git a/doc/Attic/standards.html b/doc/Attic/standards.html
index 0e1b0ee1..17fe78a2 100644
--- a/doc/Attic/standards.html
+++ b/doc/Attic/standards.html
@@ -27,8 +27,7 @@
       <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; Currently there are some differences in how the regular 
-         expression traits classes are defined, these will be fixed in a future release.</P>
+         standard).&nbsp;</P>
       <H3>ECMAScript / JavaScript</H3>
       <P>All of the ECMAScript regular expression syntax features are supported, except 
          that:</P>
@@ -39,16 +38,18 @@
          Unicode escape sequences.</P>
       <H3>Perl</H3>
       <P>Almost all Perl features are supported, except for:</P>
-      <P>\N{name}&nbsp; Use [[:name:]] instead.</P>
-      <P>\pP and \PP</P>
-      <P>(?imsx-imsx)</P>
-      <P>(?&lt;=pattern)</P>
-      <P>(?&lt;!pattern)</P>
-      <P>(?{code})</P>
-      <P>(??{code})</P>
-      <P>(?(condition)yes-pattern) and (?(condition)yes-pattern|no-pattern)</P>
-      <P>These embarrassments / limitations will be removed in due course, mainly 
-         dependent upon user demand.</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>
@@ -60,18 +61,176 @@
          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>
-         <HR>
-      <p>Revised 
+      <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_string.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 --> 
-         24 Oct 2003 
+         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 --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
    </body>
 </html>
 
-
diff --git a/doc/Attic/sub_match.html b/doc/Attic/sub_match.html
index 3a86f192..388d6773 100644
--- a/doc/Attic/sub_match.html
+++ b/doc/Attic/sub_match.html
@@ -62,7 +62,15 @@
          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;
 {
@@ -323,10 +331,11 @@ basic_ostream&lt;charT, traits&gt;&amp;
          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.
+            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 match_extra 
+            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>
@@ -550,13 +559,13 @@ basic_ostream&lt;charT, traits&gt;&amp;
          <HR>
       <p>Revised 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         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 -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--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
index b4022514..e2b62f87 100644
--- a/doc/Attic/syntax.html
+++ b/doc/Attic/syntax.html
@@ -25,742 +25,29 @@
       <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 flags used during expression compilation.
-      </P>
-      <H3>Literals
-      </H3>
-      <P>All characters are literals except: ".", "|", "*", "?", "+", "(", ")", "{", 
-         "}", "[", "]", "^", "$" and "\". These characters are literals when preceded by 
-         a "\". A literal is a character that matches itself, or matches the result of 
-         traits_type::translate(), where traits_type is the traits template parameter to 
-         class basic_regex.</P>
-      <H3>Wildcard
-      </H3>
-      <P>The dot character "." matches any single character except : when <I>match_not_dot_null</I>
-         is passed to the matching algorithms, the dot does not match a null character; 
-         when <I>match_not_dot_newline</I> is passed to the matching algorithms, then 
-         the dot does not match a newline character.
-      </P>
-      <H3>Repeats
-      </H3>
-      <P>A repeat is an expression that is repeated an arbitrary number of times. An 
-         expression followed by "*" can be repeated any number of times including zero. 
-         An expression followed by "+" can be repeated any number of times, but at least 
-         once, if the expression is compiled with the flag regex_constants::bk_plus_qm 
-         then "+" is an ordinary character and "\+" represents a repeat of once or more. 
-         An expression followed by "?" may be repeated zero or one times only, if the 
-         expression is compiled with the flag regex_constants::bk_plus_qm then "?" is an 
-         ordinary character and "\?" represents the repeat zero or once operator. When 
-         it is necessary to specify the minimum and maximum number of repeats 
-         explicitly, the bounds operator "{}" may be used, thus "a{2}" is the letter "a" 
-         repeated exactly twice, "a{2,4}" represents the letter "a" repeated between 2 
-         and 4 times, and "a{2,}" represents the letter "a" repeated at least twice with 
-         no upper limit. Note that there must be no white-space inside the {}, and there 
-         is no upper limit on the values of the lower and upper bounds. When the 
-         expression is compiled with the flag regex_constants::bk_braces then "{" and 
-         "}" are ordinary characters and "\{" and "\}" are used to delimit bounds 
-         instead. All repeat expressions refer to the shortest possible previous 
-         sub-expression: a single character; a character set, or a sub-expression 
-         grouped with "()" for example.
-      </P>
-      <P>Examples:
-      </P>
-      <P>"ba*" will match all of "b", "ba", "baaa" etc.
-      </P>
-      <P>"ba+" will match "ba" or "baaaa" for example but not "b".
-      </P>
-      <P>"ba?" will match "b" or "ba".
-      </P>
-      <P>"ba{2,4}" will match "baa", "baaa" and "baaaa".
-      </P>
-      <H3>Non-greedy repeats
-      </H3>
-      <P>Whenever the "extended" regular expression syntax is in use (the default) then 
-         non-greedy repeats are possible by appending a '?' after the repeat; a 
-         non-greedy repeat is one which will match the <I>shortest</I> possible string.
-      </P>
-      <P>For example to match html tag pairs one could use something like:
-      </P>
-      <P>"&lt;\s*tagname[^&gt;]*&gt;(.*?)&lt;\s*/tagname\s*&gt;"
-      </P>
-      <P>In this case $1 will contain the text between the tag pairs, and will be the 
-         shortest possible matching string.&nbsp;
-      </P>
-      <H3>Parenthesis
-      </H3>
-      <P>Parentheses serve two purposes, to group items together into a sub-expression, 
-         and to mark what generated the match. For example the expression "(ab)*" would 
-         match all of the string "ababab". The matching algorithms <A href="regex_match.html">
-            regex_match</A> and <A href="regex_search.html">regex_search</A> each take 
-         an instance of <A href="match_results.html">match_results</A> that reports what 
-         caused the match, on exit from these functions the <A href="match_results.html">match_results</A>
-         contains information both on what the whole expression matched and on what each 
-         sub-expression matched. In the example above match_results[1] would contain a 
-         pair of iterators denoting the final "ab" of the matching string. It is 
-         permissible for sub-expressions to match null strings. If a sub-expression 
-         takes no part in a match - for example if it is part of an alternative that is 
-         not taken - then both of the iterators that are returned for that 
-         sub-expression point to the end of the input string, and the <I>matched</I> parameter 
-         for that sub-expression is <I>false</I>. Sub-expressions are indexed from left 
-         to right starting from 1, sub-expression 0 is the whole expression.
-      </P>
-      <H3>Non-Marking Parenthesis
-      </H3>
-      <P>Sometimes you need to group sub-expressions with parenthesis, but don't want 
-         the parenthesis to spit out another marked sub-expression, in this case a 
-         non-marking parenthesis (?:expression) can be used. For example the following 
-         expression creates no sub-expressions:
-      </P>
-      <P>"(?:abc)*"</P>
-      <H3>Forward Lookahead Asserts&nbsp;
-      </H3>
-      <P>There are two forms of these; one for positive forward lookahead asserts, and 
-         one for negative lookahead asserts:</P>
-      <P>"(?=abc)" matches zero characters only if they are followed by the expression 
-         "abc".</P>
-      <P>"(?!abc)" matches zero characters only if they are not followed by the 
-         expression "abc".</P>
-      <H3>Independent sub-expressions</H3>
-      <P>"(?&gt;expression)" matches "expression" as an independent atom (the algorithm 
-         will not backtrack into it if a failure occurs later in the expression).</P>
-      <H3>Alternatives
-      </H3>
-      <P>Alternatives occur when the expression can match either one sub-expression or 
-         another, each alternative is separated by a "|", or a "\|" if the flag 
-         regex_constants::bk_vbar is set, or by a newline character if the flag 
-         regex_constants::newline_alt is set. Each alternative is the largest possible 
-         previous sub-expression; this is the opposite behavior from repetition 
-         operators.
-      </P>
-      <P>Examples:
-      </P>
-      <P>"a(b|c)" could match "ab" or "ac".
-      </P>
-      <P>"abc|def" could match "abc" or "def".
-      </P>
-      <H3>Sets
-      </H3>
-      <P>A set is a set of characters that can match any single character that is a 
-         member of the set. Sets are delimited by "[" and "]" and can contain literals, 
-         character ranges, character classes, collating elements and equivalence 
-         classes. Set declarations that start with "^" contain the complement of the 
-         elements that follow.
-      </P>
-      <P>Examples:
-      </P>
-      <P>Character literals:
-      </P>
-      <P>"[abc]" will match either of "a", "b", or "c".
-      </P>
-      <P>"[^abc] will match any character other than "a", "b", or "c".
-      </P>
-      <P>Character ranges:
-      </P>
-      <P>"[a-z]" will match any character in the range "a" to "z".
-      </P>
-      <P>"[^A-Z]" will match any character other than those in the range "A" to "Z".
-      </P>
-      <P>Note that character ranges are highly locale dependent if the flag 
-         regex_constants::collate is set: they match any character that collates between 
-         the endpoints of the range, ranges will only behave according to ASCII rules 
-         when the default "C" locale is in effect. For example if the library is 
-         compiled with the Win32 localization model, then [a-z] will match the ASCII 
-         characters a-z, and also 'A', 'B' etc, but not 'Z' which collates just after 
-         'z'. This locale specific behavior is disabled by default (in perl mode), and 
-         forces ranges to collate according to ASCII character code.
-      </P>
-      <P>Character classes are denoted using the syntax "[:classname:]" within a set 
-         declaration, for example "[[:space:]]" is the set of all whitespace characters. 
-         Character classes are only available if the flag regex_constants::char_classes 
-         is set. The available character classes are:
-         <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="50%">alnum</TD>
-               <TD vAlign="top" width="50%">Any alpha numeric character.</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">alpha</TD>
-               <TD vAlign="top" width="50%">Any alphabetical character a-z and A-Z. Other 
-                  characters may also be included depending upon the locale.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">blank</TD>
-               <TD vAlign="top" width="50%">Any blank character, either a space or a tab.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">cntrl</TD>
-               <TD vAlign="top" width="50%">Any control character.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">digit</TD>
-               <TD vAlign="top" width="50%">Any digit 0-9.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">graph</TD>
-               <TD vAlign="top" width="50%">Any graphical character.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">lower</TD>
-               <TD vAlign="top" width="50%">Any lower case character a-z. Other characters may 
-                  also be included depending upon the locale.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">print</TD>
-               <TD vAlign="top" width="50%">Any printable character.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">punct</TD>
-               <TD vAlign="top" width="50%">Any punctuation character.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">space</TD>
-               <TD vAlign="top" width="50%">Any whitespace character.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">upper</TD>
-               <TD vAlign="top" width="50%">Any upper case character A-Z. Other characters may 
-                  also be included depending upon the locale.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">xdigit</TD>
-               <TD vAlign="top" width="50%">Any hexadecimal digit character, 0-9, a-f and A-F.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">word</TD>
-               <TD vAlign="top" width="50%">Any word character - all alphanumeric characters plus 
-                  the underscore.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">Unicode</TD>
-               <TD vAlign="top" width="50%">Any character whose code is greater than 255, this 
-                  applies to the wide character traits classes only.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <P>There are some shortcuts that can be used in place of the character classes, 
-         provided the flag regex_constants::escape_in_lists is set then you can use:
-      </P>
-      <P>\w in place of [:word:]
-      </P>
-      <P>\s in place of [:space:]
-      </P>
-      <P>\d in place of [:digit:]
-      </P>
-      <P>\l in place of [:lower:]
-      </P>
-      <P>\u in place of [:upper:]&nbsp;
-      </P>
-      <P>Collating elements take the general form [.tagname.] inside a set declaration, 
-         where <I>tagname</I> is either a single character, or a name of a collating 
-         element, for example [[.a.]] is equivalent to [a], and [[.comma.]] is 
-         equivalent to [,]. The library supports all the standard POSIX collating 
-         element names, and in addition the following digraphs: "ae", "ch", "ll", "ss", 
-         "nj", "dz", "lj", each in lower, upper and title case variations. 
-         Multi-character collating elements can result in the set matching more than one 
-         character, for example [[.ae.]] would match two characters, but note that 
-         [^[.ae.]] would only match one character.&nbsp;
-      </P>
-      <P>
-         Equivalence classes take the generalform[=tagname=] inside a set declaration, 
-         where <I>tagname</I> is either a single character, or a name of a collating 
-         element, and matches any character that is a member of the same primary 
-         equivalence class as the collating element [.tagname.]. An equivalence class is 
-         a set of characters that collate the same, a primary equivalence class is a set 
-         of characters whose primary sort key are all the same (for example strings are 
-         typically collated by character, then by accent, and then by case; the primary 
-         sort key then relates to the character, the secondary to the accentation, and 
-         the tertiary to the case). If there is no equivalence class corresponding to <I>tagname</I>
-         ,then[=tagname=] is exactly the same as [.tagname.]. Unfortunately there is no 
-         locale independent method of obtaining the primary sort key for a character, 
-         except under Win32. For other operating systems the library will "guess" the 
-         primary sort key from the full sort key (obtained from <I>strxfrm</I>), so 
-         equivalence classes are probably best considered broken under any operating 
-         system other than Win32.&nbsp;
-      </P>
-      <P>To include a literal "-" in a set declaration then: make it the first character 
-         after the opening "[" or "[^", the endpoint of a range, a collating element, or 
-         if the flag regex_constants::escape_in_lists is set then precede with an escape 
-         character as in "[\-]". To include a literal "[" or "]" or "^" in a set then 
-         make them the endpoint of a range, a collating element, or precede with an 
-         escape character if the flag regex_constants::escape_in_lists is set.
-      </P>
-      <H3>Line anchors
-      </H3>
-      <P>An anchor is something that matches the null string at the start or end of a 
-         line: "^" matches the null string at the start of a line, "$" matches the null 
-         string at the end of a line.
-      </P>
-      <H3>Back references
-      </H3>
-      <P>A back reference is a reference to a previous sub-expression that has already 
-         been matched, the reference is to what the sub-expression matched, not to the 
-         expression itself. A back reference consists of the escape character "\" 
-         followed by a digit "1" to "9", "\1" refers to the first sub-expression, "\2" 
-         to the second etc. For example the expression "(.*)\1" matches any string that 
-         is repeated about its mid-point for example "abcabc" or "xyzxyz". A back 
-         reference to a sub-expression that did not participate in any match, matches 
-         the null string: NB this is different to some other regular expression 
-         matchers. Back references are only available if the expression is compiled with 
-         the flag regex_constants::bk_refs set.
-      </P>
-      <H3>Characters by code
-      </H3>
-      <P>This is an extension to the algorithm that is not available in other libraries, 
-         it consists of the escape character followed by the digit "0" followed by the 
-         octal character code. For example "\023" represents the character whose octal 
-         code is 23. Where ambiguity could occur use parentheses to break the expression 
-         up: "\0103" represents the character whose code is 103, "(\010)3 represents the 
-         character 10 followed by "3". To match characters by their hexadecimal code, 
-         use \x followed by a string of hexadecimal digits, optionally enclosed inside 
-         {}, for example \xf0 or \x{aff}, notice the latter example is a Unicode 
-         character.</P>
-      <H3>Word operators
-      </H3>
-      <P>The following operators are provided for compatibility with the GNU regular 
-         expression library.
-      </P>
-      <P>"\w" matches any single character that is a member of the "word" character 
-         class, this is identical to the expression "[[:word:]]".
-      </P>
-      <P>"\W" matches any single character that is not a member of the "word" character 
-         class, this is identical to the expression "[^[:word:]]".
-      </P>
-      <P>"\&lt;" matches the null string at the start of a word.
-      </P>
-      <P>"\&gt;" matches the null string at the end of the word.
-      </P>
-      <P>"\b" matches the null string at either the start or the end of a word.
-      </P>
-      <P>"\B" matches a null string within a word.
-      </P>
-      <P>The start of the sequence passed to the matching algorithms is considered to be 
-         a potential start of a word unless the flag match_not_bow is set. The end of 
-         the sequence passed to the matching algorithms is considered to be a potential 
-         end of a word unless the flag match_not_eow is set.
-      </P>
-      <H3>Buffer operators
-      </H3>
-      <P>The following operators are provided for compatibility with the GNU regular 
-         expression library, and Perl regular expressions:
-      </P>
-      <P>"\`" matches the start of a buffer.
-      </P>
-      <P>"\A" matches the start of the buffer.
-      </P>
-      <P>"\'" matches the end of a buffer.
-      </P>
-      <P>"\z" matches the end of a buffer.
-      </P>
-      <P>"\Z" matches the end of a buffer, or possibly one or more new line characters 
-         followed by the end of the buffer.
-      </P>
-      <P>A buffer is considered to consist of the whole sequence passed to the matching 
-         algorithms, unless the flags match_not_bob or match_not_eob are set.
-      </P>
-      <H3>Escape operator
-      </H3>
-      <P>The escape character "\" has several meanings.
-      </P>
-      <P>Inside a set declaration the escape character is a normal character unless the 
-         flag regex_constants::escape_in_lists is set in which case whatever follows the 
-         escape is a literal character regardless of its normal meaning.
-      </P>
-      <P>The escape operator may introduce an operator for example: back references, or 
-         a word operator.
-      </P>
-      <P>The escape operator may make the following character normal, for example "\*" 
-         represents a literal "*" rather than the repeat operator.
-      </P>
-      <H4>Single character escape sequences
-      </H4>
-      <P>The following escape sequences are aliases for single characters:
-         <BR>
-         &nbsp;
-      </P>
-      <P>
-         <TABLE id="Table3" cellSpacing="0" cellPadding="7" width="100%" border="0">
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="33%">Escape sequence
-               </TD>
-               <TD vAlign="top" width="33%">Character code
-               </TD>
-               <TD vAlign="top" width="33%">Meaning
-               </TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="33%">\a
-               </TD>
-               <TD vAlign="top" width="33%">0x07
-               </TD>
-               <TD vAlign="top" width="33%">Bell character.
-               </TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="33%">\f
-               </TD>
-               <TD vAlign="top" width="33%">0x0C
-               </TD>
-               <TD vAlign="top" width="33%">Form feed.
-               </TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="33%">\n
-               </TD>
-               <TD vAlign="top" width="33%">0x0A
-               </TD>
-               <TD vAlign="top" width="33%">Newline character.
-               </TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="33%">\r
-               </TD>
-               <TD vAlign="top" width="33%">0x0D
-               </TD>
-               <TD vAlign="top" width="33%">Carriage return.
-               </TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="33%">\t
-               </TD>
-               <TD vAlign="top" width="33%">0x09
-               </TD>
-               <TD vAlign="top" width="33%">Tab character.
-               </TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="33%">\v
-               </TD>
-               <TD vAlign="top" width="33%">0x0B
-               </TD>
-               <TD vAlign="top" width="33%">Vertical tab.
-               </TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="33%">\e
-               </TD>
-               <TD vAlign="top" width="33%">0x1B
-               </TD>
-               <TD vAlign="top" width="33%">ASCII Escape character.
-               </TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="33%">\0dd
-               </TD>
-               <TD vAlign="top" width="33%">0dd
-               </TD>
-               <TD vAlign="top" width="33%">An octal character code, where <I>dd</I> is one or 
-                  more octal digits.
-               </TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="33%">\xXX
-               </TD>
-               <TD vAlign="top" width="33%">0xXX
-               </TD>
-               <TD vAlign="top" width="33%">A hexadecimal character code, where XX is one or more 
-                  hexadecimal digits.
-               </TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="33%">\x{XX}
-               </TD>
-               <TD vAlign="top" width="33%">0xXX
-               </TD>
-               <TD vAlign="top" width="33%">A hexadecimal character code, where XX is one or more 
-                  hexadecimal digits, optionally a Unicode character.
-               </TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="33%">\cZ
-               </TD>
-               <TD vAlign="top" width="33%">z-@
-               </TD>
-               <TD vAlign="top" width="33%">An ASCII escape sequence control-Z, where Z is any 
-                  ASCII character greater than or equal to the character code for '@'.
-               </TD>
-               <TD>&nbsp;</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <H4>Miscellaneous escape sequences:
-      </H4>
-      <P>The following are provided mostly for perl compatibility, but note that there 
-         are some differences in the meanings of \l \L \u and \U:
-         <BR>
-         &nbsp;
-      </P>
-      <P>
-         <TABLE id="Table4" cellSpacing="0" cellPadding="6" width="100%" border="0">
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">\w
-               </TD>
-               <TD vAlign="top" width="45%">Equivalent to [[:word:]].
-               </TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">\W
-               </TD>
-               <TD vAlign="top" width="45%">Equivalent to [^[:word:]].
-               </TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">\s
-               </TD>
-               <TD vAlign="top" width="45%">Equivalent to [[:space:]].
-               </TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">\S
-               </TD>
-               <TD vAlign="top" width="45%">Equivalent to [^[:space:]].
-               </TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">\d
-               </TD>
-               <TD vAlign="top" width="45%">Equivalent to [[:digit:]].
-               </TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">\D
-               </TD>
-               <TD vAlign="top" width="45%">Equivalent to [^[:digit:]].
-               </TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">\l
-               </TD>
-               <TD vAlign="top" width="45%">Equivalent to [[:lower:]].
-               </TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">\L
-               </TD>
-               <TD vAlign="top" width="45%">Equivalent to [^[:lower:]].
-               </TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">\u
-               </TD>
-               <TD vAlign="top" width="45%">Equivalent to [[:upper:]].
-               </TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">\U
-               </TD>
-               <TD vAlign="top" width="45%">Equivalent to [^[:upper:]].
-               </TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">\C
-               </TD>
-               <TD vAlign="top" width="45%">Any single character, equivalent to '.'.
-               </TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">\X
-               </TD>
-               <TD vAlign="top" width="45%">Match any Unicode combining character sequence, for 
-                  example "a\x 0301" (a letter a with an acute).
-               </TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">\Q
-               </TD>
-               <TD vAlign="top" width="45%">The begin quote operator, everything that follows is 
-                  treated as a literal character until a \E end quote operator is found.
-               </TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">\E
-               </TD>
-               <TD vAlign="top" width="45%">The end quote operator, terminates a sequence begun 
-                  with \Q.
-               </TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <H3>What gets matched?
-      </H3>
-      <P>
-         When the expression is compiled as a Perl-compatible regex then the matching 
-         algorithms will perform a depth first search on the state machine and report 
-         the first match found.</P>
-      <P>
-         When the expression is compiled as a POSIX-compatible regex then the matching 
-         algorithms will match the first possible matching string, if more than one 
-         string starting at a given location can match then it matches the longest 
-         possible string, unless the flag match_any is set, in which case the first 
-         match encountered is returned. Use of the match_any option can reduce the time 
-         taken to find the match - but is only useful if the user is less concerned 
-         about what matched - for example it would not be suitable for search and 
-         replace operations. In cases where their are multiple possible matches all 
-         starting at the same location, and all of the same length, then the match 
-         chosen is the one with the longest first sub-expression, if that is the same 
-         for two or more matches, then the second sub-expression will be examined and so 
-         on.
-      </P>
-      <P>
-         The following table examples illustrate the main differences between Perl and 
-         POSIX regular expression matching rules:
-      </P>
-      <P>
-         <TABLE id="Table5" cellSpacing="1" cellPadding="7" width="624" border="1">
-            <TBODY>
-               <TR>
-                  <TD vAlign="top" width="25%">
-                     <P>Expression</P>
-                  </TD>
-                  <TD vAlign="top" width="25%">
-                     <P>Text</P>
-                  </TD>
-                  <TD vAlign="top" width="25%">
-                     <P>POSIX leftmost longest match</P>
-                  </TD>
-                  <TD vAlign="top" width="25%">
-                     <P>ECMAScript depth first search match</P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="25%">
-                     <P><CODE>a|ab</CODE></P>
-                  </TD>
-                  <TD vAlign="top" width="25%">
-                     <P><CODE> xaby</CODE>
-                     </P>
-                  </TD>
-                  <TD vAlign="top" width="25%">
-                     <P><CODE> "ab"</CODE></P>
-                  </TD>
-                  <TD vAlign="top" width="25%">
-                     <P><CODE> "a"</CODE></P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="25%">
-                     <P><CODE> .*([[:alnum:]]+).*</CODE></P>
-                  </TD>
-                  <TD vAlign="top" width="25%">
-                     <P><CODE> " abc def xyz "</CODE></P>
-                  </TD>
-                  <TD vAlign="top" width="25%">
-                     <P>$0 = " abc def xyz "<BR>
-                        $1 = "abc"</P>
-                  </TD>
-                  <TD vAlign="top" width="25%">
-                     <P>$0 = " abc def xyz "<BR>
-                        $1 = "z"</P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="25%">
-                     <P><CODE> .*(a|xayy)</CODE></P>
-                  </TD>
-                  <TD vAlign="top" width="25%">
-                     <P><CODE> zzxayyzz</CODE></P>
-                  </TD>
-                  <TD vAlign="top" width="25%">
-                     <P><CODE> "zzxayy"</CODE></P>
-                  </TD>
-                  <TD vAlign="top" width="25%">
-                     <P><CODE>"zzxa"</CODE></P>
-                  </TD>
-               </TR>
-            </TBODY></CODE></TD></TR></TABLE>
-      <P>These differences between Perl matching rules, and POSIX matching rules, mean 
-         that these two regular expression syntaxes differ not only in the features 
-         offered, but also in the form that the state machine takes and/or the 
-         algorithms used to traverse the state machine.</P>
+         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 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         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 -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
diff --git a/doc/Attic/syntax_basic.html b/doc/Attic/syntax_basic.html
new file mode 100644
index 00000000..cce1434b
--- /dev/null
+++ b/doc/Attic/syntax_basic.html
@@ -0,0 +1,236 @@
+<!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>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 the form[[=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>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>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
new file mode 100644
index 00000000..bfba568a
--- /dev/null
+++ b/doc/Attic/syntax_extended.html
@@ -0,0 +1,516 @@
+<!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;this results in locale specific behavior.&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>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 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).</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
new file mode 100644
index 00000000..4c8b25a8
--- /dev/null
+++ b/doc/Attic/syntax_leftmost_longest.html
@@ -0,0 +1,65 @@
+<!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 that 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
index 83e95c53..7ea438d7 100644
--- a/doc/Attic/syntax_option_type.html
+++ b/doc/Attic/syntax_option_type.html
@@ -23,40 +23,49 @@
          </TABLE>
       </P>
       <HR>
-      <H3>Synopsis</H3>
+      <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;
+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 icase;
-static const syntax_option_type nosubs;
-static const syntax_option_type optimize;
-static const syntax_option_type collate;
 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 basic;
+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 sed = basic;
-static const syntax_option_type perl;<BR>// these are boost.regex specific:<BR>static const syntax_option_type escape_in_lists;<BR>static const syntax_option_type char_classes;<BR>static const syntax_option_type intervals;<BR>static const syntax_option_type limited_ops;<BR>static const syntax_option_type newline_alt;<BR>static const syntax_option_type bk_plus_qm;<BR>static const syntax_option_type bk_braces;<BR>static const syntax_option_type bk_parens;<BR>static const syntax_option_type bk_refs;<BR>static const syntax_option_type bk_vbar;<BR>static const syntax_option_type use_except;<BR>static const syntax_option_type failbit;<BR>static const syntax_option_type literal;<BR>static const syntax_option_type nocollate;<BR>static const syntax_option_type perlex;<BR>static const syntax_option_type emacs;<BR>
+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>Description</H3>
+      <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 
-            or perl</CODE> set.</P>
+         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>
@@ -65,52 +74,81 @@ static const syntax_option_type perl;<BR>// these are boost.regex specific:<BR>s
       <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="Table2" height="1274" cellSpacing="1" cellPadding="7" width="100%" border="0">
+         <TABLE id="Table4" cellSpacing="1" cellPadding="1" width="100%" border="1">
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>Element</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>Effect if set</P>
-               </TD>
+               <TD><STRONG>Element</STRONG></TD>
+               <TD><STRONG>Standardized</STRONG></TD>
+               <TD><STRONG>Effect when set</STRONG></TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>normal</P>
+               <TD>
+                  <P>ECMAScript</P>
                </TD>
-               <TD vAlign="top" width="50%">
+               <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 most perl-compatible extensions in this mode.</P>
+                  <P>boost.regex also recognizes all of the perl-compatible (?...) extensions in 
+                     this mode.</P>
                </TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>icase</P>
-               </TD>
-               <TD vAlign="top" width="50%">
+               <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 vAlign="top" width="316">
-                  <P>nosubs</P>
-               </TD>
-               <TD vAlign="top" width="50%">
+               <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 vAlign="top" width="316">
-                  <P>optimize</P>
-               </TD>
-               <TD vAlign="top" width="50%">
+               <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 
@@ -119,91 +157,80 @@ static const syntax_option_type perl;<BR>// these are boost.regex specific:<BR>s
                </TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>collate</P>
-               </TD>
-               <TD vAlign="top" width="50%">
+               <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 vAlign="top" width="316">
-                  <P>ECMAScript</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>The same as normal.</P>
-               </TD>
+               <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 vAlign="top" width="316">
-                  <P>JavaScript</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>The same as normal.</P>
-               </TD>
+               <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 vAlign="top" width="316">
-                  <P>JScript</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>The same as normal.</P>
-               </TD>
+               <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 vAlign="top" width="316">
-                  <P>basic</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>Specifies that the grammar recognized by the regular expression engine is the 
-                     same as that used by 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).
-                  </P>
-               </TD>
+               <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 vAlign="top" width="316">
-                  <P>extended</P>
-               </TD>
-               <TD vAlign="top" width="50%">
+               <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).</P>
+                     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 vAlign="top" width="316">
-                  <P>awk</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <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>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="316">
-                  <P>grep</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>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, 
-                     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 in addition to "|".</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="316">
-                  <P>egrep</P>
-               </TD>
-               <TD vAlign="top" width="50%">
+               <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 
@@ -213,118 +240,256 @@ static const syntax_option_type perl;<BR>// these are boost.regex specific:<BR>s
                </TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>sed</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>The same as basic.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="316">
-                  <P>perl</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>The same as normal.</P>
+               <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 requires \a \b \t \v \f \n and \r to be recognised,&nbsp;but other 
+                     escape sequences invoke undefined behavior according to the POSIX standard).</P>
                </TD>
             </TR>
          </TABLE>
       </P>
-      <P>The following constants are specific to this particular regular expression 
-         implementation and do not appear in the <A href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1429.htm">
-            regular expression standardization proposal</A>:</P>
+      <P>The following options may also be set when using POSIX extended regular 
+         expressions:</P>
       <P>
-         <TABLE id="Table3" cellSpacing="0" cellPadding="7" width="100%" border="0">
+         <TABLE id="Table7" cellSpacing="1" cellPadding="1" width="100%" border="1">
             <TR>
-               <TD vAlign="top" width="45%">regbase::escape_in_lists</TD>
-               <TD vAlign="top" width="45%">Allows the use of the escape "\" character in sets of 
-                  characters, for example [\]] represents the set of characters containing only 
-                  "]". If this flag is not set then "\" is an ordinary character inside sets.</TD>
+               <TD><STRONG>Element</STRONG></TD>
+               <TD><STRONG>Standardized</STRONG></TD>
+               <TD><STRONG>Effect when set</STRONG></TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="45%">regbase::char_classes</TD>
-               <TD vAlign="top" width="45%">When this bit is set, character classes [:classname:] 
-                  are allowed inside character set declarations, for example "[[:word:]]" 
-                  represents the set of all characters that belong to the character class "word".</TD>
+               <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 vAlign="top" width="45%">regbase:: intervals</TD>
-               <TD vAlign="top" width="45%">When this bit is set, repetition intervals are 
-                  allowed, for example "a{2,4}" represents a repeat of between 2 and 4 letter 
-                  a's.</TD>
+               <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 vAlign="top" width="45%">regbase:: limited_ops</TD>
-               <TD vAlign="top" width="45%">When this bit is set all of "+", "?" and "|" are 
-                  ordinary characters in all situations.</TD>
+               <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 vAlign="top" width="45%">regbase:: newline_alt</TD>
-               <TD vAlign="top" width="45%">When this bit is set, then the newline character "\n" 
-                  has the same effect as the alternation operator "|".</TD>
+               <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 vAlign="top" width="45%">regbase:: bk_plus_qm</TD>
-               <TD vAlign="top" width="45%">When this bit is set then "\+" represents the one or 
-                  more repetition operator and "\?" represents the zero or one repetition 
-                  operator. When this bit is not set then "+" and "?" are used instead.</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="45%">regbase:: bk_braces</TD>
-               <TD vAlign="top" width="45%">When this bit is set then "\{" and "\}" are used for 
-                  bounded repetitions and "{" and "}" are normal characters. This is the opposite 
-                  of default behavior.</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="45%">regbase:: bk_parens</TD>
-               <TD vAlign="top" width="45%">When this bit is set then "\(" and "\)" are used to 
-                  group sub-expressions and "(" and ")" are ordinary characters, this is the 
-                  opposite of default behavior.</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="45%">regbase:: bk_refs</TD>
-               <TD vAlign="top" width="45%">When this bit is set then back references are 
-                  allowed.</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="45%">regbase:: bk_vbar</TD>
-               <TD vAlign="top" width="45%">When this bit is set then "\|" represents the 
-                  alternation operator and "|" is an ordinary character. This is the opposite of 
-                  default behavior.</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="45%">regbase:: use_except</TD>
-               <TD vAlign="top" width="45%">When this bit is set then a <A href="#bad_expression">bad_expression</A>
-                  exception will be thrown on error.&nbsp; Use of this flag is deprecated - 
-                  basic_regex will always throw on error.</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="45%">regbase:: failbit</TD>
-               <TD vAlign="top" width="45%">This bit is set on error, if regbase::use_except is 
-                  not set, then this bit should be checked to see if a regular expression is 
-                  valid before usage.</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="45%">regbase::literal</TD>
-               <TD vAlign="top" width="45%">All characters in the string are treated as literals, 
-                  there are no special characters or escape sequences.</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="45%" height="24">regbase::emacs</TD>
-               <TD vAlign="top" width="45%" height="24">Provides compatability with the emacs 
-                  editor, eqivalent to: bk_braces | bk_parens | bk_refs | bk_vbar.</TD>
+               <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>
          </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_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>
+         </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 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         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 -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
    </body>
 </html>
+
diff --git a/doc/Attic/syntax_perl.html b/doc/Attic/syntax_perl.html
new file mode 100644
index 00000000..eeb0b273
--- /dev/null
+++ b/doc/Attic/syntax_perl.html
@@ -0,0 +1,618 @@
+<!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>
+      <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 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 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>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://www.perldoc.com/perl5.6/pod/perlre.html"> Perl 5.6.</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/unicode.html b/doc/Attic/unicode.html
new file mode 100644
index 00000000..9e22faf3
--- /dev/null
+++ b/doc/Attic/unicode.html
@@ -0,0 +1,66 @@
+<!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/bad_expression.html b/doc/bad_expression.html
index ee19c3a2..aee75368 100644
--- a/doc/bad_expression.html
+++ b/doc/bad_expression.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
    <head>
-      <title>Boost.Regex: bad_expression</title>
+      <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">
@@ -15,7 +15,7 @@
             </td>
             <td width="353">
                <h1 align="center">Boost.Regex</h1>
-               <h2 align="center">class bad_expression</h2>
+               <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>
@@ -27,51 +27,55 @@
       <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>bad_expression</code> defines the type of objects thrown as 
+      <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> bad_pattern : <b>public</b> std::runtime_error
+<b>class</b> regex_error : <b>public</b> std::runtime_error
 {
 <b>public</b>:
-   <b>explicit</b> bad_pattern(<b>const</b> std::string&amp; s) : std::runtime_error(s){};
-};
-
-<b>class</b> bad_expression : <b>public</b> bad_pattern
-{
-<b>public</b>:
-   bad_expression(<b>const</b> std::string&amp; s) : bad_pattern(s) {}
+   <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>
-bad_expression(const string&amp; what_arg);
-</pre>
-      <p><b>Effects:</b> Constructs an object of class <code>bad_expression</code>.</p>
-      <b></b>
-      <p><b>Postcondition:</b> <code>strcmp(what(), what_arg.c_str()) == 0</code>.</p>
-      <p>Footnotes: the class <i>bad_pattern</i> forms the base class for all 
-         pattern-matching exceptions, of which <i>bad_expression</i> is one. The choice 
-         of <i>std::runtime_error</i> as the base class for <i>bad_pattern</i> 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).</p>
+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 Oct 2003 
+         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 --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
    </body>
 </html>
+
diff --git a/doc/basic_regex.html b/doc/basic_regex.html
index c72500c1..c7a25d2e 100644
--- a/doc/basic_regex.html
+++ b/doc/basic_regex.html
@@ -29,23 +29,22 @@
 #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 three template parameters:</p>
+         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.</p>
+         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>.</p>
-      <p><b><i>Allocator</i></b>: the allocator class used to allocate memory by the 
-         class.</p>
+         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 allocators, you 
-         won't need to use anything other than these:</p>
+         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;, <b>class</b> Allocator = std::allocator&lt;charT&gt;  &gt;
+<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;
+<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 
@@ -53,60 +52,60 @@
       <pre>
 namespace boost{
 
-template &lt;class charT,
-          class traits = regex_traits&lt;charT&gt;,
-          class Allocator = allocator&lt;charT&gt; &gt;
-class basic_regex
-{
-public:
+template &lt;class  charT, class traits = regex_traits&lt;charT&gt; &gt;
+class basic_regex {
+   public:          
    // types:
    typedef          charT                                value_type;
-   typedef          implementation defined               const_iterator;
-   typedef          const_iterator                       iterator;
-   typedef typename Allocator::reference                 reference;
-   typedef typename Allocator::const_reference           const_reference;
-   typedef typename Allocator::difference_type           difference_type;
-   typedef typename Allocator::size_type                 size_type;
-   typedef          Allocator                            allocator_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:
-   static const regex_constants::syntax_option_type normal = regex_constants::normal;
-   static const regex_constants::syntax_option_type icase = regex_constants::icase;
-   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 ECMAScript = normal;
-   static const regex_constants::syntax_option_type JavaScript = normal;
-   static const regex_constants::syntax_option_type JScript = normal;
-   // these flags are optional, if the functionality is supported
-   // then the flags shall take these names.
-   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;
+   // 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;
 
    // construct/copy/destroy:
-   explicit <A href="#c1">basic_regex</A>(const Allocator&amp; a = Allocator());
-   explicit <A href="#c2">basic_regex</A>(const charT* p, flag_type f = regex_constants::normal,
-                        const Allocator&amp; a = Allocator());
-   <A href="#c3">basic_regex</A>(const charT* p1, const charT* p2, flag_type f = regex_constants::normal,
-               const Allocator&amp; a = Allocator());
-   <A href="#c4">basic_regex</A>(const charT* p, size_type len, flag_type f,
-               const Allocator&amp; a = Allocator());
+   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,
-                        const Allocator&amp; a = Allocator());
+   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,
-               const Allocator&amp; a = Allocator());
+   <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;);
@@ -134,7 +133,6 @@ public:
                        flag_type f = regex_constants::normal);
 
    // const operations:
-   Allocator <A href="#m7">get_allocator</A>() const;
    flag_type <A href="#m8">flags</A>() const;
    basic_string&lt;charT&gt; <A href="#m9">str</A>() const;
    int <A href="#m10">compare</A>(basic_regex&amp;) const;
@@ -145,33 +143,33 @@ public:
    void <A href="#m13">swap</A>(basic_regex&amp;) throw();
 };
 
-template &lt;class charT, class traits, class Allocator&gt;
-bool <A href="#o4">operator</A> == (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
-template &lt;class charT, class traits, class Allocator&gt;
-bool <A href="#o5">operator</A> != (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
-template &lt;class charT, class traits, class Allocator&gt;
-bool <A href="#o7">operator</A> &lt; (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                 const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
-template &lt;class charT, class traits, class Allocator&gt;
-bool <A href="#o8">operator</A> &lt;= (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
-template &lt;class charT, class traits, class Allocator&gt;
-bool <A href="#o9">operator</A> &gt;= (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
-template &lt;class charT, class traits, class Allocator&gt;
-bool <A href="#o10">operator</A> &gt; (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                 const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
+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, class Allocator&gt;
+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, Allocator&gt;&amp; e);
+                const basic_regex&lt;charT, re_traits&gt;&amp; e);
 
-template &lt;class charT, class traits, class Allocator&gt;
-void <A href="#o12">swap</A>(basic_regex&lt;charT, traits, Allocator&gt;&amp; e1,
-          basic_regex&lt;charT, traits, Allocator&gt;&amp; e2);
+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;
@@ -182,21 +180,34 @@ typedef basic_regex&lt;wchar_t&gt; wregex;
       <p>Class&nbsp;<em>basic_regex</em> has the following public member functions:</p>
       <h4>basic_regex constants</h4>
       <pre>
-static const regex_constants::syntax_option_type normal = regex_constants::normal;
-static const regex_constants::syntax_option_type icase = regex_constants::icase;
-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 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;
+// 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">
@@ -204,11 +215,7 @@ static const regex_constants::syntax_option_type perl = regex_constants::perl;
          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>
-      <p>In all <code>basic_regex</code> constructors, a copy of the <code>Allocator</code>
-         argument is used for any memory allocation performed by the constructor or 
-         member functions during the lifetime of the object.</p>
-      <pre>
-basic_regex(const Allocator&amp; a = Allocator());
+      <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>
@@ -252,7 +259,7 @@ basic_regex(const Allocator&amp; a = Allocator());
             </table>
          </center>
       </div>
-      <pre> <A name=c2></A>basic_regex(const charT* p, flag_type f = regex_constants::normal, const Allocator&amp; a = Allocator());
+      <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>
@@ -322,7 +329,7 @@ basic_regex(const Allocator&amp; a = Allocator());
       <pre>
  
 </pre>
-      <PRE><A name=c3></A>basic_regex(const charT* p1, const charT* p2, flag_type f = regex_constants::normal, const Allocator&amp; a = Allocator());</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.</p>
@@ -390,8 +397,7 @@ basic_regex(const Allocator&amp; a = Allocator());
       <pre>
  
 </pre>
-      <pre><A name=c4></A>
-basic_regex(const charT* p, size_type len, flag_type f, const Allocator&amp; a = Allocator());
+      <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 
@@ -457,11 +463,7 @@ basic_regex(const charT* p, size_type len, flag_type f, const Allocator&amp; a =
             </table>
          </center>
       </div>
-      <pre>
-  
-</pre>
-      <pre><A name=c5></A>
-basic_regex(const basic_regex&amp; e);
+      <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 
@@ -522,14 +524,9 @@ basic_regex(const basic_regex&amp; e);
             </table>
          </center>
       </div>
-      <pre>
- 
-</pre>
-      <pre>
+      <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, const Allocator&amp; a = Allocator());
+<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.</p>
@@ -594,14 +591,9 @@ basic_regex(const basic_string&lt;charT, ST, SA&gt;&amp; s,
             </table>
          </center>
       </div>
-      <pre>
- 
-</pre>
-      <pre>
+      <pre><BR>
 template &lt;class ForwardIterator&gt;
-<A name=c7></A>
-basic_regex(ForwardIterator first, ForwardIterator last,
-            flag_type f = regex_constants::normal, const Allocator&amp; a = Allocator());
+<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.</p>
@@ -667,15 +659,11 @@ basic_regex(ForwardIterator first, ForwardIterator last,
             </table>
          </center>
       </div>
-      <pre>
-  
-</pre>
       <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><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>
@@ -685,23 +673,23 @@ 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></A>
+      <pre>
 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></A>
+      <pre>
 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></A>
+      <pre>
 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></A>
+      <pre>
 size_type max_size() const;
 </pre>
       <p><b>Effects:</b> Returns the maximum length of the sequence of characters 
@@ -716,7 +704,7 @@ bool empty() const;
       <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></A>
+      <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>
@@ -803,11 +791,7 @@ basic_regex&amp; assign(InputIterator first, InputIterator last,
          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>Allocator get_allocator() const;
-</pre>
-      <p><b>Effects:</b> Returns a copy of the Allocator that was passed to the object's 
-         constructor.</p>
-      <pre><A name=m8></A>flag_type flags() const;
+      <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>
@@ -834,7 +818,7 @@ locale_type getloc() const;
             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></A>
+      <pre>
 void swap(basic_regex&amp; e) throw();
 </pre>
       <p><b>Effects:</b> Swaps the contents of the two regular expressions.</p>
@@ -847,66 +831,65 @@ void swap(basic_regex&amp; e) throw();
          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, class Allocator&gt;
-bool operator == (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
+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, class Allocator&gt;
-bool operator != (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
+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, class Allocator&gt;
-bool operator &lt; (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                 const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
+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, class Allocator&gt;
-bool operator &lt;= (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
+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, class Allocator&gt;
-bool operator &gt;= (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                  const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
+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, class Allocator&gt;
-bool operator &gt; (const basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-                 const basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
+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, class Allocator&gt;
+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, Allocator&gt;&amp; e);
+                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, class Allocator&gt;
-void swap(basic_regex&lt;charT, traits, Allocator&gt;&amp; lhs,
-          basic_regex&lt;charT, traits, Allocator&gt;&amp; rhs);
+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 
+      <p>Revised 7 Aug 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         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 --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
diff --git a/doc/captures.html b/doc/captures.html
index 95f0dd09..fe0232f8 100644
--- a/doc/captures.html
+++ b/doc/captures.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
    <head>
-      <title>Boost.Regex: Index</title>
+      <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>
diff --git a/doc/character_class_names.html b/doc/character_class_names.html
new file mode 100644
index 00000000..576e45d0
--- /dev/null
+++ b/doc/character_class_names.html
@@ -0,0 +1,326 @@
+<!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/collating_names.html b/doc/collating_names.html
new file mode 100644
index 00000000..c553f1ed
--- /dev/null
+++ b/doc/collating_names.html
@@ -0,0 +1,368 @@
+<!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/concepts.html b/doc/concepts.html
new file mode 100644
index 00000000..ed598933
--- /dev/null
+++ b/doc/concepts.html
@@ -0,0 +1,453 @@
+<!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/configuration.html b/doc/configuration.html
index 3d61b272..9da777e7 100644
--- a/doc/configuration.html
+++ b/doc/configuration.html
@@ -1,225 +1,155 @@
 <!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>
-
-<dt><a href="#locale">Locale and traits class selection</a></dt>
-
-<dt><a href="#linkage">Linkage Options</a></dt>
-
-<dt><a href="#algorithm">Algorithm Selection</a></dt>
-
-<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 the default behavior on non-windows
-platforms, but MS Windows platforms normally use the Win32 API for
-locale support.</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.</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_C_LOCALE unless
-BOOST_REGEX_USE_CPP_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_V3</td>
-<td>Tells boost.regex to use the boost-1.30.0 matching algorithm,
-define only if you need maximum compatibility with previous
-behavior.</td>
-</tr>
-
-<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 
+   <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 --> 
-         24 Oct 2003 
+         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 --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-</body>
+   </body>
 </html>
-
-
diff --git a/doc/error_type.html b/doc/error_type.html
new file mode 100644
index 00000000..1f2754b8
--- /dev/null
+++ b/doc/error_type.html
@@ -0,0 +1,140 @@
+<!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 <a href="mailto:jm@regex.fsnet.co.uk">John Maddock</a>&nbsp;1998-<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan --> 2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></I></P>
+      <P align="left"><I>Permission to use, copy, modify, distribute and sell this software 
+            and its documentation for any purpose is hereby granted without fee, provided 
+            that the above copyright notice appear in all copies and that both that 
+            copyright notice and this permission notice appear in supporting documentation. 
+            Dr John Maddock makes no representations about the suitability of this software 
+            for any purpose. It is provided "as is" without express or implied warranty.</I></P>
+   </body>
+</html>
diff --git a/doc/examples.html b/doc/examples.html
index e1fd5ba9..8f73b69a 100644
--- a/doc/examples.html
+++ b/doc/examples.html
@@ -25,36 +25,71 @@
       <BR>
       <BR>
       <HR>
-      <P>There are three demo applications that ship with this library, they all come 
-         with makefiles for Borland, Microsoft and gcc compilers, otherwise you will 
-         have to create your own makefiles.</P>
-      <H5>regress.exe:</H5>
+      <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>Files: <A href="../test/regress/parse.cpp">parse.cpp</A>, <A href="../test/regress/regress.cpp">
-            regress.cpp</A>, <A href="../test/regress/tests.cpp">tests.cpp</A>.</P>
-      <H5>jgrep.exe</H5>
+      <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>jgrep.exe</H4>
       <P>A simple grep implementation, run with no command line options to find out its 
          usage. Look at <A href="../src/fileiter.cpp">fileiter.cpp</A>/fileiter.hpp and 
          the mapfile class to see an example of a "smart" bidirectional iterator that 
          can be used with boost.regex or any other STL algorithm.</P>
       <P>Files: <A href="../example/jgrep/jgrep.cpp">jgrep.cpp</A>, <A href="../example/jgrep/main.cpp">
             main.cpp</A>.</P>
-      <H5>timer.exe</H5>
+      <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>
-      <H5>Code snippets</H5>
+      <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>: 
@@ -66,30 +101,20 @@
       <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_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_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 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         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 --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
    </body>
 </html>
-
diff --git a/doc/format_boost_syntax.html b/doc/format_boost_syntax.html
new file mode 100644
index 00000000..d497ddeb
--- /dev/null
+++ b/doc/format_boost_syntax.html
@@ -0,0 +1,163 @@
+<!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_perl_syntax.html b/doc/format_perl_syntax.html
new file mode 100644
index 00000000..481a141a
--- /dev/null
+++ b/doc/format_perl_syntax.html
@@ -0,0 +1,150 @@
+<!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_sed_syntax.html b/doc/format_sed_syntax.html
new file mode 100644
index 00000000..ee0a331b
--- /dev/null
+++ b/doc/format_sed_syntax.html
@@ -0,0 +1,109 @@
+<!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_syntax.html b/doc/format_syntax.html
index e77aa82b..c7061d21 100644
--- a/doc/format_syntax.html
+++ b/doc/format_syntax.html
@@ -1,263 +1,52 @@
 <!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: 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></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">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 extended,
-the extended syntax is a superset of the others so this is covered
-first.</p>
-
-<p><b><i>Extended format syntax</i></b></p>
-
-<p>In format strings, all characters are treated as literals
-except: ()$\?:</p>
-
-<p>To use any of these as literals you must prefix them with the
-escape character \</p>
-
-<p>The following special sequences are recognized:&nbsp;<br>
- &nbsp;<br>
- <i>Grouping:</i></p>
-
-<p>Use the parenthesis characters ( and ) to group sub-expressions
-within the format string, use \( and \) to represent literal '('
-and ')'.&nbsp;<br>
- &nbsp;<br>
- <i>Sub-expression expansions:</i></p>
-
-<p>The following Perl like expressions expand to a particular
-matched sub-expression:<br>
- &nbsp;</p>
-
-<p></p>
-
-<table id="Table2" cellspacing="0" cellpadding="7" width="100%"
-border="0">
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="40%">$`</td>
-<td valign="top" width="43%">Expands to all the text from the end
-of the previous match to the start of the current match, if there
-was no previous match in the current operation, then everything
-from the start of the input string to the start of the match.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="40%">$'</td>
-<td valign="top" width="43%">Expands to all the text from the end
-of the match to the end of the input string.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="40%">$&amp;</td>
-<td valign="top" width="43%">Expands to all of the current
-match.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="40%">$0</td>
-<td valign="top" width="43%">Expands to all of the current
-match.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="40%">$N</td>
-<td valign="top" width="43%">Expands to the text that matched
-sub-expression <i>N</i>.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-</table>
-
-<br>
-<br>
- 
-
-<p><i>Conditional expressions:</i></p>
-
-<p>Conditional expressions allow two different format strings to be
-selected dependent upon whether a sub-expression participated in
-the match or not:</p>
-
-<p>?Ntrue_expression:false_expression</p>
-
-<p>Executes true_expression if sub-expression <i>N</i> participated
-in the match, otherwise executes false_expression.</p>
-
-<p>Example: suppose we search for "(while)|(for)" then the format
-string "?1WHILE:FOR" would output what matched, but in upper
-case.&nbsp;<br>
- &nbsp;<br>
- <i>Escape sequences:</i></p>
-
-<p>The following escape sequences are also allowed:<br>
-</p>
-
-<p></p>
-
-<table id="Table3" cellspacing="0" cellpadding="7" width="100%"
-border="0">
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="40%">\a</td>
-<td valign="top" width="43%">The bell character.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="40%">\f</td>
-<td valign="top" width="43%">The form feed character.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="40%">\n</td>
-<td valign="top" width="43%">The newline character.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="40%">\r</td>
-<td valign="top" width="43%">The carriage return character.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="40%">\t</td>
-<td valign="top" width="43%">The tab character.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="40%">\v</td>
-<td valign="top" width="43%">A vertical tab character.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="40%">\x</td>
-<td valign="top" width="43%">A hexadecimal character - for example
-\x0D.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="40%">\x{}</td>
-<td valign="top" width="43%">A possible Unicode hexadecimal
-character - for example \x{1A0}</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="40%">\cx</td>
-<td valign="top" width="43%">The ASCII escape character x, for
-example \c@ is equivalent to escape-@.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="40%">\e</td>
-<td valign="top" width="43%">The ASCII escape character.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-
-<tr>
-<td valign="top" width="8%">&nbsp;</td>
-<td valign="top" width="40%">\dd</td>
-<td valign="top" width="43%">An octal character constant, for
-example \10.</td>
-<td valign="top" width="9%">&nbsp;</td>
-</tr>
-</table>
-
-<br>
-<br>
- 
-
-<p><b><i>Perl format strings</i></b></p>
-
-<p>Perl format strings are the same as the default syntax except
-that the characters ()?: have no special meaning.</p>
-
-<p><b><i>Sed format strings</i></b></p>
-
-<p>Sed format strings use only the characters \ and &amp; as
-special characters.</p>
-
-<p>\n where n is a digit, is expanded to the nth
-sub-expression.</p>
-
-<p>&amp; is expanded to the whole of the match (equivalent to
-\0).</p>
-
-<p>Other escape sequences are expanded as per the default
-syntax.</p>
-
-<p></p>
-
-<hr>
+   <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 Oct 2003 
+         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 --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            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>
+   </body>
 </html>
-
-
diff --git a/doc/gcc-performance.html b/doc/gcc-performance.html
index 6f7facb9..6f22ddb8 100644
--- a/doc/gcc-performance.html
+++ b/doc/gcc-performance.html
@@ -534,10 +534,6 @@
       <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>
-
+      <p>Copyright John Maddock April 2003, all rights reserved.</p>
    </body>
 </html>
diff --git a/doc/headers.html b/doc/headers.html
index c58f8662..031d33fe 100644
--- a/doc/headers.html
+++ b/doc/headers.html
@@ -25,9 +25,9 @@
       <HR>
       <p></p>
       <P>There are two main headers used by this library: &lt;boost/regex.hpp&gt; 
-         provides full access to the entire library, while &lt;boost/cregex.hpp&gt; 
-         provides access to just the high level class RegEx, and the POSIX API 
-         functions.
+         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 
@@ -35,16 +35,14 @@
       <P>
          <HR>
       <P></P>
-      <p>Revised 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         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 --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
    </body>
 </html>
-
diff --git a/doc/history.html b/doc/history.html
index 03a8abce..6f3618e5 100644
--- a/doc/history.html
+++ b/doc/history.html
@@ -24,6 +24,26 @@
       </P>
       <HR>
       <p></p>
+      <P>Boost 1.33.0.</P>
+      <UL>
+         <LI>
+         Completely rewritten expression parsing code, and traits class support; now 
+         conforms to the standardization proposal.
+         <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></UL>
       <P>Boost 1.32.1.</P>
       <UL>
          <LI>
@@ -59,12 +79,12 @@
       <P>
          <HR>
       <P></P>
-      <p>Revised 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         22 Dec 2003 
+         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 -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
diff --git a/doc/icu_strings.html b/doc/icu_strings.html
new file mode 100644
index 00000000..45c5bffb
--- /dev/null
+++ b/doc/icu_strings.html
@@ -0,0 +1,467 @@
+<!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.hmtl">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/index.html b/doc/index.html
index df1a8a48..fb393dc8 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -1,8 +1,8 @@
 <!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: 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>
@@ -13,7 +13,7 @@
             <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 style="WIDTH: 353px">
+            <td width="353">
                <h1 align="center">Boost.Regex</h1>
                <h2 align="center">Index</h2>
             </td>
@@ -27,117 +27,139 @@
       <hr>
       <h2>Contents</h2>
       <dl class="index">
-         <dt><a href="introduction.html">Overview</a></dt>
-         <dt><a href="configuration.html">Configuration and setup</a></dt> 
-         <dt><a href="install.html">Installation</a></dt>
-         <dd>
-            <dl class="index">
-               <dt><a href="install.html#bcb">Borland C++ Builder</a></dt> <dt><a href="install.html#vc">
-                     Microsoft Visual C++</a></dt> <dt><a href="install.html#gcc">GNU G++</a></dt>
-               <dt><a href="install.html#sun">Sun Forte Compiler</a></dt> <dt><a href="install.html#other">
-                     Other compilers (building with bjam)</a></dt>
-            </dl>
-         </dd>
-         <dt>Reference</dt>
-         <dd>
-            <dl class="index">
-               <dt>Types</dt>
-               <dd>
-                  <dl class="index">
-                     <dt><a href="syntax_option_type.html">syntax_option_type</a></dt> <dt><a href="match_flag_type.html">
-                           match_flag_type</a></dt> <dt><a href="bad_expression.html">class bad_expression</a></dt>
-                     <dt><a href="regex_traits.html">class regex_traits</a></dt> 
-                     <dt><a href="basic_regex.html">class template basic_regex</a></dt> 
-                     <dt><a href="sub_match.html">class template sub_match</a></dt> 
-                     <dt><a href="match_results.html">class template match_results</a></dt>
-                  </dl>
-               </dd>
-               <dt>Algorithms</dt>
-               <dd>
-                  <dl class="index">
-                     <dt><a href="regex_match.html">regex_match</a></dt> <dt><a href="regex_search.html">regex_search</a></dt>
-                     <dt><a href="regex_replace.html">regex_replace</a></dt>
-                  </dl>
-               </dd>
-               <dt>Iterators</dt>
-               <dd>
-                  <dl class="index">
-                     <dt><a href="regex_iterator.html">regex_iterator</a></dt>
-                     <dt><a href="regex_token_iterator.html">regex_token_iterator</a></dt>
-                  </dl>
-               </dd>
-               <dt>Typedefs</dt>
-               <dd>
-                  <dl class="index">
-                     <dt><a href="basic_regex.html">regex</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = basic_regex&lt;char&gt; ]</dt> 
-                     <dt><a href="basic_regex.html">wregex</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = basic_regex&lt;wchar_t&gt; ]</dt> 
-                     <dt><a href="match_results.html">cmatch</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = match_results&lt;const char*&gt; ]</dt>
-                     <dt><a href="match_results.html">wcmatch</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = match_results&lt;const wchar_t*&gt; ]</dt>
-                     <dt><a href="match_results.html">smatch</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = match_results&lt;std::string::const_iterator&gt; ]</dt>
-                     <dt><a href="match_results.html">wsmatch</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = match_results&lt;std::wstring::const_iterator&gt; ]</dt>
-                     <dt><a href="regex_iterator.html">cregex_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = regex_iterator&lt;const char*&gt;]</dt>
-                     <dt><a href="regex_iterator.html">wcregex_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = regex_iterator&lt;const wchar_t*&gt;]</dt>
-                     <dt><a href="regex_iterator.html">sregex_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = regex_iterator&lt;std::string::const_iterator&gt;]</dt>
-                     <dt><a href="regex_iterator.html">wsregex_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = regex_iterator&lt;std::wstring::const_iterator&gt;]</dt>
-                     <dt><a href="regex_token_iterator.html">cregex_token_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = regex_token_iterator&lt;const char*&gt;]</dt>
-                     <dt><a href="regex_token_iterator.html">wcregex_token_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = regex_token_iterator&lt;const wchar_t*&gt;]</dt>
-                     <dt><a href="regex_token_iterator.html">sregex_token_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = regex_token_iterator&lt;std::string::const_iterator&gt;]</dt>
-                     <dt><a href="regex_token_iterator.html">wsregex_token_iterator</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ = regex_token_iterator&lt;std::wstring::const_iterator&gt;]</dt>
-                  </dl>
-               </dd>
-               <dt>Misc.</dt>
-               <dd>
-                  <dl class="index">
-                     <dt><a href="posix_api.html">POSIX API Compatibility Functions</a></dt>
-                     <dt><a href="partial_matches.html">Partial matches</a></dt>
-                     <dt><a href="syntax.html">Regular Expression Syntax</a></dt>
-                     <dt><a href="format_syntax.html">Format String Syntax</a></dt>
-                     <dt><a href="captures.html">Understanding Captures</a></dt>
-                  </dl>
-               </dd>
-               <dt>Deprecated interfaces</dt>
-               <dd>
-                  <dl class="index">
-                     <dt><a href="regbase.html">class regbase</a></dt> <dt><a href="reg_expression.html">class 
-                           template reg_expression</a></dt> <dt><a href="regex_grep.html">Algorithm 
-                           regex_grep</a></dt> <dt><a href="regex_format.html">Algorithm regex_format</a></dt>
-                     <dt><a href="regex_merge.html">Algorithm regex_merge</a></dt> <dt><a href="regex_split.html">
-                           Algorithm regex_split</a></dt>
-                      <dt><a href="regex.html">class RegEx</a></dt>
-                 </dl>
-               </dd>
-            </dl>
-         </dd>
-         <dt><a href="faq.html">FAQ</a></dt>
-         <dt>Appendix</dt>
-         <dd>
-            <dl class="index">
-               <dt><a href="implementation.html">Implementation</a></dt>
-               <dt><a href="thread_safety.html">Thread Safety</a></dt>
-               <dt><a href="localisation.html">Localisation</a></dt>
-               <dt><a href="examples.html">Examples</a></dt>
-               <dt><a href="headers.html">Headers</a></dt>
-               <dt><a href="redistributables.html">Redistributables and Library Names</a></dt>
-               <dt><a href="standards.html">Standards Conformance</a></dt>
-               <dt><a href="history.html">History</a></dt>
-               <dt><a href="performance.html">Performance</a></dt>
-               <dt><a href="contacts.html">Contacts and Acknowledgements</a></dt>
-           </dl>
-         </dd>
+         <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 (prefered)</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>
+                        </dl></dd></dt>
+                     </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>
+                              <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>
+                              <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>
+                     <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 Oct 2003 
+         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 --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
    </body>
 </html>
-
-
-
diff --git a/doc/install.html b/doc/install.html
index 92241e2b..ffc1e996 100644
--- a/doc/install.html
+++ b/doc/install.html
@@ -1,23 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
    <head>
-      <title>Boost.Regex: Index</title>
+      <title>Boost.Regex: Installation</title>
       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-      <link rel="stylesheet" type="text/css" href="../../../boost.css">
-   </head>
+      <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" width="277" alt="C++ Boost" src="../../../boost.png" border="0"></a></h3>
+               <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" width="43" alt="Boost.Regex Index" src="uarrow.gif" border="0"></a></h3>
+                  <h3><A href="index.html"><IMG height="45" alt="Boost.Regex Index" src="uarrow.gif" width="43" border="0"></A></h3>
                </td>
             </TR>
          </TABLE>
@@ -41,8 +40,23 @@
          or archive file before you can use it, instructions for specific platforms are 
          as follows:
       </P>
-      <P><B><A name="bcb"></A>Borland C++ Builder:</B>
-      </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; To do that 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 you might use:</P>
+      <PRE>bjam -sICU_PATH=/usr/local -sTOOLS=<A href="../../../more/getting_started.html#Tools" >my-compiler</A></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>.</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 
@@ -84,7 +98,7 @@
       </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 staically 
+         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>
@@ -94,7 +108,7 @@
          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>
-      <P><B><A name="vc"></A>Microsoft Visual C++ 6</B><STRONG> and 7</STRONG></P>
+      <H3><A name="vc"></A>Microsoft Visual C++ 6 and 7</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>
@@ -117,14 +131,17 @@
       <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 
+      <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>
@@ -155,26 +172,28 @@
             modify the makefile to add /Zc:wchar_t before building the library.
          </LI>
       </UL>
-      <P><B><A name="gcc"></A>GCC(2.95 and 3.x)</B>
-      </P>
-      <P>The best way to&nbsp;build with gcc is using the <A href="../../../more/getting_started.html">
-            normal boost Jamfile in &lt;boost&gt;/libs/regex/build</A>, 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:
+      <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-gcc-1_32.a and 
-         libboost_regex-gcc-d-1_32.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-gcc-1_32.a to your list 
-         of library files.
+         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&nbsp;libboost_regex-gcc-1_32.so and 
-         libboost_regex-gcc-d-1_32.so.</P>
+      <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>
@@ -183,7 +202,7 @@
       <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>
-      <P><B><A name="sun"></A>Sun Workshop 6.1</B></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>
@@ -206,29 +225,22 @@
          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>
-      <P><B><A name="other"></A>Other compilers:</B>
-      </P>
-      <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.
-      <P>
-         Alternatively you can using the <A href="../../../more/getting_started.html">Jam 
-            based build system</A>: cd into &lt;boost&gt;/libs/regex/build and run:<PRE>bjam -sTOOLS=mytoolset</PRE>
-      <P>
-         If you need to configure the library for your platform, then refer to the <A href="../../config/config.htm">
-            config library documentation</A>
-      .
-      <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 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         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 -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--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/introduction.html b/doc/introduction.html
index 069295c8..df9762e9 100644
--- a/doc/introduction.html
+++ b/doc/introduction.html
@@ -42,8 +42,7 @@
       <pre><B>namespace </B>boost{
 
 <B>template</B> &lt;<B>class</B> charT, 
-<B>          class</B> traits = regex_traits&lt;charT&gt;, 
-          <B>class</B> Allocator = std::allocator&lt;charT&gt; &gt;
+<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;
diff --git a/doc/localisation.html b/doc/localisation.html
index 07e9b0a1..31bd8663 100644
--- a/doc/localisation.html
+++ b/doc/localisation.html
@@ -1,1023 +1,808 @@
 <!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: Localisation</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">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 there is a single global locale as
-defined by the user's control panel settings, and returned by
-GetUserDefaultLCID. 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>Note that this API sets the dll name for <i>both</i> the narrow
-and wide character specializations of w32_regex_traits.</p>
-
-<p>This model does not currently support thread specific locales
-(via SetThreadLocale under Windows NT), 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 is the default model when the library is compiled under an
-operating system other than Win32, and 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. Front end
-localization requires a POSIX message catalogue. 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 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::c_regex_traits&lt;char&gt;::set_message_catalogue("mycatalogue");</p>
-
-<p>Note that this API sets the dll name for <i>both</i> the narrow
-and wide character specializations of c_regex_traits. If your run
-time library does not support POSIX message catalogues, then you
-can either provide your own implementation of &lt;nl_types.h&gt; or
-define BOOST_RE_NO_CAT to disable front-end localization via
-message catalogues.</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 only in effect if the library is built with the
-pre-processor symbol BOOST_REGEX_USE_CPP_LOCALE defined. 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;. This model is the one which closest fits the
-ethos of the C++ standard library, however it is the model which
-will produce the slowest code, and which is the least well
-supported by current standard library implementations, for example
-I have yet to find an implementation of std::locale which supports
-either message catalogues, or locales other than "C" or
-"POSIX".</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 or 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 
+   <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 --> 
-         24 Oct 2003 
+         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 --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
-</body>
+   </body>
 </html>
-
-
diff --git a/doc/match_flag_type.html b/doc/match_flag_type.html
index eaf44bb6..fec767e4 100644
--- a/doc/match_flag_type.html
+++ b/doc/match_flag_type.html
@@ -28,12 +28,12 @@
       <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 descibed in more 
+         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>implementation-specific-bitmask-type</EM> match_flag_type;
+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;
@@ -70,10 +70,10 @@ static const match_flag_type format_all;
       <table id="Table2" cellspacing="1" cellpadding="7" width="100%" border="0">
          <tr>
             <td valign="top" width="50%">
-               <p>Element</p>
+               <p><STRONG>Element</STRONG></p>
             </td>
             <td valign="top" width="50%">
-               <p>Effect if set</p>
+               <p><STRONG>Effect if set</STRONG></p>
             </td>
          </tr>
          <tr>
@@ -88,12 +88,12 @@ static const match_flag_type format_all;
          </tr>
          <tr>
             <td valign="top" width="50%">match_not_bob</td>
-            <td valign="top" width="50%">Specifies that the expression "\A" should not match 
-               against the sub-sequence [first,first).</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 
+            <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>
@@ -119,8 +119,8 @@ static const match_flag_type format_all;
                <p>match_not_bow</p>
             </td>
             <td valign="top" width="50%">
-               <p>Specifies that the expression "\b" should not be matched against the 
-                  sub-sequence [first,first).</p>
+               <p>Specifies that the expressions "\&lt;" and&nbsp;"\b" should not be matched 
+                  against the sub-sequence [first,first).</p>
             </td>
          </tr>
          <tr>
@@ -128,8 +128,8 @@ static const match_flag_type format_all;
                <p>match_not_eow</p>
             </td>
             <td valign="top" width="50%">
-               <p>Specifies that the expression "\b" should not be matched against the 
-                  sub-sequence [last,last).</p>
+               <p>Specifies that the expressions "\&gt;" and&nbsp;"\b" should not be matched 
+                  against the sub-sequence [last,last).</p>
             </td>
          </tr>
          <tr>
@@ -138,7 +138,10 @@ static const match_flag_type format_all;
             </td>
             <td valign="top" width="50%">
                <p>Specifies that if more than one match is possible then any match is an 
-                  acceptable result.</p>
+                  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>
@@ -280,3 +283,4 @@ static const match_flag_type format_all;
             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_results.html b/doc/match_results.html
index 7309a327..f158c0f8 100644
--- a/doc/match_results.html
+++ b/doc/match_results.html
@@ -51,7 +51,7 @@
       <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 = allocator&lt;sub_match&lt;BidirectionalIterator&gt; &gt;
+          class Allocator = std::allocator&lt;sub_match&lt;BidirectionalIterator&gt; &gt;
 class match_results;
 
 typedef match_results&lt;const char*&gt; cmatch;
@@ -60,7 +60,7 @@ typedef match_results&lt;string::const_iterator&gt; smatch;
 typedef match_results&lt;wstring::const_iterator&gt; wsmatch;
 
 template &lt;class BidirectionalIterator,
-          class Allocator = allocator&lt;sub_match&lt;BidirectionalIterator&gt; &gt;
+          class Allocator = std::allocator&lt;sub_match&lt;BidirectionalIterator&gt; &gt;
 class match_results
 { 
 public: 
@@ -455,4 +455,3 @@ void swap(match_results&lt;BidirectionalIterator, Allocator&gt;&amp; m1,
             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
new file mode 100644
index 00000000..f1d733b7
--- /dev/null
+++ b/doc/mfc_strings.html
@@ -0,0 +1,294 @@
+<!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/non_standard_strings.html b/doc/non_standard_strings.html
new file mode 100644
index 00000000..5196abcf
--- /dev/null
+++ b/doc/non_standard_strings.html
@@ -0,0 +1,53 @@
+<!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/redistributables.html b/doc/redistributables.html
index db2492e1..cdad4739 100644
--- a/doc/redistributables.html
+++ b/doc/redistributables.html
@@ -32,51 +32,22 @@
          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 following 
-         formula:<BR>
+         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></P>
-      <P>BOOST_LIB_PREFIX<BR>
-         + "boost_regex_"<BR>
-         + BOOST_LIB_TOOLSET<BR>
-         + "_"<BR>
-         + BOOST_LIB_THREAD_OPT<BR>
-         + BOOST_LIB_RT_OPT<BR>
-         + BOOST_LIB_DEBUG_OPT<BR>
-         <BR>
-         These are defined as:</P>
-      <P>BOOST_LIB_PREFIX: Either "lib" if this is a static link library, 
-         or&nbsp;nothing for dynamic / shared&nbsp;libraries.<BR>
-         <BR>
-         BOOST_LIB_TOOLSET: The compiler toolset name (vc6, vc7, bcb5 etc).<BR>
-         <BR>
-         BOOST_LIB_THREAD_OPT: "s" for single thread builds,<BR>
-         "m" for multithread builds.<BR>
-         <BR>
-         BOOST_LIB_RT_OPT: "s" for static runtime,<BR>
-         "d" for dynamic runtime.<BR>
-         <BR>
-         BOOST_LIB_LINK_OPT: "s" for static link,<BR>
-         "i" for dynamic link.<BR>
-         <BR>
-         BOOST_LIB_DEBUG_OPT: nothing for release builds,<BR>
-         "d" for debug builds,<BR>
-         "dd" for debug-diagnostic builds (_STLP_DEBUG).</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 statically 
-      link even though you're using the dll version of your run time library, or if 
-      you need to debug boost.regex.
       <P>
          <HR>
       <P></P>
-      <p>Revised 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         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 --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
diff --git a/doc/regex_grep.html b/doc/regex_grep.html
index f4c23f26..30afa48a 100644
--- a/doc/regex_grep.html
+++ b/doc/regex_grep.html
@@ -37,11 +37,11 @@
          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, <b>class</b> Allocator&gt;
+<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, Allocator&gt;&amp; e,
+                         <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 
@@ -49,16 +49,16 @@
          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> Allocator, <b>class</b> traits&gt;
+<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, Allocator&gt;&amp; e, 
+              <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> Allocator, <b>class</b> charT, <b>class</b> traits&gt;
+<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, Allocator&gt;&amp; e, 
+              <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 
@@ -101,23 +101,19 @@
       <br>
       <br>
       <p>The algorithm finds all of the non-overlapping matches of the expression e, for 
-         each match it fills a <a href="#reg_match">match_results</a>&lt;iterator, 
-         Allocator&gt; structure, which contains information on what matched, and calls 
-         the predicate foo, passing the match_results&lt;iterator, Allocator&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>
+         each match it fills a <a href="#reg_match">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, typename expression_type::alloc_type::template rebind&lt;sub_match&lt;BidirectionalIterator&gt; &gt;::other&gt;&amp; m);
+ <b>  bool</b> <b>operator</b>()(<b>const</b> match_results&lt;iterator_type&gt;&amp; m);
 };
 </pre>
-      <p>Note that in almost every case the allocator parameter can be omitted, when 
-         specifying the <a href="match_results.html">match_results</a> type, 
-         alternatively one of the typedefs cmatch, wcmatch, smatch or wsmatch can be 
-         used.</p>
       <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 
@@ -370,7 +366,7 @@ index[std::string(what[5].first, what[5].second) + std::string(what[6].first, wh
       <hr>
       <p>Revised 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         04 Feb 2004 
+         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>
diff --git a/doc/regex_iterator.html b/doc/regex_iterator.html
index c4f99994..3bde1c1d 100644
--- a/doc/regex_iterator.html
+++ b/doc/regex_iterator.html
@@ -37,12 +37,11 @@
       <pre>
 template &lt;class BidirectionalIterator, 
           class charT = iterator_traits&lt;BidirectionalIterator&gt;::value_type,
-          class traits = regex_traits&lt;charT&gt;,
-          class Allocator = allocator&lt;charT&gt; &gt;
+          class traits = regex_traits&lt;charT&gt; &gt;
 class regex_iterator 
 {
 public:
-   typedef          <A href="basic_regex.html">basic_regex</A>&lt;charT, traits, Allocator&gt;                   regex_type;
+   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;
@@ -63,12 +62,23 @@ public:
    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
+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>
@@ -300,6 +310,20 @@ regex_iterator operator++(int);
          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>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 
@@ -419,12 +443,12 @@ color=
 }
 </pre>
       <hr>
-      <p>Revised 
+      <p>Revised&nbsp;&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         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 -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--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>
diff --git a/doc/regex_match.html b/doc/regex_match.html
index dc007760..31c5eba6 100644
--- a/doc/regex_match.html
+++ b/doc/regex_match.html
@@ -42,46 +42,44 @@
          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, class Allocator2&gt;
+         <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, Allocator2&gt;&amp; e,
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default);
-                 
-template &lt;class BidirectionalIterator, class charT, class traits, class Allocator2&gt;
+                 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, Allocator2&gt;&amp; e,
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default);
-                 
-template &lt;class charT, class Allocator, class traits, class Allocator2&gt;
+                 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, Allocator2&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, class Allocator2&gt;
+                 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, Allocator2&gt;&amp; e, 
-                 <A href="match_flag_type.html">match_flag_type</A> flags = match_default);
-                 
-template &lt;class charT, class traits, class Allocator2&gt;
+                 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, Allocator2&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, class Allocator2&gt;
+                 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, Allocator2&gt;&amp; e,
+                 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, class Allocator2&gt;
+         <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, Allocator2&gt;&amp; e,
+                 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>
@@ -237,36 +235,36 @@ bool regex_match(BidirectionalIterator first, BidirectionalIterator last,
       <P></P>
       <DIV></DIV>
       <PRE>&nbsp;</PRE>
-      <PRE><A name=f2></A>template &lt;class BidirectionalIterator, class charT, class traits, class Allocator2&gt;
+      <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, Allocator2&gt;&amp; e,
+                 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, class Allocator2&gt;
+      <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, Allocator2&gt;&amp; e,
+                 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, class Allocator2&gt;
+      <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, Allocator2&gt;&amp; e, 
+                 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, class Allocator2&gt;
+      <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, Allocator2&gt;&amp; e,
+                 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, class Allocator2&gt;
+      <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, Allocator2&gt;&amp; e,
+                 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>.
@@ -307,13 +305,12 @@ regex expression(<FONT color=#000080>"([0-9]+)(\\-| |$)(.*)"</FONT>);
       <P>
          <HR></PRE>
       <P></P>
-      <p>Revised 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         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 --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
diff --git a/doc/regex_replace.html b/doc/regex_replace.html
index f7a9c267..8ae8bb01 100644
--- a/doc/regex_replace.html
+++ b/doc/regex_replace.html
@@ -35,29 +35,27 @@
          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 Allocator, class charT&gt;
+         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, Allocator&gt;&amp; e,
+                           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 Allocator, class charT&gt;
+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, Allocator&gt;&amp; e,
+                            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 Allocator, class charT&gt;
+         <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, Allocator&gt;&amp; e,
+                           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, 
@@ -126,9 +124,9 @@ OutputIterator regex_replace(OutputIterator out,
             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 Allocator, class charT&gt;
+      <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, Allocator&gt;&amp; e,
+                            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>, 
@@ -245,13 +243,12 @@ boost::regex e1, e2;
 <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 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         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 --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
diff --git a/doc/regex_search.html b/doc/regex_search.html
index aab58a63..22691687 100644
--- a/doc/regex_search.html
+++ b/doc/regex_search.html
@@ -35,55 +35,47 @@
          match could conceivably start at that position. The algorithm is defined as 
          follows:
          <PRE>template &lt;class BidirectionalIterator, 
-          class Allocator, class charT,
-          class traits, class Allocator2&gt;
+          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, Allocator2&gt;&amp; e,
+                  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, class Allocator2&gt; 
+          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, Allocator2&gt;&amp; e, 
+                  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, 
-         class Allocator2&gt; 
+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, Allocator2&gt;&amp; e,
+                  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 Allocator,
-          class charT, class traits&gt;                
+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, Allocator&gt;&amp; e, 
+                  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; 
+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, Allocator&gt;&amp; e, 
+                  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;
+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, Allocator&gt;&amp; e,
+                  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, class Allocator2&gt;
+         <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, Allocator2&gt;&amp; e,
+                  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>
@@ -234,38 +226,36 @@ bool regex_search(BidirectionalIterator first, BidirectionalIterator last,
                </TD></TR></TABLE>
          </CENTER>
       </DIV>
-      <PRE><A name=f2></A>template &lt;class charT, class Allocator, class traits, class Allocator2&gt;
+      <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, Allocator2&gt;&amp; e,
+                  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, class Allocator2&gt;
+          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, Allocator2&gt;&amp; e,
+                  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 Allocator, class charT,
-          class traits&gt;
+      <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, Allocator&gt;&amp; e,
+                  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 Allocator, class traits&gt;
+      <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, Allocator&gt;&amp; e,
+                  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 Allocator, class charT,
-          class traits&gt;
+      <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, Allocator&gt;&amp; e,
+                  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>.
@@ -314,7 +304,7 @@ void</B> IndexClasses(map_type&amp; m, <B>const</B> std::string&amp; file)
       <HR>
       <p>Revised 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         04 Feb 2004 
+         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>
diff --git a/doc/regex_split.html b/doc/regex_split.html
index 8fb0ba7d..a3b7b293 100644
--- a/doc/regex_split.html
+++ b/doc/regex_split.html
@@ -35,17 +35,17 @@
       <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, <B>class</B> Alloc2&gt;
+      <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, Alloc2&gt;&amp; e,
+&nbsp;<B>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;const</B> basic_regex&lt;charT, Traits2&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, <B>class</B> Alloc2&gt;
+<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, Alloc2&gt;&amp; e,
+&nbsp;<B>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;const</B> basic_regex&lt;charT, Traits2&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;
@@ -132,9 +132,9 @@ boost::regex e(<FONT color=#000080>"&lt;\\s*A\\s+[^&gt;]*href\\s*=\\s*\"([^\"]*)
    <B>return</B> 0;
 }</PRE>
       <HR>
-      <p>Revised 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         04 Feb 2004 
+         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>
diff --git a/doc/regex_token_iterator.html b/doc/regex_token_iterator.html
index 947ff37a..9bd59050 100644
--- a/doc/regex_token_iterator.html
+++ b/doc/regex_token_iterator.html
@@ -41,14 +41,12 @@
       <PRE>
 template &lt;class BidirectionalIterator, 
           class charT = iterator_traits&lt;BidirectionalIterator&gt;::value_type,
-          class traits = regex_traits&lt;charT&gt;,
-          class Allocator = allocator&lt;charT&gt; &gt;
+          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, Allocator&gt;                   regex_type;
-   typedef          <A href="sub_match.html">sub_match</A>                     
-             &lt;BidirectionalIterator&gt;                                     value_type;
+   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;
@@ -78,6 +76,48 @@ typedef regex_token_iterator&lt;std::string::const_iterator&gt;   sregex_token_i
 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>
@@ -171,7 +211,54 @@ regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const reg
       <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>
-         <H3>Examples</H3>
+         <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>
@@ -280,14 +367,15 @@ boost::regex e(<FONT color=#0000ff>"&lt;\\s*A\\s+[^&gt;]*href\\s*=\\s*\"([^\"]*)
 }
 </pre>
       <HR>
-      <p>Revised 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         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 -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
    </body>
 </html>
+
diff --git a/doc/regex_traits.html b/doc/regex_traits.html
index 052ee99f..dc1708f7 100644
--- a/doc/regex_traits.html
+++ b/doc/regex_traits.html
@@ -23,22 +23,63 @@
          </TABLE>
       </P>
       <HR>
-      <p></p>
-      <P>
-         Under construction: the current design will be replaced by that specified in 
-         the <A href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1429.htm">regular 
-            expression standardization proposal</A>, the current (obsolete) design has 
-         it's <A href="http://cvs.sourceforge.net/viewcvs.py/*checkout*/boost/boost/libs/regex/Attic/traits_class_ref.htm?rev=1.11">
-            documentation archived online</A>.</P>
-      <P>
-         <HR>
+      <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 Oct 2003 
+         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 -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--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>
diff --git a/doc/standards.html b/doc/standards.html
index 0e1b0ee1..17fe78a2 100644
--- a/doc/standards.html
+++ b/doc/standards.html
@@ -27,8 +27,7 @@
       <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; Currently there are some differences in how the regular 
-         expression traits classes are defined, these will be fixed in a future release.</P>
+         standard).&nbsp;</P>
       <H3>ECMAScript / JavaScript</H3>
       <P>All of the ECMAScript regular expression syntax features are supported, except 
          that:</P>
@@ -39,16 +38,18 @@
          Unicode escape sequences.</P>
       <H3>Perl</H3>
       <P>Almost all Perl features are supported, except for:</P>
-      <P>\N{name}&nbsp; Use [[:name:]] instead.</P>
-      <P>\pP and \PP</P>
-      <P>(?imsx-imsx)</P>
-      <P>(?&lt;=pattern)</P>
-      <P>(?&lt;!pattern)</P>
-      <P>(?{code})</P>
-      <P>(??{code})</P>
-      <P>(?(condition)yes-pattern) and (?(condition)yes-pattern|no-pattern)</P>
-      <P>These embarrassments / limitations will be removed in due course, mainly 
-         dependent upon user demand.</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>
@@ -60,18 +61,176 @@
          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>
-         <HR>
-      <p>Revised 
+      <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_string.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 --> 
-         24 Oct 2003 
+         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 --> 
-            2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
    </body>
 </html>
 
-
diff --git a/doc/sub_match.html b/doc/sub_match.html
index 3a86f192..388d6773 100644
--- a/doc/sub_match.html
+++ b/doc/sub_match.html
@@ -62,7 +62,15 @@
          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;
 {
@@ -323,10 +331,11 @@ basic_ostream&lt;charT, traits&gt;&amp;
          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.
+            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 match_extra 
+            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>
@@ -550,13 +559,13 @@ basic_ostream&lt;charT, traits&gt;&amp;
          <HR>
       <p>Revised 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         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 -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--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/syntax.html b/doc/syntax.html
index b4022514..e2b62f87 100644
--- a/doc/syntax.html
+++ b/doc/syntax.html
@@ -25,742 +25,29 @@
       <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 flags used during expression compilation.
-      </P>
-      <H3>Literals
-      </H3>
-      <P>All characters are literals except: ".", "|", "*", "?", "+", "(", ")", "{", 
-         "}", "[", "]", "^", "$" and "\". These characters are literals when preceded by 
-         a "\". A literal is a character that matches itself, or matches the result of 
-         traits_type::translate(), where traits_type is the traits template parameter to 
-         class basic_regex.</P>
-      <H3>Wildcard
-      </H3>
-      <P>The dot character "." matches any single character except : when <I>match_not_dot_null</I>
-         is passed to the matching algorithms, the dot does not match a null character; 
-         when <I>match_not_dot_newline</I> is passed to the matching algorithms, then 
-         the dot does not match a newline character.
-      </P>
-      <H3>Repeats
-      </H3>
-      <P>A repeat is an expression that is repeated an arbitrary number of times. An 
-         expression followed by "*" can be repeated any number of times including zero. 
-         An expression followed by "+" can be repeated any number of times, but at least 
-         once, if the expression is compiled with the flag regex_constants::bk_plus_qm 
-         then "+" is an ordinary character and "\+" represents a repeat of once or more. 
-         An expression followed by "?" may be repeated zero or one times only, if the 
-         expression is compiled with the flag regex_constants::bk_plus_qm then "?" is an 
-         ordinary character and "\?" represents the repeat zero or once operator. When 
-         it is necessary to specify the minimum and maximum number of repeats 
-         explicitly, the bounds operator "{}" may be used, thus "a{2}" is the letter "a" 
-         repeated exactly twice, "a{2,4}" represents the letter "a" repeated between 2 
-         and 4 times, and "a{2,}" represents the letter "a" repeated at least twice with 
-         no upper limit. Note that there must be no white-space inside the {}, and there 
-         is no upper limit on the values of the lower and upper bounds. When the 
-         expression is compiled with the flag regex_constants::bk_braces then "{" and 
-         "}" are ordinary characters and "\{" and "\}" are used to delimit bounds 
-         instead. All repeat expressions refer to the shortest possible previous 
-         sub-expression: a single character; a character set, or a sub-expression 
-         grouped with "()" for example.
-      </P>
-      <P>Examples:
-      </P>
-      <P>"ba*" will match all of "b", "ba", "baaa" etc.
-      </P>
-      <P>"ba+" will match "ba" or "baaaa" for example but not "b".
-      </P>
-      <P>"ba?" will match "b" or "ba".
-      </P>
-      <P>"ba{2,4}" will match "baa", "baaa" and "baaaa".
-      </P>
-      <H3>Non-greedy repeats
-      </H3>
-      <P>Whenever the "extended" regular expression syntax is in use (the default) then 
-         non-greedy repeats are possible by appending a '?' after the repeat; a 
-         non-greedy repeat is one which will match the <I>shortest</I> possible string.
-      </P>
-      <P>For example to match html tag pairs one could use something like:
-      </P>
-      <P>"&lt;\s*tagname[^&gt;]*&gt;(.*?)&lt;\s*/tagname\s*&gt;"
-      </P>
-      <P>In this case $1 will contain the text between the tag pairs, and will be the 
-         shortest possible matching string.&nbsp;
-      </P>
-      <H3>Parenthesis
-      </H3>
-      <P>Parentheses serve two purposes, to group items together into a sub-expression, 
-         and to mark what generated the match. For example the expression "(ab)*" would 
-         match all of the string "ababab". The matching algorithms <A href="regex_match.html">
-            regex_match</A> and <A href="regex_search.html">regex_search</A> each take 
-         an instance of <A href="match_results.html">match_results</A> that reports what 
-         caused the match, on exit from these functions the <A href="match_results.html">match_results</A>
-         contains information both on what the whole expression matched and on what each 
-         sub-expression matched. In the example above match_results[1] would contain a 
-         pair of iterators denoting the final "ab" of the matching string. It is 
-         permissible for sub-expressions to match null strings. If a sub-expression 
-         takes no part in a match - for example if it is part of an alternative that is 
-         not taken - then both of the iterators that are returned for that 
-         sub-expression point to the end of the input string, and the <I>matched</I> parameter 
-         for that sub-expression is <I>false</I>. Sub-expressions are indexed from left 
-         to right starting from 1, sub-expression 0 is the whole expression.
-      </P>
-      <H3>Non-Marking Parenthesis
-      </H3>
-      <P>Sometimes you need to group sub-expressions with parenthesis, but don't want 
-         the parenthesis to spit out another marked sub-expression, in this case a 
-         non-marking parenthesis (?:expression) can be used. For example the following 
-         expression creates no sub-expressions:
-      </P>
-      <P>"(?:abc)*"</P>
-      <H3>Forward Lookahead Asserts&nbsp;
-      </H3>
-      <P>There are two forms of these; one for positive forward lookahead asserts, and 
-         one for negative lookahead asserts:</P>
-      <P>"(?=abc)" matches zero characters only if they are followed by the expression 
-         "abc".</P>
-      <P>"(?!abc)" matches zero characters only if they are not followed by the 
-         expression "abc".</P>
-      <H3>Independent sub-expressions</H3>
-      <P>"(?&gt;expression)" matches "expression" as an independent atom (the algorithm 
-         will not backtrack into it if a failure occurs later in the expression).</P>
-      <H3>Alternatives
-      </H3>
-      <P>Alternatives occur when the expression can match either one sub-expression or 
-         another, each alternative is separated by a "|", or a "\|" if the flag 
-         regex_constants::bk_vbar is set, or by a newline character if the flag 
-         regex_constants::newline_alt is set. Each alternative is the largest possible 
-         previous sub-expression; this is the opposite behavior from repetition 
-         operators.
-      </P>
-      <P>Examples:
-      </P>
-      <P>"a(b|c)" could match "ab" or "ac".
-      </P>
-      <P>"abc|def" could match "abc" or "def".
-      </P>
-      <H3>Sets
-      </H3>
-      <P>A set is a set of characters that can match any single character that is a 
-         member of the set. Sets are delimited by "[" and "]" and can contain literals, 
-         character ranges, character classes, collating elements and equivalence 
-         classes. Set declarations that start with "^" contain the complement of the 
-         elements that follow.
-      </P>
-      <P>Examples:
-      </P>
-      <P>Character literals:
-      </P>
-      <P>"[abc]" will match either of "a", "b", or "c".
-      </P>
-      <P>"[^abc] will match any character other than "a", "b", or "c".
-      </P>
-      <P>Character ranges:
-      </P>
-      <P>"[a-z]" will match any character in the range "a" to "z".
-      </P>
-      <P>"[^A-Z]" will match any character other than those in the range "A" to "Z".
-      </P>
-      <P>Note that character ranges are highly locale dependent if the flag 
-         regex_constants::collate is set: they match any character that collates between 
-         the endpoints of the range, ranges will only behave according to ASCII rules 
-         when the default "C" locale is in effect. For example if the library is 
-         compiled with the Win32 localization model, then [a-z] will match the ASCII 
-         characters a-z, and also 'A', 'B' etc, but not 'Z' which collates just after 
-         'z'. This locale specific behavior is disabled by default (in perl mode), and 
-         forces ranges to collate according to ASCII character code.
-      </P>
-      <P>Character classes are denoted using the syntax "[:classname:]" within a set 
-         declaration, for example "[[:space:]]" is the set of all whitespace characters. 
-         Character classes are only available if the flag regex_constants::char_classes 
-         is set. The available character classes are:
-         <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="50%">alnum</TD>
-               <TD vAlign="top" width="50%">Any alpha numeric character.</TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">alpha</TD>
-               <TD vAlign="top" width="50%">Any alphabetical character a-z and A-Z. Other 
-                  characters may also be included depending upon the locale.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">blank</TD>
-               <TD vAlign="top" width="50%">Any blank character, either a space or a tab.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">cntrl</TD>
-               <TD vAlign="top" width="50%">Any control character.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">digit</TD>
-               <TD vAlign="top" width="50%">Any digit 0-9.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">graph</TD>
-               <TD vAlign="top" width="50%">Any graphical character.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">lower</TD>
-               <TD vAlign="top" width="50%">Any lower case character a-z. Other characters may 
-                  also be included depending upon the locale.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">print</TD>
-               <TD vAlign="top" width="50%">Any printable character.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">punct</TD>
-               <TD vAlign="top" width="50%">Any punctuation character.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">space</TD>
-               <TD vAlign="top" width="50%">Any whitespace character.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">upper</TD>
-               <TD vAlign="top" width="50%">Any upper case character A-Z. Other characters may 
-                  also be included depending upon the locale.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">xdigit</TD>
-               <TD vAlign="top" width="50%">Any hexadecimal digit character, 0-9, a-f and A-F.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">word</TD>
-               <TD vAlign="top" width="50%">Any word character - all alphanumeric characters plus 
-                  the underscore.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="50%">Unicode</TD>
-               <TD vAlign="top" width="50%">Any character whose code is greater than 255, this 
-                  applies to the wide character traits classes only.</TD>
-               <TD>&nbsp;</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <P>There are some shortcuts that can be used in place of the character classes, 
-         provided the flag regex_constants::escape_in_lists is set then you can use:
-      </P>
-      <P>\w in place of [:word:]
-      </P>
-      <P>\s in place of [:space:]
-      </P>
-      <P>\d in place of [:digit:]
-      </P>
-      <P>\l in place of [:lower:]
-      </P>
-      <P>\u in place of [:upper:]&nbsp;
-      </P>
-      <P>Collating elements take the general form [.tagname.] inside a set declaration, 
-         where <I>tagname</I> is either a single character, or a name of a collating 
-         element, for example [[.a.]] is equivalent to [a], and [[.comma.]] is 
-         equivalent to [,]. The library supports all the standard POSIX collating 
-         element names, and in addition the following digraphs: "ae", "ch", "ll", "ss", 
-         "nj", "dz", "lj", each in lower, upper and title case variations. 
-         Multi-character collating elements can result in the set matching more than one 
-         character, for example [[.ae.]] would match two characters, but note that 
-         [^[.ae.]] would only match one character.&nbsp;
-      </P>
-      <P>
-         Equivalence classes take the generalform[=tagname=] inside a set declaration, 
-         where <I>tagname</I> is either a single character, or a name of a collating 
-         element, and matches any character that is a member of the same primary 
-         equivalence class as the collating element [.tagname.]. An equivalence class is 
-         a set of characters that collate the same, a primary equivalence class is a set 
-         of characters whose primary sort key are all the same (for example strings are 
-         typically collated by character, then by accent, and then by case; the primary 
-         sort key then relates to the character, the secondary to the accentation, and 
-         the tertiary to the case). If there is no equivalence class corresponding to <I>tagname</I>
-         ,then[=tagname=] is exactly the same as [.tagname.]. Unfortunately there is no 
-         locale independent method of obtaining the primary sort key for a character, 
-         except under Win32. For other operating systems the library will "guess" the 
-         primary sort key from the full sort key (obtained from <I>strxfrm</I>), so 
-         equivalence classes are probably best considered broken under any operating 
-         system other than Win32.&nbsp;
-      </P>
-      <P>To include a literal "-" in a set declaration then: make it the first character 
-         after the opening "[" or "[^", the endpoint of a range, a collating element, or 
-         if the flag regex_constants::escape_in_lists is set then precede with an escape 
-         character as in "[\-]". To include a literal "[" or "]" or "^" in a set then 
-         make them the endpoint of a range, a collating element, or precede with an 
-         escape character if the flag regex_constants::escape_in_lists is set.
-      </P>
-      <H3>Line anchors
-      </H3>
-      <P>An anchor is something that matches the null string at the start or end of a 
-         line: "^" matches the null string at the start of a line, "$" matches the null 
-         string at the end of a line.
-      </P>
-      <H3>Back references
-      </H3>
-      <P>A back reference is a reference to a previous sub-expression that has already 
-         been matched, the reference is to what the sub-expression matched, not to the 
-         expression itself. A back reference consists of the escape character "\" 
-         followed by a digit "1" to "9", "\1" refers to the first sub-expression, "\2" 
-         to the second etc. For example the expression "(.*)\1" matches any string that 
-         is repeated about its mid-point for example "abcabc" or "xyzxyz". A back 
-         reference to a sub-expression that did not participate in any match, matches 
-         the null string: NB this is different to some other regular expression 
-         matchers. Back references are only available if the expression is compiled with 
-         the flag regex_constants::bk_refs set.
-      </P>
-      <H3>Characters by code
-      </H3>
-      <P>This is an extension to the algorithm that is not available in other libraries, 
-         it consists of the escape character followed by the digit "0" followed by the 
-         octal character code. For example "\023" represents the character whose octal 
-         code is 23. Where ambiguity could occur use parentheses to break the expression 
-         up: "\0103" represents the character whose code is 103, "(\010)3 represents the 
-         character 10 followed by "3". To match characters by their hexadecimal code, 
-         use \x followed by a string of hexadecimal digits, optionally enclosed inside 
-         {}, for example \xf0 or \x{aff}, notice the latter example is a Unicode 
-         character.</P>
-      <H3>Word operators
-      </H3>
-      <P>The following operators are provided for compatibility with the GNU regular 
-         expression library.
-      </P>
-      <P>"\w" matches any single character that is a member of the "word" character 
-         class, this is identical to the expression "[[:word:]]".
-      </P>
-      <P>"\W" matches any single character that is not a member of the "word" character 
-         class, this is identical to the expression "[^[:word:]]".
-      </P>
-      <P>"\&lt;" matches the null string at the start of a word.
-      </P>
-      <P>"\&gt;" matches the null string at the end of the word.
-      </P>
-      <P>"\b" matches the null string at either the start or the end of a word.
-      </P>
-      <P>"\B" matches a null string within a word.
-      </P>
-      <P>The start of the sequence passed to the matching algorithms is considered to be 
-         a potential start of a word unless the flag match_not_bow is set. The end of 
-         the sequence passed to the matching algorithms is considered to be a potential 
-         end of a word unless the flag match_not_eow is set.
-      </P>
-      <H3>Buffer operators
-      </H3>
-      <P>The following operators are provided for compatibility with the GNU regular 
-         expression library, and Perl regular expressions:
-      </P>
-      <P>"\`" matches the start of a buffer.
-      </P>
-      <P>"\A" matches the start of the buffer.
-      </P>
-      <P>"\'" matches the end of a buffer.
-      </P>
-      <P>"\z" matches the end of a buffer.
-      </P>
-      <P>"\Z" matches the end of a buffer, or possibly one or more new line characters 
-         followed by the end of the buffer.
-      </P>
-      <P>A buffer is considered to consist of the whole sequence passed to the matching 
-         algorithms, unless the flags match_not_bob or match_not_eob are set.
-      </P>
-      <H3>Escape operator
-      </H3>
-      <P>The escape character "\" has several meanings.
-      </P>
-      <P>Inside a set declaration the escape character is a normal character unless the 
-         flag regex_constants::escape_in_lists is set in which case whatever follows the 
-         escape is a literal character regardless of its normal meaning.
-      </P>
-      <P>The escape operator may introduce an operator for example: back references, or 
-         a word operator.
-      </P>
-      <P>The escape operator may make the following character normal, for example "\*" 
-         represents a literal "*" rather than the repeat operator.
-      </P>
-      <H4>Single character escape sequences
-      </H4>
-      <P>The following escape sequences are aliases for single characters:
-         <BR>
-         &nbsp;
-      </P>
-      <P>
-         <TABLE id="Table3" cellSpacing="0" cellPadding="7" width="100%" border="0">
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="33%">Escape sequence
-               </TD>
-               <TD vAlign="top" width="33%">Character code
-               </TD>
-               <TD vAlign="top" width="33%">Meaning
-               </TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="33%">\a
-               </TD>
-               <TD vAlign="top" width="33%">0x07
-               </TD>
-               <TD vAlign="top" width="33%">Bell character.
-               </TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="33%">\f
-               </TD>
-               <TD vAlign="top" width="33%">0x0C
-               </TD>
-               <TD vAlign="top" width="33%">Form feed.
-               </TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="33%">\n
-               </TD>
-               <TD vAlign="top" width="33%">0x0A
-               </TD>
-               <TD vAlign="top" width="33%">Newline character.
-               </TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="33%">\r
-               </TD>
-               <TD vAlign="top" width="33%">0x0D
-               </TD>
-               <TD vAlign="top" width="33%">Carriage return.
-               </TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="33%">\t
-               </TD>
-               <TD vAlign="top" width="33%">0x09
-               </TD>
-               <TD vAlign="top" width="33%">Tab character.
-               </TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="33%">\v
-               </TD>
-               <TD vAlign="top" width="33%">0x0B
-               </TD>
-               <TD vAlign="top" width="33%">Vertical tab.
-               </TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="33%">\e
-               </TD>
-               <TD vAlign="top" width="33%">0x1B
-               </TD>
-               <TD vAlign="top" width="33%">ASCII Escape character.
-               </TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="33%">\0dd
-               </TD>
-               <TD vAlign="top" width="33%">0dd
-               </TD>
-               <TD vAlign="top" width="33%">An octal character code, where <I>dd</I> is one or 
-                  more octal digits.
-               </TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="33%">\xXX
-               </TD>
-               <TD vAlign="top" width="33%">0xXX
-               </TD>
-               <TD vAlign="top" width="33%">A hexadecimal character code, where XX is one or more 
-                  hexadecimal digits.
-               </TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="33%">\x{XX}
-               </TD>
-               <TD vAlign="top" width="33%">0xXX
-               </TD>
-               <TD vAlign="top" width="33%">A hexadecimal character code, where XX is one or more 
-                  hexadecimal digits, optionally a Unicode character.
-               </TD>
-               <TD>&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD>&nbsp;</TD>
-               <TD vAlign="top" width="33%">\cZ
-               </TD>
-               <TD vAlign="top" width="33%">z-@
-               </TD>
-               <TD vAlign="top" width="33%">An ASCII escape sequence control-Z, where Z is any 
-                  ASCII character greater than or equal to the character code for '@'.
-               </TD>
-               <TD>&nbsp;</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <H4>Miscellaneous escape sequences:
-      </H4>
-      <P>The following are provided mostly for perl compatibility, but note that there 
-         are some differences in the meanings of \l \L \u and \U:
-         <BR>
-         &nbsp;
-      </P>
-      <P>
-         <TABLE id="Table4" cellSpacing="0" cellPadding="6" width="100%" border="0">
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">\w
-               </TD>
-               <TD vAlign="top" width="45%">Equivalent to [[:word:]].
-               </TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">\W
-               </TD>
-               <TD vAlign="top" width="45%">Equivalent to [^[:word:]].
-               </TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">\s
-               </TD>
-               <TD vAlign="top" width="45%">Equivalent to [[:space:]].
-               </TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">\S
-               </TD>
-               <TD vAlign="top" width="45%">Equivalent to [^[:space:]].
-               </TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">\d
-               </TD>
-               <TD vAlign="top" width="45%">Equivalent to [[:digit:]].
-               </TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">\D
-               </TD>
-               <TD vAlign="top" width="45%">Equivalent to [^[:digit:]].
-               </TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">\l
-               </TD>
-               <TD vAlign="top" width="45%">Equivalent to [[:lower:]].
-               </TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">\L
-               </TD>
-               <TD vAlign="top" width="45%">Equivalent to [^[:lower:]].
-               </TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">\u
-               </TD>
-               <TD vAlign="top" width="45%">Equivalent to [[:upper:]].
-               </TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">\U
-               </TD>
-               <TD vAlign="top" width="45%">Equivalent to [^[:upper:]].
-               </TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">\C
-               </TD>
-               <TD vAlign="top" width="45%">Any single character, equivalent to '.'.
-               </TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">\X
-               </TD>
-               <TD vAlign="top" width="45%">Match any Unicode combining character sequence, for 
-                  example "a\x 0301" (a letter a with an acute).
-               </TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">\Q
-               </TD>
-               <TD vAlign="top" width="45%">The begin quote operator, everything that follows is 
-                  treated as a literal character until a \E end quote operator is found.
-               </TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-            <TR>
-               <TD width="5%">&nbsp;</TD>
-               <TD vAlign="top" width="45%">\E
-               </TD>
-               <TD vAlign="top" width="45%">The end quote operator, terminates a sequence begun 
-                  with \Q.
-               </TD>
-               <TD width="5%">&nbsp;</TD>
-            </TR>
-         </TABLE>
-      </P>
-      <H3>What gets matched?
-      </H3>
-      <P>
-         When the expression is compiled as a Perl-compatible regex then the matching 
-         algorithms will perform a depth first search on the state machine and report 
-         the first match found.</P>
-      <P>
-         When the expression is compiled as a POSIX-compatible regex then the matching 
-         algorithms will match the first possible matching string, if more than one 
-         string starting at a given location can match then it matches the longest 
-         possible string, unless the flag match_any is set, in which case the first 
-         match encountered is returned. Use of the match_any option can reduce the time 
-         taken to find the match - but is only useful if the user is less concerned 
-         about what matched - for example it would not be suitable for search and 
-         replace operations. In cases where their are multiple possible matches all 
-         starting at the same location, and all of the same length, then the match 
-         chosen is the one with the longest first sub-expression, if that is the same 
-         for two or more matches, then the second sub-expression will be examined and so 
-         on.
-      </P>
-      <P>
-         The following table examples illustrate the main differences between Perl and 
-         POSIX regular expression matching rules:
-      </P>
-      <P>
-         <TABLE id="Table5" cellSpacing="1" cellPadding="7" width="624" border="1">
-            <TBODY>
-               <TR>
-                  <TD vAlign="top" width="25%">
-                     <P>Expression</P>
-                  </TD>
-                  <TD vAlign="top" width="25%">
-                     <P>Text</P>
-                  </TD>
-                  <TD vAlign="top" width="25%">
-                     <P>POSIX leftmost longest match</P>
-                  </TD>
-                  <TD vAlign="top" width="25%">
-                     <P>ECMAScript depth first search match</P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="25%">
-                     <P><CODE>a|ab</CODE></P>
-                  </TD>
-                  <TD vAlign="top" width="25%">
-                     <P><CODE> xaby</CODE>
-                     </P>
-                  </TD>
-                  <TD vAlign="top" width="25%">
-                     <P><CODE> "ab"</CODE></P>
-                  </TD>
-                  <TD vAlign="top" width="25%">
-                     <P><CODE> "a"</CODE></P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="25%">
-                     <P><CODE> .*([[:alnum:]]+).*</CODE></P>
-                  </TD>
-                  <TD vAlign="top" width="25%">
-                     <P><CODE> " abc def xyz "</CODE></P>
-                  </TD>
-                  <TD vAlign="top" width="25%">
-                     <P>$0 = " abc def xyz "<BR>
-                        $1 = "abc"</P>
-                  </TD>
-                  <TD vAlign="top" width="25%">
-                     <P>$0 = " abc def xyz "<BR>
-                        $1 = "z"</P>
-                  </TD>
-               </TR>
-               <TR>
-                  <TD vAlign="top" width="25%">
-                     <P><CODE> .*(a|xayy)</CODE></P>
-                  </TD>
-                  <TD vAlign="top" width="25%">
-                     <P><CODE> zzxayyzz</CODE></P>
-                  </TD>
-                  <TD vAlign="top" width="25%">
-                     <P><CODE> "zzxayy"</CODE></P>
-                  </TD>
-                  <TD vAlign="top" width="25%">
-                     <P><CODE>"zzxa"</CODE></P>
-                  </TD>
-               </TR>
-            </TBODY></CODE></TD></TR></TABLE>
-      <P>These differences between Perl matching rules, and POSIX matching rules, mean 
-         that these two regular expression syntaxes differ not only in the features 
-         offered, but also in the form that the state machine takes and/or the 
-         algorithms used to traverse the state machine.</P>
+         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 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         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 -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
diff --git a/doc/syntax_basic.html b/doc/syntax_basic.html
new file mode 100644
index 00000000..cce1434b
--- /dev/null
+++ b/doc/syntax_basic.html
@@ -0,0 +1,236 @@
+<!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>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 the form[[=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>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>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_extended.html b/doc/syntax_extended.html
new file mode 100644
index 00000000..bfba568a
--- /dev/null
+++ b/doc/syntax_extended.html
@@ -0,0 +1,516 @@
+<!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;this results in locale specific behavior.&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>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 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).</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_leftmost_longest.html b/doc/syntax_leftmost_longest.html
new file mode 100644
index 00000000..4c8b25a8
--- /dev/null
+++ b/doc/syntax_leftmost_longest.html
@@ -0,0 +1,65 @@
+<!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 that 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
index 83e95c53..7ea438d7 100644
--- a/doc/syntax_option_type.html
+++ b/doc/syntax_option_type.html
@@ -23,40 +23,49 @@
          </TABLE>
       </P>
       <HR>
-      <H3>Synopsis</H3>
+      <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;
+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 icase;
-static const syntax_option_type nosubs;
-static const syntax_option_type optimize;
-static const syntax_option_type collate;
 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 basic;
+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 sed = basic;
-static const syntax_option_type perl;<BR>// these are boost.regex specific:<BR>static const syntax_option_type escape_in_lists;<BR>static const syntax_option_type char_classes;<BR>static const syntax_option_type intervals;<BR>static const syntax_option_type limited_ops;<BR>static const syntax_option_type newline_alt;<BR>static const syntax_option_type bk_plus_qm;<BR>static const syntax_option_type bk_braces;<BR>static const syntax_option_type bk_parens;<BR>static const syntax_option_type bk_refs;<BR>static const syntax_option_type bk_vbar;<BR>static const syntax_option_type use_except;<BR>static const syntax_option_type failbit;<BR>static const syntax_option_type literal;<BR>static const syntax_option_type nocollate;<BR>static const syntax_option_type perlex;<BR>static const syntax_option_type emacs;<BR>
+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>Description</H3>
+      <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 
-            or perl</CODE> set.</P>
+         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>
@@ -65,52 +74,81 @@ static const syntax_option_type perl;<BR>// these are boost.regex specific:<BR>s
       <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="Table2" height="1274" cellSpacing="1" cellPadding="7" width="100%" border="0">
+         <TABLE id="Table4" cellSpacing="1" cellPadding="1" width="100%" border="1">
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>Element</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>Effect if set</P>
-               </TD>
+               <TD><STRONG>Element</STRONG></TD>
+               <TD><STRONG>Standardized</STRONG></TD>
+               <TD><STRONG>Effect when set</STRONG></TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>normal</P>
+               <TD>
+                  <P>ECMAScript</P>
                </TD>
-               <TD vAlign="top" width="50%">
+               <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 most perl-compatible extensions in this mode.</P>
+                  <P>boost.regex also recognizes all of the perl-compatible (?...) extensions in 
+                     this mode.</P>
                </TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>icase</P>
-               </TD>
-               <TD vAlign="top" width="50%">
+               <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 vAlign="top" width="316">
-                  <P>nosubs</P>
-               </TD>
-               <TD vAlign="top" width="50%">
+               <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 vAlign="top" width="316">
-                  <P>optimize</P>
-               </TD>
-               <TD vAlign="top" width="50%">
+               <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 
@@ -119,91 +157,80 @@ static const syntax_option_type perl;<BR>// these are boost.regex specific:<BR>s
                </TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>collate</P>
-               </TD>
-               <TD vAlign="top" width="50%">
+               <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 vAlign="top" width="316">
-                  <P>ECMAScript</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>The same as normal.</P>
-               </TD>
+               <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 vAlign="top" width="316">
-                  <P>JavaScript</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>The same as normal.</P>
-               </TD>
+               <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 vAlign="top" width="316">
-                  <P>JScript</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>The same as normal.</P>
-               </TD>
+               <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 vAlign="top" width="316">
-                  <P>basic</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>Specifies that the grammar recognized by the regular expression engine is the 
-                     same as that used by 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).
-                  </P>
-               </TD>
+               <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 vAlign="top" width="316">
-                  <P>extended</P>
-               </TD>
-               <TD vAlign="top" width="50%">
+               <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).</P>
+                     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 vAlign="top" width="316">
-                  <P>awk</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <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>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="316">
-                  <P>grep</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>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, 
-                     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 in addition to "|".</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="316">
-                  <P>egrep</P>
-               </TD>
-               <TD vAlign="top" width="50%">
+               <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 
@@ -213,118 +240,256 @@ static const syntax_option_type perl;<BR>// these are boost.regex specific:<BR>s
                </TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="316">
-                  <P>sed</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>The same as basic.</P>
-               </TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="316">
-                  <P>perl</P>
-               </TD>
-               <TD vAlign="top" width="50%">
-                  <P>The same as normal.</P>
+               <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 requires \a \b \t \v \f \n and \r to be recognised,&nbsp;but other 
+                     escape sequences invoke undefined behavior according to the POSIX standard).</P>
                </TD>
             </TR>
          </TABLE>
       </P>
-      <P>The following constants are specific to this particular regular expression 
-         implementation and do not appear in the <A href="http://anubis.dkuug.dk/jtc1/sc22/wg21/docs/papers/2003/n1429.htm">
-            regular expression standardization proposal</A>:</P>
+      <P>The following options may also be set when using POSIX extended regular 
+         expressions:</P>
       <P>
-         <TABLE id="Table3" cellSpacing="0" cellPadding="7" width="100%" border="0">
+         <TABLE id="Table7" cellSpacing="1" cellPadding="1" width="100%" border="1">
             <TR>
-               <TD vAlign="top" width="45%">regbase::escape_in_lists</TD>
-               <TD vAlign="top" width="45%">Allows the use of the escape "\" character in sets of 
-                  characters, for example [\]] represents the set of characters containing only 
-                  "]". If this flag is not set then "\" is an ordinary character inside sets.</TD>
+               <TD><STRONG>Element</STRONG></TD>
+               <TD><STRONG>Standardized</STRONG></TD>
+               <TD><STRONG>Effect when set</STRONG></TD>
             </TR>
             <TR>
-               <TD vAlign="top" width="45%">regbase::char_classes</TD>
-               <TD vAlign="top" width="45%">When this bit is set, character classes [:classname:] 
-                  are allowed inside character set declarations, for example "[[:word:]]" 
-                  represents the set of all characters that belong to the character class "word".</TD>
+               <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 vAlign="top" width="45%">regbase:: intervals</TD>
-               <TD vAlign="top" width="45%">When this bit is set, repetition intervals are 
-                  allowed, for example "a{2,4}" represents a repeat of between 2 and 4 letter 
-                  a's.</TD>
+               <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 vAlign="top" width="45%">regbase:: limited_ops</TD>
-               <TD vAlign="top" width="45%">When this bit is set all of "+", "?" and "|" are 
-                  ordinary characters in all situations.</TD>
+               <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 vAlign="top" width="45%">regbase:: newline_alt</TD>
-               <TD vAlign="top" width="45%">When this bit is set, then the newline character "\n" 
-                  has the same effect as the alternation operator "|".</TD>
+               <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 vAlign="top" width="45%">regbase:: bk_plus_qm</TD>
-               <TD vAlign="top" width="45%">When this bit is set then "\+" represents the one or 
-                  more repetition operator and "\?" represents the zero or one repetition 
-                  operator. When this bit is not set then "+" and "?" are used instead.</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="45%">regbase:: bk_braces</TD>
-               <TD vAlign="top" width="45%">When this bit is set then "\{" and "\}" are used for 
-                  bounded repetitions and "{" and "}" are normal characters. This is the opposite 
-                  of default behavior.</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="45%">regbase:: bk_parens</TD>
-               <TD vAlign="top" width="45%">When this bit is set then "\(" and "\)" are used to 
-                  group sub-expressions and "(" and ")" are ordinary characters, this is the 
-                  opposite of default behavior.</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="45%">regbase:: bk_refs</TD>
-               <TD vAlign="top" width="45%">When this bit is set then back references are 
-                  allowed.</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="45%">regbase:: bk_vbar</TD>
-               <TD vAlign="top" width="45%">When this bit is set then "\|" represents the 
-                  alternation operator and "|" is an ordinary character. This is the opposite of 
-                  default behavior.</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="45%">regbase:: use_except</TD>
-               <TD vAlign="top" width="45%">When this bit is set then a <A href="#bad_expression">bad_expression</A>
-                  exception will be thrown on error.&nbsp; Use of this flag is deprecated - 
-                  basic_regex will always throw on error.</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="45%">regbase:: failbit</TD>
-               <TD vAlign="top" width="45%">This bit is set on error, if regbase::use_except is 
-                  not set, then this bit should be checked to see if a regular expression is 
-                  valid before usage.</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="45%">regbase::literal</TD>
-               <TD vAlign="top" width="45%">All characters in the string are treated as literals, 
-                  there are no special characters or escape sequences.</TD>
-            </TR>
-            <TR>
-               <TD vAlign="top" width="45%" height="24">regbase::emacs</TD>
-               <TD vAlign="top" width="45%" height="24">Provides compatability with the emacs 
-                  editor, eqivalent to: bk_braces | bk_parens | bk_refs | bk_vbar.</TD>
+               <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>
          </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_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>
+         </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 
+      <p>Revised&nbsp; 
          <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan --> 
-         24 Oct 2003 
+         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 -->  2003<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
+            <!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%Y" startspan -->  2004<!--webbot bot="Timestamp" endspan i-checksum="39359" --></i></p>
       <P><I>Use, modification and distribution are subject to the Boost Software License, 
             Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
             or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
    </body>
 </html>
+
diff --git a/doc/syntax_perl.html b/doc/syntax_perl.html
new file mode 100644
index 00000000..eeb0b273
--- /dev/null
+++ b/doc/syntax_perl.html
@@ -0,0 +1,618 @@
+<!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>
+      <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 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 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>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://www.perldoc.com/perl5.6/pod/perlre.html"> Perl 5.6.</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/unicode.html b/doc/unicode.html
new file mode 100644
index 00000000..9e22faf3
--- /dev/null
+++ b/doc/unicode.html
@@ -0,0 +1,66 @@
+<!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/vc71-performance.html b/doc/vc71-performance.html
index 1b2bec28..eca7a248 100644
--- a/doc/vc71-performance.html
+++ b/doc/vc71-performance.html
@@ -694,9 +694,6 @@
          </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>
+      <p>Copyright John Maddock April 2003, all rights reserved.</p>
    </body>
 </html>
diff --git a/example/Jamfile b/example/Jamfile
index 7f94201a..f7b8c21a 100644
--- a/example/Jamfile
+++ b/example/Jamfile
@@ -5,6 +5,41 @@ subproject libs/regex/example ;
 # bring in the rules for testing
 import testing  ;
 
+#
+# test for MFC by looking inside VC++ include directories:
+#
+if ! $(gMFC_CHECK)
+{
+   gMFC_CHECK = true ;
+   if $(VS71COMNTOOLS)
+   {
+      VS71COMNTOOLS = $(VS71COMNTOOLS:J=" ") ;
+      if [ GLOB $(VS71COMNTOOLS)..\\..\\VC7\\atlmfc\\include : cstringt.h ]
+      {
+         ECHO MFC/ATL regex wrappers will be tested when building with VC7.1 ;
+         REGEX_MFC_OPTS += "<vc-7_1><*><define>TEST_MFC=1" ;
+      }
+   }
+   if $(VSCOMNTOOLS)
+   {
+      VSCOMNTOOLS = $(VSCOMNTOOLS:J=" ") ;
+      if [ GLOB $(VSCOMNTOOLS)\\..\\..\\VC7\\atlmfc\\include : cstringt.h ]
+      {
+         ECHO MFC/ATL regex wrappers will be tested when building with VC7 ;
+         REGEX_MFC_OPTS += "<vc7><*><define>TEST_MFC=1" ;
+      }
+   }
+   if $(VS80COMNTOOLS)
+   {
+      VS80COMNTOOLS = $(VS80COMNTOOLS:J=" ") ;
+      if [ GLOB $(VS80COMNTOOLS)..\\..\\VC8\\atlmfc\\include : cstringt.h ]
+      {
+         ECHO MFC/ATL regex wrappers will be tested when building with VC8 ;
+         REGEX_MFC_OPTS += "<vc-8_0><*><define>TEST_MFC=1" ;
+      }
+   }
+}
+
 rule regex-test-run ( sources + : input * )
 {
         return [ 
@@ -20,6 +55,7 @@ rule regex-test-run ( sources + : input * )
          :  # test-files
          :  # requirements
          <threading>multi
+         $(REGEX_MFC_OPTS)
          :  # test name
         ] ;
 }
@@ -29,6 +65,8 @@ test-suite regex-examples :
 [ regex-test-run timer/regex_timer.cpp <template>../build/msvc-stlport-tricky : $(BOOST_ROOT)/libs/regex/example/timer/input_script.txt ]
 [ regex-test-run jgrep/jgrep.cpp jgrep/main.cpp : -n boost/ $(BOOST_ROOT)/boost/regex.hpp ]
 [ regex-test-run snippets/credit_card_example.cpp ]
+[ 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_match.cpp : 1234-5678-8765-4 ]
 [ regex-test-run snippets/regex_grep_example_1.cpp : $(BOOST_ROOT)/boost/rational.hpp ]
diff --git a/example/Jamfile.v2 b/example/Jamfile.v2
index 0f0d053d..58d4b9a2 100644
--- a/example/Jamfile.v2
+++ b/example/Jamfile.v2
@@ -1,7 +1,7 @@
 # copyright John Maddock 2003
 
 project
-    : requirements <threading>multi
+    : requirements <threading>multi <link>shared:<define>BOOST_REGEX_DYN_LINK=1
     ;
 
 
@@ -26,6 +26,8 @@ test-suite regex-examples :
 [ regex-test-run timer/regex_timer.cpp : $(BOOST_ROOT)/libs/regex/example/timer/input_script.txt ]
 [ regex-test-run jgrep/jgrep.cpp jgrep/main.cpp : -n boost/ $(BOOST_ROOT)/boost/regex.hpp ]
 [ regex-test-run snippets/credit_card_example.cpp ]
+[ 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_match.cpp : 1234-5678-8765-4 ]
 [ regex-test-run snippets/regex_grep_example_1.cpp : $(BOOST_ROOT)/boost/rational.hpp ]
diff --git a/example/iso8859_1_regex_traits/iso8859_1_regex_traits.cpp b/example/iso8859_1_regex_traits/iso8859_1_regex_traits.cpp
deleted file mode 100644
index 4152c190..00000000
--- a/example/iso8859_1_regex_traits/iso8859_1_regex_traits.cpp
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * (C) Copyright Christain Engstrom 2001.
- * 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)
- */
- 
-#include "iso8859_1_regex_traits.hpp"
-
-bool iso8859_1_regex_traits::is_class(char c, boost::uint_fast32_t f) const
-{
-  static const boost::uint_fast32_t cntrl =      base::char_class_cntrl;
-  static const boost::uint_fast32_t space =      base::char_class_space;
-  static const boost::uint_fast32_t blank =      base::char_class_blank;
-  static const boost::uint_fast32_t digit =      base::char_class_digit;
-  static const boost::uint_fast32_t xdigit =     base::char_class_xdigit;
-  static const boost::uint_fast32_t underscore = base::char_class_underscore;
-  static const boost::uint_fast32_t punct =      base::char_class_punct;
-  static const boost::uint_fast32_t upper =      base::char_class_upper |
-                                                 base::char_class_alpha;
-  static const boost::uint_fast32_t lower =      base::char_class_lower |
-                                                 base::char_class_alpha;
-
-
-  static const boost::uint_fast32_t flag_table[UCHAR_MAX + 1] = {
-//                            Hex  Oct  Dec  Char
-  cntrl                  , //   0    0   0
-  cntrl                  , //   1    1   1
-  cntrl                  , //   2    2   2
-  cntrl                  , //   3    3   3
-  cntrl                  , //   4    4   4
-  cntrl                  , //   5    5   5
-  cntrl                  , //   6    6   6
-  cntrl                  , //   7    7   7
-  cntrl                  , //   8   10   8
-  cntrl | space | blank  , //   9   11   9  <HT>
-  cntrl | space          , //   a   12  10  <LF>
-  cntrl | space          , //   b   13  11  <VT>
-  cntrl | space          , //   c   14  12  <FF>
-  cntrl | space          , //   d   15  13  <CR>
-  cntrl                  , //   e   16  14
-  cntrl                  , //   f   17  15
-  cntrl                  , //  10   20  16
-  cntrl                  , //  11   21  17
-  cntrl                  , //  12   22  18
-  cntrl                  , //  13   23  19
-  cntrl                  , //  14   24  20
-  cntrl                  , //  15   25  21
-  cntrl                  , //  16   26  22
-  cntrl                  , //  17   27  23
-  cntrl                  , //  18   30  24
-  cntrl                  , //  19   31  25
-  cntrl                  , //  1a   32  26
-  cntrl                  , //  1b   33  27
-  cntrl                  , //  1c   34  28
-  cntrl                  , //  1d   35  29
-  cntrl                  , //  1e   36  30
-  cntrl                  , //  1f   37  31
-  space | blank          , //  20   40  32       |  Space
-  punct                  , //  21   41  33  !
-  punct                  , //  22   42  34  "
-  punct                  , //  23   43  35  #
-  punct                  , //  24   44  36  $
-  punct                  , //  25   45  37  %
-  punct                  , //  26   46  38  &
-  punct                  , //  27   47  39  '
-  punct                  , //  28   50  40  (
-  punct                  , //  29   51  41  )
-  punct                  , //  2a   52  42  *
-  punct                  , //  2b   53  43  +
-  punct                  , //  2c   54  44
-  punct                  , //  2d   55  45  -
-  punct                  , //  2e   56  46  .
-  punct                  , //  2f   57  47  /
-  digit | xdigit         , //  30   60  48  0
-  digit | xdigit         , //  31   61  49  1
-  digit | xdigit         , //  32   62  50  2
-  digit | xdigit         , //  33   63  51  3
-  digit | xdigit         , //  34   64  52  4
-  digit | xdigit         , //  35   65  53  5
-  digit | xdigit         , //  36   66  54  6
-  digit | xdigit         , //  37   67  55  7
-  digit | xdigit         , //  38   70  56  8
-  digit | xdigit         , //  39   71  57  9
-  punct                  , //  3a   72  58  :
-  punct                  , //  3b   73  59  ;
-  punct                  , //  3c   74  60  <
-  punct                  , //  3d   75  61  =
-  punct                  , //  3e   76  62  >
-  punct                  , //  3f   77  63  ?
-  punct                  , //  40  100  64  @
-  upper | xdigit         , //  41  101  65  A
-  upper | xdigit         , //  42  102  66  B
-  upper | xdigit         , //  43  103  67  C
-  upper | xdigit         , //  44  104  68  D
-  upper | xdigit         , //  45  105  69  E
-  upper | xdigit         , //  46  106  70  F
-  upper                  , //  47  107  71  G
-  upper                  , //  48  110  72  H
-  upper                  , //  49  111  73  I
-  upper                  , //  4a  112  74  J
-  upper                  , //  4b  113  75  K
-  upper                  , //  4c  114  76  L
-  upper                  , //  4d  115  77  M
-  upper                  , //  4e  116  78  N
-  upper                  , //  4f  117  79  O
-  upper                  , //  50  120  80  P
-  upper                  , //  51  121  81  Q
-  upper                  , //  52  122  82  R
-  upper                  , //  53  123  83  S
-  upper                  , //  54  124  84  T
-  upper                  , //  55  125  85  U
-  upper                  , //  56  126  86  V
-  upper                  , //  57  127  87  W
-  upper                  , //  58  130  88  X
-  upper                  , //  59  131  89  Y
-  upper                  , //  5a  132  90  Z
-  punct                  , //  5b  133  91  [    |  Left square bracket
-  punct                  , //  5c  134  92  \    |  Backslash
-  punct                  , //  5d  135  93  ]    |  Right square bracket
-  punct                  , //  5e  136  94  ^    |  Circumflex
-  punct | underscore     , //  5f  137  95  _    |  Underscore
-  punct                  , //  60  140  96  `
-  lower | xdigit         , //  61  141  97  a
-  lower | xdigit         , //  62  142  98  b
-  lower | xdigit         , //  63  143  99  c
-  lower | xdigit         , //  64  144 100  d
-  lower | xdigit         , //  65  145 101  e
-  lower | xdigit         , //  66  146 102  f
-  lower                  , //  67  147 103  g
-  lower                  , //  68  150 104  h
-  lower                  , //  69  151 105  i
-  lower                  , //  6a  152 106  j
-  lower                  , //  6b  153 107  k
-  lower                  , //  6c  154 108  l
-  lower                  , //  6d  155 109  m
-  lower                  , //  6e  156 110  n
-  lower                  , //  6f  157 111  o
-  lower                  , //  70  160 112  p
-  lower                  , //  71  161 113  q
-  lower                  , //  72  162 114  r
-  lower                  , //  73  163 115  s
-  lower                  , //  74  164 116  t
-  lower                  , //  75  165 117  u
-  lower                  , //  76  166 118  v
-  lower                  , //  77  167 119  w
-  lower                  , //  78  170 120  x
-  lower                  , //  79  171 121  y
-  lower                  , //  7a  172 122  z
-  punct                  , //  7b  173 123  {
-  punct                  , //  7c  174 124  |
-  punct                  , //  7d  175 125  }
-  punct                  , //  7e  176 126  ~
-  cntrl                  , //  7f  177 127
-  cntrl                  , //  80  200 128
-  cntrl                  , //  81  201 129
-  cntrl                  , //  82  202 130
-  cntrl                  , //  83  203 131
-  cntrl                  , //  84  204 132
-  cntrl                  , //  85  205 133
-  cntrl                  , //  86  206 134
-  cntrl                  , //  87  207 135
-  cntrl                  , //  88  210 136
-  cntrl                  , //  89  211 137
-  cntrl                  , //  8a  212 138
-  cntrl                  , //  8b  213 139
-  cntrl                  , //  8c  214 140
-  cntrl                  , //  8d  215 141
-  cntrl                  , //  8e  216 142
-  cntrl                  , //  8f  217 143
-  cntrl                  , //  90  220 144
-  cntrl                  , //  91  221 145
-  cntrl                  , //  92  222 146
-  cntrl                  , //  93  223 147
-  cntrl                  , //  94  224 148
-  cntrl                  , //  95  225 149
-  cntrl                  , //  96  226 150
-  cntrl                  , //  97  227 151
-  cntrl                  , //  98  230 152
-  cntrl                  , //  99  231 153
-  cntrl                  , //  9a  232 154
-  cntrl                  , //  9b  233 155
-  cntrl                  , //  9c  234 156
-  cntrl                  , //  9d  235 157
-  cntrl                  , //  9e  236 158
-  cntrl                  , //  9f  237 159
-  punct                  , //  a0  240 160       |  Non-breaking space
-  punct                  , //  a1  241 161  ¡    |  Inverted exclamation mark
-  punct                  , //  a2  242 162  ¢    |  Cent sign
-  punct                  , //  a3  243 163  £    |  Pound sign
-  punct                  , //  a4  244 164  ¤    |  Currency sign
-  punct                  , //  a5  245 165  ¥    |  Yen sign
-  punct                  , //  a6  246 166  ¦    |  Broken bar
-  punct                  , //  a7  247 167  §    |  Section sign
-  punct                  , //  a8  250 168  ¨    |  Diaeresis
-  punct                  , //  a9  251 169  ©    |  Copyright sign
-  punct                  , //  aa  252 170  ª    |  Feminine ordinal indicator
-  punct                  , //  ab  253 171  «    |  Left-pointing double angle
-  punct                  , //  ac  254 172  ¬    |  Not sign
-  punct                  , //  ad  255 173  ­    |  Soft hyphen
-  punct                  , //  ae  256 174  ®    |  Registered trademark sign
-  punct                  , //  af  257 175  ¯    |  Macron
-  punct                  , //  b0  260 176  °    |  Degree sign
-  punct                  , //  b1  261 177  ±    |  Plus-minus sign
-  punct                  , //  b2  262 178  ²    |  Superscript two
-  punct                  , //  b3  263 179  ³    |  Superscript three
-  punct                  , //  b4  264 180  ´    |  Acute accent
-  punct                  , //  b5  265 181  µ    |  Micro sign
-  punct                  , //  b6  266 182  ¶    |  Pilcrow sign
-  punct                  , //  b7  267 183  ·    |  Middle dot
-  punct                  , //  b8  270 184  ¸    |  Cedilla
-  punct                  , //  b9  271 185  ¹    |  Superscript one
-  punct                  , //  ba  272 186  º    |  Masculine ordinal indicator
-  punct                  , //  bb  273 187  »    |  Right-pointing double angle
-  punct                  , //  bc  274 188  ¼    |  Fraction one quarter
-  punct                  , //  bd  275 189  ½    |  Fraction one half
-  punct                  , //  be  276 190  ¾    |  Fraction three quarters
-  punct                  , //  bf  277 191  ¿    |  Inverted question mark
-  upper                  , //  c0  300 192  À    |  "A" with grave accent
-  upper                  , //  c1  301 193  Á    |  "A" with acute accent
-  upper                  , //  c2  302 194  Â    |  "A" with circumflex
-  upper                  , //  c3  303 195  Ã    |  "A" with tilde
-  upper                  , //  c4  304 196  Ä    |  "A" with diaeresis
-  upper                  , //  c5  305 197  Å    |  "A" with ring above
-  upper                  , //  c6  306 198  Æ    |  "AE" ligature
-  upper                  , //  c7  307 199  Ç    |  "C" with cedilla
-  upper                  , //  c8  310 200  È    |  "E" with grave accent
-  upper                  , //  c9  311 201  É    |  "E" with acute accent
-  upper                  , //  ca  312 202  Ê    |  "E" with circumflex
-  upper                  , //  cb  313 203  Ë    |  "E" with diaeresis
-  upper                  , //  cc  314 204  Ì    |  "I" with grave accent
-  upper                  , //  cd  315 205  Í    |  "I" with acute accent
-  upper                  , //  ce  316 206  Î    |  "I" with circumflex
-  upper                  , //  cf  317 207  Ï    |  "I" with diaeresis
-  upper                  , //  d0  320 208  Ð    |  Upper Icelandic D (Eth)
-  upper                  , //  d1  321 209  Ñ    |  "N" with tilde
-  upper                  , //  d2  322 210  Ò    |  "O" with grave accent
-  upper                  , //  d3  323 211  Ó    |  "O" with acute accent
-  upper                  , //  d4  324 212  Ô    |  "O" with circumflex
-  upper                  , //  d5  325 213  Õ    |  "O" with tilde
-  upper                  , //  d6  326 214  Ö    |  "O" with diaeresis
-  punct                  , //  d7  327 215  ×    |  Multiplication sign
-  upper                  , //  d8  330 216  Ø    |  "O" with stroke
-  upper                  , //  d9  331 217  Ù    |  "U" with grave accent
-  upper                  , //  da  332 218  Ú    |  "U" with acute accent
-  upper                  , //  db  333 219  Û    |  "U" with circumflex
-  upper                  , //  dc  334 220  Ü    |  "U" with diaeresis
-  upper                  , //  dd  335 221  Ý    |  "Y" with acute accent
-  upper                  , //  de  336 222  Þ    |  Upper Icelandic T (Thorn)
-  lower                  , //  df  337 223  ß    |  German sharp s
-  lower                  , //  e0  340 224  à    |  "a" with grave accent
-  lower                  , //  e1  341 225  á    |  "a" with acute accent
-  lower                  , //  e2  342 226  â    |  "a" with circumflex
-  lower                  , //  e3  343 227  ã    |  "a" with tilde
-  lower                  , //  e4  344 228  ä    |  "a" with diaeresis
-  lower                  , //  e5  345 229  å    |  "a" with ring above
-  lower                  , //  e6  346 230  æ    |  Latin small ligature ae
-  lower                  , //  e7  347 231  ç    |  "c" with cedilla
-  lower                  , //  e8  350 232  è    |  "e" with grave accent
-  lower                  , //  e9  351 233  é    |  "e" with acute accent
-  lower                  , //  ea  352 234  ê    |  "e" with circumflex
-  lower                  , //  eb  353 235  ë    |  "e" with diaeresis
-  lower                  , //  ec  354 236  ì    |  "i" with grave accent
-  lower                  , //  ed  355 237  í    |  "i" with acute accent
-  lower                  , //  ee  356 238  î    |  "i" with circumflex
-  lower                  , //  ef  357 239  ï    |  "i" with diaeresis
-  lower                  , //  f0  360 240  ð    |  Lower Icelandic d (eth)
-  lower                  , //  f1  361 241  ñ    |  "n" with tilde
-  lower                  , //  f2  362 242  ò    |  "o" with grave accent
-  lower                  , //  f3  363 243  ó    |  "o" with acute accent
-  lower                  , //  f4  364 244  ô    |  "o" with circumflex
-  lower                  , //  f5  365 245  õ    |  "o" with tilde
-  lower                  , //  f6  366 246  ö    |  "o" with diaeresis
-  punct                  , //  f7  367 247  ÷    |  Division sign
-  lower                  , //  f8  370 248  ø    |  "o" with oblique bar
-  lower                  , //  f9  371 249  ù    |  "u" with grave accent
-  lower                  , //  fa  372 250  ú    |  "u" with acute accent
-  lower                  , //  fb  373 251  û    |  "u" with circumflex
-  lower                  , //  fc  374 252  ü    |  "u" with diaeresis
-  lower                  , //  fd  375 253  ý    |  "y" with acute accent
-  lower                  , //  fe  376 254  þ    |  Lower Icelandic t (thorn)
-  lower                    //  ff  377 255  ÿ    |  "y" with diaeresis
-  };
-
-  return (flag_table[unsigned char(c)] & f) != 0;
-}
-
-
-//============================================================================
-char iso8859_1_regex_traits::translate(char c, bool icase) const
-{
-//----------------------------------------------------------------------------
-//      "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -> "abcdefghijklmnopqrstuvwxyz"
-//  "ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞ" -> "àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþ"
-//----------------------------------------------------------------------------
-  static const char lower_case_map[UCHAR_MAX + 1] = {
-    0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
-   16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
-   32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
-   48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,
-   64, 97, 98, 99,100,101,102,103,104,105,106,107,108,109,110,111,
-  112,113,114,115,116,117,118,119,120,121,122, 91, 92, 93, 94, 95,
-   96, 97, 98, 99,100,101,102,103,104,105,106,107,108,109,110,111,
-  112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,
-  128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,
-  144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
-  160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
-  176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
-  224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
-  240,241,242,243,244,245,246,215,248,249,250,251,252,253,254,223,
-  224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,
-  240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255
-};
-
-  return icase ? lower_case_map[unsigned char(c)] : c;
-}
-
diff --git a/example/iso8859_1_regex_traits/iso8859_1_regex_traits.hpp b/example/iso8859_1_regex_traits/iso8859_1_regex_traits.hpp
deleted file mode 100644
index a5c7ae95..00000000
--- a/example/iso8859_1_regex_traits/iso8859_1_regex_traits.hpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * (C) Copyright Christain Engstrom 2001.
- * 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)
- */
-
-#ifndef BOOST_ISO8859_1_REGEX_TRAITS_HPP
-#define BOOST_ISO8859_1_REGEX_TRAITS_HPP
-  
-class iso8859_1_regex_traits : public boost::c_regex_traits<char> {
-private:
-  typedef boost::c_regex_traits<char> base;
-public:
-  iso8859_1_regex_traits() {}
-  ~iso8859_1_regex_traits() {}
-
-  bool is_class(char c, boost::uint_fast32_t f) const;
-  char translate(char c, bool icase) const;
-};
-
-#endif
-
-
diff --git a/example/iso8859_1_regex_traits/readme.txt b/example/iso8859_1_regex_traits/readme.txt
deleted file mode 100644
index b08bb249..00000000
--- a/example/iso8859_1_regex_traits/readme.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-I have written a class iso8859_1_regex_traits, which I enclose.  Any
-comments will be very welcome.
-
-The class is derived from boost::c_regex_traits<char>, and just redefines
-the member function is_class so that it will handle the character classes
-for all the 8 bit characters in the ISO8859-1 (Latin 1) alphabet.  The
-enclosed file iso8859_1.txt lists the character classes for all the 256
-characters.
-
-For the 7 bit ASCII characters up to octal 177, the character classes are
-identical to the ones returned by boost::c_regex_traits<char> and
-boost::w32_regex_traits<char>.  (I have only tried this under Windows.)
-
-For the characters above octal 177, iso8859_1_regex_traits differs from
-boost::w32_regex_traits<char> in the following ways:
-
-1) The characters between octal 200 and octal 237 all belong to the
-character class cntrl only, whereas most of them belong to print graph punct
-in Windows.  This reflects a true difference between the ISO8859-1 and
-Windows character sets, so it should be pretty uncontroversial.
-
-2) The superscript digits ¹²³ (octal 271, 262 and 263) belong to print graph
-punct only in iso8859_1_regex_traits.  In w32_regex_traits these characters
-are defined to belong to digit as well, which automatically makes them
-members of alnum and word too.  I consider this to be a mistake made by
-those who defined the Windows locale, as I can see few, if any, uses for a
-character class defined in this manner, and the definition precludes the use
-of the digit character class for many normal and useful purposes, such as
-checking if a string contains an integer number.  (Please note that this
-criticism is directed towards Microsoft itself rather than towards the regex
-package, since this definition is a part of Visual C++.)
-
-3) The non-breaking space character (octal 240) belongs to print graph punct
-in iso8859_1_regex_traits.  In w32_regex_traits it is instead defined to
-belong print blank space, i.e.: it is defined in exactly the same way as the
-ordinary octal 40 space character.  Again I consider this to be a mistake in
-the Windows locale, that renders the space character class fairly useless
-for any applications where non-breaking spaces might occur.  After all, the
-whole point in having both ordinary and non-breaking spaces in the character
-set is that programs should be able to treat them differently, but with the
-Windows locale, this is not possible.
-
-As stated above I look forward to any comments, both relating to the
-implementation as such and to the choices I have made in the definition of
-the character classes.
-
-Christian Engström
-
-
diff --git a/example/jgrep/jgrep.cpp b/example/jgrep/jgrep.cpp
index a0bc19c2..9acf48e4 100644
--- a/example/jgrep/jgrep.cpp
+++ b/example/jgrep/jgrep.cpp
@@ -53,6 +53,8 @@ public:
    ogrep_predicate(unsigned int& i, const char* p, iterator start, iterator end) : lines(i), filename(p), last_line(-1), end_of_storage(end), last_line_start(start) {}
    ogrep_predicate(const ogrep_predicate& o) : lines(o.lines), filename(o.filename), last_line(o.last_line), end_of_storage(o.end_of_storage), last_line_start(o.last_line_start) {}
    bool operator () (const boost::match_results<iterator, Allocator>& i);
+private:
+   void operator=(const ogrep_predicate&);
 };
 
 // ideally we'd ignor the allocator type and use a template member function
diff --git a/example/jgrep/jgrep.h b/example/jgrep/jgrep.h
index c7919edc..c9e6ac3b 100644
--- a/example/jgrep/jgrep.h
+++ b/example/jgrep/jgrep.h
@@ -19,15 +19,7 @@
 
 #include <boost/regex.hpp>
 
-// case sensitive reg_expression determines our allocator type:
-typedef boost::reg_expression<char> re_type;
-typedef re_type::allocator_type allocator_type;
-
-// now declare static (global) data, including an allocator
-// instance which we'll pass to all instances that require an allocator.
-
-extern allocator_type a;
-
+typedef boost::basic_regex<char> re_type;
 extern re_type e;
 
 // flags for output:
diff --git a/example/jgrep/main.cpp b/example/jgrep/main.cpp
index 19693479..d3e6cb6a 100644
--- a/example/jgrep/main.cpp
+++ b/example/jgrep/main.cpp
@@ -15,40 +15,26 @@
   */
 
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <boost/regex.hpp>
-#ifdef JM_OLD_IOSTREAM
-#include <iostream.h>
-#else
+#include <cstdio>
+#include <cstdlib>
 #include <iostream>
-using std::cout;
-using std::cin;
-using std::cerr;
-using std::endl;
-#endif
-#ifdef __BORLANDC__
-#  pragma hrdstop
-#endif
+#include <algorithm>
 
-#ifdef BOOST_REGEX_V3
-#include <boost/regex/v3/fileiter.hpp>
-#else
+#include <boost/regex.hpp>
 #include <boost/regex/v4/fileiter.hpp>
-#endif
 #include "jgrep.h"
 #ifndef BOOST_REGEX_NO_FILEITER
 
-#ifndef JM_ALGO_INCLUDED
-// HP and SGI STL's use <algo.h> instead
-// this will have been pulled in by <jm_cfg.h>
-// for std::distance
-#include <algorithm>
+#ifdef BOOST_NO_STDC_NAMESPACE
+namespace std{
+   using ::strcpy;
+   using ::strcat;
+   using ::sprintf;
+}
 #endif
 
-allocator_type a;
 
-re_type e(a);
+re_type e;
 //rei_type ei(a);
 
 // flags for output:
@@ -65,7 +51,7 @@ bool verbose = false;
 
 void usage()
 {
-   cout <<
+   std::cout <<
 "jgrep version 0.95\n"
 "usage: jgrep [-options] expression file [files...]\n"
 "\n"
@@ -84,7 +70,7 @@ void usage()
 "expression: a regular expression, or a literal string if -r- is specified\n"
 "\n"
 "files:  one or more files to search, the names can contain the wildcard\n"
-"        characters ? and *\n" << endl;
+"        characters ? and *\n" << std::endl;
 
 }
 
@@ -123,9 +109,9 @@ void parse_switch(const char* flag)
                   verbose = false;
                   break;
                default:
-                  cout << "Undefined option -";
-                  cout.put(*flag);
-                  cout << endl;
+                  std::cout << "Undefined option -";
+                  std::cout.put(*flag);
+                  std::cout << std::endl;
             }
             // turn off prev character:
             break;
@@ -159,9 +145,9 @@ void parse_switch(const char* flag)
          case '+':
             break;
          default:
-            cout << "Undefined option -";
-            cout.put(*flag);
-            cout << endl;
+            std::cout << "Undefined option -";
+            std::cout.put(*flag);
+            std::cout << std::endl;
       }
       ++flag;
    }
@@ -172,7 +158,6 @@ using namespace boost;
 void HandleFile(const char* wild)
 {
    using namespace boost;
-   jm_trace("Handling file " << wild);
    file_iterator end;
    file_iterator start(wild);
 
@@ -193,14 +178,12 @@ void HandleFile(const char* wild)
          std::strcat(buf, directory_iterator::separator());
          std::strcat(buf, "*");
       }
-      jm_trace("Enumerating directories: " << buf);
       directory_iterator dstart(buf);
       directory_iterator dend;
 
       // now get the file mask bit of "wild":
       const char* ptr = wild + rootlen;
       if(*ptr) ++ptr;
-      jm_trace("File mask part is: " << ptr);
 
       while(dstart != dend)
       {
@@ -217,7 +200,6 @@ int done = 0;
 void HandleArg(const char* arg)
 {
    using namespace boost;
-   jm_trace("Handling argument: " << arg);
    if(*arg == '-')
    {
       parse_switch(arg);
@@ -286,7 +268,7 @@ int main(int argc, char * argv[])
 
 int main(int argc, char * argv[])
 {
-   std::cout <<
+   std::std::cout <<
    "\n<note>\n"
    "This functionality is not available on with this compiler on this platform.\n"
    "</note>\n";
diff --git a/example/snippets/captures_example.cpp b/example/snippets/captures_example.cpp
index de7edd61..eafced6b 100644
--- a/example/snippets/captures_example.cpp
+++ b/example/snippets/captures_example.cpp
@@ -1,14 +1,21 @@
 /*
  *
- * Copyright (c) 2004
+ * Copyright (c) 2003-2004
  * Dr John Maddock
  *
- * Use, modification and distribution are subject to the
- * Boost Software License, Version 1.0. (See accompanying file
+ * 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         captures_example.cpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Demonstrate the behaviour of captures.
+  */
+
 #include <boost/regex.hpp>
 #include <iostream>
 
diff --git a/example/snippets/icu_example.cpp b/example/snippets/icu_example.cpp
new file mode 100644
index 00000000..49eec8c3
--- /dev/null
+++ b/example/snippets/icu_example.cpp
@@ -0,0 +1,182 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         mfc_example.cpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: examples of using Boost.Regex with MFC and ATL string types.
+  */
+
+#include <boost/regex/config.hpp>
+
+#ifdef BOOST_HAS_ICU
+
+#include <boost/regex/icu.hpp>
+#include <iostream>
+#include <assert.h>
+
+//
+// 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));
+}
+
+//
+// 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 CString:
+      return what.str(1);
+   }
+   else
+   {
+      throw std::runtime_error("Invalid pathname");
+   }
+}
+
+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.
+   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!");
+   }
+}
+
+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;
+   }
+}
+
+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;
+   }
+}
+
+
+//
+// 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);
+}
+
+
+int main()
+{
+   // password checks using u32regex_match:
+   UnicodeString pwd = "abcDEF---";
+   UnicodeString pwd_check = "(?=.*[[:lower:]])(?=.*[[:upper:]])(?=.*[[:punct:]]).{6,}";
+   bool b = is_valid_password(pwd, pwd_check);
+   assert(b);
+   pwd = "abcD-";
+   b = is_valid_password(pwd, pwd_check);
+   assert(!b);
+   // filename extraction with u32regex_match:
+   std::string file = "abc.hpp";
+   file = get_filename(file);
+   assert(file == "abc.hpp");
+   file = "c:\\a\\b\\c\\d.h";
+   file = get_filename(file);
+   assert(file == "d.h");
+
+   // Greek text extraction with u32regex_search:
+   UnicodeString text = L"Some where in \x0391\x039D\x0395\x0398\x0391 2004";
+   UnicodeString greek = extract_greek(text);
+   assert(greek == L"\x0391\x039D\x0395\x0398\x0391 2004");
+
+   // extract currency symbols with associated value, use iterator interface:
+   std::string text2 = " $100.23 or \xC2\xA3""198.12 "; // \xC2\xA3 is the £ sign encoded in UTF-8
+   enumerate_currencies(text2);
+   enumerate_currencies2(text2);
+
+   UnicodeString credit_card_number = "1234567887654321";
+   credit_card_number = human_readable_card_number(credit_card_number);
+   assert(credit_card_number == "1234-5678-8765-4321");
+   return 0;
+}
+
+#else
+
+#include <iostream>
+
+int main()
+{
+   std::cout << "<NOTE>ICU support not enabled, feature unavailable</NOTE>";
+   return 0;
+}
+
+
+#endif
+
diff --git a/example/snippets/mfc_example.cpp b/example/snippets/mfc_example.cpp
new file mode 100644
index 00000000..4a940e4e
--- /dev/null
+++ b/example/snippets/mfc_example.cpp
@@ -0,0 +1,162 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         mfc_example.cpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: examples of using Boost.Regex with MFC and ATL string types.
+  */
+
+#ifdef TEST_MFC
+
+#include <boost/regex/mfc.hpp>
+#include <cstringt.h>
+#include <atlstr.h>
+#include <assert.h>
+#include <tchar.h>
+#include <iostream>
+
+#ifdef _UNICODE
+#define cout wcout
+#endif
+
+//
+// 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));
+}
+
+//
+// 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");
+   }
+}
+
+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");
+   }
+}
+
+void enumerate_links(const CString& html)
+{
+   // enumerate and print all the <a> 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;
+   }
+}
+
+void enumerate_links2(const CString& html)
+{
+   // enumerate and print all the <a> 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;
+   }
+}
+
+//
+// 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);
+}
+
+
+int main()
+{
+   // password checks using regex_match:
+   CString pwd = "abcDEF---";
+   CString pwd_check = "(?=.*[[:lower:]])(?=.*[[:upper:]])(?=.*[[:punct:]]).{6,}";
+   bool b = is_valid_password(pwd, pwd_check);
+   assert(b);
+   pwd = "abcD-";
+   b = is_valid_password(pwd, pwd_check);
+   assert(!b);
+
+   // filename extraction with regex_match:
+   CString file = "abc.hpp";
+   file = get_filename(file);
+   assert(file == "abc.hpp");
+   file = "c:\\a\\b\\c\\d.h";
+   file = get_filename(file);
+   assert(file == "d.h");
+
+   // postcode extraction with regex_search:
+   CString address = "Joe Bloke, 001 Somestreet, Somewhere,\nPL2 8AB";
+   CString postcode = extract_postcode(address);
+   assert(postcode = "PL2 8NV");
+
+   // html link extraction with regex_iterator:
+   CString text = "<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>";
+   enumerate_links(text);
+   enumerate_links2(text);
+
+   CString credit_card_number = "1234567887654321";
+   credit_card_number = human_readable_card_number(credit_card_number);
+   assert(credit_card_number == "1234-5678-8765-4321");
+   return 0;
+}
+
+#else
+
+#include <iostream>
+
+int main()
+{
+   std::cout << "<NOTE>MFC support not enabled, feature unavailable</NOTE>";
+   return 0;
+}
+
+#endif
diff --git a/example/timer/regex_timer.cpp b/example/timer/regex_timer.cpp
index 67484858..dceb0d5a 100644
--- a/example/timer/regex_timer.cpp
+++ b/example/timer/regex_timer.cpp
@@ -33,9 +33,14 @@ using std::getline;
 
 #include <boost/config.hpp>
 #include <boost/regex.hpp>
+#include <boost/cregex.hpp>
 #include <boost/timer.hpp> 
 #include <boost/smart_ptr.hpp>
 
+#if defined(_WIN32) && defined(BOOST_REGEX_USE_WIN32_LOCALE)
+#include <windows.h>
+#endif
+
 #if (defined(_MSC_VER) && (_MSC_VER <= 1300)) || defined(__sgi)
 // maybe no Koenig lookup, use using declaration instead:
 using namespace boost;
@@ -367,7 +372,9 @@ int main(int argc, char**argv)
    return 0;
 }
 
-
+#if defined(_WIN32) && defined(BOOST_REGEX_USE_WIN32_LOCALE)
+#pragma message(lib, "user32.lib")
+#endif
 
 
 
diff --git a/include/boost/cregex.hpp b/include/boost/cregex.hpp
index 661a5ca2..9b3060ce 100644
--- a/include/boost/cregex.hpp
+++ b/include/boost/cregex.hpp
@@ -24,11 +24,7 @@
 #include <boost/regex/config.hpp>
 #endif
 
-#ifdef BOOST_REGEX_V3
-#include <boost/regex/v3/cregex.hpp>
-#else
 #include <boost/regex/v4/cregex.hpp>
-#endif
 
 #endif /* include guard */
 
diff --git a/include/boost/regex.hpp b/include/boost/regex.hpp
index 42bf95ea..b07177c5 100644
--- a/include/boost/regex.hpp
+++ b/include/boost/regex.hpp
@@ -28,11 +28,7 @@
 #include <boost/regex/config.hpp>
 #endif
 
-#ifdef BOOST_REGEX_V3
-#include <boost/regex/v3/regex.hpp>
-#else
 #include <boost/regex/v4/regex.hpp>
-#endif
 
 #endif  // include
 
diff --git a/include/boost/regex/concepts.hpp b/include/boost/regex/concepts.hpp
new file mode 100644
index 00000000..de3e5c9f
--- /dev/null
+++ b/include/boost/regex/concepts.hpp
@@ -0,0 +1,829 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         concepts.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Declares regular expression concepts.
+  */
+
+#ifndef BOOST_REGEX_CONCEPTS_HPP_INCLUDED
+#define BOOST_REGEX_CONCEPTS_HPP_INCLUDED
+
+#include <boost/concept_archetype.hpp>
+#include <boost/concept_check.hpp>
+#include <boost/type_traits/is_enum.hpp>
+#include <boost/type_traits/is_base_and_derived.hpp>
+#include <boost/static_assert.hpp>
+#include <boost/regex.hpp>
+#include <bitset>
+#include <vector>
+
+namespace boost{
+
+//
+// bitmask_archetype:
+// this can be either an integer type, an enum, or a std::bitset,
+// we use the latter as the architype as it offers the "strictest"
+// of the possible interfaces:
+//
+typedef std::bitset<512> bitmask_archetype;
+//
+// char_architype:
+// A strict model for the character type interface.
+//
+struct char_architype
+{
+   // default constructable:
+   char_architype();
+   // copy constructable / assignable:
+   char_architype(const char_architype&);
+   char_architype& operator=(const char_architype&);
+   // constructable from an integral value:
+   char_architype(unsigned long val);
+   // comparable:
+   bool operator==(const char_architype&)const;
+   bool operator!=(const char_architype&)const;
+   bool operator<(const char_architype&)const;
+   bool operator<=(const char_architype&)const;
+   bool operator>=(const char_architype&)const;
+   bool operator>(const char_architype&)const;
+   // conversion to integral type:
+   operator long()const;
+};
+//
+// char_architype can not be used with basic_string:
+//
+} // namespace boost
+namespace std{
+   template<> struct char_traits<boost::char_architype>{};
+}
+namespace boost{
+//
+// regex_traits_architype:
+// A strict interpretation of the regular expression traits class requirements.
+//
+template <class charT>
+struct regex_traits_architype
+{
+public:
+   regex_traits_architype();
+   typedef charT char_type;
+   typedef std::size_t size_type;
+   typedef std::vector<char_type> string_type;
+   typedef copy_constructible_archetype<assignable_archetype<> > locale_type;
+   typedef bitmask_archetype char_class_type;
+
+   static size_type length(const char_type* ) { return 0; }
+
+   charT translate(charT ) const { return charT(); }
+   charT translate_nocase(charT ) const { return static_object<charT>::get(); }
+
+   template <class ForwardIterator>
+   string_type transform(ForwardIterator , ForwardIterator ) const
+   { return static_object<string_type>::get(); }
+   template <class ForwardIterator>
+   string_type transform_primary(ForwardIterator , ForwardIterator ) const
+   { return static_object<string_type>::get(); }
+
+   template <class ForwardIterator>
+   char_class_type lookup_classname(ForwardIterator , ForwardIterator ) const
+   { return static_object<char_class_type>::get(); }
+   template <class ForwardIterator>
+   string_type lookup_collatename(ForwardIterator , ForwardIterator ) const
+   { return static_object<string_type>::get(); }
+
+   bool isctype(charT, char_class_type) const
+   { return false; }
+   int value(charT, int) const
+   { return 0; }
+
+   locale_type imbue(locale_type l)
+   { return l; }
+   locale_type getloc()const
+   { return static_object<locale_type>::get(); }
+
+private:
+   // this type is not copyable:
+   regex_traits_architype(const regex_traits_architype&);
+   regex_traits_architype& operator=(const regex_traits_architype&);
+};
+
+//
+// alter this to std::tr1, to test a std implementation:
+//
+namespace global_regex_namespace = ::boost;
+
+template <class Bitmask>
+struct BitmaskConcept
+{
+   void constraints() 
+   {
+      function_requires<CopyConstructibleConcept<Bitmask> >();
+      function_requires<AssignableConcept<Bitmask> >();
+
+      m_mask1 = m_mask2 | m_mask3;
+      m_mask1 = m_mask2 & m_mask3;
+      m_mask1 = m_mask2 ^ m_mask3;
+
+      m_mask1 = ~m_mask2;
+
+      m_mask1 |= m_mask2;
+      m_mask1 &= m_mask2;
+      m_mask1 ^= m_mask2;
+   }
+   Bitmask m_mask1, m_mask2, m_mask3;
+};
+
+template <class traits>
+struct RegexTraitsConcept
+{
+   RegexTraitsConcept();
+   // required typedefs:
+   typedef typename traits::char_type char_type;
+   typedef typename traits::size_type size_type;
+   typedef typename traits::string_type string_type;
+   typedef typename traits::locale_type locale_type;
+   typedef typename traits::char_class_type char_class_type;
+
+   void constraints() 
+   {
+      function_requires<UnsignedIntegerConcept<size_type> >();
+      function_requires<RandomAccessContainerConcept<string_type> >();
+      function_requires<DefaultConstructibleConcept<locale_type> >();
+      function_requires<CopyConstructibleConcept<locale_type> >();
+      function_requires<AssignableConcept<locale_type> >();
+      function_requires<BitmaskConcept<char_class_type> >();
+
+      size_type n = traits::length(m_pointer);
+      ignore_unused_variable_warning(n);
+
+      char_type c = m_ctraits.translate(m_char);
+      ignore_unused_variable_warning(c);
+      c = m_ctraits.translate_nocase(m_char);
+      
+      //string_type::foobar bar;
+      string_type s1 = m_ctraits.transform(m_pointer, m_pointer);
+      ignore_unused_variable_warning(s1);
+
+      string_type s2 = m_ctraits.transform_primary(m_pointer, m_pointer);
+      ignore_unused_variable_warning(s2);
+
+      char_class_type cc = m_ctraits.lookup_classname(m_pointer, m_pointer);
+      ignore_unused_variable_warning(cc);
+
+      string_type s3 = m_ctraits.lookup_collatename(m_pointer, m_pointer);
+      ignore_unused_variable_warning(s3);
+
+      bool b = m_ctraits.isctype(m_char, cc);
+      ignore_unused_variable_warning(b);
+
+      int v = m_ctraits.value(m_char, 16);
+      ignore_unused_variable_warning(v);
+
+      locale_type l(m_ctraits.getloc());
+      m_traits.imbue(l);
+      ignore_unused_variable_warning(l);
+   }
+   traits m_traits;
+   const traits m_ctraits;
+   const char_type* m_pointer;
+   char_type m_char;
+};
+
+//
+// helper class to compute what traits class a regular expression type is using:
+//
+template <class Regex>
+struct regex_traits_computer;
+
+template <class charT, class traits>
+struct regex_traits_computer< global_regex_namespace::basic_regex<charT, traits> >
+{
+   typedef traits type;
+};
+
+//
+// BaseRegexConcept does not test anything dependent on basic_string,
+// in case our charT does not have an associated char_traits:
+//
+template <class Regex>
+struct BaseRegexConcept
+{
+   typedef typename Regex::value_type value_type;
+   typedef typename Regex::size_type size_type;
+   typedef typename Regex::flag_type flag_type;
+   typedef typename Regex::locale_type locale_type;
+   typedef input_iterator_archetype<value_type> input_iterator_type;
+
+   // derived test types:
+   typedef const value_type* pointer_type;
+   typedef bidirectional_iterator_archetype<value_type> BidiIterator;
+   typedef global_regex_namespace::sub_match<BidiIterator> sub_match_type;
+   typedef global_regex_namespace::match_results<BidiIterator> match_results_type;
+   typedef output_iterator_archetype<value_type> OutIterator;
+   typedef typename regex_traits_computer<Regex>::type traits_type;
+   typedef global_regex_namespace::regex_iterator<BidiIterator, value_type, traits_type> regex_iterator_type;
+   typedef global_regex_namespace::regex_token_iterator<BidiIterator, value_type, traits_type> regex_token_iterator_type;
+
+   void global_constraints()
+   {
+      //
+      // test non-template components:
+      //
+      function_requires<BitmaskConcept<global_regex_namespace::regex_constants::syntax_option_type> >();
+      global_regex_namespace::regex_constants::syntax_option_type opts
+         = global_regex_namespace::regex_constants::icase
+         | global_regex_namespace::regex_constants::nosubs
+         | global_regex_namespace::regex_constants::optimize
+         | global_regex_namespace::regex_constants::collate
+         | global_regex_namespace::regex_constants::ECMAScript
+         | global_regex_namespace::regex_constants::basic
+         | global_regex_namespace::regex_constants::extended
+         | global_regex_namespace::regex_constants::awk
+         | global_regex_namespace::regex_constants::grep
+         | global_regex_namespace::regex_constants::egrep;
+      ignore_unused_variable_warning(opts);
+
+      function_requires<BitmaskConcept<global_regex_namespace::regex_constants::match_flag_type> >();
+      global_regex_namespace::regex_constants::match_flag_type mopts
+         = global_regex_namespace::regex_constants::match_default
+         | global_regex_namespace::regex_constants::match_not_bol
+         | global_regex_namespace::regex_constants::match_not_eol
+         | global_regex_namespace::regex_constants::match_not_bow
+         | global_regex_namespace::regex_constants::match_not_eow
+         | global_regex_namespace::regex_constants::match_any
+         | global_regex_namespace::regex_constants::match_not_null
+         | global_regex_namespace::regex_constants::match_continuous
+         | global_regex_namespace::regex_constants::match_partial
+         | global_regex_namespace::regex_constants::match_prev_avail
+         | global_regex_namespace::regex_constants::format_default
+         | global_regex_namespace::regex_constants::format_sed
+         | global_regex_namespace::regex_constants::format_perl
+         | global_regex_namespace::regex_constants::format_no_copy
+         | global_regex_namespace::regex_constants::format_first_only;
+      ignore_unused_variable_warning(mopts);
+
+      BOOST_STATIC_ASSERT((::boost::is_enum<global_regex_namespace::regex_constants::error_type>::value));
+      global_regex_namespace::regex_constants::error_type e1 = global_regex_namespace::regex_constants::error_collate;
+      ignore_unused_variable_warning(e1);
+      e1 = global_regex_namespace::regex_constants::error_ctype;
+      ignore_unused_variable_warning(e1);
+      e1 = global_regex_namespace::regex_constants::error_escape;
+      ignore_unused_variable_warning(e1);
+      e1 = global_regex_namespace::regex_constants::error_backref;
+      ignore_unused_variable_warning(e1);
+      e1 = global_regex_namespace::regex_constants::error_brack;
+      ignore_unused_variable_warning(e1);
+      e1 = global_regex_namespace::regex_constants::error_paren;
+      ignore_unused_variable_warning(e1);
+      e1 = global_regex_namespace::regex_constants::error_brace;
+      ignore_unused_variable_warning(e1);
+      e1 = global_regex_namespace::regex_constants::error_badbrace;
+      ignore_unused_variable_warning(e1);
+      e1 = global_regex_namespace::regex_constants::error_range;
+      ignore_unused_variable_warning(e1);
+      e1 = global_regex_namespace::regex_constants::error_space;
+      ignore_unused_variable_warning(e1);
+      e1 = global_regex_namespace::regex_constants::error_badrepeat;
+      ignore_unused_variable_warning(e1);
+      e1 = global_regex_namespace::regex_constants::error_complexity;
+      ignore_unused_variable_warning(e1);
+      e1 = global_regex_namespace::regex_constants::error_stack;
+      ignore_unused_variable_warning(e1);
+
+      BOOST_STATIC_ASSERT((::boost::is_base_and_derived<std::runtime_error, global_regex_namespace::regex_error>::value  ));
+      const global_regex_namespace::regex_error except(e1);
+      e1 = except.code();
+
+      typedef typename Regex::value_type value_type;
+      function_requires< RegexTraitsConcept<global_regex_namespace::regex_traits<char> > >();
+      function_requires< BaseRegexConcept<global_regex_namespace::basic_regex<char> > >();
+   }
+   void constraints() 
+   {
+      global_constraints();
+
+      BOOST_STATIC_ASSERT((::boost::is_same< flag_type, global_regex_namespace::regex_constants::syntax_option_type>::value));
+      flag_type opts
+         = Regex::icase
+         | Regex::nosubs
+         | Regex::optimize
+         | Regex::collate
+         | Regex::ECMAScript
+         | Regex::basic
+         | Regex::extended
+         | Regex::awk
+         | Regex::grep
+         | Regex::egrep;
+      ignore_unused_variable_warning(opts);
+
+      function_requires<DefaultConstructibleConcept<Regex> >();
+      function_requires<CopyConstructibleConcept<Regex> >();
+
+      // Regex constructors:
+      Regex e1(m_pointer);
+      ignore_unused_variable_warning(e1);
+      Regex e2(m_pointer, m_flags);
+      ignore_unused_variable_warning(e2);
+      Regex e3(m_pointer, m_size, m_flags);
+      ignore_unused_variable_warning(e3);
+      Regex e4(in1, in2);
+      ignore_unused_variable_warning(e4);
+      Regex e5(in1, in2, m_flags);
+      ignore_unused_variable_warning(e5);
+
+      // assign etc:
+      Regex e;
+      e = m_pointer;
+      e = e1;
+      e.assign(e1);
+      e.assign(m_pointer);
+      e.assign(m_pointer, m_flags);
+      e.assign(m_pointer, m_size, m_flags);
+      e.assign(in1, in2);
+      e.assign(in1, in2, m_flags);
+
+      // access:
+      const Regex ce;
+      bool b = ce.empty();
+      ignore_unused_variable_warning(b);
+      size_type i = ce.mark_count();
+      ignore_unused_variable_warning(i);
+      m_flags = ce.flags();
+      e.imbue(ce.getloc());
+      e.swap(e1);
+      
+      global_regex_namespace::swap(e, e1);
+
+      // sub_match:
+      BOOST_STATIC_ASSERT((::boost::is_base_and_derived<std::pair<BidiIterator, BidiIterator>, sub_match_type>::value));
+      typedef typename sub_match_type::value_type sub_value_type;
+      typedef typename sub_match_type::difference_type sub_diff_type;
+      typedef typename sub_match_type::iterator sub_iter_type;
+      BOOST_STATIC_ASSERT((::boost::is_same<sub_value_type, value_type>::value));
+      BOOST_STATIC_ASSERT((::boost::is_same<sub_iter_type, BidiIterator>::value));
+      b = m_sub.matched;
+      ignore_unused_variable_warning(b);
+      BidiIterator bi = m_sub.first;
+      ignore_unused_variable_warning(bi);
+      bi = m_sub.second;
+      ignore_unused_variable_warning(bi);
+      sub_diff_type diff = m_sub.length();
+      ignore_unused_variable_warning(diff);
+      // match_results tests:
+      typedef typename match_results_type::value_type mr_value_type;
+      typedef typename match_results_type::const_reference mr_const_reference;
+      typedef typename match_results_type::reference mr_reference;
+      typedef typename match_results_type::const_iterator mr_const_iterator;
+      typedef typename match_results_type::iterator mr_iterator;
+      typedef typename match_results_type::difference_type mr_difference_type;
+      typedef typename match_results_type::size_type mr_size_type;
+      typedef typename match_results_type::allocator_type mr_allocator_type;
+      typedef typename match_results_type::char_type mr_char_type;
+      typedef typename match_results_type::string_type mr_string_type;
+
+      match_results_type m1;
+      mr_allocator_type at;
+      match_results_type m2(at);
+      match_results_type m3(m1);
+      m1 = m2;
+
+      mr_size_type mrs = m_cresults.size();
+      ignore_unused_variable_warning(mrs);
+      mrs = m_cresults.max_size();
+      ignore_unused_variable_warning(mrs);
+      b = m_cresults.empty();
+      ignore_unused_variable_warning(b);
+      mr_difference_type mrd = m_cresults.length();
+      ignore_unused_variable_warning(mrd);
+      mrd = m_cresults.length(mrs);
+      ignore_unused_variable_warning(mrd);
+      mrd = m_cresults.position();
+      ignore_unused_variable_warning(mrd);
+      mrd = m_cresults.position(mrs);
+      ignore_unused_variable_warning(mrd);
+
+      mr_const_reference mrcr = m_cresults[m_size];
+      ignore_unused_variable_warning(mrcr);
+      mr_const_reference mrcr2 = m_cresults.prefix();
+      ignore_unused_variable_warning(mrcr2);
+      mr_const_reference mrcr3 = m_cresults.suffix();
+      ignore_unused_variable_warning(mrcr3);
+      mr_const_iterator mrci = m_cresults.begin();
+      ignore_unused_variable_warning(mrci);
+      mrci = m_cresults.end();
+      ignore_unused_variable_warning(mrci);
+
+      mr_allocator_type at2 = m_cresults.get_allocator();
+      m_results.swap(m_results);
+      global_regex_namespace::swap(m_results, m_results);
+
+      // regex_match:
+      b = global_regex_namespace::regex_match(m_in, m_in, m_results, e);
+      ignore_unused_variable_warning(b);
+      b = global_regex_namespace::regex_match(m_in, m_in, m_results, e, m_mft);
+      ignore_unused_variable_warning(b);
+      b = global_regex_namespace::regex_match(m_in, m_in, e);
+      ignore_unused_variable_warning(b);
+      b = global_regex_namespace::regex_match(m_in, m_in, e, m_mft);
+      ignore_unused_variable_warning(b);
+      b = global_regex_namespace::regex_match(m_pointer, m_pmatch, e);
+      ignore_unused_variable_warning(b);
+      b = global_regex_namespace::regex_match(m_pointer, m_pmatch, e, m_mft);
+      ignore_unused_variable_warning(b);
+      b = global_regex_namespace::regex_match(m_pointer, e);
+      ignore_unused_variable_warning(b);
+      b = global_regex_namespace::regex_match(m_pointer, e, m_mft);
+      ignore_unused_variable_warning(b);
+      // regex_search:
+      b = global_regex_namespace::regex_search(m_in, m_in, m_results, e);
+      ignore_unused_variable_warning(b);
+      b = global_regex_namespace::regex_search(m_in, m_in, m_results, e, m_mft);
+      ignore_unused_variable_warning(b);
+      b = global_regex_namespace::regex_search(m_in, m_in, e);
+      ignore_unused_variable_warning(b);
+      b = global_regex_namespace::regex_search(m_in, m_in, e, m_mft);
+      ignore_unused_variable_warning(b);
+      b = global_regex_namespace::regex_search(m_pointer, m_pmatch, e);
+      ignore_unused_variable_warning(b);
+      b = global_regex_namespace::regex_search(m_pointer, m_pmatch, e, m_mft);
+      ignore_unused_variable_warning(b);
+      b = global_regex_namespace::regex_search(m_pointer, e);
+      ignore_unused_variable_warning(b);
+      b = global_regex_namespace::regex_search(m_pointer, e, m_mft);
+      ignore_unused_variable_warning(b);
+
+      // regex_iterator:
+      typedef typename regex_iterator_type::regex_type rit_regex_type;
+      typedef typename regex_iterator_type::value_type rit_value_type;
+      typedef typename regex_iterator_type::difference_type rit_difference_type;
+      typedef typename regex_iterator_type::pointer rit_pointer;
+      typedef typename regex_iterator_type::reference rit_reference;
+      typedef typename regex_iterator_type::iterator_category rit_iterator_category;
+      BOOST_STATIC_ASSERT((::boost::is_same<rit_regex_type, Regex>::value));
+      BOOST_STATIC_ASSERT((::boost::is_same<rit_value_type, match_results_type>::value));
+      BOOST_STATIC_ASSERT((::boost::is_same<rit_difference_type, std::ptrdiff_t>::value));
+      BOOST_STATIC_ASSERT((::boost::is_same<rit_pointer, const match_results_type*>::value));
+      BOOST_STATIC_ASSERT((::boost::is_same<rit_reference, const match_results_type&>::value));
+      BOOST_STATIC_ASSERT((::boost::is_convertible<rit_iterator_category*, std::forward_iterator_tag*>::value));
+      // this takes care of most of the checks needed:
+      function_requires<ForwardIteratorConcept<regex_iterator_type> >();
+      regex_iterator_type iter1(m_in, m_in, e);
+      ignore_unused_variable_warning(iter1);
+      regex_iterator_type iter2(m_in, m_in, e, m_mft);
+      ignore_unused_variable_warning(iter2);
+
+      // regex_token_iterator:
+      typedef typename regex_token_iterator_type::regex_type rtit_regex_type;
+      typedef typename regex_token_iterator_type::value_type rtit_value_type;
+      typedef typename regex_token_iterator_type::difference_type rtit_difference_type;
+      typedef typename regex_token_iterator_type::pointer rtit_pointer;
+      typedef typename regex_token_iterator_type::reference rtit_reference;
+      typedef typename regex_token_iterator_type::iterator_category rtit_iterator_category;
+      BOOST_STATIC_ASSERT((::boost::is_same<rtit_regex_type, Regex>::value));
+      BOOST_STATIC_ASSERT((::boost::is_same<rtit_value_type, sub_match_type>::value));
+      BOOST_STATIC_ASSERT((::boost::is_same<rtit_difference_type, std::ptrdiff_t>::value));
+      BOOST_STATIC_ASSERT((::boost::is_same<rtit_pointer, const sub_match_type*>::value));
+      BOOST_STATIC_ASSERT((::boost::is_same<rtit_reference, const sub_match_type&>::value));
+      BOOST_STATIC_ASSERT((::boost::is_convertible<rtit_iterator_category*, std::forward_iterator_tag*>::value));
+      // this takes care of most of the checks needed:
+      function_requires<ForwardIteratorConcept<regex_token_iterator_type> >();
+      regex_token_iterator_type ti1(m_in, m_in, e);
+      ignore_unused_variable_warning(ti1);
+      regex_token_iterator_type ti2(m_in, m_in, e, 0);
+      ignore_unused_variable_warning(ti2);
+      regex_token_iterator_type ti3(m_in, m_in, e, 0, m_mft);
+      ignore_unused_variable_warning(ti3);
+      std::vector<int> subs;
+      regex_token_iterator_type ti4(m_in, m_in, e, subs);
+      ignore_unused_variable_warning(ti4);
+      regex_token_iterator_type ti5(m_in, m_in, e, subs, m_mft);
+      ignore_unused_variable_warning(ti5);
+      static const int i_array[] = { 1, 2, 3, };
+      regex_token_iterator_type ti6(m_in, m_in, e, i_array);
+      ignore_unused_variable_warning(ti6);
+      regex_token_iterator_type ti7(m_in, m_in, e, i_array, m_mft);
+      ignore_unused_variable_warning(ti7);
+   }
+
+   pointer_type m_pointer;
+   flag_type m_flags;
+   size_type m_size;
+   input_iterator_type in1, in2;
+   const sub_match_type m_sub;
+   const value_type m_char;
+   match_results_type m_results;
+   const match_results_type m_cresults;
+   OutIterator m_out;
+   BidiIterator m_in;
+   global_regex_namespace::regex_constants::match_flag_type m_mft;
+   global_regex_namespace::match_results<pointer_type> m_pmatch;
+
+   BaseRegexConcept();
+   BaseRegexConcept(const BaseRegexConcept&);
+   BaseRegexConcept& operator=(const BaseRegexConcept&);
+};
+
+//
+// RegexConcept:
+// Test every interface in the std:
+//
+template <class Regex>
+struct RegexConcept
+{
+   typedef typename Regex::value_type value_type;
+   typedef typename Regex::size_type size_type;
+   typedef typename Regex::flag_type flag_type;
+   typedef typename Regex::locale_type locale_type;
+
+   // derived test types:
+   typedef const value_type* pointer_type;
+   typedef std::basic_string<value_type> string_type;
+   typedef boost::bidirectional_iterator_archetype<value_type> BidiIterator;
+   typedef global_regex_namespace::sub_match<BidiIterator> sub_match_type;
+   typedef global_regex_namespace::match_results<BidiIterator> match_results_type;
+   typedef output_iterator_archetype<value_type> OutIterator;
+
+
+   void constraints() 
+   {
+      function_requires<BaseRegexConcept<Regex> >();
+      // string based construct:
+      Regex e1(m_string);
+      ignore_unused_variable_warning(e1);
+      Regex e2(m_string, m_flags);
+      ignore_unused_variable_warning(e2);
+
+      // assign etc:
+      Regex e;
+      e = m_string;
+      e.assign(m_string);
+      e.assign(m_string, m_flags);
+
+      // sub_match:
+      string_type s(m_sub);
+      ignore_unused_variable_warning(s);
+      s = m_sub.str();
+      ignore_unused_variable_warning(s);
+      int i = m_sub.compare(m_string);
+      ignore_unused_variable_warning(i);
+
+      int i2 = m_sub.compare(m_sub);
+      ignore_unused_variable_warning(i2);
+      i2 = m_sub.compare(m_pointer);
+      ignore_unused_variable_warning(i2);
+
+      bool b = m_sub == m_sub;
+      ignore_unused_variable_warning(b);
+      b = m_sub != m_sub;
+      ignore_unused_variable_warning(b);
+      b = m_sub <= m_sub;
+      ignore_unused_variable_warning(b);
+      b = m_sub <= m_sub;
+      ignore_unused_variable_warning(b);
+      b = m_sub > m_sub;
+      ignore_unused_variable_warning(b);
+      b = m_sub >= m_sub;
+      ignore_unused_variable_warning(b);
+
+      b = m_sub == m_pointer;
+      ignore_unused_variable_warning(b);
+      b = m_sub != m_pointer;
+      ignore_unused_variable_warning(b);
+      b = m_sub <= m_pointer;
+      ignore_unused_variable_warning(b);
+      b = m_sub <= m_pointer;
+      ignore_unused_variable_warning(b);
+      b = m_sub > m_pointer;
+      ignore_unused_variable_warning(b);
+      b = m_sub >= m_pointer;
+      ignore_unused_variable_warning(b);
+
+      b = m_pointer == m_sub;
+      ignore_unused_variable_warning(b);
+      b = m_pointer != m_sub;
+      ignore_unused_variable_warning(b);
+      b = m_pointer <= m_sub;
+      ignore_unused_variable_warning(b);
+      b = m_pointer <= m_sub;
+      ignore_unused_variable_warning(b);
+      b = m_pointer > m_sub;
+      ignore_unused_variable_warning(b);
+      b = m_pointer >= m_sub;
+      ignore_unused_variable_warning(b);
+
+      b = m_sub == m_char;
+      ignore_unused_variable_warning(b);
+      b = m_sub != m_char;
+      ignore_unused_variable_warning(b);
+      b = m_sub <= m_char;
+      ignore_unused_variable_warning(b);
+      b = m_sub <= m_char;
+      ignore_unused_variable_warning(b);
+      b = m_sub > m_char;
+      ignore_unused_variable_warning(b);
+      b = m_sub >= m_char;
+      ignore_unused_variable_warning(b);
+
+      b = m_char == m_sub;
+      ignore_unused_variable_warning(b);
+      b = m_char != m_sub;
+      ignore_unused_variable_warning(b);
+      b = m_char <= m_sub;
+      ignore_unused_variable_warning(b);
+      b = m_char <= m_sub;
+      ignore_unused_variable_warning(b);
+      b = m_char > m_sub;
+      ignore_unused_variable_warning(b);
+      b = m_char >= m_sub;
+      ignore_unused_variable_warning(b);
+
+      b = m_sub == m_string;
+      ignore_unused_variable_warning(b);
+      b = m_sub != m_string;
+      ignore_unused_variable_warning(b);
+      b = m_sub <= m_string;
+      ignore_unused_variable_warning(b);
+      b = m_sub <= m_string;
+      ignore_unused_variable_warning(b);
+      b = m_sub > m_string;
+      ignore_unused_variable_warning(b);
+      b = m_sub >= m_string;
+      ignore_unused_variable_warning(b);
+
+      b = m_string == m_sub;
+      ignore_unused_variable_warning(b);
+      b = m_string != m_sub;
+      ignore_unused_variable_warning(b);
+      b = m_string <= m_sub;
+      ignore_unused_variable_warning(b);
+      b = m_string <= m_sub;
+      ignore_unused_variable_warning(b);
+      b = m_string > m_sub;
+      ignore_unused_variable_warning(b);
+      b = m_string >= m_sub;
+      ignore_unused_variable_warning(b);
+
+      // match results:
+      m_string = m_results.str();
+      ignore_unused_variable_warning(m_string);
+      m_string = m_results.str(0);
+      ignore_unused_variable_warning(m_string);
+      m_out = m_cresults.format(m_out, m_string);
+      m_out = m_cresults.format(m_out, m_string, m_mft);
+      m_string = m_cresults.format(m_string);
+      ignore_unused_variable_warning(m_string);
+      m_string = m_cresults.format(m_string, m_mft);
+      ignore_unused_variable_warning(m_string);
+
+      // regex_match:
+      b = global_regex_namespace::regex_match(m_string, m_smatch, e);
+      ignore_unused_variable_warning(b);
+      b = global_regex_namespace::regex_match(m_string, m_smatch, e, m_mft);
+      ignore_unused_variable_warning(b);
+      b = global_regex_namespace::regex_match(m_string, e);
+      ignore_unused_variable_warning(b);
+      b = global_regex_namespace::regex_match(m_string, e, m_mft);
+      ignore_unused_variable_warning(b);
+
+      // regex_search:
+      b = global_regex_namespace::regex_search(m_string, m_smatch, e);
+      ignore_unused_variable_warning(b);
+      b = global_regex_namespace::regex_search(m_string, m_smatch, e, m_mft);
+      ignore_unused_variable_warning(b);
+      b = global_regex_namespace::regex_search(m_string, e);
+      ignore_unused_variable_warning(b);
+      b = global_regex_namespace::regex_search(m_string, e, m_mft);
+      ignore_unused_variable_warning(b);
+
+      // regex_replace:
+      m_out = global_regex_namespace::regex_replace(m_out, m_in, m_in, e, m_string, m_mft);
+      m_out = global_regex_namespace::regex_replace(m_out, m_in, m_in, e, m_string);
+      m_string = global_regex_namespace::regex_replace(m_string, e, m_string, m_mft);
+      ignore_unused_variable_warning(m_string);
+      m_string = global_regex_namespace::regex_replace(m_string, e, m_string);
+      ignore_unused_variable_warning(m_string);
+
+   }
+
+   flag_type m_flags;
+   string_type m_string;
+   const sub_match_type m_sub;
+   match_results_type m_results;
+   pointer_type m_pointer;
+   value_type m_char;
+   const match_results_type m_cresults;
+   OutIterator m_out;
+   BidiIterator m_in;
+   global_regex_namespace::regex_constants::match_flag_type m_mft;
+   global_regex_namespace::match_results<typename string_type::const_iterator> m_smatch;
+
+   RegexConcept();
+   RegexConcept(const RegexConcept&);
+   RegexConcept& operator=(const RegexConcept&);
+};
+
+//
+// BoostRegexConcept:
+// Test every interface in the Boost implementation:
+//
+template <class Regex>
+struct BoostRegexConcept
+{
+   typedef typename Regex::value_type value_type;
+   typedef typename Regex::size_type size_type;
+   typedef typename Regex::flag_type flag_type;
+   typedef typename Regex::locale_type locale_type;
+
+   // derived test types:
+   typedef const value_type* pointer_type;
+   typedef std::basic_string<value_type> string_type;
+   typedef typename Regex::const_iterator const_iterator;
+   typedef bidirectional_iterator_archetype<value_type> BidiIterator;
+   typedef global_regex_namespace::sub_match<BidiIterator> sub_match_type;
+   typedef global_regex_namespace::match_results<BidiIterator> match_results_type;
+
+   void constraints() 
+   {
+      function_requires<RegexConcept<Regex> >();
+      const global_regex_namespace::regex_error except(global_regex_namespace::regex_constants::error_collate);
+      std::ptrdiff_t pt = except.position();
+      ignore_unused_variable_warning(pt);
+      const Regex ce, ce2;
+      m_stream << ce;
+      unsigned i = ce.error_code();
+      ignore_unused_variable_warning(i);
+      pointer_type p = ce.expression();
+      ignore_unused_variable_warning(p);
+      int i2 = ce.compare(ce2);
+      ignore_unused_variable_warning(i2);
+      bool b = ce == ce2;
+      ignore_unused_variable_warning(b);
+      b = ce != ce2;
+      ignore_unused_variable_warning(b);
+      b = ce < ce2;
+      ignore_unused_variable_warning(b);
+      b = ce > ce2;
+      ignore_unused_variable_warning(b);
+      b = ce <= ce2;
+      ignore_unused_variable_warning(b);
+      b = ce >= ce2;
+      ignore_unused_variable_warning(b);
+      i = ce.status();
+      ignore_unused_variable_warning(i);
+      size_type s = ce.max_size();
+      ignore_unused_variable_warning(s);
+      s = ce.size();
+      ignore_unused_variable_warning(s);
+      const_iterator pi = ce.begin();
+      ignore_unused_variable_warning(pi);
+      pi = ce.end();
+      ignore_unused_variable_warning(pi);
+      string_type s2 = ce.str();
+      ignore_unused_variable_warning(s2);
+
+      m_string = m_sub + m_sub;
+      ignore_unused_variable_warning(m_string);
+      m_string = m_sub + m_pointer;
+      ignore_unused_variable_warning(m_string);
+      m_string = m_pointer + m_sub;
+      ignore_unused_variable_warning(m_string);
+      m_string = m_sub + m_string;
+      ignore_unused_variable_warning(m_string);
+      m_string = m_string + m_sub;
+      ignore_unused_variable_warning(m_string);
+      m_string = m_sub + m_char;
+      ignore_unused_variable_warning(m_string);
+      m_string = m_char + m_sub;
+      ignore_unused_variable_warning(m_string);
+
+      m_stream << m_sub;
+      m_stream << m_cresults;
+   }
+
+   std::basic_ostream<value_type> m_stream;
+   sub_match_type m_sub;
+   pointer_type m_pointer;
+   string_type m_string;
+   const value_type m_char;
+   match_results_type m_results;
+   const match_results_type m_cresults;
+
+   BoostRegexConcept();
+   BoostRegexConcept(const BoostRegexConcept&);
+   BoostRegexConcept& operator=(const BoostRegexConcept&);
+};
+
+}
+
+#endif
diff --git a/include/boost/regex/config.hpp b/include/boost/regex/config.hpp
index b7e4cd68..631c4e9d 100644
--- a/include/boost/regex/config.hpp
+++ b/include/boost/regex/config.hpp
@@ -18,10 +18,10 @@
 
 #ifndef BOOST_REGEX_CONFIG_HPP
 #define BOOST_REGEX_CONFIG_HPP
-/*
- Borland C++ Fix/error check
- this has to go *before* we include any std lib headers:
-*/
+//
+// Borland C++ Fix/error check
+// this has to go *before* we include any std lib headers:
+//
 #if defined(__BORLANDC__)
 #  include <boost/regex/config/borland.hpp>
 #endif
@@ -40,31 +40,14 @@
 
 #  include BOOST_REGEX_USER_CONFIG
 
-#  include <cstdlib>
-#  include <cstddef>
-#  include <cstdio>
-#  include <clocale>
-#  include <cassert>
-#  include <string>
-#  include <stdexcept>
-#  include <iterator>
-#  include <iosfwd>
-#  include <vector>
 #  include <boost/config.hpp>
-#  include <boost/cstdint.hpp>
-#  include <boost/regex/config/allocator.hpp>
-#  include <boost/regex/config/cstring.hpp>
-#  include <boost/throw_exception.hpp>
-#  include <boost/scoped_ptr.hpp>
-#  ifndef BOOST_NO_STD_LOCALE
-#     include <locale>
-#  endif
+
 #else
-   /*
-   * C build,
-   * don't include <boost/config.hpp> because that may
-   * do C++ specific things in future...
-   */
+   //
+   // C build,
+   // don't include <boost/config.hpp> because that may
+   // do C++ specific things in future...
+   //
 #  include <stdlib.h>
 #  include <stddef.h>
 #  ifdef _MSC_VER
@@ -81,24 +64,34 @@
 /* Obsolete macro, use BOOST_VERSION instead: */
 #define BOOST_RE_VERSION 320
 
-/* fix: */
+// fix:
 #if defined(_UNICODE) && !defined(UNICODE)
 #define UNICODE
 #endif
 
-/*
-* If there isn't good enough wide character support then there will
-* be no wide character regular expressions:
-*/
+//
+// Fix for gcc prior to 3.4: std::ctype<wchar_t> doesn't allow
+// masks to be combined, for example:
+// std::use_facet<std::ctype<wchar_t> >.is(std::ctype_base::lower|std::ctype_base::upper, L'a');
+// returns *false*.
+//
+#ifdef __GLIBCPP__
+#  define BOOST_REGEX_BUGGY_CTYPE_FACET
+#endif
+
+//
+// If there isn't good enough wide character support then there will
+// be no wide character regular expressions:
+//
 #if (defined(BOOST_NO_CWCHAR) || defined(BOOST_NO_CWCTYPE) || defined(BOOST_NO_STD_WSTRING))
 #  if !defined(BOOST_NO_WREGEX)
 #     define BOOST_NO_WREGEX
 #  endif
 #else
 #  if defined(__sgi) && (defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION))
-      /* STLPort on IRIX is misconfigured: <cwctype> does not compile
-      * as a temporary fix include <wctype.h> instead and prevent inclusion
-      * of STLPort version of <cwctype> */
+      // STLPort on IRIX is misconfigured: <cwctype> does not compile
+      // as a temporary fix include <wctype.h> instead and prevent inclusion
+      // of STLPort version of <cwctype>
 #     include <wctype.h>
 #     define __STLPORT_CWCTYPE
 #     define _STLP_CWCTYPE
@@ -110,78 +103,28 @@
 
 #endif
 
-/*
-* If Win32 support has been disabled for boost in general, then
-* it is for regex in particular:
-*/
+//
+// If Win32 support has been disabled for boost in general, then
+// it is for regex in particular:
+//
 #if defined(BOOST_DISABLE_WIN32) && !defined(BOOST_REGEX_NO_W32)
 #  define BOOST_REGEX_NO_W32
 #endif
 
-/* some versions of gcc can't merge template instances: */
-#if defined(__CYGWIN__)
-#  define BOOST_REGEX_NO_TEMPLATE_SWITCH_MERGE
-#endif
-
-/* fix problems with bool as a macro,
-* this probably doesn't affect any current compilers: */
-#if defined(bool) || defined(true) || defined(false)
-#  define BOOST_REGEX_NO_BOOL
-#endif
-
-/* We don't make our templates external if the compiler
- can't handle it: */
-#if (defined(BOOST_NO_MEMBER_FUNCTION_SPECIALIZATIONS) || defined(__HP_aCC) || defined(__MWERKS__) || defined(__COMO__) || defined(BOOST_INTEL))\
-   && !defined(BOOST_MSVC) && !defined(__BORLANDC__)
-#  define BOOST_REGEX_NO_EXTERNAL_TEMPLATES
-#endif
-
-/* disable our own file-iterators and mapfiles if we can't
- support them: */
+// disable our own file-iterators and mapfiles if we can't
+// support them:
 #if !defined(BOOST_HAS_DIRENT_H) && !(defined(_WIN32) && !defined(BOOST_REGEX_NO_W32))
 #  define BOOST_REGEX_NO_FILEITER
 #endif
 
-#ifdef __cplusplus
-#ifndef MB_CUR_MAX
-// yuk!
-// better make a conservative guess!
-#define MB_CUR_MAX 10
-#endif
-
-namespace boost{ namespace re_detail{
-#ifdef BOOST_NO_STD_DISTANCE
-template <class T>
-std::ptrdiff_t distance(const T& x, const T& y)
-{ return y - x; }
-#else
-using std::distance;
-#endif
-}}
-
-
-#ifdef BOOST_REGEX_NO_BOOL
-#  define BOOST_REGEX_MAKE_BOOL(x) static_cast<bool>((x) ? true : false)
-#else
-#  ifdef BOOST_MSVC
-      // warning suppression with VC6:
-#     pragma warning(disable: 4800)
-#  endif
-#  define BOOST_REGEX_MAKE_BOOL(x) static_cast<bool>(x)
-#endif
-#endif /* __cplusplus */
-
-/* backwards compatibitity: */
+// backwards compatibitity:
 #if defined(BOOST_RE_NO_LIB)
 #  define BOOST_REGEX_NO_LIB
 #endif
 
 #if defined(__GNUC__) && (defined(_WIN32) || defined(__CYGWIN__))
-// gcc on win32 has problems merging switch statements in templates:
-#  define BOOST_REGEX_NO_TEMPLATE_SWITCH_MERGE
 // gcc on win32 has problems if you include <windows.h>
 // (sporadically generates bad code).
-#  define BOOST_REGEX_USE_C_LOCALE
 #  define BOOST_REGEX_NO_W32
 #endif
 #if defined(__COMO__) && !defined(BOOST_REGEX_NO_W32) && !defined(_MSC_EXTENSIONS)
@@ -194,13 +137,26 @@ using std::distance;
  *
  ****************************************************************************/
 
-#ifdef __cplusplus
-#if defined(BOOST_MSVC) && (BOOST_MSVC >= 1300) && !defined(BOOST_REGEX_V3) && !(defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION))
-#  define BOOST_REGEX_HAS_SHORT_WCHAR_T
-namespace boost{ typedef __wchar_t regex_wchar_type; }
-#else
-namespace boost{ typedef wchar_t regex_wchar_type; }
-#endif
+//
+// define BOOST_REGEX_HAS_OTHER_WCHAR_T when wchar_t is a native type, but the users
+// code may be built with wchar_t as unsigned short: basically when we're building
+// with MSVC and the /Zc:wchar_t option we place some extra unsigned short versions
+// of the non-inline functions in the library, so that users can still link to the lib,
+// irrespective of whether their own code is built with /Zc:wchar_t.
+//
+#if defined(__cplusplus) && (defined(BOOST_MSVC) || defined(__ICL)) && !defined(BOOST_NO_INTRINSIC_WCHAR_T) && defined(BOOST_WINDOWS)
+#  define BOOST_REGEX_HAS_OTHER_WCHAR_T
+#  ifdef BOOST_MSVC
+#     pragma warning(push)
+#     pragma warning(disable : 4251 4231 4660)
+#  endif
+#  ifdef _DLL
+#     include <string>
+      extern template class __declspec(dllimport) std::basic_string<unsigned short>;
+#  endif
+#  ifdef BOOST_MSVC
+#     pragma warning(pop)
+#  endif
 #endif
 
 
@@ -228,9 +184,9 @@ namespace boost{ typedef wchar_t regex_wchar_type; }
 #  if defined(BOOST_REGEX_DYN_LINK) || defined(BOOST_ALL_DYN_LINK)
 #     define BOOST_DYN_LINK
 #  endif
-#ifdef BOOST_REGEX_DIAG
-#  define BOOST_LIB_DIAGNOSTIC
-#endif
+#  ifdef BOOST_REGEX_DIAG
+#     define BOOST_LIB_DIAGNOSTIC
+#  endif
 #  include <boost/config/auto_link.hpp>
 #endif
 
@@ -267,7 +223,7 @@ namespace boost{ typedef wchar_t regex_wchar_type; }
  *
  ****************************************************************************/
 
-/* backwards compatibility: */
+// backwards compatibility:
 #ifdef BOOST_RE_LOCALE_C
 #  define BOOST_REGEX_USE_C_LOCALE
 #endif
@@ -276,29 +232,19 @@ namespace boost{ typedef wchar_t regex_wchar_type; }
 #  define BOOST_REGEX_USE_CPP_LOCALE
 #endif
 
-/* Win32 defaults to native Win32 locale: */
+// Win32 defaults to native Win32 locale:
 #if defined(_WIN32) && !defined(BOOST_REGEX_USE_WIN32_LOCALE) && !defined(BOOST_REGEX_USE_C_LOCALE) && !defined(BOOST_REGEX_USE_CPP_LOCALE) && !defined(BOOST_REGEX_NO_W32)
 #  define BOOST_REGEX_USE_WIN32_LOCALE
 #endif
-/* otherwise use C locale: */
+// otherwise use C++ locale if supported:
+#if !defined(BOOST_REGEX_USE_WIN32_LOCALE) && !defined(BOOST_REGEX_USE_C_LOCALE) && !defined(BOOST_REGEX_USE_CPP_LOCALE) && !defined(BOOST_NO_STD_LOCALE)
+#  define BOOST_REGEX_USE_CPP_LOCALE
+#endif
+// otherwise use C+ locale:
 #if !defined(BOOST_REGEX_USE_WIN32_LOCALE) && !defined(BOOST_REGEX_USE_C_LOCALE) && !defined(BOOST_REGEX_USE_CPP_LOCALE)
 #  define BOOST_REGEX_USE_C_LOCALE
 #endif
 
-#if defined(_WIN32) && !defined(BOOST_REGEX_NO_W32)
-#  include <windows.h>
-#endif
-
-#ifdef MAXPATH
-#  define BOOST_REGEX_MAX_PATH MAXPATH
-#elif defined(MAX_PATH)
-#  define BOOST_REGEX_MAX_PATH MAX_PATH
-#elif defined(FILENAME_MAX)
-#  define BOOST_REGEX_MAX_PATH FILENAME_MAX
-#else
-#  define BOOST_REGEX_MAX_PATH 200
-#endif
-
 #ifndef BOOST_REGEX_MAX_STATE_COUNT
 #  define BOOST_REGEX_MAX_STATE_COUNT 100000000
 #endif
@@ -311,10 +257,14 @@ namespace boost{ typedef wchar_t regex_wchar_type; }
  ****************************************************************************/
 
 #ifdef BOOST_NO_EXCEPTIONS
-/*
-*  If there are no exceptions then we must report critical-errors
-*  the only way we know how; by terminating.
-*/
+//
+// If there are no exceptions then we must report critical-errors
+// the only way we know how; by terminating.
+//
+#include <stdexcept>
+#include <string>
+#include <boost/throw_exception.hpp>
+
 #  define BOOST_REGEX_NOEH_ASSERT(x)\
 if(0 == (x))\
 {\
@@ -324,70 +274,13 @@ if(0 == (x))\
    boost::throw_exception(e);\
 }
 #else
-/*
-*  With exceptions then error handling is taken care of and
-*  there is no need for these checks:
-*/
+//
+// With exceptions then error handling is taken care of and
+// there is no need for these checks:
+//
 #  define BOOST_REGEX_NOEH_ASSERT(x)
 #endif
 
-/*****************************************************************************
- *
- *  Debugging / tracing support:
- *
- ****************************************************************************/
-
-#if defined(BOOST_REGEX_DEBUG) && defined(__cplusplus)
-
-#  include <iostream>
-using std::cout;
-using std::cin;
-using std::cerr;
-using std::endl;
-using std::hex;
-using std::dec;
-
-#  ifndef jm_assert
-#     define jm_assert(x) assert(x)
-#  endif
-#  ifndef jm_trace
-#     define jm_trace(x) cerr << x << endl;
-#  endif
-#  ifndef jm_instrument
-#     define jm_instrument jm_trace(__FILE__<<"#"<<__LINE__)
-#  endif
-
-namespace boost{
-   namespace re_detail{
-class debug_guard
-{
-public:
-   char g1[32];
-   const char* pc;
-   char* pnc;
-   const char* file;
-   int line;
-   char g2[32];
-   debug_guard(const char* f, int l, const char* p1 = 0, char* p2 = 0);
-   ~debug_guard();
-};
-
-#  define BOOST_RE_GUARD_STACK boost::re_detail::debug_guard sg(__FILE__, __LINE__);
-#  define BOOST_RE_GUARD_GLOBAL(x) const char g1##x[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, }; char g2##x[32]; boost::debug_guard g3##x(__FILE__, __LINE__, g1##x, g2##x);
-
-   } // namespace re_detail
-} // namespace boost
-
-#else
-
-#  define jm_assert(x)
-#  define jm_trace(x)
-#  define BOOST_RE_GUARD_STACK
-#  define BOOST_RE_GUARD_GLOBAL(x)
-#  ifndef jm_instrument
-#     define jm_instrument
-#  endif
-#endif
 
 /*****************************************************************************
  *
@@ -419,31 +312,6 @@ BOOST_REGEX_DECL void BOOST_REGEX_CALL reset_stack_guard_page();
 #endif
 
 
-/*****************************************************************************
- *
- *  Error handling:
- *
- ****************************************************************************/
-
-#if defined(__cplusplus)
-
-namespace boost{
-namespace re_detail{
-
-BOOST_REGEX_DECL void BOOST_REGEX_CALL raise_regex_exception(const std::string& s);
-
-template <class traits>
-void raise_error(const traits& t, unsigned code)
-{
-   (void)t;  // warning suppression
-   raise_regex_exception(t.error_string(code));
-}
-
-}
-}
-
-#endif
-
 /*****************************************************************************
  *
  *  Algorithm selection and configuration:
@@ -480,93 +348,6 @@ void raise_error(const traits& t, unsigned code)
 #endif
 
 
-/*****************************************************************************
- *
- *  Fix broken compilers that wrongly #define some symbols:
- *
- ****************************************************************************/
-
-#ifdef __cplusplus
-
-// the following may be defined as macros; this is
-// incompatable with std::something syntax, we have
-// no choice but to undef them?
-
-#ifdef sprintf
-#undef sprintf
-#endif
-#ifdef swprintf
-#undef swprintf
-#endif
-#endif
-
-/*****************************************************************************
- *
- *  Fix broken broken namespace support:
- *
- ****************************************************************************/
-
-#if defined(BOOST_NO_STDC_NAMESPACE) && defined(__cplusplus)
-
-namespace std{
-   using ::ptrdiff_t;
-   using ::size_t;
-   using ::sprintf;
-   using ::abs;
-   using ::setlocale;
-#  ifndef BOOST_NO_WREGEX
-#     ifndef BOOST_NO_SWPRINTF
-   using ::swprintf;
-#     endif
-   using ::wcstombs;
-   using ::mbstowcs;
-#     if !defined(BOOST_NO_STD_LOCALE) && !defined (__STL_NO_NATIVE_MBSTATE_T) && !defined(_STLP_NO_NATIVE_MBSTATE_T)
-   using ::mbstate_t;
-#     endif
-#  endif /* BOOST_NO_WREGEX */
-   using ::fseek;
-   using ::fread;
-   using ::ftell;
-   using ::fopen;
-   using ::fclose;
-   using ::FILE;
-#ifdef BOOST_NO_EXCEPTIONS
-   using ::fprintf;
-   using ::abort;
-#endif
-}
-
-#endif
-
-/*****************************************************************************
- *
- *  helper functions pointer_construct/pointer_destroy:
- *
- ****************************************************************************/
-
-#ifdef __cplusplus
-namespace boost{ namespace re_detail{
-
-#ifdef BOOST_MSVC
-#pragma warning (push)
-#pragma warning (disable : 4100)
-#endif
-
-template <class T>
-inline void pointer_destroy(T* p)
-{ p->~T(); (void)p; }
-
-#ifdef BOOST_MSVC
-#pragma warning (pop)
-#endif
-
-template <class T>
-inline void pointer_construct(T* p, const T& t)
-{ new (p) T(t); }
-
-}} // namespaces
-#endif
-
 /*****************************************************************************
  *
  *  helper memory allocation functions:
@@ -593,9 +374,9 @@ BOOST_REGEX_DECL void BOOST_REGEX_CALL print_regex_library_info();
 #endif
 
 #if defined(BOOST_REGEX_DIAG)
-#  pragma message ("BOOST_REGEX_DECL set as: " BOOST_STRINGIZE(BOOST_REGEX_DECL))
-#  pragma message ("BOOST_REGEX_CALL set as: " BOOST_STRINGIZE(BOOST_REGEX_CALL))
-#  pragma message ("BOOST_REGEX_CCALL set as: " BOOST_STRINGIZE(BOOST_REGEX_CCALL))
+#  pragma message ("BOOST_REGEX_DECL" BOOST_STRINGIZE(=BOOST_REGEX_DECL))
+#  pragma message ("BOOST_REGEX_CALL" BOOST_STRINGIZE(=BOOST_REGEX_CALL))
+#  pragma message ("BOOST_REGEX_CCALL" BOOST_STRINGIZE(=BOOST_REGEX_CCALL))
 #ifdef BOOST_REGEX_USE_C_LOCALE
 #  pragma message ("Using C locale in regex traits class")
 #elif BOOST_REGEX_USE_CPP_LOCALE
@@ -603,20 +384,15 @@ BOOST_REGEX_DECL void BOOST_REGEX_CALL print_regex_library_info();
 #else
 #  pragma message ("Using Win32 locale in regex traits class")
 #endif
-#ifdef BOOST_REGEX_DYN_LINK
+#if defined(BOOST_REGEX_DYN_LINK) || defined(BOOST_ALL_DYN_LINK)
 #  pragma message ("Dynamic linking enabled")
 #endif
-#ifdef BOOST_REGEX_NO_LIB
+#if defined(BOOST_REGEX_NO_LIB) || defined(BOOST_ALL_NO_LIB)
 #  pragma message ("Auto-linking disabled")
 #endif
 #ifdef BOOST_REGEX_NO_EXTERNAL_TEMPLATES
 #  pragma message ("Extern templates disabled")
 #endif
-#ifdef BOOST_REGEX_V3
-#  pragma message ("Using Version 3 regex code")
-#else
-#  pragma message ("Using Version 4 regex code")
-#endif
 
 #endif
 
diff --git a/include/boost/regex/config/borland.hpp b/include/boost/regex/config/borland.hpp
index 372aa0c4..f0c795d9 100644
--- a/include/boost/regex/config/borland.hpp
+++ b/include/boost/regex/config/borland.hpp
@@ -58,6 +58,15 @@
 #     endif
 #  endif
 
+#if __BORLANDC__ < 0x600
+//
+// string workarounds:
+//
+#include <cstring>
+#undef strcmp
+#undef strcpy
+#endif
+
 #endif
 
 
diff --git a/include/boost/regex/config/cstring.hpp b/include/boost/regex/config/cstring.hpp
deleted file mode 100644
index 3e09fc34..00000000
--- a/include/boost/regex/config/cstring.hpp
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- *
- * Copyright (c) 1998-2002
- * Dr 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         boost/regex/config/cstring.hpp
-  *   VERSION      see <boost/version.hpp>
-  *   DESCRIPTION: regex narrow character string fixes.
-  */
-
-#ifndef BOOST_REGEX_CONFIG_CSTRING_HPP
-#define BOOST_REGEX_CONFIG_CSTRING_HPP
-
-#include <cstring>
-#include <cctype>
-#ifndef __sgi
-#ifdef __KCC
-#include <ios>
-#endif
-#include <boost/config.hpp>
-
-namespace std{
-
-#ifdef __BORLANDC__
-#pragma option push -w-8008 -w-8066 -w-8004
-#endif
-
-#ifdef BOOST_NO_STDC_NAMESPACE
-
-// Any function that is a macro is converted into an inline function:
-#ifdef memcmp
-inline int boost_memcmp(const void * p1, const void * p2, size_t s)
-{ return memcmp(p1, p2, s); }
-#undef memcmp
-inline int memcmp(const void * p1, const void * p2, size_t s)
-{ return boost_memcmp(p1, p2, s); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::memcmp;
-#endif
-
-#ifdef memcpy
-inline void *boost_memcpy(void * p1, const void *p2, size_t s)
-{ return memcpy(p1, p2, s); }
-#undef memcpy
-inline void *memcpy(void * p1, const void *p2, size_t s)
-{ return boost_memcpy(p1, p2, s); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::memcpy;
-#endif
-
-#ifdef memmove
-inline void *(memmove)(void *, const void *, size_t)
-{ return memmove(p1,p2,s); }
-#undef memmove
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::memmove;
-#endif
-
-#ifdef memset
-inline void *(boost_memset)(void *p, int a, size_t b)
-{ return memset(p,a,b); }
-#undef memset
-inline void *(memset)(void *p, int a, size_t b)
-{ return boost_memset(p,a,b); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::memset;
-#endif
-
-#ifdef strcat
-inline char *(boost_strcat)(char *p1, const char *p2)
-{ return strcat(p1,p2); }
-#undef strcat
-inline char *(strcat)(char *p1, const char *p2)
-{ return boost_strcat(p1,p2); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::strcat;
-#endif
-
-#ifdef strcmp
-inline int (boost_strcmp)(const char *p1, const char *p2)
-{ return strcmp(p1,p2); }
-#undef strcmp
-inline int (strcmp)(const char *p1, const char *p2)
-{ return boost_strcmp(p1,p2); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::strcmp;
-#endif
-
-#ifdef strcoll
-inline int (boost_strcoll) (const char *p1, const char *p2)
-{ return strcoll(p1,p2); }
-#undef strcoll
-inline int (strcoll) (const char *p1, const char *p2)
-{ return boost_strcoll(p1,p2); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::strcoll;
-#endif
-
-#ifdef strcpy
-inline char *(boost_strcpy)(char *p1, const char *p2)
-{ return strcpy(p1,p2); }
-#undef strcpy
-inline char *(strcpy)(char *p1, const char *p2)
-{ return boost_strcpy(p1,p2); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::strcpy;
-#endif
-
-#ifdef strlen
-inline size_t (boost_strlen)(const char *p)
-{ return strlen(p); }
-#undef strlen
-inline size_t (strlen)(const char *p)
-{ return boost_strlen(p); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::strlen;
-#endif
-
-#ifdef strxfrm
-inline size_t (boost_strxfrm)(char *p1, const char *p2, size_t s)
-{ return strxfrm(p1,p2,s); }
-#undef strxfrm
-inline size_t (strxfrm)(char *p1, const char *p2, size_t s)
-{ return boost_strxfrm(p1,p2,s); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::strxfrm;
-#endif
-
-#ifdef isalnum
-inline int (boost_isalnum)(int i)
-{ return isalnum(i); }
-#undef isalnum
-inline int (isalnum)(int i)
-{ return boost_isalnum(i); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::isalnum;
-#endif
-
-#ifdef isalpha
-inline int (boost_isalpha)(int i)
-{ return isalpha(i); }
-#undef isalpha
-inline int (isalpha)(int i)
-{ return boost_isalpha(i); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::isalpha;
-#endif
-
-#ifdef iscntrl
-inline int (boost_iscntrl)(int i)
-{ return iscntrl(i); }
-#undef iscntrl
-inline int (iscntrl)(int i)
-{ return boost_iscntrl(i); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::iscntrl;
-#endif
-
-#ifdef isdigit
-inline int (boost_isdigit)(int i)
-{ return isdigit(i); }
-#undef isdigit
-inline int (isdigit)(int i)
-{ return boost_isdigit(i); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::isdigit;
-#endif
-
-#ifdef isgraph
-inline int (boost_isgraph)(int i)
-{ return isgraph(i); }
-#undef isgraph
-inline int (isgraph)(int i)
-{ return boost_isgraph(i); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::isgraph;
-#endif
-
-#ifdef islower
-inline int (boost_islower)(int i)
-{ return islower(i); }
-#undef islower
-inline int (islower)(int i)
-{ return boost_islower(i); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::islower;
-#endif
-
-#ifdef isprint
-inline int (boost_isprint)(int i)
-{ return isprint(i); }
-#undef isprint
-inline int (isprint)(int i)
-{ return boost_isprint(i); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::isprint;
-#endif
-
-#ifdef ispunct
-inline int (boost_ispunct)(int i)
-{ return ispunct(i); }
-#undef ispunct
-inline int (ispunct)(int i)
-{ return boost_ispunct(i); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::ispunct;
-#endif
-
-#ifdef isspace
-inline int (isspace)(int i)
-{ return isspace(i); }
-#undef isspace
-inline int (boost_isspace)(int i)
-{ return boost_isspace(i); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::isspace;
-#endif
-
-#ifdef isupper
-inline int (isupper)(int i)
-{ return isupper(i); }
-#undef isupper
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::isupper;
-#endif
-
-#ifdef isxdigit
-inline int (isxdigit)(int i)
-{ return isxdigit(i); }
-#undef isxdigit
-inline int (boost_isxdigit)(int i)
-{ return boost_isxdigit(i); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::isxdigit;
-#endif
-
-#ifdef tolower
-inline int (boost_tolower)(int i)
-{ return tolower(i); }
-#undef tolower
-inline int (tolower)(int i)
-{ return boost_tolower(i); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::tolower;
-#endif
-
-#ifdef toupper
-inline int (boost_toupper)(int i)
-{ return toupper(i); }
-#undef toupper
-inline int (toupper)(int i)
-{ return boost_toupper(i); }
-#elif defined(BOOST_NO_STDC_NAMESPACE)
-using ::toupper;
-#endif
-
-#else
-
-#undef memcmp
-#undef memcpy
-#undef memmove
-#undef memset
-#undef strcat
-#undef strcmp
-#undef strcoll
-#undef strcpy
-#undef strlen
-#undef strxfrm
-#undef isalnum
-#undef isalpha
-#undef iscntrl
-#undef isdigit
-#undef isgraph
-#undef islower
-#undef isprint
-#undef ispunct
-#undef isspace
-#undef isupper
-#undef isxdigit
-#undef tolower
-#undef toupper
-
-#endif
-
-
-#ifdef __BORLANDC__
-#pragma option pop
-#endif
-
-} // namespace std
-
-#endif // __sgi
-
-#endif
-
diff --git a/include/boost/regex/icu.hpp b/include/boost/regex/icu.hpp
new file mode 100644
index 00000000..8ece578d
--- /dev/null
+++ b/include/boost/regex/icu.hpp
@@ -0,0 +1,897 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         icu.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Unicode regular expressions on top of the ICU Library.
+  */
+
+#ifndef BOOST_REGEX_ICU_HPP
+#define BOOST_REGEX_ICU_HPP
+
+#include <unicode/utypes.h>
+#include <unicode/uchar.h>
+#include <unicode/coll.h>
+#include <boost/regex.hpp>
+#include <boost/regex/pending/unicode_iterator.hpp>
+#include <boost/mpl/int_fwd.hpp>
+#include <bitset>
+
+
+namespace boost{
+
+namespace re_detail{
+
+// 
+// Implementation details:
+//
+class BOOST_REGEX_DECL icu_regex_traits_implementation
+{
+   typedef UChar32                      char_type;
+   typedef std::size_t                  size_type;
+   typedef std::vector<char_type>       string_type;
+   typedef ::Locale                     locale_type;
+   typedef boost::uint_least32_t        char_class_type;
+public:
+   icu_regex_traits_implementation(const ::Locale& l)
+      : m_locale(l)
+   {
+      UErrorCode success = U_ZERO_ERROR;
+      m_collator.reset( ::Collator::createInstance(l, success));
+      if(U_SUCCESS(success) == 0)
+         init_error();
+      m_collator->setStrength(::Collator::IDENTICAL);
+      success = U_ZERO_ERROR;
+      m_primary_collator.reset( ::Collator::createInstance(l, success));
+      if(U_SUCCESS(success) == 0)
+         init_error();
+      m_primary_collator->setStrength(::Collator::PRIMARY);
+   }
+   ::Locale getloc()const
+   {
+      return m_locale;
+   }
+   string_type do_transform(const char_type* p1, const char_type* p2, const ::Collator* pcoll) const;
+   string_type transform(const char_type* p1, const char_type* p2) const
+   {
+      return do_transform(p1, p2, m_collator.get());
+   }
+   string_type transform_primary(const char_type* p1, const char_type* p2) const
+   {
+      return do_transform(p1, p2, m_primary_collator.get());
+   }
+private:
+   void init_error()
+   {
+      std::runtime_error e("Could not initialize ICU resources");
+      boost::throw_exception(e);
+   }
+   ::Locale m_locale;                                  // The ICU locale that we're using
+   boost::scoped_ptr< ::Collator> m_collator;          // The full collation object
+   boost::scoped_ptr< ::Collator> m_primary_collator;  // The primary collation object
+};
+
+inline boost::shared_ptr<icu_regex_traits_implementation> get_icu_regex_traits_implementation(const ::Locale& loc)
+{
+   return boost::shared_ptr<icu_regex_traits_implementation>(new icu_regex_traits_implementation(loc));
+}
+
+}
+
+class BOOST_REGEX_DECL icu_regex_traits
+{
+public:
+   typedef UChar32                      char_type;
+   typedef std::size_t                  size_type;
+   typedef std::vector<char_type>       string_type;
+   typedef ::Locale                     locale_type;
+#ifdef BOOST_NO_INT64_T
+   typedef std::bitset<64>              char_class_type;
+#else
+   typedef boost::uint64_t              char_class_type;
+#endif
+
+   struct boost_extensions_tag{};
+
+   icu_regex_traits()
+      : m_pimpl(re_detail::get_icu_regex_traits_implementation(::Locale()))
+   {
+   }
+   static size_type length(const char_type* p);
+
+   ::boost::regex_constants::syntax_type syntax_type(char_type c)const
+   {
+      return ((c < 0x7f) && (c > 0)) ? re_detail::get_default_syntax_type(static_cast<char>(c)) : regex_constants::syntax_char;
+   }
+   ::boost::regex_constants::escape_syntax_type escape_syntax_type(char_type c) const
+   {
+      return ((c < 0x7f) && (c > 0)) ? re_detail::get_default_escape_syntax_type(static_cast<char>(c)) : regex_constants::syntax_char;
+   }
+   char_type translate(char_type c) const
+   {
+      return c;
+   }
+   char_type translate_nocase(char_type c) const
+   {
+      return ::u_tolower(c);
+   }
+   char_type translate(char_type c, bool icase) const
+   {
+      return icase ? translate_nocase(c) : translate(c);
+   }
+   char_type tolower(char_type c) const
+   {
+      return ::u_tolower(c);
+   }
+   char_type toupper(char_type c) const
+   {
+      return ::u_toupper(c);
+   }
+   string_type transform(const char_type* p1, const char_type* p2) const
+   {
+      return m_pimpl->transform(p1, p2);
+   }
+   string_type transform_primary(const char_type* p1, const char_type* p2) const
+   {
+      return m_pimpl->transform_primary(p1, p2);
+   }
+   char_class_type lookup_classname(const char_type* p1, const char_type* p2) const;
+   string_type lookup_collatename(const char_type* p1, const char_type* p2) const;
+   bool isctype(char_type c, char_class_type f) const;
+   int toi(const char_type*& p1, const char_type* p2, int radix)const
+   {
+      return re_detail::global_toi(p1, p2, radix, *this);
+   }
+   int value(char_type c, int radix)const
+   {
+      return u_digit(c, static_cast< ::int8_t>(radix));
+   }
+   locale_type imbue(locale_type l)
+   {
+      locale_type result(m_pimpl->getloc());
+      m_pimpl = re_detail::get_icu_regex_traits_implementation(l);
+      return result;
+   }
+   locale_type getloc()const
+   {
+      return locale_type();
+   }
+   std::string error_string(::boost::regex_constants::error_type n) const
+   {
+      return re_detail::get_default_error_string(n);
+   }
+private:
+   icu_regex_traits(const icu_regex_traits&);
+   icu_regex_traits& operator=(const icu_regex_traits&);
+
+   //
+   // define the bitmasks offsets we need for additional character properties:
+   //
+   enum{
+      offset_blank = U_CHAR_CATEGORY_COUNT,
+      offset_space = U_CHAR_CATEGORY_COUNT+1,
+      offset_xdigit = U_CHAR_CATEGORY_COUNT+2,
+      offset_underscore = U_CHAR_CATEGORY_COUNT+3,
+      offset_unicode = U_CHAR_CATEGORY_COUNT+4,
+      offset_any = U_CHAR_CATEGORY_COUNT+5,
+      offset_ascii = U_CHAR_CATEGORY_COUNT+6
+   };
+
+   //
+   // and now the masks:
+   //
+   static const char_class_type mask_blank;
+   static const char_class_type mask_space;
+   static const char_class_type mask_xdigit;
+   static const char_class_type mask_underscore;
+   static const char_class_type mask_unicode;
+   static const char_class_type mask_any;
+   static const char_class_type mask_ascii;
+
+   static char_class_type lookup_icu_mask(const ::UChar32* p1, const ::UChar32* p2);
+
+   boost::shared_ptr< ::boost::re_detail::icu_regex_traits_implementation> m_pimpl;
+};
+
+// types:
+typedef basic_regex< ::UChar32, icu_regex_traits> u32regex;
+typedef match_results<const ::UChar32*> u32match;
+typedef match_results<const ::UChar*> u16match;
+
+//
+// Construction of 32-bit regex types from UTF-8 and UTF-16 primitives:
+//
+namespace re_detail{
+
+template <class InputIterator>
+inline u32regex do_make_u32regex(InputIterator i, 
+                              InputIterator j, 
+                              boost::regex_constants::syntax_option_type opt, 
+                              const boost::mpl::int_<1>*)
+{
+   typedef boost::u8_to_u32_iterator<InputIterator, UChar32> conv_type;
+   return u32regex(conv_type(i), conv_type(j), opt);
+}
+
+template <class InputIterator>
+inline u32regex do_make_u32regex(InputIterator i, 
+                              InputIterator j, 
+                              boost::regex_constants::syntax_option_type opt, 
+                              const boost::mpl::int_<2>*)
+{
+   typedef boost::u16_to_u32_iterator<InputIterator, UChar32> conv_type;
+   return u32regex(conv_type(i), conv_type(j), opt);
+}
+
+template <class InputIterator>
+inline u32regex do_make_u32regex(InputIterator i, 
+                              InputIterator j, 
+                              boost::regex_constants::syntax_option_type opt, 
+                              const boost::mpl::int_<4>*)
+{
+   return u32regex(i, j, opt);
+}
+
+}
+
+//
+// Construction from an iterator pair:
+//
+template <class InputIterator>
+inline u32regex make_u32regex(InputIterator i, 
+                              InputIterator j, 
+                              boost::regex_constants::syntax_option_type opt)
+{
+   return re_detail::do_make_u32regex(i, j, opt, static_cast<boost::mpl::int_<sizeof(*i)> const*>(0));
+}
+//
+// construction from UTF-8 nul-terminated strings:
+//
+inline u32regex make_u32regex(const char* p, boost::regex_constants::syntax_option_type opt = boost::regex_constants::perl)
+{
+   return re_detail::do_make_u32regex(p, p + std::strlen(p), opt, static_cast<boost::mpl::int_<1> const*>(0));
+}
+inline u32regex make_u32regex(const unsigned char* p, boost::regex_constants::syntax_option_type opt = boost::regex_constants::perl)
+{
+   return re_detail::do_make_u32regex(p, p + std::strlen(reinterpret_cast<const char*>(p)), opt, static_cast<boost::mpl::int_<1> const*>(0));
+}
+//
+// construction from UTF-16 nul-terminated strings:
+//
+#ifndef BOOST_NO_WREGEX
+inline u32regex make_u32regex(const wchar_t* p, boost::regex_constants::syntax_option_type opt = boost::regex_constants::perl)
+{
+   return re_detail::do_make_u32regex(p, p + std::wcslen(p), opt, static_cast<boost::mpl::int_<sizeof(wchar_t)> const*>(0));
+}
+#endif
+#ifndef U_WCHAR_IS_UTF16
+inline u32regex make_u32regex(const UChar* p, boost::regex_constants::syntax_option_type opt = boost::regex_constants::perl)
+{
+   return re_detail::do_make_u32regex(p, p + u_strlen(p), opt, static_cast<boost::mpl::int_<2> const*>(0));
+}
+#endif
+//
+// construction from basic_string class-template:
+//
+template<class C, class T, class A>
+inline u32regex make_u32regex(const std::basic_string<C, T, A>& s, boost::regex_constants::syntax_option_type opt = boost::regex_constants::perl)
+{
+   return re_detail::do_make_u32regex(s.begin(), s.end(), opt, static_cast<boost::mpl::int_<sizeof(C)> const*>(0));
+}
+//
+// Construction from ICU string type:
+//
+inline u32regex make_u32regex(const UnicodeString& s, boost::regex_constants::syntax_option_type opt = boost::regex_constants::perl)
+{
+   return re_detail::do_make_u32regex(s.getBuffer(), s.getBuffer() + s.length(), opt, static_cast<boost::mpl::int_<2> const*>(0));
+}
+
+//
+// regex_match overloads that widen the character type as appropriate:
+//
+namespace re_detail{
+template<class MR1, class MR2>
+void copy_results(MR1& out, MR2 const& in)
+{
+   // copy results from an adapted MR2 match_results:
+   out.set_size(in.size(), in.prefix().first.base(), in.suffix().second.base());
+   out.set_base(in.base().base());
+   for(int i = 0; i < (int)in.size(); ++i)
+   {
+      if(in[i].matched)
+      {
+         out.set_first(in[i].first.base(), i);
+         out.set_second(in[i].second.base(), i);
+      }
+   }
+}
+
+template <class BidiIterator, class Allocator>
+inline bool do_regex_match(BidiIterator first, BidiIterator last, 
+                 match_results<BidiIterator, Allocator>& m, 
+                 const u32regex& e, 
+                 match_flag_type flags,
+                 boost::mpl::int_<4> const*)
+{
+   return ::boost::regex_match(first, last, m, e, flags);
+}
+template <class BidiIterator, class Allocator>
+bool do_regex_match(BidiIterator first, BidiIterator last, 
+                 match_results<BidiIterator, Allocator>& m, 
+                 const u32regex& e, 
+                 match_flag_type flags,
+                 boost::mpl::int_<2> const*)
+{
+   typedef u16_to_u32_iterator<BidiIterator, UChar32> conv_type;
+   typedef match_results<conv_type>                   match_type;
+   typedef typename match_type::allocator_type        alloc_type;
+   match_type what;
+   bool result = ::boost::regex_match(conv_type(first), conv_type(last), what, e, flags);
+   // copy results across to m:
+   if(result) copy_results(m, what);
+   return result;
+}
+template <class BidiIterator, class Allocator>
+bool do_regex_match(BidiIterator first, BidiIterator last, 
+                 match_results<BidiIterator, Allocator>& m, 
+                 const u32regex& e, 
+                 match_flag_type flags,
+                 boost::mpl::int_<1> const*)
+{
+   typedef u8_to_u32_iterator<BidiIterator, UChar32>  conv_type;
+   typedef match_results<conv_type>                   match_type;
+   typedef typename match_type::allocator_type        alloc_type;
+   match_type what;
+   bool result = ::boost::regex_match(conv_type(first), conv_type(last), what, e, flags);
+   // copy results across to m:
+   if(result) copy_results(m, what);
+   return result;
+}
+} // namespace re_detail
+
+template <class BidiIterator, class Allocator>
+inline bool u32regex_match(BidiIterator first, BidiIterator last, 
+                 match_results<BidiIterator, Allocator>& m, 
+                 const u32regex& e, 
+                 match_flag_type flags = match_default)
+{
+   return re_detail::do_regex_match(first, last, m, e, flags, static_cast<mpl::int_<sizeof(*first)> const*>(0));
+}
+inline bool u32regex_match(const UChar* p, 
+                 match_results<const UChar*>& m, 
+                 const u32regex& e, 
+                 match_flag_type flags = match_default)
+{
+   return re_detail::do_regex_match(p, p+u_strlen(p), m, e, flags, static_cast<mpl::int_<2> const*>(0));
+}
+#if !defined(U_WCHAR_IS_UTF16) && !defined(BOOST_NO_WREGEX)
+inline bool u32regex_match(const wchar_t* p, 
+                 match_results<const wchar_t*>& m, 
+                 const u32regex& e, 
+                 match_flag_type flags = match_default)
+{
+   return re_detail::do_regex_match(p, p+std::wcslen(p), m, e, flags, static_cast<mpl::int_<sizeof(wchar_t)> const*>(0));
+}
+#endif
+inline bool u32regex_match(const char* p, 
+                 match_results<const char*>& m, 
+                 const u32regex& e, 
+                 match_flag_type flags = match_default)
+{
+   return re_detail::do_regex_match(p, p+std::strlen(p), m, e, flags, static_cast<mpl::int_<1> const*>(0));
+}
+inline bool u32regex_match(const unsigned char* p, 
+                 match_results<const unsigned char*>& m, 
+                 const u32regex& e, 
+                 match_flag_type flags = match_default)
+{
+   return re_detail::do_regex_match(p, p+std::strlen((const char*)p), m, e, flags, static_cast<mpl::int_<1> const*>(0));
+}
+inline bool u32regex_match(const std::string& s, 
+                        match_results<std::string::const_iterator>& m, 
+                        const u32regex& e, 
+                        match_flag_type flags = match_default)
+{
+   return re_detail::do_regex_match(s.begin(), s.end(), m, e, flags, static_cast<mpl::int_<1> const*>(0));
+}
+#ifndef BOOST_NO_STD_WSTRING
+inline bool u32regex_match(const std::wstring& s, 
+                        match_results<std::wstring::const_iterator>& m, 
+                        const u32regex& e, 
+                        match_flag_type flags = match_default)
+{
+   return re_detail::do_regex_match(s.begin(), s.end(), m, e, flags, static_cast<mpl::int_<sizeof(wchar_t)> const*>(0));
+}
+#endif
+inline bool u32regex_match(const UnicodeString& s, 
+                        match_results<const UChar*>& m, 
+                        const u32regex& e, 
+                        match_flag_type flags = match_default)
+{
+   return re_detail::do_regex_match(s.getBuffer(), s.getBuffer() + s.length(), m, e, flags, static_cast<mpl::int_<sizeof(wchar_t)> const*>(0));
+}
+//
+// regex_match overloads that do not return what matched:
+//
+template <class BidiIterator>
+inline bool u32regex_match(BidiIterator first, BidiIterator last, 
+                 const u32regex& e, 
+                 match_flag_type flags = match_default)
+{
+   match_results<BidiIterator> m;
+   return re_detail::do_regex_match(first, last, m, e, flags, static_cast<mpl::int_<sizeof(*first)> const*>(0));
+}
+inline bool u32regex_match(const UChar* p, 
+                 const u32regex& e, 
+                 match_flag_type flags = match_default)
+{
+   match_results<const UChar*> m;
+   return re_detail::do_regex_match(p, p+u_strlen(p), m, e, flags, static_cast<mpl::int_<2> const*>(0));
+}
+#if !defined(U_WCHAR_IS_UTF16) && !defined(BOOST_NO_WREGEX)
+inline bool u32regex_match(const wchar_t* p, 
+                 const u32regex& e, 
+                 match_flag_type flags = match_default)
+{
+   match_results<const wchar_t*> m;
+   return re_detail::do_regex_match(p, p+std::wcslen(p), m, e, flags, static_cast<mpl::int_<sizeof(wchar_t)> const*>(0));
+}
+#endif
+inline bool u32regex_match(const char* p, 
+                 const u32regex& e, 
+                 match_flag_type flags = match_default)
+{
+   match_results<const char*> m;
+   return re_detail::do_regex_match(p, p+std::strlen(p), m, e, flags, static_cast<mpl::int_<1> const*>(0));
+}
+inline bool u32regex_match(const unsigned char* p, 
+                 const u32regex& e, 
+                 match_flag_type flags = match_default)
+{
+   match_results<const unsigned char*> m;
+   return re_detail::do_regex_match(p, p+std::strlen((const char*)p), m, e, flags, static_cast<mpl::int_<1> const*>(0));
+}
+inline bool u32regex_match(const std::string& s, 
+                        const u32regex& e, 
+                        match_flag_type flags = match_default)
+{
+   match_results<std::string::const_iterator> m;
+   return re_detail::do_regex_match(s.begin(), s.end(), m, e, flags, static_cast<mpl::int_<1> const*>(0));
+}
+#ifndef BOOST_NO_STD_WSTRING
+inline bool u32regex_match(const std::wstring& s, 
+                        const u32regex& e, 
+                        match_flag_type flags = match_default)
+{
+   match_results<std::wstring::const_iterator> m;
+   return re_detail::do_regex_match(s.begin(), s.end(), m, e, flags, static_cast<mpl::int_<sizeof(wchar_t)> const*>(0));
+}
+#endif
+inline bool u32regex_match(const UnicodeString& s, 
+                        const u32regex& e, 
+                        match_flag_type flags = match_default)
+{
+   match_results<const UChar*> m;
+   return re_detail::do_regex_match(s.getBuffer(), s.getBuffer() + s.length(), m, e, flags, static_cast<mpl::int_<sizeof(wchar_t)> const*>(0));
+}
+
+//
+// regex_search overloads that widen the character type as appropriate:
+//
+namespace re_detail{
+template <class BidiIterator, class Allocator>
+inline bool do_regex_search(BidiIterator first, BidiIterator last, 
+                 match_results<BidiIterator, Allocator>& m, 
+                 const u32regex& e, 
+                 match_flag_type flags,
+                 boost::mpl::int_<4> const*)
+{
+   return ::boost::regex_search(first, last, m, e, flags);
+}
+template <class BidiIterator, class Allocator>
+bool do_regex_search(BidiIterator first, BidiIterator last, 
+                 match_results<BidiIterator, Allocator>& m, 
+                 const u32regex& e, 
+                 match_flag_type flags,
+                 boost::mpl::int_<2> const*)
+{
+   typedef u16_to_u32_iterator<BidiIterator, UChar32> conv_type;
+   typedef match_results<conv_type>                   match_type;
+   typedef typename match_type::allocator_type        alloc_type;
+   match_type what;
+   bool result = ::boost::regex_search(conv_type(first), conv_type(last), what, e, flags);
+   // copy results across to m:
+   if(result) copy_results(m, what);
+   return result;
+}
+template <class BidiIterator, class Allocator>
+bool do_regex_search(BidiIterator first, BidiIterator last, 
+                 match_results<BidiIterator, Allocator>& m, 
+                 const u32regex& e, 
+                 match_flag_type flags,
+                 boost::mpl::int_<1> const*)
+{
+   typedef u8_to_u32_iterator<BidiIterator, UChar32>  conv_type;
+   typedef match_results<conv_type>                   match_type;
+   typedef typename match_type::allocator_type        alloc_type;
+   match_type what;
+   bool result = ::boost::regex_search(conv_type(first), conv_type(last), what, e, flags);
+   // copy results across to m:
+   if(result) copy_results(m, what);
+   return result;
+}
+}
+
+template <class BidiIterator, class Allocator>
+inline bool u32regex_search(BidiIterator first, BidiIterator last, 
+                 match_results<BidiIterator, Allocator>& m, 
+                 const u32regex& e, 
+                 match_flag_type flags = match_default)
+{
+   return re_detail::do_regex_search(first, last, m, e, flags, static_cast<mpl::int_<sizeof(*first)> const*>(0));
+}
+inline bool u32regex_search(const UChar* p, 
+                 match_results<const UChar*>& m, 
+                 const u32regex& e, 
+                 match_flag_type flags = match_default)
+{
+   return re_detail::do_regex_search(p, p+u_strlen(p), m, e, flags, static_cast<mpl::int_<2> const*>(0));
+}
+#if !defined(U_WCHAR_IS_UTF16) && !defined(BOOST_NO_WREGEX)
+inline bool u32regex_search(const wchar_t* p, 
+                 match_results<const wchar_t*>& m, 
+                 const u32regex& e, 
+                 match_flag_type flags = match_default)
+{
+   return re_detail::do_regex_search(p, p+std::wcslen(p), m, e, flags, static_cast<mpl::int_<sizeof(wchar_t)> const*>(0));
+}
+#endif
+inline bool u32regex_search(const char* p, 
+                 match_results<const char*>& m, 
+                 const u32regex& e, 
+                 match_flag_type flags = match_default)
+{
+   return re_detail::do_regex_search(p, p+std::strlen(p), m, e, flags, static_cast<mpl::int_<1> const*>(0));
+}
+inline bool u32regex_search(const unsigned char* p, 
+                 match_results<const unsigned char*>& m, 
+                 const u32regex& e, 
+                 match_flag_type flags = match_default)
+{
+   return re_detail::do_regex_search(p, p+std::strlen((const char*)p), m, e, flags, static_cast<mpl::int_<1> const*>(0));
+}
+inline bool u32regex_search(const std::string& s, 
+                        match_results<std::string::const_iterator>& m, 
+                        const u32regex& e, 
+                        match_flag_type flags = match_default)
+{
+   return re_detail::do_regex_search(s.begin(), s.end(), m, e, flags, static_cast<mpl::int_<1> const*>(0));
+}
+#ifndef BOOST_NO_STD_WSTRING
+inline bool u32regex_search(const std::wstring& s, 
+                        match_results<std::wstring::const_iterator>& m, 
+                        const u32regex& e, 
+                        match_flag_type flags = match_default)
+{
+   return re_detail::do_regex_search(s.begin(), s.end(), m, e, flags, static_cast<mpl::int_<sizeof(wchar_t)> const*>(0));
+}
+#endif
+inline bool u32regex_search(const UnicodeString& s, 
+                        match_results<const UChar*>& m, 
+                        const u32regex& e, 
+                        match_flag_type flags = match_default)
+{
+   return re_detail::do_regex_search(s.getBuffer(), s.getBuffer() + s.length(), m, e, flags, static_cast<mpl::int_<sizeof(wchar_t)> const*>(0));
+}
+template <class BidiIterator>
+inline bool u32regex_search(BidiIterator first, BidiIterator last, 
+                 const u32regex& e, 
+                 match_flag_type flags = match_default)
+{
+   match_results<BidiIterator> m;
+   return re_detail::do_regex_search(first, last, m, e, flags, static_cast<mpl::int_<sizeof(*first)> const*>(0));
+}
+inline bool u32regex_search(const UChar* p, 
+                 const u32regex& e, 
+                 match_flag_type flags = match_default)
+{
+   match_results<const UChar*> m;
+   return re_detail::do_regex_search(p, p+u_strlen(p), m, e, flags, static_cast<mpl::int_<2> const*>(0));
+}
+#if !defined(U_WCHAR_IS_UTF16) && !defined(BOOST_NO_WREGEX)
+inline bool u32regex_search(const wchar_t* p, 
+                 const u32regex& e, 
+                 match_flag_type flags = match_default)
+{
+   match_results<const wchar_t*> m;
+   return re_detail::do_regex_search(p, p+std::wcslen(p), m, e, flags, static_cast<mpl::int_<sizeof(wchar_t)> const*>(0));
+}
+#endif
+inline bool u32regex_search(const char* p, 
+                 const u32regex& e, 
+                 match_flag_type flags = match_default)
+{
+   match_results<const char*> m;
+   return re_detail::do_regex_search(p, p+std::strlen(p), m, e, flags, static_cast<mpl::int_<1> const*>(0));
+}
+inline bool u32regex_search(const unsigned char* p, 
+                 const u32regex& e, 
+                 match_flag_type flags = match_default)
+{
+   match_results<const unsigned char*> m;
+   return re_detail::do_regex_search(p, p+std::strlen((const char*)p), m, e, flags, static_cast<mpl::int_<1> const*>(0));
+}
+inline bool u32regex_search(const std::string& s, 
+                        const u32regex& e, 
+                        match_flag_type flags = match_default)
+{
+   match_results<std::string::const_iterator> m;
+   return re_detail::do_regex_search(s.begin(), s.end(), m, e, flags, static_cast<mpl::int_<1> const*>(0));
+}
+#ifndef BOOST_NO_STD_WSTRING
+inline bool u32regex_search(const std::wstring& s, 
+                        const u32regex& e, 
+                        match_flag_type flags = match_default)
+{
+   match_results<std::wstring::const_iterator> m;
+   return re_detail::do_regex_search(s.begin(), s.end(), m, e, flags, static_cast<mpl::int_<sizeof(wchar_t)> const*>(0));
+}
+#endif
+inline bool u32regex_search(const UnicodeString& s, 
+                        const u32regex& e, 
+                        match_flag_type flags = match_default)
+{
+   match_results<const UChar*> m;
+   return re_detail::do_regex_search(s.getBuffer(), s.getBuffer() + s.length(), m, e, flags, static_cast<mpl::int_<sizeof(wchar_t)> const*>(0));
+}
+
+//
+// overloads for regex_replace with utf-8 and utf-16 data types:
+//
+namespace re_detail{
+template <class I>
+inline std::pair< boost::u8_to_u32_iterator<I>, boost::u8_to_u32_iterator<I> >
+   make_utf32_seq(I i, I j, mpl::int_<1> const*)
+{
+   return std::pair< boost::u8_to_u32_iterator<I>, boost::u8_to_u32_iterator<I> >(boost::u8_to_u32_iterator<I>(i), boost::u8_to_u32_iterator<I>(j));
+}
+template <class I>
+inline std::pair< boost::u16_to_u32_iterator<I>, boost::u16_to_u32_iterator<I> >
+   make_utf32_seq(I i, I j, mpl::int_<2> const*)
+{
+   return std::pair< boost::u16_to_u32_iterator<I>, boost::u16_to_u32_iterator<I> >(boost::u16_to_u32_iterator<I>(i), boost::u16_to_u32_iterator<I>(j));
+}
+template <class I>
+inline std::pair< I, I >
+   make_utf32_seq(I i, I j, mpl::int_<4> const*)
+{
+   return std::pair< I, I >(i, j);
+}
+template <class charT>
+inline std::pair< boost::u8_to_u32_iterator<const charT*>, boost::u8_to_u32_iterator<const charT*> >
+   make_utf32_seq(const charT* p, mpl::int_<1> const*)
+{
+   return std::pair< boost::u8_to_u32_iterator<const charT*>, boost::u8_to_u32_iterator<const charT*> >(boost::u8_to_u32_iterator<const charT*>(p), boost::u8_to_u32_iterator<const charT*>(p+std::strlen((const char*)p)));
+}
+template <class charT>
+inline std::pair< boost::u16_to_u32_iterator<const charT*>, boost::u16_to_u32_iterator<const charT*> >
+   make_utf32_seq(const charT* p, mpl::int_<2> const*)
+{
+   return std::pair< boost::u16_to_u32_iterator<const charT*>, boost::u16_to_u32_iterator<const charT*> >(boost::u16_to_u32_iterator<const charT*>(p), boost::u16_to_u32_iterator<const charT*>(p+u_strlen((const UChar*)p)));
+}
+template <class charT>
+inline std::pair< const charT*, const charT* >
+   make_utf32_seq(const charT* p, mpl::int_<4> const*)
+{
+   return std::pair< const charT*, const charT* >(p, p+icu_regex_traits::length((UChar32 const*)p));
+}
+template <class OutputIterator>
+inline OutputIterator make_utf32_out(OutputIterator o, mpl::int_<4> const*)
+{
+   return o;
+}
+template <class OutputIterator>
+inline utf16_output_iterator<OutputIterator> make_utf32_out(OutputIterator o, mpl::int_<2> const*)
+{
+   return o;
+}
+template <class OutputIterator>
+inline utf8_output_iterator<OutputIterator> make_utf32_out(OutputIterator o, mpl::int_<1> const*)
+{
+   return o;
+}
+
+template <class OutputIterator, class I1, class I2>
+OutputIterator do_regex_replace(OutputIterator out,
+                                 std::pair<I1, I1> const& in,
+                                 const u32regex& e, 
+                                 const std::pair<I2, I2>& fmt, 
+                                 match_flag_type flags
+                                 )
+{
+   // unfortunately we have to copy the format string in order to pass in onward:
+   std::vector<UChar32> f;
+   f.assign(fmt.first, fmt.second);
+   
+   regex_iterator<I1, UChar32, icu_regex_traits> i(in.first, in.second, e, flags);
+   regex_iterator<I1, UChar32, icu_regex_traits> j;
+   if(i == j)
+   {
+      if(!(flags & regex_constants::format_no_copy))
+         out = std::copy(in.first, in.second, out);
+   }
+   else
+   {
+      I1 last_m = in.first;
+      while(i != j)
+      {
+         if(!(flags & regex_constants::format_no_copy))
+            out = std::copy(i->prefix().first, i->prefix().second, out); 
+         out = ::boost::re_detail::regex_format_imp(out, *i, &*f.begin(), &*f.end(), flags, e.get_traits());
+         last_m = (*i)[0].second;
+         if(flags & regex_constants::format_first_only)
+            break;
+         ++i;
+      }
+      if(!(flags & regex_constants::format_no_copy))
+         out = std::copy(last_m, in.second, out);
+   }
+   return out;
+}
+template <class BaseIterator>
+inline const BaseIterator& extract_output_base(const BaseIterator& b)
+{
+   return b;
+}
+template <class BaseIterator>
+inline BaseIterator extract_output_base(const utf8_output_iterator<BaseIterator>& b)
+{
+   return b.base();
+}
+template <class BaseIterator>
+inline BaseIterator extract_output_base(const utf16_output_iterator<BaseIterator>& b)
+{
+   return b.base();
+}
+}  // re_detail
+
+template <class OutputIterator, class BidirectionalIterator, class charT>
+inline OutputIterator u32regex_replace(OutputIterator out,
+                         BidirectionalIterator first,
+                         BidirectionalIterator last,
+                         const u32regex& e, 
+                         const charT* fmt, 
+                         match_flag_type flags = match_default)
+{
+   return re_detail::extract_output_base(
+      re_detail::do_regex_replace(
+         re_detail::make_utf32_out(out, static_cast<mpl::int_<sizeof(*first)> const*>(0)),
+         re_detail::make_utf32_seq(first, last, static_cast<mpl::int_<sizeof(*first)> const*>(0)),
+         e,
+         re_detail::make_utf32_seq(fmt, static_cast<mpl::int_<sizeof(*fmt)> const*>(0)),
+         flags)
+      );
+}
+
+template <class OutputIterator, class Iterator, class charT>
+inline OutputIterator u32regex_replace(OutputIterator out,
+                         Iterator first,
+                         Iterator last,
+                         const u32regex& e, 
+                         const std::basic_string<charT>& fmt,
+                         match_flag_type flags = match_default)
+{
+   return re_detail::extract_output_base(
+      re_detail::do_regex_replace(
+         re_detail::make_utf32_out(out, static_cast<mpl::int_<sizeof(*first)> const*>(0)),
+         re_detail::make_utf32_seq(first, last, static_cast<mpl::int_<sizeof(*first)> const*>(0)),
+         e,
+         re_detail::make_utf32_seq(fmt.begin(), fmt.end(), static_cast<mpl::int_<sizeof(charT)> const*>(0)),
+         flags)
+      );
+}
+
+template <class OutputIterator, class Iterator>
+inline OutputIterator u32regex_replace(OutputIterator out,
+                         Iterator first,
+                         Iterator last,
+                         const u32regex& e, 
+                         const UnicodeString& fmt,
+                         match_flag_type flags = match_default)
+{
+   return re_detail::extract_output_base(
+      re_detail::do_regex_replace(
+         re_detail::make_utf32_out(out, static_cast<mpl::int_<sizeof(*first)> const*>(0)),
+         re_detail::make_utf32_seq(first, last, static_cast<mpl::int_<sizeof(*first)> const*>(0)),
+         e,
+         re_detail::make_utf32_seq(fmt.getBuffer(), fmt.getBuffer() + fmt.length(), static_cast<mpl::int_<2> const*>(0)),
+         flags)
+      );
+}
+
+template <class charT>
+std::basic_string<charT> u32regex_replace(const std::basic_string<charT>& s,
+                         const u32regex& e, 
+                         const charT* fmt,
+                         match_flag_type flags = match_default)
+{
+   std::basic_string<charT> result;
+   re_detail::string_out_iterator<std::basic_string<charT> > i(result);
+   u32regex_replace(i, s.begin(), s.end(), e, fmt, flags);
+   return result;
+}
+
+template <class charT>
+std::basic_string<charT> u32regex_replace(const std::basic_string<charT>& s,
+                         const u32regex& e, 
+                         const std::basic_string<charT>& fmt,
+                         match_flag_type flags = match_default)
+{
+   std::basic_string<charT> result;
+   re_detail::string_out_iterator<std::basic_string<charT> > i(result);
+   u32regex_replace(i, s.begin(), s.end(), e, fmt.c_str(), flags);
+   return result;
+}
+
+namespace re_detail{
+
+class unicode_string_out_iterator
+{
+   UnicodeString* out;
+public:
+   unicode_string_out_iterator(UnicodeString& s) : out(&s) {}
+   unicode_string_out_iterator& operator++() { return *this; }
+   unicode_string_out_iterator& operator++(int) { return *this; }
+   unicode_string_out_iterator& operator*() { return *this; }
+   unicode_string_out_iterator& operator=(UChar v) 
+   { 
+      *out += v; 
+      return *this; 
+   }
+};
+
+}
+
+inline UnicodeString u32regex_replace(const UnicodeString& s,
+                         const u32regex& e, 
+                         const UChar* fmt,
+                         match_flag_type flags = match_default)
+{
+   UnicodeString result;
+   re_detail::unicode_string_out_iterator i(result);
+   u32regex_replace(i, s.getBuffer(), s.getBuffer()+s.length(), e, fmt, flags);
+   return result;
+}
+
+inline UnicodeString u32regex_replace(const UnicodeString& s,
+                         const u32regex& e, 
+                         const UnicodeString& fmt,
+                         match_flag_type flags = match_default)
+{
+   UnicodeString result;
+   re_detail::unicode_string_out_iterator i(result);
+   re_detail::do_regex_replace(
+         re_detail::make_utf32_out(i, static_cast<mpl::int_<2> const*>(0)),
+         re_detail::make_utf32_seq(s.getBuffer(), s.getBuffer()+s.length(), static_cast<mpl::int_<2> const*>(0)),
+         e,
+         re_detail::make_utf32_seq(fmt.getBuffer(), fmt.getBuffer() + fmt.length(), static_cast<mpl::int_<2> const*>(0)),
+         flags);
+   return result;
+}
+
+} // namespace boost.
+
+#include <boost/regex/v4/u32regex_iterator.hpp>
+#include <boost/regex/v4/u32regex_token_iterator.hpp>
+
+#endif
diff --git a/include/boost/regex/mfc.hpp b/include/boost/regex/mfc.hpp
new file mode 100644
index 00000000..c621b695
--- /dev/null
+++ b/include/boost/regex/mfc.hpp
@@ -0,0 +1,185 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         mfc.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Overloads and helpers for using MFC/ATL string types with Boost.Regex.
+  */
+
+#ifndef BOOST_REGEX_MFC_HPP
+#define BOOST_REGEX_MFC_HPP
+
+#include <atlsimpstr.h>
+#include <boost/regex.hpp>
+
+namespace boost{
+
+//
+// define the types used for 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 _MSC_VER >= 1310
+#define SIMPLE_STRING_PARAM class B, bool b
+#define SIMPLE_STRING_ARG_LIST B, b
+#else
+#define SIMPLE_STRING_PARAM class B
+#define SIMPLE_STRING_ARG_LIST B
+#endif
+
+//
+// define regex creation functions:
+//
+template <SIMPLE_STRING_PARAM>
+inline basic_regex<B> 
+make_regex(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s, ::boost::regex_constants::syntax_option_type f = boost::regex_constants::normal)
+{
+   basic_regex<B> result(s.GetString(), s.GetString() + s.GetLength(), f);
+   return result;
+}
+//
+// regex_match overloads:
+//
+template <SIMPLE_STRING_PARAM, class A, class T>
+inline bool regex_match(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s,
+                 match_results<const B*, A>& what,
+                 const basic_regex<B, T>& e,
+                 boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
+{
+   return ::boost::regex_match(s.GetString(),
+                               s.GetString() + s.GetLength(),
+                               what,
+                               e,
+                               f);
+}
+
+template <SIMPLE_STRING_PARAM, class T>
+inline bool regex_match(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s,
+                 const basic_regex<B, T>& e,
+                 boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
+{
+   return ::boost::regex_match(s.GetString(),
+                               s.GetString() + s.GetLength(),
+                               e,
+                               f);
+}
+//
+// regex_search overloads:
+//
+template <SIMPLE_STRING_PARAM, class A, class T>
+inline bool regex_search(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s,
+                 match_results<const B*, A>& what,
+                 const basic_regex<B, T>& e,
+                 boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
+{
+   return ::boost::regex_search(s.GetString(),
+                               s.GetString() + s.GetLength(),
+                               what,
+                               e,
+                               f);
+}
+
+template <SIMPLE_STRING_PARAM, class T>
+inline bool regex_search(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s,
+                 const basic_regex<B, T>& e,
+                 boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
+{
+   return ::boost::regex_search(s.GetString(),
+                               s.GetString() + s.GetLength(),
+                               e,
+                               f);
+}
+//
+// regex_iterator creation:
+//
+template <SIMPLE_STRING_PARAM>
+inline regex_iterator<B const*> 
+make_regex_iterator(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s, const basic_regex<B>& e, ::boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
+{
+   regex_iterator<B const*> result(s.GetString(), s.GetString() + s.GetLength(), e, f);
+   return result;
+}
+
+template <SIMPLE_STRING_PARAM>
+inline regex_token_iterator<B const*> 
+   make_regex_token_iterator(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s, const basic_regex<B>& e, int sub = 0, ::boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
+{
+   regex_token_iterator<B const*> result(s.GetString(), s.GetString() + s.GetLength(), e, sub, f);
+   return result;
+}
+
+template <SIMPLE_STRING_PARAM>
+inline regex_token_iterator<B const*> 
+make_regex_token_iterator(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s, const basic_regex<B>& e, const std::vector<int>& subs, ::boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
+{
+   regex_token_iterator<B const*> result(s.GetString(), s.GetString() + s.GetLength(), e, subs, f);
+   return result;
+}
+
+template <SIMPLE_STRING_PARAM, std::size_t N>
+inline regex_token_iterator<B const*> 
+make_regex_token_iterator(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s, const basic_regex<B>& e, const int (& subs)[N], ::boost::regex_constants::match_flag_type f = boost::regex_constants::match_default)
+{
+   regex_token_iterator<B const*> result(s.GetString(), s.GetString() + s.GetLength(), e, subs, f);
+   return result;
+}
+
+template <class OutputIterator, class BidirectionalIterator, class traits,
+          SIMPLE_STRING_PARAM>
+OutputIterator regex_replace(OutputIterator out,
+                           BidirectionalIterator first,
+                           BidirectionalIterator last,
+                           const basic_regex<B, traits>& e,
+                           const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& fmt,
+                           match_flag_type flags = match_default)
+{
+   return ::boost::regex_replace(out, first, last, e, fmt.GetString(), flags);
+}
+
+namespace re_detail{
+
+template <SIMPLE_STRING_PARAM>
+class mfc_string_out_iterator
+{
+   ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>* out;
+public:
+   mfc_string_out_iterator(ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s) : out(&s) {}
+   mfc_string_out_iterator& operator++() { return *this; }
+   mfc_string_out_iterator& operator++(int) { return *this; }
+   mfc_string_out_iterator& operator*() { return *this; }
+   mfc_string_out_iterator& operator=(B v) 
+   { 
+      out->AppendChar(v); 
+      return *this; 
+   }
+};
+
+}
+
+template <class traits, SIMPLE_STRING_PARAM>
+ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST> regex_replace(const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& s,
+                            const basic_regex<B, traits>& e,
+                            const ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST>& fmt,
+                            match_flag_type flags = match_default)
+{
+   ATL::CSimpleStringT<SIMPLE_STRING_ARG_LIST> result(s.GetManager());
+   re_detail::mfc_string_out_iterator<SIMPLE_STRING_ARG_LIST> i(result);
+   regex_replace(i, s.GetString(), s.GetString() + s.GetLength(), e, fmt.GetString(), flags);
+   return result;
+}
+
+} // namespace boost.
+
+#endif
diff --git a/include/boost/regex/pattern_except.hpp b/include/boost/regex/pattern_except.hpp
index 39d28ccf..51d202e7 100644
--- a/include/boost/regex/pattern_except.hpp
+++ b/include/boost/regex/pattern_except.hpp
@@ -23,6 +23,10 @@
 #include <boost/regex/config.hpp>
 #endif
 
+#include <stdexcept>
+#include <cstddef>
+#include <boost/regex/v4/error_type.hpp>
+
 namespace boost{
 
 #ifdef BOOST_HAS_ABI_HEADERS
@@ -33,22 +37,39 @@ namespace boost{
 #pragma warning(push)
 #pragma warning(disable : 4275)
 #endif
-class BOOST_REGEX_DECL bad_pattern : public std::runtime_error
+   class BOOST_REGEX_DECL regex_error : public std::runtime_error
 {
 public:
-   explicit bad_pattern(const std::string& s) : std::runtime_error(s){};
-   ~bad_pattern() throw();
+   explicit regex_error(const std::string& s, regex_constants::error_type err, std::ptrdiff_t pos);
+   explicit regex_error(regex_constants::error_type err);
+   ~regex_error() throw();
+   regex_constants::error_type code()const
+   { return m_error_code; }
+   std::ptrdiff_t position()const
+   { return m_position; }
+   void raise()const;
+private:
+   regex_constants::error_type m_error_code;
+   std::ptrdiff_t m_position;
 };
-#ifdef BOOST_MSVC
-#pragma warning(pop)
-#endif
 
-class BOOST_REGEX_DECL bad_expression : public bad_pattern
+typedef regex_error bad_pattern;
+typedef regex_error bad_expression;
+
+namespace re_detail{
+
+BOOST_REGEX_DECL void BOOST_REGEX_CALL raise_runtime_error(const std::runtime_error& ex);
+
+template <class traits>
+void raise_error(const traits& t, regex_constants::error_type code)
 {
-public:
-   explicit bad_expression(const std::string& s) : bad_pattern(s) {}
-   ~bad_expression() throw();
-};
+   (void)t;  // warning suppression
+   std::runtime_error e(t.error_string(code));
+   ::boost::re_detail::raise_runtime_error(e);
+}
+
+}
+
 
 #ifdef BOOST_HAS_ABI_HEADERS
 #  include BOOST_ABI_SUFFIX
diff --git a/include/boost/regex/pending/object_cache.hpp b/include/boost/regex/pending/object_cache.hpp
new file mode 100644
index 00000000..7364667d
--- /dev/null
+++ b/include/boost/regex/pending/object_cache.hpp
@@ -0,0 +1,159 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         object_cache.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Implements a generic object cache.
+  */
+
+#ifndef BOOST_REGEX_OBJECT_CACHE_HPP
+#define BOOST_REGEX_OBJECT_CACHE_HPP
+
+#include <map>
+#include <list>
+#include <stdexcept>
+#include <string>
+#include <boost/config.hpp>
+#include <boost/shared_ptr.hpp>
+#ifdef BOOST_HAS_THREADS
+#include <boost/regex/pending/static_mutex.hpp>
+#endif
+
+namespace boost{
+
+template <class Key, class Object>
+class object_cache
+{
+   typedef std::pair< ::boost::shared_ptr<Object>, Key const*> value_type;
+   typedef std::list<value_type> list_type;
+   typedef typename list_type::iterator list_iterator;
+   typedef std::map<Key, list_iterator> map_type;
+   typedef typename map_type::iterator map_iterator;
+   typedef typename list_type::size_type size_type;
+public:
+   static boost::shared_ptr<Object> get(const Key& k, size_type max_cache_size);
+
+private:
+   static boost::shared_ptr<Object> do_get(const Key& k, size_type max_cache_size);
+
+   struct data
+   {
+      list_type   cont;
+      map_type    index;
+   };
+};
+
+template <class Key, class Object>
+boost::shared_ptr<Object> object_cache<Key, Object>::get(const Key& k, size_type max_cache_size)
+{
+#ifdef BOOST_HAS_THREADS
+   static boost::static_mutex mut = BOOST_STATIC_MUTEX_INIT;
+
+   boost::static_mutex::scoped_lock l(mut);
+   if(l)
+   {
+      return do_get(k, max_cache_size);
+   }
+   //
+   // what do we do if the lock fails?
+   // for now just throw, but we should never really get here...
+   //
+   ::boost::throw_exception(std::runtime_error("Error in thread safety code: could not acquire a lock"));
+   return boost::shared_ptr<Object>();
+#else
+   return do_get(k, max_cache_size);
+#endif
+}
+
+template <class Key, class Object>
+boost::shared_ptr<Object> object_cache<Key, Object>::do_get(const Key& k, size_type max_cache_size)
+{
+   typedef typename object_cache<Key, Object>::data object_data;
+   typedef typename list_type::size_type list_size_type;
+   static object_data s_data;
+
+   //
+   // see if the object is already in the cache:
+   //
+   map_iterator mpos = s_data.index.find(k);
+   if(mpos != s_data.index.end())
+   {
+      //
+      // Eureka! 
+      // We have a cached item, bump it up the list and return it:
+      //
+      if(--(s_data.cont.end()) != mpos->second)
+      {
+         // splice out the item we want to move:
+         list_type temp;
+         temp.splice(temp.end(), s_data.cont, mpos->second);
+         // and now place it at the end of the list:
+         s_data.cont.splice(s_data.cont.end(), temp, temp.begin());
+         BOOST_ASSERT(*(s_data.cont.back().second) == k);
+         // update index with new position:
+         mpos->second = --(s_data.cont.end());
+         BOOST_ASSERT(&(mpos->first) == mpos->second->second);
+         BOOST_ASSERT(&(mpos->first) == s_data.cont.back().second);
+      }
+      return s_data.cont.back().first;
+   }
+   //
+   // if we get here then the item is not in the cache,
+   // so create it:
+   //
+   boost::shared_ptr<Object> result(new Object(k));
+   //
+   // Add it to the list, and index it:
+   //
+   s_data.cont.push_back(value_type(result, 0));
+   s_data.index[k] = --(s_data.cont.end());
+   s_data.cont.back().second = &(s_data.index.find(k)->first);
+   list_size_type s = s_data.cont.size();
+   BOOST_ASSERT(s_data.index[k]->first.get() == result.get());
+   BOOST_ASSERT(&(s_data.index.find(k)->first) == s_data.cont.back().second);
+   BOOST_ASSERT(s_data.index.find(k)->first == k);
+   if(s > max_cache_size)
+   {
+      //
+      // We have too many items in the list, so we need to start
+      // popping them off the back of the list, but only if they're
+      // being held uniquely by us:
+      //
+      list_iterator pos = s_data.cont.begin();
+      list_iterator last = s_data.cont.end();
+      while((pos != last) && (s > max_cache_size))
+      {
+         if(pos->first.unique())
+         {
+            list_iterator condemmed(pos);
+            ++pos;
+            // now remove the items from our containers, 
+            // then order has to be as follows:
+            BOOST_ASSERT(s_data.index.find(*(condemmed->second)) != s_data.index.end());
+            s_data.index.erase(*(condemmed->second));
+            s_data.cont.erase(condemmed); 
+            --s;
+         }
+         else
+            --pos;
+      }
+      BOOST_ASSERT(s_data.index[k]->first.get() == result.get());
+      BOOST_ASSERT(&(s_data.index.find(k)->first) == s_data.cont.back().second);
+      BOOST_ASSERT(s_data.index.find(k)->first == k);
+   }
+   return result;
+}
+
+}
+
+#endif
diff --git a/include/boost/regex/pending/static_mutex.hpp b/include/boost/regex/pending/static_mutex.hpp
new file mode 100644
index 00000000..109de9f2
--- /dev/null
+++ b/include/boost/regex/pending/static_mutex.hpp
@@ -0,0 +1,180 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         static_mutex.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Declares static_mutex lock type, there are three different
+  *                implementations: POSIX pthreads, WIN32 threads, and portable,
+  *                these are described in more detail below.
+  */
+
+#ifndef BOOST_REGEX_STATIC_MUTEX_HPP
+#define BOOST_REGEX_STATIC_MUTEX_HPP
+
+#include <boost/config.hpp>
+#include <boost/regex/config.hpp> // dll import/export options.
+
+#ifdef BOOST_HAS_PTHREADS
+#include <pthread.h>
+#endif
+
+#if defined(BOOST_HAS_PTHREADS) && defined(PTHREAD_MUTEX_INITIALIZER)
+//
+// pthreads version:
+// simple wrap around a pthread_mutex_t initialized with
+// PTHREAD_MUTEX_INITIALIZER.
+//
+namespace boost{
+
+class BOOST_REGEX_DECL scoped_static_mutex_lock;
+
+class static_mutex
+{
+public:
+   typedef scoped_static_mutex_lock scoped_lock;
+   pthread_mutex_t m_mutex;
+};
+
+#define BOOST_STATIC_MUTEX_INIT { PTHREAD_MUTEX_INITIALIZER, }
+
+class BOOST_REGEX_DECL scoped_static_mutex_lock
+{
+public:
+   scoped_static_mutex_lock(static_mutex& mut, bool lk = true);
+   ~scoped_static_mutex_lock();
+   operator void const*()const;
+   bool locked()const;
+   void lock();
+   void unlock();
+private:
+   static_mutex& m_mutex;
+   bool m_have_lock;
+};
+
+inline scoped_static_mutex_lock::operator void const*()const
+{
+   return locked() ? this : 0;
+}
+
+inline bool scoped_static_mutex_lock::locked()const
+{
+   return m_have_lock;
+}
+
+} // namespace boost
+#elif defined(BOOST_HAS_WINTHREADS)
+//
+// Win32 version:
+// Use a 32-bit int as a lock, along with a test-and-set
+// implementation using InterlockedCompareExchange.
+//
+
+#include <boost/cstdint.hpp>
+
+namespace boost{
+
+class BOOST_REGEX_DECL scoped_static_mutex_lock;
+
+class static_mutex
+{
+public:
+   typedef scoped_static_mutex_lock scoped_lock;
+   boost::int32_t m_mutex;
+};
+
+#define BOOST_STATIC_MUTEX_INIT { 0, }
+
+class BOOST_REGEX_DECL scoped_static_mutex_lock
+{
+public:
+   scoped_static_mutex_lock(static_mutex& mut, bool lk = true);
+   ~scoped_static_mutex_lock();
+   operator void const*()const;
+   bool locked()const;
+   void lock();
+   void unlock();
+private:
+   static_mutex& m_mutex;
+   bool m_have_lock;
+   scoped_static_mutex_lock(const scoped_static_mutex_lock&);
+   scoped_static_mutex_lock& operator=(const scoped_static_mutex_lock&);
+};
+
+inline scoped_static_mutex_lock::operator void const*()const
+{
+   return locked() ? this : 0;
+}
+
+inline bool scoped_static_mutex_lock::locked()const
+{
+   return m_have_lock;
+}
+
+} // namespace
+
+#else
+//
+// Portable version of a static mutex based on Boost.Thread library:
+// This has to use a single mutex shared by all instances of static_mutex
+// because boost::call_once doesn't alow us to pass instance information
+// down to the initialisation proceedure.  In fact the initialisation routine
+// may need to be called more than once - but only once per instance.
+//
+#include <boost/thread/once.hpp>
+#include <boost/thread/recursive_mutex.hpp>
+
+namespace boost{
+
+class BOOST_REGEX_DECL scoped_static_mutex_lock;
+extern "C" BOOST_REGEX_DECL void free_static_mutex();
+
+class BOOST_REGEX_DECL static_mutex
+{
+public:
+   typedef scoped_static_mutex_lock scoped_lock;
+   static void init();
+   static boost::recursive_mutex* m_pmutex;
+   static boost::once_flag m_once;
+};
+
+#define BOOST_STATIC_MUTEX_INIT {  }
+
+class BOOST_REGEX_DECL scoped_static_mutex_lock
+{
+public:
+   scoped_static_mutex_lock(static_mutex& mut, bool lk = true);
+   ~scoped_static_mutex_lock();
+   operator void const*()const;
+   bool locked()const;
+   void lock();
+   void unlock();
+private:
+   boost::recursive_mutex::scoped_lock* m_plock;
+   bool m_have_lock;
+};
+
+inline scoped_static_mutex_lock::operator void const*()const
+{
+   return locked() ? this : 0;
+}
+
+inline bool scoped_static_mutex_lock::locked()const
+{
+   return m_have_lock;
+}
+
+} // namespace
+
+#endif
+
+#endif
diff --git a/include/boost/regex/pending/unicode_iterator.hpp b/include/boost/regex/pending/unicode_iterator.hpp
new file mode 100644
index 00000000..11e81001
--- /dev/null
+++ b/include/boost/regex/pending/unicode_iterator.hpp
@@ -0,0 +1,676 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         unicode_iterator.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Iterator adapters for converting between different Unicode encodings.
+  */
+
+/****************************************************************************
+
+Contents:
+~~~~~~~~~
+
+1) Read Only, Input Adapters:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+template <class BaseIterator, class U8Type = ::boost::uint8_t>
+class u32_to_u8_iterator;
+
+Adapts sequence of UTF-32 code points to "look like" a sequence of UTF-8.
+
+template <class BaseIterator, class U32Type = ::boost::uint32_t>
+class u8_to_u32_iterator;
+
+Adapts sequence of UTF-8 code points to "look like" a sequence of UTF-32.
+
+template <class BaseIterator, class U16Type = ::boost::uint16_t>
+class u32_to_u16_iterator;
+
+Adapts sequence of UTF-32 code points to "look like" a sequence of UTF-16.
+
+template <class BaseIterator, class U32Type = ::boost::uint32_t>
+class u16_to_u32_iterator;
+
+Adapts sequence of UTF-16 code points to "look like" a sequence of UTF-32.
+
+2) Single pass output iterator adapters:
+
+template <class BaseIterator>
+class utf8_output_iterator;
+
+Accepts UTF-32 code points and forwards them on as UTF-8 code points.
+
+template <class BaseIterator>
+class utf16_output_iterator;
+
+Accepts UTF-32 code points and forwards them on as UTF-16 code points.
+
+****************************************************************************/
+
+#ifndef BOOST_REGEX_UNICODE_ITERATOR_HPP
+#define BOOST_REGEX_UNICODE_ITERATOR_HPP
+#include <boost/cstdint.hpp>
+#include <boost/assert.hpp>
+#include <boost/iterator/iterator_facade.hpp>
+#include <boost/static_assert.hpp>
+#include <boost/throw_exception.hpp>
+#include <stdexcept>
+#ifndef BOOST_NO_STD_LOCALE
+#include <sstream>
+#endif
+
+namespace boost{
+
+namespace detail{
+
+static const ::boost::uint16_t high_surrogate_base = 0xD7C0u;
+static const ::boost::uint16_t low_surrogate_base = 0xDC00u;
+static const ::boost::uint32_t ten_bit_mask = 0x3FFu;
+
+inline bool is_high_surrogate(::boost::uint16_t v)
+{
+   return (v & 0xFC00u) == 0xd800u;
+}
+inline bool is_low_surrogate(::boost::uint16_t v)
+{
+   return (v & 0xFC00u) == 0xdc00u;
+}
+template <class T>
+inline bool is_surrogate(T v)
+{
+   return (v & 0xF800u) == 0xd800;
+}
+
+inline unsigned utf8_byte_count(boost::uint8_t c)
+{
+   // if the most significant bit with a zero in it is in position
+   // 8-N then there are N bytes in this UTF-8 sequence:
+   boost::uint8_t mask = 0x80u;
+   unsigned result = 0;
+   while(c & mask)
+   {
+      ++result;
+      mask >>= 1;
+   }
+   return (result == 0) ? 1 : ((result > 4) ? 4 : result);
+}
+
+inline unsigned utf8_trailing_byte_count(boost::uint8_t c)
+{
+   return utf8_byte_count(c) - 1;
+}
+
+inline void invalid_utf32_code_point(::boost::uint32_t val)
+{
+#ifndef BOOST_NO_STD_LOCALE
+   std::stringstream ss;
+   ss << "Invalid UTF-32 code point U+" << std::showbase << std::hex << val << " encountered while trying to encode UTF-16 sequence";
+   std::out_of_range e(ss.str());
+#else
+   std::out_of_range e("Invalid UTF-32 code point encountered while trying to encode UTF-16 sequence");
+#endif
+   boost::throw_exception(e);
+}
+
+
+} // namespace detail
+
+template <class BaseIterator, class U16Type = ::boost::uint16_t>
+class u32_to_u16_iterator
+   : public boost::iterator_facade<u32_to_u16_iterator<BaseIterator, U16Type>, U16Type, std::bidirectional_iterator_tag, const U16Type>
+{
+   typedef boost::iterator_facade<u32_to_u16_iterator<BaseIterator, U16Type>, U16Type, std::bidirectional_iterator_tag, const U16Type> base_type;
+
+#if !defined(BOOST_NO_STD_ITERATOR_TRAITS) && !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
+   typedef typename std::iterator_traits<BaseIterator>::value_type base_value_type;
+
+   BOOST_STATIC_ASSERT(sizeof(base_value_type)*CHAR_BIT == 32);
+   BOOST_STATIC_ASSERT(sizeof(U16Type)*CHAR_BIT == 16);
+#endif
+
+public:
+   typename base_type::reference
+      dereference()const
+   {
+      if(m_current == 2)
+         extract_current();
+      return m_values[m_current];
+   }
+   bool equal(const u32_to_u16_iterator& that)const
+   {
+      if(m_position == that.m_position)
+      {
+         // Both m_currents must be equal, or both even
+         // this is the same as saying their sum must be even:
+         return (m_current + that.m_current) & 1u ? false : true;
+      }
+      return false;
+   }
+   void increment()
+   {
+      // if we have a pending read then read now, so that we know whether
+      // to skip a position, or move to a low-surrogate:
+      if(m_current == 2)
+      {
+         // pending read:
+         extract_current();
+      }
+      // move to the next surrogate position:
+      ++m_current;
+      // if we've reached the end skip a position:
+      if(m_values[m_current] == 0)
+      {
+         m_current = 2;
+         ++m_position;
+      }
+   }
+   void decrement()
+   {
+      if(m_current != 1)
+      {
+         // decrementing an iterator always leads to a valid position:
+         --m_position;
+         extract_current();
+         m_current = m_values[1] ? 1 : 0;
+      }
+      else
+      {
+         m_current = 0;
+      }
+   }
+   BaseIterator base()const
+   {
+      return m_position;
+   }
+   // construct:
+   u32_to_u16_iterator() : m_position(), m_current(0)
+   {
+      m_values[2] = 0;
+   }
+   u32_to_u16_iterator(BaseIterator b) : m_position(b), m_current(2)
+   {
+      m_values[2] = 0;
+   }
+private:
+
+   void extract_current()const
+   {
+      // begin by checking for a code point out of range:
+      ::boost::uint32_t v = *m_position;
+      if(v >= 0x10000u)
+      {
+         if(v > 0x10FFFFu)
+            detail::invalid_utf32_code_point(*m_position);
+         // split into two surrogates:
+         m_values[0] = static_cast<U16Type>(v >> 10) + detail::high_surrogate_base;
+         m_values[1] = static_cast<U16Type>(v & detail::ten_bit_mask) + detail::low_surrogate_base;
+         m_current = 0;
+         BOOST_ASSERT(detail::is_high_surrogate(m_values[0]));
+         BOOST_ASSERT(detail::is_low_surrogate(m_values[1]));
+      }
+      else
+      {
+         // 16-bit code point:
+         m_values[0] = static_cast<U16Type>(*m_position);
+         m_values[1] = 0;
+         m_current = 0;
+         // value must not be a surrogate:
+         if(detail::is_surrogate(m_values[0]))
+            detail::invalid_utf32_code_point(*m_position);
+      }
+   }
+   BaseIterator m_position;
+   mutable U16Type m_values[3];
+   mutable unsigned m_current;
+};
+
+template <class BaseIterator, class U32Type = ::boost::uint32_t>
+class u16_to_u32_iterator
+   : public boost::iterator_facade<u16_to_u32_iterator<BaseIterator, U32Type>, U32Type, std::bidirectional_iterator_tag, const U32Type>
+{
+   typedef boost::iterator_facade<u16_to_u32_iterator<BaseIterator, U32Type>, U32Type, std::bidirectional_iterator_tag, const U32Type> base_type;
+   // special values for pending iterator reads:
+   BOOST_STATIC_CONSTANT(U32Type, pending_read = 0xffffffffu);
+
+#if !defined(BOOST_NO_STD_ITERATOR_TRAITS) && !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
+   typedef typename std::iterator_traits<BaseIterator>::value_type base_value_type;
+
+   BOOST_STATIC_ASSERT(sizeof(base_value_type)*CHAR_BIT == 16);
+   BOOST_STATIC_ASSERT(sizeof(U32Type)*CHAR_BIT == 32);
+#endif
+
+public:
+   typename base_type::reference
+      dereference()const
+   {
+      if(m_value == pending_read)
+         extract_current();
+      return m_value;
+   }
+   bool equal(const u16_to_u32_iterator& that)const
+   {
+      return m_position == that.m_position;
+   }
+   void increment()
+   {
+      // skip high surrogate first if there is one:
+      if(detail::is_high_surrogate(*m_position)) ++m_position;
+      ++m_position;
+      m_value = pending_read;
+   }
+   void decrement()
+   {
+      --m_position;
+      // if we have a low surrogate then go back one more:
+      if(detail::is_low_surrogate(*m_position)) 
+         --m_position;
+      m_value = pending_read;
+   }
+   BaseIterator base()const
+   {
+      return m_position;
+   }
+   // construct:
+   u16_to_u32_iterator() : m_position()
+   {
+   }
+   u16_to_u32_iterator(BaseIterator b) : m_position(b)
+   {
+      m_value = pending_read;
+   }
+private:
+   static void invalid_code_point(::boost::uint16_t val)
+   {
+#ifndef BOOST_NO_STD_LOCALE
+      std::stringstream ss;
+      ss << "Misplaced UTF-16 surrogate U+" << std::showbase << std::hex << val << " encountered while trying to encode UTF-32 sequence";
+      std::out_of_range e(ss.str());
+#else
+      std::out_of_range e("Misplaced UTF-16 surrogate encountered while trying to encode UTF-32 sequence");
+#endif
+      boost::throw_exception(e);
+   }
+   void extract_current()const
+   {
+      m_value = static_cast<U32Type>(static_cast< ::boost::uint16_t>(*m_position));
+      // if the last value is a high surrogate then adjust m_position and m_value as needed:
+      if(detail::is_high_surrogate(*m_position))
+      {
+         // precondition; next value must have be a low-surrogate:
+         BaseIterator next(m_position);
+         ::boost::uint16_t t = *++next;
+         if((t & 0xFC00u) != 0xDC00u)
+            invalid_code_point(t);
+         m_value = (m_value - detail::high_surrogate_base) << 10;
+         m_value |= (static_cast<U32Type>(static_cast< ::boost::uint16_t>(t)) & detail::ten_bit_mask);
+      }
+      // postcondition; result must not be a surrogate:
+      if(detail::is_surrogate(m_value))
+         invalid_code_point(static_cast< ::boost::uint16_t>(m_value));
+   }
+   BaseIterator m_position;
+   mutable U32Type m_value;
+};
+
+template <class BaseIterator, class U8Type = ::boost::uint8_t>
+class u32_to_u8_iterator
+   : public boost::iterator_facade<u32_to_u8_iterator<BaseIterator, U8Type>, U8Type, std::bidirectional_iterator_tag, const U8Type>
+{
+   typedef boost::iterator_facade<u32_to_u8_iterator<BaseIterator, U8Type>, U8Type, std::bidirectional_iterator_tag, const U8Type> base_type;
+   
+#if !defined(BOOST_NO_STD_ITERATOR_TRAITS) && !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
+   typedef typename std::iterator_traits<BaseIterator>::value_type base_value_type;
+
+   BOOST_STATIC_ASSERT(sizeof(base_value_type)*CHAR_BIT == 32);
+   BOOST_STATIC_ASSERT(sizeof(U8Type)*CHAR_BIT == 8);
+#endif
+
+public:
+   typename base_type::reference
+      dereference()const
+   {
+      if(m_current == 4)
+         extract_current();
+      return m_values[m_current];
+   }
+   bool equal(const u32_to_u8_iterator& that)const
+   {
+      if(m_position == that.m_position)
+      {
+         // either the m_current's must be equal, or one must be 0 and 
+         // the other 4: which means neither must have bits 1 or 2 set:
+         return (m_current == that.m_current)
+            || (((m_current | that.m_current) & 3) == 0);
+      }
+      return false;
+   }
+   void increment()
+   {
+      // if we have a pending read then read now, so that we know whether
+      // to skip a position, or move to a low-surrogate:
+      if(m_current == 4)
+      {
+         // pending read:
+         extract_current();
+      }
+      // move to the next surrogate position:
+      ++m_current;
+      // if we've reached the end skip a position:
+      if(m_values[m_current] == 0)
+      {
+         m_current = 4;
+         ++m_position;
+      }
+   }
+   void decrement()
+   {
+      if((m_current & 3) == 0)
+      {
+         --m_position;
+         extract_current();
+         m_current = 3;
+         while(m_current && (m_values[m_current] == 0))
+            --m_current;
+      }
+      else
+         --m_current;
+   }
+   BaseIterator base()const
+   {
+      return m_position;
+   }
+   // construct:
+   u32_to_u8_iterator() : m_position(), m_current(0)
+   {
+      m_values[4] = 0;
+   }
+   u32_to_u8_iterator(BaseIterator b) : m_position(b), m_current(4)
+   {
+      m_values[4] = 0;
+   }
+private:
+
+   void extract_current()const
+   {
+      boost::uint32_t c = *m_position;
+      if(c > 0x10FFFFu)
+         detail::invalid_utf32_code_point(c);
+      if(c < 0x80u)
+      {
+         m_values[0] = static_cast<unsigned char>(c);
+         m_values[1] = static_cast<unsigned char>(0u);
+         m_values[2] = static_cast<unsigned char>(0u);
+         m_values[3] = static_cast<unsigned char>(0u);
+      }
+      else if(c < 0x800u)
+      {
+         m_values[0] = static_cast<unsigned char>(0xC0u + (c >> 6));
+         m_values[1] = static_cast<unsigned char>(0x80u + (c & 0x3Fu));
+         m_values[2] = static_cast<unsigned char>(0u);
+         m_values[3] = static_cast<unsigned char>(0u);
+      }
+      else if(c < 0x10000u)
+      {
+         m_values[0] = static_cast<unsigned char>(0xE0u + (c >> 12));
+         m_values[1] = static_cast<unsigned char>(0x80u + ((c >> 6) & 0x3Fu));
+         m_values[2] = static_cast<unsigned char>(0x80u + (c & 0x3Fu));
+         m_values[3] = static_cast<unsigned char>(0u);
+      }
+      else
+      {
+         m_values[0] = static_cast<unsigned char>(0xF0u + (c >> 18));
+         m_values[1] = static_cast<unsigned char>(0x80u + ((c >> 12) & 0x3Fu));
+         m_values[2] = static_cast<unsigned char>(0x80u + ((c >> 6) & 0x3Fu));
+         m_values[3] = static_cast<unsigned char>(0x80u + (c & 0x3Fu));
+      }
+      m_current= 0;
+   }
+   BaseIterator m_position;
+   mutable U8Type m_values[5];
+   mutable unsigned m_current;
+};
+
+template <class BaseIterator, class U32Type = ::boost::uint32_t>
+class u8_to_u32_iterator
+   : public boost::iterator_facade<u8_to_u32_iterator<BaseIterator, U32Type>, U32Type, std::bidirectional_iterator_tag, const U32Type>
+{
+   typedef boost::iterator_facade<u8_to_u32_iterator<BaseIterator, U32Type>, U32Type, std::bidirectional_iterator_tag, const U32Type> base_type;
+   // special values for pending iterator reads:
+   BOOST_STATIC_CONSTANT(U32Type, pending_read = 0xffffffffu);
+
+#if !defined(BOOST_NO_STD_ITERATOR_TRAITS) && !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
+   typedef typename std::iterator_traits<BaseIterator>::value_type base_value_type;
+
+   BOOST_STATIC_ASSERT(sizeof(base_value_type)*CHAR_BIT == 8);
+   BOOST_STATIC_ASSERT(sizeof(U32Type)*CHAR_BIT == 32);
+#endif
+
+public:
+   typename base_type::reference
+      dereference()const
+   {
+      if(m_value == pending_read)
+         extract_current();
+      return m_value;
+   }
+   bool equal(const u8_to_u32_iterator& that)const
+   {
+      return m_position == that.m_position;
+   }
+   void increment()
+   {
+      // skip high surrogate first if there is one:
+      unsigned c = detail::utf8_byte_count(*m_position);
+      std::advance(m_position, c);
+      m_value = pending_read;
+   }
+   void decrement()
+   {
+      // Keep backtracking until we don't have a trailing character:
+      unsigned count = 0;
+      while((*--m_position & 0xC0u) == 0x80u) ++count;
+      // now check that the sequence was valid:
+      if(count != detail::utf8_trailing_byte_count(*m_position))
+         invalid_sequnce();
+      m_value = pending_read;
+   }
+   BaseIterator base()const
+   {
+      return m_position;
+   }
+   // construct:
+   u8_to_u32_iterator() : m_position()
+   {
+      m_value = pending_read;
+   }
+   u8_to_u32_iterator(BaseIterator b) : m_position(b)
+   {
+      m_value = pending_read;
+   }
+private:
+   static void invalid_sequnce()
+   {
+      std::out_of_range e("Invalid UTF-8 sequence encountered while trying to encode UTF-32 character");
+      boost::throw_exception(e);
+   }
+   void extract_current()const
+   {
+      m_value = static_cast<U32Type>(static_cast< ::boost::uint8_t>(*m_position));
+      // we must not have a continuation character:
+      if((m_value & 0xC0u) == 0x80u)
+         invalid_sequnce();
+      // see how many extra byts we have:
+      unsigned extra = detail::utf8_trailing_byte_count(*m_position);
+      // extract the extra bits, 6 from each extra byte:
+      BaseIterator next(m_position);
+      for(unsigned c = 0; c < extra; ++c)
+      {
+         ++next;
+         m_value <<= 6;
+         m_value += static_cast<boost::uint8_t>(*next) & 0x3Fu;
+      }
+      // we now need to remove a few of the leftmost bits, but how many depends
+      // upon how many extra bytes we've extracted:
+      static const boost::uint32_t masks[] = 
+      {
+         0x7Fu,
+         0x7FFu,
+         0xFFFFu,
+         0x1FFFFFu,
+      };
+      m_value &= masks[extra];
+      // check the result:
+      if(m_value > static_cast<U32Type>(0x10FFFFu))
+         invalid_sequnce();
+   }
+   BaseIterator m_position;
+   mutable U32Type m_value;
+};
+
+template <class BaseIterator>
+class utf16_output_iterator
+{
+public:
+   typedef void                                   difference_type;
+   typedef void                                   value_type;
+   typedef boost::uint32_t*                       pointer;
+   typedef boost::uint32_t&                       reference;
+   typedef std::output_iterator_tag               iterator_category;
+
+   utf16_output_iterator(const BaseIterator& b)
+      : m_position(b){}
+   utf16_output_iterator(const utf16_output_iterator& that)
+      : m_position(that.m_position){}
+   utf16_output_iterator& operator=(const utf16_output_iterator& that)
+   {
+      m_position = that.m_position;
+      return *this;
+   }
+   const utf16_output_iterator& operator*()const
+   {
+      return *this;
+   }
+   void operator=(boost::uint32_t val)const
+   {
+      push(val);
+   }
+   utf16_output_iterator& operator++()
+   {
+      return *this;
+   }
+   utf16_output_iterator& operator++(int)
+   {
+      return *this;
+   }
+   BaseIterator base()const
+   {
+      return m_position;
+   }
+private:
+   void push(boost::uint32_t v)const
+   {
+      if(v >= 0x10000u)
+      {
+         // begin by checking for a code point out of range:
+         if(v > 0x10FFFFu)
+            detail::invalid_utf32_code_point(v);
+         // split into two surrogates:
+         *m_position++ = static_cast<boost::uint16_t>(v >> 10) + detail::high_surrogate_base;
+         *m_position++ = static_cast<boost::uint16_t>(v & detail::ten_bit_mask) + detail::low_surrogate_base;
+      }
+      else
+      {
+         // 16-bit code point:
+         // value must not be a surrogate:
+         if(detail::is_surrogate(v))
+            detail::invalid_utf32_code_point(v);
+         *m_position++ = static_cast<boost::uint16_t>(v);
+      }
+   }
+   mutable BaseIterator m_position;
+};
+
+template <class BaseIterator>
+class utf8_output_iterator
+{
+public:
+   typedef void                                   difference_type;
+   typedef void                                   value_type;
+   typedef boost::uint32_t*                       pointer;
+   typedef boost::uint32_t&                       reference;
+   typedef std::output_iterator_tag               iterator_category;
+
+   utf8_output_iterator(const BaseIterator& b)
+      : m_position(b){}
+   utf8_output_iterator(const utf8_output_iterator& that)
+      : m_position(that.m_position){}
+   utf8_output_iterator& operator=(const utf8_output_iterator& that)
+   {
+      m_position = that.m_position;
+      return *this;
+   }
+   const utf8_output_iterator& operator*()const
+   {
+      return *this;
+   }
+   void operator=(boost::uint32_t val)const
+   {
+      push(val);
+   }
+   utf8_output_iterator& operator++()
+   {
+      return *this;
+   }
+   utf8_output_iterator& operator++(int)
+   {
+      return *this;
+   }
+   BaseIterator base()const
+   {
+      return m_position;
+   }
+private:
+   void push(boost::uint32_t c)const
+   {
+      if(c > 0x10FFFFu)
+         detail::invalid_utf32_code_point(c);
+      if(c < 0x80u)
+      {
+         *m_position++ = static_cast<unsigned char>(c);
+      }
+      else if(c < 0x800u)
+      {
+         *m_position++ = static_cast<unsigned char>(0xC0u + (c >> 6));
+         *m_position++ = static_cast<unsigned char>(0x80u + (c & 0x3Fu));
+      }
+      else if(c < 0x10000u)
+      {
+         *m_position++ = static_cast<unsigned char>(0xE0u + (c >> 12));
+         *m_position++ = static_cast<unsigned char>(0x80u + ((c >> 6) & 0x3Fu));
+         *m_position++ = static_cast<unsigned char>(0x80u + (c & 0x3Fu));
+      }
+      else
+      {
+         *m_position++ = static_cast<unsigned char>(0xF0u + (c >> 18));
+         *m_position++ = static_cast<unsigned char>(0x80u + ((c >> 12) & 0x3Fu));
+         *m_position++ = static_cast<unsigned char>(0x80u + ((c >> 6) & 0x3Fu));
+         *m_position++ = static_cast<unsigned char>(0x80u + (c & 0x3Fu));
+      }
+   }
+   mutable BaseIterator m_position;
+};
+
+} // namespace boost
+
+#endif // BOOST_REGEX_UNICODE_ITERATOR_HPP
diff --git a/include/boost/regex/static_mutex.hpp b/include/boost/regex/static_mutex.hpp
new file mode 100644
index 00000000..109de9f2
--- /dev/null
+++ b/include/boost/regex/static_mutex.hpp
@@ -0,0 +1,180 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         static_mutex.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Declares static_mutex lock type, there are three different
+  *                implementations: POSIX pthreads, WIN32 threads, and portable,
+  *                these are described in more detail below.
+  */
+
+#ifndef BOOST_REGEX_STATIC_MUTEX_HPP
+#define BOOST_REGEX_STATIC_MUTEX_HPP
+
+#include <boost/config.hpp>
+#include <boost/regex/config.hpp> // dll import/export options.
+
+#ifdef BOOST_HAS_PTHREADS
+#include <pthread.h>
+#endif
+
+#if defined(BOOST_HAS_PTHREADS) && defined(PTHREAD_MUTEX_INITIALIZER)
+//
+// pthreads version:
+// simple wrap around a pthread_mutex_t initialized with
+// PTHREAD_MUTEX_INITIALIZER.
+//
+namespace boost{
+
+class BOOST_REGEX_DECL scoped_static_mutex_lock;
+
+class static_mutex
+{
+public:
+   typedef scoped_static_mutex_lock scoped_lock;
+   pthread_mutex_t m_mutex;
+};
+
+#define BOOST_STATIC_MUTEX_INIT { PTHREAD_MUTEX_INITIALIZER, }
+
+class BOOST_REGEX_DECL scoped_static_mutex_lock
+{
+public:
+   scoped_static_mutex_lock(static_mutex& mut, bool lk = true);
+   ~scoped_static_mutex_lock();
+   operator void const*()const;
+   bool locked()const;
+   void lock();
+   void unlock();
+private:
+   static_mutex& m_mutex;
+   bool m_have_lock;
+};
+
+inline scoped_static_mutex_lock::operator void const*()const
+{
+   return locked() ? this : 0;
+}
+
+inline bool scoped_static_mutex_lock::locked()const
+{
+   return m_have_lock;
+}
+
+} // namespace boost
+#elif defined(BOOST_HAS_WINTHREADS)
+//
+// Win32 version:
+// Use a 32-bit int as a lock, along with a test-and-set
+// implementation using InterlockedCompareExchange.
+//
+
+#include <boost/cstdint.hpp>
+
+namespace boost{
+
+class BOOST_REGEX_DECL scoped_static_mutex_lock;
+
+class static_mutex
+{
+public:
+   typedef scoped_static_mutex_lock scoped_lock;
+   boost::int32_t m_mutex;
+};
+
+#define BOOST_STATIC_MUTEX_INIT { 0, }
+
+class BOOST_REGEX_DECL scoped_static_mutex_lock
+{
+public:
+   scoped_static_mutex_lock(static_mutex& mut, bool lk = true);
+   ~scoped_static_mutex_lock();
+   operator void const*()const;
+   bool locked()const;
+   void lock();
+   void unlock();
+private:
+   static_mutex& m_mutex;
+   bool m_have_lock;
+   scoped_static_mutex_lock(const scoped_static_mutex_lock&);
+   scoped_static_mutex_lock& operator=(const scoped_static_mutex_lock&);
+};
+
+inline scoped_static_mutex_lock::operator void const*()const
+{
+   return locked() ? this : 0;
+}
+
+inline bool scoped_static_mutex_lock::locked()const
+{
+   return m_have_lock;
+}
+
+} // namespace
+
+#else
+//
+// Portable version of a static mutex based on Boost.Thread library:
+// This has to use a single mutex shared by all instances of static_mutex
+// because boost::call_once doesn't alow us to pass instance information
+// down to the initialisation proceedure.  In fact the initialisation routine
+// may need to be called more than once - but only once per instance.
+//
+#include <boost/thread/once.hpp>
+#include <boost/thread/recursive_mutex.hpp>
+
+namespace boost{
+
+class BOOST_REGEX_DECL scoped_static_mutex_lock;
+extern "C" BOOST_REGEX_DECL void free_static_mutex();
+
+class BOOST_REGEX_DECL static_mutex
+{
+public:
+   typedef scoped_static_mutex_lock scoped_lock;
+   static void init();
+   static boost::recursive_mutex* m_pmutex;
+   static boost::once_flag m_once;
+};
+
+#define BOOST_STATIC_MUTEX_INIT {  }
+
+class BOOST_REGEX_DECL scoped_static_mutex_lock
+{
+public:
+   scoped_static_mutex_lock(static_mutex& mut, bool lk = true);
+   ~scoped_static_mutex_lock();
+   operator void const*()const;
+   bool locked()const;
+   void lock();
+   void unlock();
+private:
+   boost::recursive_mutex::scoped_lock* m_plock;
+   bool m_have_lock;
+};
+
+inline scoped_static_mutex_lock::operator void const*()const
+{
+   return locked() ? this : 0;
+}
+
+inline bool scoped_static_mutex_lock::locked()const
+{
+   return m_have_lock;
+}
+
+} // namespace
+
+#endif
+
+#endif
diff --git a/include/boost/regex/v3/cregex.hpp b/include/boost/regex/v3/cregex.hpp
deleted file mode 100644
index 0af1ef6c..00000000
--- a/include/boost/regex/v3/cregex.hpp
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- *
- * Copyright (c) 1998-2002
- * Dr 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         cregex.cpp
-  *   VERSION      see <boost/version.hpp>
-  *   DESCRIPTION: Declares POSIX API functions
-  *                + boost::RegEx high level wrapper.
-  */
-
-#ifndef BOOST_RE_CREGEX_HPP_INCLUDED
-#define BOOST_RE_CREGEX_HPP_INCLUDED
-
-#ifndef BOOST_REGEX_CONFIG_HPP
-#include <boost/regex/config.hpp>
-#endif
-
-#ifdef __BORLANDC__
-   #pragma option push -a8 -b -Vx -Ve -pc
-#endif
-
-/* include these defs only for POSIX compatablity */
-#ifdef __cplusplus
-namespace boost{
-extern "C" {
-#endif
-
-#if defined(__cplusplus) && !defined(BOOST_NO_STDC_NAMESPACE)
-typedef std::ptrdiff_t regoff_t;
-typedef std::size_t regsize_t;
-#else
-typedef ptrdiff_t regoff_t;
-typedef size_t regsize_t;
-#endif
-
-typedef struct
-{
-   unsigned int re_magic;
-   unsigned int re_nsub;      /* number of parenthesized subexpressions */
-   const char* re_endp;       /* end pointer for REG_PEND */
-   void* guts;             /* none of your business :-) */
-   unsigned int eflags;       /* none of your business :-) */
-} regex_tA;
-
-#ifndef BOOST_NO_WREGEX
-typedef struct
-{
-   unsigned int re_magic;
-   unsigned int re_nsub;      /* number of parenthesized subexpressions */
-   const wchar_t* re_endp;       /* end pointer for REG_PEND */
-   void* guts;             /* none of your business :-) */
-   unsigned int eflags;       /* none of your business :-) */
-} regex_tW;
-#endif
-
-typedef struct
-{
-   regoff_t rm_so;      /* start of match */
-   regoff_t rm_eo;      /* end of match */
-} regmatch_t;
-
-/* regcomp() flags */
-typedef enum{
-   REG_BASIC = 0000,
-   REG_EXTENDED = 0001,
-   REG_ICASE = 0002,
-   REG_NOSUB = 0004,
-   REG_NEWLINE = 0010,
-   REG_NOSPEC = 0020,
-   REG_PEND = 0040,
-   REG_DUMP = 0200,
-   REG_NOCOLLATE = 0400,
-   REG_ESCAPE_IN_LISTS = 01000,
-   REG_NEWLINE_ALT = 02000,
-
-   REG_PERL = REG_EXTENDED | REG_NOCOLLATE | REG_ESCAPE_IN_LISTS,
-   REG_AWK = REG_EXTENDED | REG_ESCAPE_IN_LISTS,
-   REG_GREP = REG_BASIC | REG_NEWLINE_ALT,
-   REG_EGREP = REG_EXTENDED | REG_NEWLINE_ALT,
-
-   REG_ASSERT = 15,
-   REG_INVARG = 16,
-   REG_ATOI = 255,   /* convert name to number (!) */
-   REG_ITOA = 0400   /* convert number to name (!) */
-} reg_comp_flags;
-
-/* regexec() flags */
-typedef enum{
-   REG_NOTBOL =    00001,
-   REG_NOTEOL =    00002,
-   REG_STARTEND =  00004
-} reg_exec_flags;
-
-BOOST_REGEX_DECL int BOOST_REGEX_CCALL regcompA(regex_tA*, const char*, int);
-BOOST_REGEX_DECL regsize_t BOOST_REGEX_CCALL regerrorA(int, const regex_tA*, char*, regsize_t);
-BOOST_REGEX_DECL int BOOST_REGEX_CCALL regexecA(const regex_tA*, const char*, regsize_t, regmatch_t*, int);
-BOOST_REGEX_DECL void BOOST_REGEX_CCALL regfreeA(regex_tA*);
-
-#ifndef BOOST_NO_WREGEX
-BOOST_REGEX_DECL int BOOST_REGEX_CCALL regcompW(regex_tW*, const wchar_t*, int);
-BOOST_REGEX_DECL regsize_t BOOST_REGEX_CCALL regerrorW(int, const regex_tW*, wchar_t*, regsize_t);
-BOOST_REGEX_DECL int BOOST_REGEX_CCALL regexecW(const regex_tW*, const wchar_t*, regsize_t, regmatch_t*, int);
-BOOST_REGEX_DECL void BOOST_REGEX_CCALL regfreeW(regex_tW*);
-#endif
-
-#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
-
-/* regerror() flags */
-typedef enum
-{
-  REG_NOERROR = 0,   /* Success.  */
-  REG_NOMATCH = 1,      /* Didn't find a match (for regexec).  */
-
-  /* POSIX regcomp return error codes.  (In the order listed in the
-     standard.)  */
-  REG_BADPAT = 2,    /* Invalid pattern.  */
-  REG_ECOLLATE = 3,  /* Undefined collating element.  */
-  REG_ECTYPE = 4,    /* Invalid character class name.  */
-  REG_EESCAPE = 5,   /* Trailing backslash.  */
-  REG_ESUBREG = 6,   /* Invalid back reference.  */
-  REG_EBRACK = 7,    /* Unmatched left bracket.  */
-  REG_EPAREN = 8,    /* Parenthesis imbalance.  */
-  REG_EBRACE = 9,    /* Unmatched \{.  */
-  REG_BADBR = 10,    /* Invalid contents of \{\}.  */
-  REG_ERANGE = 11,   /* Invalid range end.  */
-  REG_ESPACE = 12,   /* Ran out of memory.  */
-  REG_BADRPT = 13,   /* No preceding re for repetition op.  */
-  REG_EEND = 14,     /* unexpected end of expression */
-  REG_ESIZE = 15,    /* expression too big */
-  REG_ERPAREN = 16,   /* unmatched right parenthesis */
-  REG_EMPTY = 17,    /* empty expression */
-  REG_E_MEMORY = REG_ESIZE, /* out of memory */
-  REG_E_UNKNOWN = 18 /* unknown error */
-} reg_errcode_t;
-
-enum match_flags
-{
-   match_default = 0,
-   match_not_bol = 1,                                // first is not start of line
-   match_not_eol = match_not_bol << 1,               // last is not end of line
-   match_not_bob = match_not_eol << 1,               // first is not start of buffer
-   match_not_eob = match_not_bob << 1,               // last is not end of buffer
-   match_not_bow = match_not_eob << 1,               // first is not start of word
-   match_not_eow = match_not_bow << 1,               // last is not end of word
-   match_not_dot_newline = match_not_eow << 1,       // \n is not matched by '.'
-   match_not_dot_null = match_not_dot_newline << 1,  // '\0' is not matched by '.'
-   match_prev_avail = match_not_dot_null << 1,       // *--first is a valid expression
-   match_init = match_prev_avail << 1,               // internal use
-   match_any = match_init << 1,                      // don't care what we match
-   match_not_null = match_any << 1,                  // string can't be null
-   match_continuous = match_not_null << 1,           // each grep match must continue from
-                                                     // uninterupted from the previous one
-   match_partial = match_continuous << 1,            // find partial matches
-   
-   match_stop = match_partial << 1,                  // stop after first match (grep)
-   match_all = match_stop << 1,                      // must find the whole of input even if match_any is set
-   match_max = match_all
-};
-
-typedef unsigned long match_flag_type;
-
-#ifdef __cplusplus
-} // extern "C"
-} // namespace
-#endif
-
-
-#ifdef __BORLANDC__
- #if __BORLANDC__ > 0x520
-  #pragma option pop
- #endif
-#endif
-
-
-//
-// C++ high level wrapper goes here:
-//
-#if defined(__cplusplus)
-#include <string>
-#include <vector>
-namespace boost{
-
-#ifdef __BORLANDC__
-   #if __BORLANDC__ == 0x530
-    #pragma option push -a4 -b
-   #elif __BORLANDC__ > 0x530
-    #pragma option push -a8 -b
-   #endif
-#endif
-
-class RegEx;
-
-namespace re_detail{
-
-class RegExData;
-struct pred1;
-struct pred2;
-struct pred3;
-struct pred4;
-
-}  // namespace re_detail
-
-#if defined(BOOST_MSVC) || defined(__BORLANDC__)
-typedef bool (__cdecl *GrepCallback)(const RegEx& expression);
-typedef bool (__cdecl *GrepFileCallback)(const char* file, const RegEx& expression);
-typedef bool (__cdecl *FindFilesCallback)(const char* file);
-#else
-typedef bool (*GrepCallback)(const RegEx& expression);
-typedef bool (*GrepFileCallback)(const char* file, const RegEx& expression);
-typedef bool (*FindFilesCallback)(const char* file);
-#endif
-
-class BOOST_REGEX_DECL RegEx
-{
-private:
-   re_detail::RegExData* pdata;
-public:
-   RegEx();
-   RegEx(const RegEx& o);
-   ~RegEx();
-   explicit 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){ return this->operator=(s.c_str()); }
-   unsigned int SetExpression(const char* p, bool icase = false);
-   unsigned int SetExpression(const std::string& s, bool icase = false){ return SetExpression(s.c_str(), icase); }
-   std::string Expression()const;
-   unsigned int error_code()const;
-   //
-   // now matching operators:
-   //
-   bool Match(const char* p, match_flag_type flags = match_default);
-   bool Match(const std::string& s, match_flag_type flags = match_default) { return Match(s.c_str(), flags); }
-   bool Search(const char* p, match_flag_type flags = match_default);
-   bool Search(const std::string& s, match_flag_type flags = match_default) { return Search(s.c_str(), flags); }
-   unsigned int Grep(GrepCallback cb, const char* p, match_flag_type flags = match_default);
-   unsigned int Grep(GrepCallback cb, const std::string& s, match_flag_type flags = match_default) { return Grep(cb, s.c_str(), flags); }
-   unsigned int Grep(std::vector<std::string>& v, const char* p, match_flag_type flags = match_default);
-   unsigned int Grep(std::vector<std::string>& v, const std::string& s, match_flag_type flags = match_default) { return Grep(v, s.c_str(), flags); }
-   unsigned int Grep(std::vector<std::size_t>& v, const char* p, match_flag_type flags = match_default);
-   unsigned int Grep(std::vector<std::size_t>& v, const std::string& s, match_flag_type flags = match_default) { return Grep(v, s.c_str(), flags); }
-#ifndef BOOST_REGEX_NO_FILEITER
-   unsigned int GrepFiles(GrepFileCallback cb, const char* files, bool recurse = false, match_flag_type flags = match_default);
-   unsigned int GrepFiles(GrepFileCallback cb, const std::string& files, bool recurse = false, match_flag_type flags = match_default) { return GrepFiles(cb, files.c_str(), recurse, flags); }
-   unsigned int FindFiles(FindFilesCallback cb, const char* files, bool recurse = false, match_flag_type flags = match_default);
-   unsigned int FindFiles(FindFilesCallback cb, const std::string& files, bool recurse = false, match_flag_type flags = match_default) { return FindFiles(cb, files.c_str(), recurse, flags); }
-#endif
-
-   std::string Merge(const std::string& in, const std::string& fmt,
-                       bool copy = true, match_flag_type flags = match_default);
-   std::string Merge(const char* in, const char* fmt,
-                       bool copy = true, match_flag_type flags = match_default);
-
-   std::size_t Split(std::vector<std::string>& v, std::string& s, match_flag_type flags = match_default, unsigned max_count = ~0);
-   //
-   // now operators for returning what matched in more detail:
-   //
-   std::size_t Position(int i = 0)const;
-   std::size_t Length(int i = 0)const;
-   bool Matched(int i = 0)const;
-   unsigned int Line()const;
-   unsigned int Marks()const;
-   std::string What(int i = 0)const;
-   std::string operator[](int i)const { return What(i); }
-
-   static const unsigned int npos;
-
-   friend struct re_detail::pred1;
-   friend struct re_detail::pred2;
-   friend struct re_detail::pred3;
-   friend struct re_detail::pred4;
-};
-
-#ifdef __BORLANDC__
-  #pragma option pop
-#endif
-
-} // namespace boost
-
-#endif
-
-#endif // include guard
-
-
-
-
-
-
-
-
-
-
diff --git a/include/boost/regex/v3/fileiter.hpp b/include/boost/regex/v3/fileiter.hpp
deleted file mode 100644
index ef861f40..00000000
--- a/include/boost/regex/v3/fileiter.hpp
+++ /dev/null
@@ -1,453 +0,0 @@
-/*
- *
- * Copyright (c) 1998-2002
- * Dr 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         fileiter.hpp
-  *   VERSION      see <boost/version.hpp>
-  *   DESCRIPTION: Declares various platform independent file and
-  *                directory iterators, plus binary file input in
-  *                the form of class map_file.
-  */
-
-#ifndef BOOST_RE_FILEITER_HPP_INCLUDED
-#define BOOST_RE_FILEITER_HPP_INCLUDED
-
-#ifndef BOOST_REGEX_CONFIG_HPP
-#include <boost/regex/config.hpp>
-#endif
-
-#ifndef BOOST_REGEX_NO_FILEITER
-
-#if (defined(__CYGWIN__) || defined(__CYGWIN32__)) && !defined(BOOST_REGEX_NO_W32)
-#error "Sorry, can't mix <windows.h> with STL code and gcc compiler: if you ran configure, try again with configure --disable-ms-windows"
-#define BOOST_REGEX_FI_WIN32_MAP
-#define BOOST_REGEX_FI_POSIX_DIR
-#elif (defined(__WIN32__) || defined(_WIN32) || defined(WIN32)) && !defined(BOOST_REGEX_NO_W32)
-#define BOOST_REGEX_FI_WIN32_MAP
-#define BOOST_REGEX_FI_WIN32_DIR
-#else
-#define BOOST_REGEX_FI_POSIX_MAP
-#define BOOST_REGEX_FI_POSIX_DIR
-#endif
-
-#if defined(BOOST_REGEX_FI_WIN32_MAP)||defined(BOOST_REGEX_FI_WIN32_DIR)
-#include <windows.h>
-#endif
-
-#if defined(BOOST_REGEX_FI_WIN32_DIR)
-
-namespace boost{
-   namespace re_detail{
-
-typedef WIN32_FIND_DATAA _fi_find_data;
-typedef HANDLE _fi_find_handle;
-
-   } // namespace re_detail
-
-} // namespace boost
-
-#define _fi_invalid_handle INVALID_HANDLE_VALUE
-#define _fi_dir FILE_ATTRIBUTE_DIRECTORY
-
-#elif defined(BOOST_REGEX_FI_POSIX_DIR)
-
-#include <cstdio>
-#include <cctype>
-#include <iterator>
-#include <list>
-#include <cassert>
-#include <dirent.h>
-
-#if defined(__SUNPRO_CC)
-using std::list;
-#endif
-
-#ifndef MAX_PATH
-#define MAX_PATH 256
-#endif
-
-namespace boost{
-   namespace re_detail{
-
-#ifdef __BORLANDC__
-   #pragma option push -a8 -b -Vx -Ve -pc
-#endif
-
-struct _fi_find_data
-{
-   unsigned dwFileAttributes;
-   char cFileName[MAX_PATH];
-};
-
-struct _fi_priv_data;
-
-typedef _fi_priv_data* _fi_find_handle;
-#define _fi_invalid_handle 0
-#define _fi_dir 1
-
-_fi_find_handle _fi_FindFirstFile(const char* lpFileName, _fi_find_data* lpFindFileData);
-bool _fi_FindNextFile(_fi_find_handle hFindFile,   _fi_find_data* lpFindFileData);
-bool _fi_FindClose(_fi_find_handle hFindFile);
-
-#ifdef __BORLANDC__
- #if __BORLANDC__ > 0x520
-  #pragma option pop
- #endif
-#endif
-
-   } // namespace re_detail
-} // namespace boost
-
-#ifdef FindFirstFile
- #undef FindFirstFile
-#endif
-#ifdef FindNextFile
- #undef FindNextFile
-#endif
-#ifdef FindClose
- #undef FindClose
-#endif
-
-#define FindFirstFileA _fi_FindFirstFile
-#define FindNextFileA _fi_FindNextFile
-#define FindClose _fi_FindClose
-
-#endif
-
-namespace boost{
-   namespace re_detail{
-
-#ifdef __BORLANDC__
-   #if __BORLANDC__ == 0x530
-    #pragma option push -a4 -b
-   #elif __BORLANDC__ > 0x530
-    #pragma option push -a8 -b
-   #endif
-#endif
-
-#ifdef BOOST_REGEX_FI_WIN32_MAP // win32 mapfile
-
-class BOOST_REGEX_DECL mapfile
-{
-   HANDLE hfile;
-   HANDLE hmap;
-   const char* _first;
-   const char* _last;
-public:
-
-   typedef const char* iterator;
-
-   mapfile(){ hfile = hmap = 0; _first = _last = 0; }
-   mapfile(const char* file){ hfile = hmap = 0; _first = _last = 0; open(file); }
-   ~mapfile(){ close(); }
-   void open(const char* file);
-   void close();
-   const char* begin(){ return _first; }
-   const char* end(){ return _last; }
-   size_t size(){ return _last - _first; }
-   bool valid(){ return (hfile != 0) && (hfile != INVALID_HANDLE_VALUE); }
-};
-
-
-#else
-
-class BOOST_REGEX_DECL mapfile_iterator;
-
-class BOOST_REGEX_DECL mapfile
-{
-   typedef char* pointer;
-   std::FILE* hfile;
-   long int _size;
-   pointer* _first;
-   pointer* _last;
-   mutable std::list<pointer*> condemed;
-   enum sizes
-   {
-      buf_size = 4096
-   };
-   void lock(pointer* node)const;
-   void unlock(pointer* node)const;
-public:
-
-   typedef mapfile_iterator iterator;
-
-   mapfile(){ hfile = 0; _size = 0; _first = _last = 0; }
-   mapfile(const char* file){ hfile = 0; _size = 0; _first = _last = 0; open(file); }
-   ~mapfile(){ close(); }
-   void open(const char* file);
-   void close();
-   iterator begin()const;
-   iterator end()const;
-   unsigned long size()const{ return _size; }
-   bool valid()const{ return hfile != 0; }
-   friend class mapfile_iterator;
-};
-
-class BOOST_REGEX_DECL mapfile_iterator
-#if !defined(BOOST_NO_STD_ITERATOR) || defined(BOOST_MSVC_STD_ITERATOR)
-: public std::iterator<std::random_access_iterator_tag, char>
-#endif
-{
-   typedef mapfile::pointer internal_pointer;
-   internal_pointer* node;
-   const mapfile* file;
-   unsigned long offset;
-   long position()const
-   {
-      return file ? ((node - file->_first) * mapfile::buf_size + offset) : 0;
-   }
-   void position(long pos)
-   {
-      if(file)
-      {
-         node = file->_first + (pos / mapfile::buf_size);
-         offset = pos % mapfile::buf_size;
-      }
-   }
-public:
-   typedef std::ptrdiff_t                  difference_type;
-   typedef char                            value_type;
-   typedef const char*                     pointer;
-   typedef const char&                     reference;
-   typedef std::random_access_iterator_tag iterator_category;
-
-   mapfile_iterator() { node = 0; file = 0; offset = 0; }
-   mapfile_iterator(const mapfile* f, long position)
-   {
-      file = f;
-      node = f->_first + position / mapfile::buf_size;
-      offset = position % mapfile::buf_size;
-      if(file)
-         file->lock(node);
-   }
-   mapfile_iterator(const mapfile_iterator& i)
-   {
-      file = i.file;
-      node = i.node;
-      offset = i.offset;
-      if(file)
-         file->lock(node);
-   }
-   ~mapfile_iterator()
-   {
-      if(file && node)
-         file->unlock(node);
-   }
-   mapfile_iterator& operator = (const mapfile_iterator& i);
-   char operator* ()const
-   {
-      assert(node >= file->_first);
-      assert(node < file->_last);
-      return file ? *(*node + sizeof(int) + offset) : char(0);
-   }
-   char operator[] (long off)const
-   {
-      mapfile_iterator tmp(*this);
-      tmp += off;
-      return *tmp;
-   }
-   mapfile_iterator& operator++ ();
-   mapfile_iterator operator++ (int);
-   mapfile_iterator& operator-- ();
-   mapfile_iterator operator-- (int);
-
-   mapfile_iterator& operator += (long off)
-   {
-      position(position() + off);
-      return *this;
-   }
-   mapfile_iterator& operator -= (long off)
-   {
-      position(position() - off);
-      return *this;
-   }
-
-   friend inline bool operator==(const mapfile_iterator& i, const mapfile_iterator& j)
-   {
-      return (i.file == j.file) && (i.node == j.node) && (i.offset == j.offset);
-   }
-
-   friend inline bool operator!=(const mapfile_iterator& i, const mapfile_iterator& j)
-   {
-      return !(i == j);
-   }
-
-   friend inline bool operator<(const mapfile_iterator& i, const mapfile_iterator& j)
-   {
-      return i.position() < j.position();
-   }
-   friend inline bool operator>(const mapfile_iterator& i, const mapfile_iterator& j)
-   {
-      return i.position() > j.position();
-   }
-   friend inline bool operator<=(const mapfile_iterator& i, const mapfile_iterator& j)
-   {
-      return i.position() <= j.position();
-   }
-   friend inline bool operator>=(const mapfile_iterator& i, const mapfile_iterator& j)
-   {
-      return i.position() >= j.position();
-   }
-
-   friend mapfile_iterator operator + (const mapfile_iterator& i, long off);
-   friend mapfile_iterator operator + (long off, const mapfile_iterator& i)
-   {
-      mapfile_iterator tmp(i);
-      return tmp += off;
-   }
-   friend mapfile_iterator operator - (const mapfile_iterator& i, long off);
-   friend inline long operator - (const mapfile_iterator& i, const mapfile_iterator& j)
-   {
-      return i.position() - j.position();
-   }
-};
-
-#endif
-
-// _fi_sep determines the directory separator, either '\\' or '/'
-BOOST_REGEX_DECL extern const char* _fi_sep;
-
-struct file_iterator_ref
-{
-   _fi_find_handle hf;
-   _fi_find_data _data;
-   long count;
-};
-
-
-class BOOST_REGEX_DECL file_iterator 
-{
-   char* _root;
-   char* _path;
-   char* ptr;
-   file_iterator_ref* ref;
-
-public:
-   typedef std::ptrdiff_t            difference_type;
-   typedef const char*               value_type;
-   typedef const char**              pointer;
-   typedef const char*&              reference;
-   typedef std::input_iterator_tag   iterator_category;
-
-   file_iterator();
-   file_iterator(const char* wild);
-   ~file_iterator();
-   file_iterator(const file_iterator&);
-   file_iterator& operator=(const file_iterator&);
-   const char* root()const { return _root; }
-   const char* path()const { return _path; }
-   const char* name()const { return ptr; }
-   _fi_find_data* data() { return &(ref->_data); }
-   void next();
-   file_iterator& operator++() { next(); return *this; }
-   file_iterator operator++(int);
-   const char* operator*() { return path(); }
-
-   friend inline bool operator == (const file_iterator& f1, const file_iterator& f2)
-   {
-      return ((f1.ref->hf == _fi_invalid_handle) && (f2.ref->hf == _fi_invalid_handle));
-   }
-
-   friend inline bool operator != (const file_iterator& f1, const file_iterator& f2)
-   {
-      return !(f1 == f2);
-   }
-
-};
-
-// dwa 9/13/00 - suppress unused parameter warning
-inline bool operator < (const file_iterator&, const file_iterator&)
-{
-   return false;
-}
-
-
-class BOOST_REGEX_DECL directory_iterator
-{
-   char* _root;
-   char* _path;
-   char* ptr;
-   file_iterator_ref* ref;
-
-public:
-   typedef std::ptrdiff_t            difference_type;
-   typedef const char*               value_type;
-   typedef const char**              pointer;
-   typedef const char*&              reference;
-   typedef std::input_iterator_tag   iterator_category;
-
-   directory_iterator();
-   directory_iterator(const char* wild);
-   ~directory_iterator();
-   directory_iterator(const directory_iterator& other);
-   directory_iterator& operator=(const directory_iterator& other);
-
-   const char* root()const { return _root; }
-   const char* path()const { return _path; }
-   const char* name()const { return ptr; }
-   _fi_find_data* data() { return &(ref->_data); }
-   void next();
-   directory_iterator& operator++() { next(); return *this; }
-   directory_iterator operator++(int);
-   const char* operator*() { return path(); }
-
-   static const char* separator() { return _fi_sep; }
-
-   friend inline bool operator == (const directory_iterator& f1, const directory_iterator& f2)
-   {
-      return ((f1.ref->hf == _fi_invalid_handle) && (f2.ref->hf == _fi_invalid_handle));
-   }
-
-
-   friend inline bool operator != (const directory_iterator& f1, const directory_iterator& f2)
-   {
-      return !(f1 == f2);
-   }
-
-   };
-
-inline bool operator < (const directory_iterator&, const directory_iterator&)
-{
-   return false;
-}
-
-#ifdef __BORLANDC__
-  #pragma option pop
-#endif
-
-
-} // namespace re_detail
-using boost::re_detail::directory_iterator;
-using boost::re_detail::file_iterator;
-using boost::re_detail::mapfile;
-} // namespace boost
-
-#endif     // BOOST_REGEX_NO_FILEITER
-#endif     // BOOST_RE_FILEITER_HPP
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/include/boost/regex/v3/instances.hpp b/include/boost/regex/v3/instances.hpp
deleted file mode 100644
index 25c7f8bd..00000000
--- a/include/boost/regex/v3/instances.hpp
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- *
- * Copyright (c) 1998-2002
- * Dr 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         instances.cpp
-  *   VERSION      see <boost/version.hpp>
-  *   DESCRIPTION: Defines those template instances that are placed in the
-  *                library rather than in the users object files.
-  */
-
-//
-// note no include guard, we may include this multiple times:
-//
-#ifndef BOOST_REGEX_NO_EXTERNAL_TEMPLATES
-
-namespace boost{
-
-//
-// this header can be included multiple times, each time with
-// a different character type, BOOST_REGEX_CHAR_T must be defined
-// first:
-//
-#ifndef BOOST_REGEX_CHAR_T
-#  error "BOOST_REGEX_CHAR_T not defined"
-#endif
-
-//
-// what follows is compiler specific:
-//
-
-#ifdef __BORLANDC__
-
-#pragma option push -a8 -b -Vx -Ve -pc
-
-#  ifndef BOOST_REGEX_INSTANTIATE
-#     pragma option push -Jgx
-#  endif
-
-template class BOOST_REGEX_DECL reg_expression< BOOST_REGEX_CHAR_T >;
-template class BOOST_REGEX_DECL re_detail::match_results_base<BOOST_REGEX_CHAR_T const*>;
-template class BOOST_REGEX_DECL re_detail::match_results_base<std::basic_string<BOOST_REGEX_CHAR_T>::const_iterator>;
-template class BOOST_REGEX_DECL match_results<BOOST_REGEX_CHAR_T const*>;
-template class BOOST_REGEX_DECL match_results<std::basic_string<BOOST_REGEX_CHAR_T>::const_iterator>;
-
-
-#  ifndef BOOST_REGEX_INSTANTIATE
-#     pragma option pop
-#  endif
-
-#pragma option pop
-
-#elif defined(BOOST_MSVC)
-
-#  ifndef BOOST_REGEX_INSTANTIATE
-#     define template extern template
-#  endif
-
-#pragma warning(push)
-#pragma warning(disable : 4251 4231 4660)
-
-//template class BOOST_REGEX_DECL regex_traits< BOOST_REGEX_CHAR_T >;
-template class BOOST_REGEX_DECL reg_expression< BOOST_REGEX_CHAR_T >;
-template class BOOST_REGEX_DECL re_detail::match_results_base<BOOST_REGEX_CHAR_T const*, BOOST_DEFAULT_ALLOCATOR(re_detail::def_alloc_param_traits<BOOST_REGEX_CHAR_T const*>::type) >;
-template class BOOST_REGEX_DECL re_detail::match_results_base<std::basic_string<BOOST_REGEX_CHAR_T>::const_iterator, BOOST_DEFAULT_ALLOCATOR(re_detail::def_alloc_param_traits<std::basic_string<BOOST_REGEX_CHAR_T>::const_iterator>::type) >;
-template class BOOST_REGEX_DECL match_results<BOOST_REGEX_CHAR_T const*, BOOST_DEFAULT_ALLOCATOR(re_detail::def_alloc_param_traits<BOOST_REGEX_CHAR_T const*>::type) >;
-template class BOOST_REGEX_DECL match_results<std::basic_string<BOOST_REGEX_CHAR_T>::const_iterator, BOOST_DEFAULT_ALLOCATOR(re_detail::def_alloc_param_traits<std::basic_string<BOOST_REGEX_CHAR_T>::const_iterator>::type) >;
-
-
-#pragma warning(pop)
-
-#  ifdef template
-#     undef template
-#  endif
-
-#elif !defined(BOOST_REGEX_HAS_DLL_RUNTIME)
-
-//
-// for each [member] function declare a full specialisation of that
-// [member] function, then instantiate it in one translation unit.
-// This is not guarenteed to work according to the standard, but in
-// practice it should work for all compilers (unless they use a realy
-// perverse name mangling convention).  Unfortunately this approach
-// does *not* work for Win32 style import/export, because that can
-// alter the class layout.
-//
-
-#  ifndef BOOST_REGEX_INSTANTIATE
-#     define template template<>
-#  endif
-
-template reg_expression<BOOST_REGEX_CHAR_T>::reg_expression(const BOOST_DEFAULT_ALLOCATOR(BOOST_REGEX_CHAR_T)&);
-template reg_expression<BOOST_REGEX_CHAR_T>::reg_expression(const BOOST_REGEX_CHAR_T* p, reg_expression<BOOST_REGEX_CHAR_T>::flag_type f, const BOOST_DEFAULT_ALLOCATOR(BOOST_REGEX_CHAR_T)& a);
-template reg_expression<BOOST_REGEX_CHAR_T>::reg_expression(const BOOST_REGEX_CHAR_T* p, size_type len, reg_expression<BOOST_REGEX_CHAR_T>::flag_type f, const BOOST_DEFAULT_ALLOCATOR(BOOST_REGEX_CHAR_T)&);
-template reg_expression<BOOST_REGEX_CHAR_T>::reg_expression(const reg_expression<BOOST_REGEX_CHAR_T>&);
-template reg_expression<BOOST_REGEX_CHAR_T>::~reg_expression();
-template reg_expression<BOOST_REGEX_CHAR_T>& BOOST_REGEX_CALL reg_expression<BOOST_REGEX_CHAR_T>::operator=(const reg_expression&);
-template BOOST_DEFAULT_ALLOCATOR(BOOST_REGEX_CHAR_T) BOOST_REGEX_CALL reg_expression<BOOST_REGEX_CHAR_T>::get_allocator()const;
-template bool BOOST_REGEX_CALL reg_expression<BOOST_REGEX_CHAR_T>::operator==(const reg_expression<BOOST_REGEX_CHAR_T>&)const;
-template bool BOOST_REGEX_CALL reg_expression<BOOST_REGEX_CHAR_T>::operator<(const reg_expression<BOOST_REGEX_CHAR_T>&)const;
-template BOOST_DEFAULT_ALLOCATOR(BOOST_REGEX_CHAR_T) BOOST_REGEX_CALL reg_expression<BOOST_REGEX_CHAR_T>::allocator()const;
-template unsigned int BOOST_REGEX_CALL reg_expression<BOOST_REGEX_CHAR_T>::set_expression(const BOOST_REGEX_CHAR_T* p, const BOOST_REGEX_CHAR_T* end, reg_expression<BOOST_REGEX_CHAR_T>::flag_type f);
-template void BOOST_REGEX_CALL reg_expression<BOOST_REGEX_CHAR_T>::compile_maps();
-template void BOOST_REGEX_CALL reg_expression<BOOST_REGEX_CHAR_T>::compile_map(re_detail::re_syntax_base* node, unsigned char* _map, unsigned int* pnull, unsigned char mask, re_detail::re_syntax_base* terminal)const;
-template bool BOOST_REGEX_CALL reg_expression<BOOST_REGEX_CHAR_T>::probe_start(re_detail::re_syntax_base* node, BOOST_REGEX_CHAR_T c, re_detail::re_syntax_base* terminal)const;
-template bool BOOST_REGEX_CALL reg_expression<BOOST_REGEX_CHAR_T>::probe_start_null(re_detail::re_syntax_base* node, re_detail::re_syntax_base* terminal)const;
-template void BOOST_REGEX_CALL reg_expression<BOOST_REGEX_CHAR_T>::fixup_apply(re_detail::re_syntax_base* b, unsigned cbraces);
-template void BOOST_REGEX_CALL reg_expression<BOOST_REGEX_CHAR_T>::move_offsets(re_detail::re_syntax_base* j, unsigned size);
-template re_detail::re_syntax_base* BOOST_REGEX_CALL reg_expression<BOOST_REGEX_CHAR_T>::compile_set(const BOOST_REGEX_CHAR_T*& first, const BOOST_REGEX_CHAR_T* last);
-template re_detail::re_syntax_base* BOOST_REGEX_CALL reg_expression<BOOST_REGEX_CHAR_T>::compile_set_aux(re_detail::jstack<reg_expression<BOOST_REGEX_CHAR_T>::traits_string_type, BOOST_DEFAULT_ALLOCATOR(BOOST_REGEX_CHAR_T) >& singles, re_detail::jstack<reg_expression<BOOST_REGEX_CHAR_T>::traits_string_type, BOOST_DEFAULT_ALLOCATOR(BOOST_REGEX_CHAR_T)>& ranges, re_detail::jstack<boost::uint_fast32_t, BOOST_DEFAULT_ALLOCATOR(BOOST_REGEX_CHAR_T) >& classes, re_detail::jstack<reg_expression<BOOST_REGEX_CHAR_T>::traits_string_type, BOOST_DEFAULT_ALLOCATOR(BOOST_REGEX_CHAR_T) >& equivalents, bool isnot, const re_detail::_narrow_type&);
-template re_detail::re_syntax_base* BOOST_REGEX_CALL reg_expression<BOOST_REGEX_CHAR_T>::compile_set_aux(re_detail::jstack<reg_expression<BOOST_REGEX_CHAR_T>::traits_string_type, BOOST_DEFAULT_ALLOCATOR(BOOST_REGEX_CHAR_T) >& singles, re_detail::jstack<reg_expression<BOOST_REGEX_CHAR_T>::traits_string_type, BOOST_DEFAULT_ALLOCATOR(BOOST_REGEX_CHAR_T)>& ranges, re_detail::jstack<boost::uint_fast32_t, BOOST_DEFAULT_ALLOCATOR(BOOST_REGEX_CHAR_T) >& classes, re_detail::jstack<reg_expression<BOOST_REGEX_CHAR_T>::traits_string_type, BOOST_DEFAULT_ALLOCATOR(BOOST_REGEX_CHAR_T) >& equivalents, bool isnot, const re_detail::_wide_type&);
-template re_detail::re_syntax_base* BOOST_REGEX_CALL reg_expression<BOOST_REGEX_CHAR_T>::compile_set_simple(re_detail::re_syntax_base* dat, unsigned long cls, bool isnot);
-template unsigned int BOOST_REGEX_CALL reg_expression<BOOST_REGEX_CHAR_T>::parse_inner_set(const BOOST_REGEX_CHAR_T*& first, const BOOST_REGEX_CHAR_T* last);
-template re_detail::re_syntax_base* BOOST_REGEX_CALL reg_expression<BOOST_REGEX_CHAR_T>::add_simple(re_detail::re_syntax_base* dat, re_detail::syntax_element_type type, unsigned int size);
-template re_detail::re_syntax_base* BOOST_REGEX_CALL reg_expression<BOOST_REGEX_CHAR_T>::add_literal(re_detail::re_syntax_base* dat, BOOST_REGEX_CHAR_T c);
-template BOOST_REGEX_CHAR_T BOOST_REGEX_CALL reg_expression<BOOST_REGEX_CHAR_T>::parse_escape(const BOOST_REGEX_CHAR_T*& first, const BOOST_REGEX_CHAR_T* last);
-template void BOOST_REGEX_CALL reg_expression<BOOST_REGEX_CHAR_T>::parse_range(const BOOST_REGEX_CHAR_T*& first, const BOOST_REGEX_CHAR_T* last, unsigned& min, unsigned& max);
-template bool BOOST_REGEX_CALL reg_expression<BOOST_REGEX_CHAR_T>::skip_space(const BOOST_REGEX_CHAR_T*& first, const BOOST_REGEX_CHAR_T* last);
-template unsigned int BOOST_REGEX_CALL reg_expression<BOOST_REGEX_CHAR_T>::probe_restart(re_detail::re_syntax_base* dat);
-template unsigned int BOOST_REGEX_CALL reg_expression<BOOST_REGEX_CHAR_T>::fixup_leading_rep(re_detail::re_syntax_base* dat, re_detail::re_syntax_base* end);
-template void BOOST_REGEX_CALL reg_expression<BOOST_REGEX_CHAR_T>::fail(unsigned int err);
-
-namespace re_detail{
-
-#define iterator const BOOST_REGEX_CHAR_T*
-#define Allocator match_results_base<iterator>::alloc_type
-#define size_type match_results_base<iterator>::size_type
-
-template void BOOST_REGEX_CALL match_results_base<iterator, Allocator>::set_first(iterator i);
-template void BOOST_REGEX_CALL match_results_base<iterator, Allocator>::set_first(iterator i, std::size_t pos);
-template match_results_base<iterator, Allocator>::match_results_base(const Allocator& a);
-template Allocator BOOST_REGEX_CALL match_results_base<iterator, Allocator>::allocator()const;
-template void BOOST_REGEX_CALL match_results_base<iterator, Allocator>::m_free();
-template bool match_results_base<iterator, Allocator>::operator==(const match_results_base<iterator, Allocator>& that)const;
-template void BOOST_REGEX_CALL match_results_base<iterator, Allocator>::set_size(size_type n);
-template void BOOST_REGEX_CALL match_results_base<iterator, Allocator>::set_size(size_type n, iterator i, iterator j);
-template void BOOST_REGEX_CALL match_results_base<iterator, Allocator>::cow();
-
-#undef iterator
-#undef Allocator
-#undef size_type
-
-} // namespace re_detail
-
-#  ifdef template
-#     undef template
-#  endif
-
-#endif
-
-} // namespace boost
-
-#endif // BOOST_REGEX_NO_EXTERNAL_TEMPLATES
- 
-
-
-
diff --git a/include/boost/regex/v3/regex.hpp b/include/boost/regex/v3/regex.hpp
deleted file mode 100644
index 52d745ef..00000000
--- a/include/boost/regex/v3/regex.hpp
+++ /dev/null
@@ -1,1633 +0,0 @@
-/*
- *
- * Copyright (c) 1998-2002
- * Dr 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         regex.cpp
-  *   VERSION      see <boost/version.hpp>
-  *   DESCRIPTION: Declares boost::reg_expression<> and associated
-  *                functions and classes. This header is the main
-  *                entry point for the template regex code.
-  */
-
-
-/* start with C compatibility API */
-
-#ifndef BOOST_RE_REGEX_HPP_INCLUDED
-#define BOOST_RE_REGEX_HPP_INCLUDED
-
-#ifndef BOOST_RE_CREGEX_HPP
-#include <boost/cregex.hpp>
-#endif
-
-#ifdef __cplusplus
-
-// what follows is all C++ don't include in C builds!!
-
-#ifdef BOOST_REGEX_DEBUG
-# include <iosfwd>
-#endif
-
-#include <new>
-#include <cstring>
-#ifndef BOOST_REGEX_CONFIG_HPP
-#include <boost/regex/config.hpp>
-#endif
-#ifndef BOOST_REGEX_FWD_HPP
-#include <boost/regex_fwd.hpp>
-#endif
-#ifndef BOOST_REGEX_STACK_HPP
-#include <boost/regex/v3/regex_stack.hpp>
-#endif
-#ifndef BOOST_REGEX_RAW_BUFFER_HPP
-#include <boost/regex/v3/regex_raw_buffer.hpp>
-#endif
-#ifndef BOOST_REGEX_KMP_HPP
-#include <boost/regex/v3/regex_kmp.hpp>
-#endif
-#ifndef BOOST_RE_PAT_EXCEPT_HPP
-#include <boost/regex/pattern_except.hpp>
-#endif
-#ifndef BOOST_REGEX_TRAITS_HPP
-#include <boost/regex/regex_traits.hpp>
-#endif
-#include <boost/type_traits/remove_cv.hpp>
-#include <boost/scoped_array.hpp>
-
-
-namespace boost{
-
-#ifdef __BORLANDC__
-   #pragma option push -a8 -b -Vx -Ve -pc -w-8027
-#endif
-
-namespace re_detail{
-
-struct re_set_long;
-struct re_syntax_base;
-
-} // namespace re_detail
-
-namespace deprecated{
-//
-// class char_regex_traits_i
-// provides case insensitive traits classes (deprecated):
-template <class charT>
-class char_regex_traits_i : public regex_traits<charT> {};
-
-template<>
-class char_regex_traits_i<char> : public regex_traits<char>
-{
-public:
-   typedef char char_type;
-   typedef unsigned char uchar_type;
-   typedef unsigned int size_type;
-   typedef regex_traits<char> base_type;
-
-   char BOOST_REGEX_CALL translate(char c, bool)const
-   {
-      return static_cast<const regex_traits<char>*>(this)->translate(c, true);
-   }
-};
-
-#ifndef BOOST_NO_WREGEX
-template<>
-class char_regex_traits_i<wchar_t> : public regex_traits<wchar_t>
-{
-public:
-   typedef wchar_t char_type;
-   typedef unsigned short uchar_type;
-   typedef unsigned int size_type;
-   typedef regex_traits<wchar_t> base_type;
-
-   wchar_t BOOST_REGEX_CALL translate(wchar_t c, bool)const
-   {
-      return static_cast<const regex_traits<wchar_t>*>(this)->translate(c, true);
-   }
-   boost::uint_fast32_t BOOST_REGEX_CALL lookup_classname(const wchar_t* first, const wchar_t* last)const
-   {
-      boost::uint_fast32_t result = static_cast<const regex_traits<wchar_t>*>(this)->lookup_classname(first, last);
-      if((result & base_type::char_class_upper) == base_type::char_class_upper)
-         result |= base_type::char_class_alpha;
-      return result;
-   }
-};
-#endif
-} // namespace deprecated
-
-
-namespace re_detail{
-
-enum mask_type
-{
-   mask_take = 1,
-   mask_skip = 2,
-   mask_any = mask_skip | mask_take,
-   mask_all = mask_any
-};
-
-struct _narrow_type{};
-struct _wide_type{};
-
-template <class charT>
-class is_byte;
-
-template<>
-class is_byte<char>
-{
-public:
-   typedef _narrow_type width_type;
-};
-
-template<>
-class is_byte<unsigned char>
-{
-public:
-   typedef _narrow_type width_type;
-};
-
-template<>
-class is_byte<signed char>
-{
-public:
-   typedef _narrow_type width_type;
-};
-
-template <class charT>
-class is_byte
-{
-public:
-   typedef _wide_type width_type;
-};
-
-
-//
-// compiled structures
-//
-// the following defs describe the format of the compiled string
-//
-
-//
-// enum syntax_element_type
-// describes the type of a record
-enum syntax_element_type
-{
-   syntax_element_startmark = 0,
-   syntax_element_endmark = syntax_element_startmark + 1,
-   syntax_element_literal = syntax_element_endmark + 1,
-   syntax_element_start_line = syntax_element_literal + 1,
-   syntax_element_end_line = syntax_element_start_line + 1,
-   syntax_element_wild = syntax_element_end_line + 1,
-   syntax_element_match = syntax_element_wild + 1,
-   syntax_element_word_boundary = syntax_element_match + 1,
-   syntax_element_within_word = syntax_element_word_boundary + 1,
-   syntax_element_word_start = syntax_element_within_word + 1,
-   syntax_element_word_end = syntax_element_word_start + 1,
-   syntax_element_buffer_start = syntax_element_word_end + 1,
-   syntax_element_buffer_end = syntax_element_buffer_start + 1,
-   syntax_element_backref = syntax_element_buffer_end + 1,
-   syntax_element_long_set = syntax_element_backref + 1,
-   syntax_element_set = syntax_element_long_set + 1,
-   syntax_element_jump = syntax_element_set + 1,
-   syntax_element_alt = syntax_element_jump + 1,
-   syntax_element_rep = syntax_element_alt + 1,
-   syntax_element_combining = syntax_element_rep + 1,
-   syntax_element_soft_buffer_end = syntax_element_combining + 1,
-   syntax_element_restart_continue = syntax_element_soft_buffer_end + 1
-};
-
-#ifdef BOOST_REGEX_DEBUG
-// dwa 09/26/00 - This is needed to suppress warnings about an ambiguous conversion
-std::ostream& operator<<(std::ostream&, syntax_element_type);
-#endif
-
-union offset_type
-{
-   re_syntax_base* p;
-   std::size_t i;
-};
-
-//
-// struct re_syntax_base
-// base class for all syntax types:
-struct re_syntax_base
-{
-   syntax_element_type type;
-   offset_type next;
-   unsigned int can_be_null;
-};
-
-//
-// struct re_brace
-// marks start or end of (...)
-struct re_brace : public re_syntax_base
-{
-   int index;
-};
-
-//
-// struct re_literal
-// marks a literal string and
-// is followed by an array of charT[length]:
-struct re_literal : public re_syntax_base
-{
-   unsigned int length;
-};
-
-//
-// struct re_long_set
-// provides data for sets [...] containing
-// wide characters
-struct re_set_long : public re_syntax_base
-{
-   unsigned int csingles, cranges, cequivalents;
-   boost::uint_fast32_t cclasses;
-   bool isnot;
-};
-
-//
-// struct re_set
-// provides a map of bools for sets containing
-// narrow, single byte characters.
-struct re_set : public re_syntax_base
-{
-   unsigned char _map[256];
-};
-
-//
-// struct re_jump
-// provides alternative next destination
-struct re_jump : public re_syntax_base
-{
-   offset_type alt;
-   unsigned char _map[256];
-};
-
-//
-// struct re_repeat
-// provides repeat expressions
-struct re_repeat : public re_jump
-{
-   unsigned min, max;
-   int id;
-   bool leading;
-   bool greedy;
-   bool singleton;
-};
-
-
-//
-// enum re_jump_size_type
-// provides compiled size of re_jump
-// allowing for trailing alignment
-// provide this so we know how many
-// bytes to insert
-enum re_jump_size_type
-{
-   re_jump_size = (sizeof(re_jump) + padding_mask) & ~(padding_mask),
-   re_repeater_size = (sizeof(re_repeat) + padding_mask) & ~(padding_mask)
-};
-
-} // namespace re_detail
-
-//
-// class basic_regex
-// handles error codes and flags
-
-class BOOST_REGEX_DECL regbase
-{
-public:
-   enum flag_type_
-   {
-      escape_in_lists = 1,                     // '\' special inside [...]
-      char_classes = escape_in_lists << 1,     // [[:CLASS:]] allowed
-      intervals = char_classes << 1,           // {x,y} allowed
-      limited_ops = intervals << 1,            // all of + ? and | are normal characters
-      newline_alt = limited_ops << 1,          // \n is the same as |
-      bk_plus_qm = newline_alt << 1,           // uses \+ and \?
-      bk_braces = bk_plus_qm << 1,             // uses \{ and \}
-      bk_parens = bk_braces << 1,              // uses \( and \)
-      bk_refs = bk_parens << 1,                // \d allowed
-      bk_vbar = bk_refs << 1,                  // uses \|
-
-      use_except = bk_vbar << 1,               // exception on error
-      failbit = use_except << 1,               // error flag
-      literal = failbit << 1,                  // all characters are literals
-      icase = literal << 1,                    // characters are matched regardless of case
-      nocollate = icase << 1,                  // don't use locale specific collation
-
-      basic = char_classes | intervals | limited_ops | bk_braces | bk_parens | bk_refs,
-      extended = char_classes | intervals | bk_refs,
-      normal = escape_in_lists | char_classes | intervals | bk_refs | nocollate,
-      emacs = bk_braces | bk_parens | bk_refs | bk_vbar,
-      awk = extended | escape_in_lists,
-      grep = basic | newline_alt,
-      egrep = extended | newline_alt,
-      sed = basic,
-      perl = normal
-   };
-   typedef unsigned int flag_type;
-
-   enum restart_info
-   {
-      restart_any = 0,
-      restart_word = 1,
-      restart_line = 2,
-      restart_buf = 3,
-      restart_continue = 4,
-      restart_lit = 5,
-      restart_fixed_lit = 6
-   };
-
-   flag_type BOOST_REGEX_CALL flags()const
-   {
-      return _flags;
-   }
-
-   regbase();
-   regbase(const regbase& b);
-protected:
-   flag_type _flags;
-};
-
-//
-// some forward declarations:
-namespace re_detail{
-template <class iterator, class Allocator>
-class _priv_match_data;
-
-#if defined(BOOST_NO_STD_ITERATOR_TRAITS) || defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
-
-template <class T>
-struct regex_iterator_traits 
-{
-  typedef typename T::iterator_category iterator_category;
-  typedef typename T::value_type        value_type;
-#if !defined(BOOST_NO_STD_ITERATOR)
-  typedef typename T::difference_type   difference_type;
-  typedef typename T::pointer           pointer;
-  typedef typename T::reference         reference;
-#else
-  typedef std::ptrdiff_t                difference_type;
-  typedef value_type*                   pointer;
-  typedef value_type&                   reference;
-#endif
-};
-
-template <class T>
-struct pointer_iterator_traits
-{
-   typedef std::ptrdiff_t difference_type;
-   typedef T value_type;
-   typedef T* pointer;
-   typedef T& reference;
-   typedef std::random_access_iterator_tag iterator_category;
-};
-template <class T>
-struct const_pointer_iterator_traits
-{
-   typedef std::ptrdiff_t difference_type;
-   typedef T value_type;
-   typedef const T* pointer;
-   typedef const T& reference;
-   typedef std::random_access_iterator_tag iterator_category;
-};
-
-template<>
-struct regex_iterator_traits<char*> : pointer_iterator_traits<char>{};
-template<>
-struct regex_iterator_traits<const char*> : const_pointer_iterator_traits<char>{};
-template<>
-struct regex_iterator_traits<wchar_t*> : pointer_iterator_traits<wchar_t>{};
-template<>
-struct regex_iterator_traits<const wchar_t*> : const_pointer_iterator_traits<wchar_t>{};
-
-#if defined(__SGI_STL_PORT) && defined(__STL_DEBUG)
-template<>
-struct regex_iterator_traits<std::string::iterator> : pointer_iterator_traits<char>{};
-template<>
-struct regex_iterator_traits<std::string::const_iterator> : const_pointer_iterator_traits<char>{};
-#ifndef BOOST_NO_STD_WSTRING
-template<>
-struct regex_iterator_traits<std::wstring::iterator> : pointer_iterator_traits<wchar_t>{};
-template<>
-struct regex_iterator_traits<std::wstring::const_iterator> : const_pointer_iterator_traits<wchar_t>{};
-#endif // BOOST_NO_WSTRING
-#endif // stport
-
-#else
-
-template <class T>
-struct regex_iterator_traits : public std::iterator_traits<T> {};
-
-#endif
-
-template <class I>
-struct def_alloc_param_traits
-{
-   typedef typename regex_iterator_traits<I>::value_type const_value_type;
-   typedef typename remove_cv<const_value_type>::type type;
-};
-template <>
-struct def_alloc_param_traits<const char*>
-{
-   typedef char type;
-};
-template <>
-struct def_alloc_param_traits<const wchar_t*>
-{
-   typedef wchar_t type;
-};
-
-}
-
-template <class iterator, class Allocator =
-#if !(defined(BOOST_MSVC) && (BOOST_MSVC <= 1300))
-BOOST_DEFAULT_ALLOCATOR(typename re_detail::def_alloc_param_traits<iterator>::type) >
-#else
-BOOST_DEFAULT_ALLOCATOR(re_detail::def_alloc_param_traits<iterator>::type) >
-#endif
-class match_results;
-
-//
-// class reg_expression
-// represents the compiled
-// regular expression:
-//
-
-#ifdef BOOST_MSVC
-#pragma warning(push)
-#pragma warning(disable : 4251 4231 4660)
-#endif
-
-#ifdef BOOST_REGEX_NO_FWD
-template <class charT, class traits = regex_traits<charT>, class Allocator = BOOST_DEFAULT_ALLOCATOR(charT) >
-#else
-template <class charT, class traits, class Allocator >
-#endif
-class reg_expression : public regbase
-{
-public:
-   typedef typename traits::size_type traits_size_type;
-   typedef typename traits::uchar_type traits_uchar_type;
-   typedef typename traits::string_type traits_string_type;
-   // typedefs:
-   typedef charT char_type;
-   typedef traits traits_type;
-
-   // locale_type
-   // placeholder for actual locale type used by the
-   // traits class to localise *this.
-   typedef typename traits::locale_type locale_type;
-   // value_type
-   typedef charT value_type;
-   // reference, const_reference
-   typedef charT& reference;
-   typedef const charT& const_reference;
-   // iterator, const_iterator
-   typedef const charT* const_iterator;
-   typedef const_iterator iterator;
-   // difference_type
-   typedef typename Allocator::difference_type difference_type;
-   // size_type
-   typedef typename Allocator::size_type size_type;   
-   // allocator_type
-   typedef Allocator allocator_type;
-   typedef Allocator alloc_type;
-   // flag_type
-   typedef regbase::flag_type flag_type;
-   
-public:
-   explicit reg_expression(const Allocator& a = Allocator());
-   explicit reg_expression(const charT* p, flag_type f = regbase::normal, const Allocator& a = Allocator());
-   reg_expression(const charT* p1, const charT* p2, flag_type f = regbase::normal, const Allocator& a = Allocator());
-   reg_expression(const charT* p, size_type len, flag_type f, const Allocator& a = Allocator());
-   reg_expression(const reg_expression&);
-   ~reg_expression();
-   reg_expression& BOOST_REGEX_CALL operator=(const reg_expression&);
-   reg_expression& BOOST_REGEX_CALL operator=(const charT* ptr)
-   {
-      set_expression(ptr, regbase::normal | regbase::use_except);
-      return *this;
-   }
-
-   //
-   // assign:
-   reg_expression& assign(const reg_expression& that)
-   { return *this = that; }
-   reg_expression& assign(const charT* ptr, flag_type f = regbase::normal)
-   {
-      set_expression(ptr, f | regbase::use_except);
-      return *this;
-   }
-
-   reg_expression& assign(const charT* first,
-                          const charT* last,
-                          flag_type f = regbase::normal)
-   {
-      set_expression(first, last, f | regbase::use_except);
-      return *this;
-   }
-#if !defined(BOOST_NO_MEMBER_TEMPLATES) && !(defined(__IBMCPP__) && (__IBMCPP__ <= 502))
-
-   template <class ST, class SA>
-   unsigned int BOOST_REGEX_CALL set_expression(const std::basic_string<charT, ST, SA>& p, flag_type f = regbase::normal)
-   { return set_expression(p.data(), p.data() + p.size(), f); }
-
-   template <class ST, class SA>
-   explicit reg_expression(const std::basic_string<charT, ST, SA>& p, flag_type f = regbase::normal, const Allocator& a = Allocator())
-    : data(a), pkmp(0), error_code_(REG_EMPTY), _expression(0) { set_expression(p, f | regbase::use_except); }
-
-   template <class I>
-   reg_expression(I first, I last, flag_type f = regbase::normal, const Allocator& al = Allocator())
-    : data(al), pkmp(0), error_code_(REG_EMPTY), _expression(0)
-   {
-      size_type len = last-first;
-      scoped_array<charT> a(new charT[len]);
-      std::copy(first, last, a.get());
-      set_expression(a.get(), a.get() + len, f | regbase::use_except);
-   }
-
-   template <class ST, class SA>
-   reg_expression& BOOST_REGEX_CALL operator=(const std::basic_string<charT, ST, SA>& p)
-   {
-      set_expression(p.c_str(), p.c_str() + p.size(), regbase::normal | regbase::use_except);
-      return *this;
-   }
-
-   template <class string_traits, class A>
-   reg_expression& BOOST_REGEX_CALL assign(
-       const std::basic_string<charT, string_traits, A>& s,
-       flag_type f = regbase::normal)
-   {
-      set_expression(s.c_str(), s.c_str() + s.size(), f | regbase::use_except);
-      return *this;
-   }
-
-   template <class fwd_iterator>
-   reg_expression& BOOST_REGEX_CALL assign(fwd_iterator first,
-                          fwd_iterator last,
-                          flag_type f = regbase::normal)
-   {
-      size_type len = last-first;
-      scoped_array<charT> a(new charT[len]);
-      std::copy(first, last, a.get());
-      set_expression(a.get(), a.get() + len, f | regbase::use_except);
-      return *this;
-   }
-#else
-   unsigned int BOOST_REGEX_CALL set_expression(const std::basic_string<charT>& p, flag_type f = regbase::normal)
-   { return set_expression(p.data(), p.data() + p.size(), f | regbase::use_except); }
-
-   reg_expression(const std::basic_string<charT>& p, flag_type f = regbase::normal, const Allocator& a = Allocator())
-    : data(a), pkmp(0) { set_expression(p, f | regbase::use_except); }
-
-   reg_expression& BOOST_REGEX_CALL operator=(const std::basic_string<charT>& p)
-   {
-      set_expression(p.c_str(), p.c_str() + p.size(), regbase::normal | regbase::use_except);
-      return *this;
-   }
-
-   reg_expression& BOOST_REGEX_CALL assign(
-       const std::basic_string<charT>& s,
-       flag_type f = regbase::normal)
-   {
-      set_expression(s.c_str(), s.c_str() + s.size(), f | regbase::use_except);
-      return *this;
-   }
-
-#endif
-
-
-   //
-   // allocator access:
-   Allocator BOOST_REGEX_CALL get_allocator()const;
-   //
-   // locale:
-   locale_type BOOST_REGEX_CALL imbue(locale_type l){ return traits_inst.imbue(l); }
-   locale_type BOOST_REGEX_CALL getloc()const{ return traits_inst.getloc(); }
-   //
-   // flags:
-   flag_type BOOST_REGEX_CALL getflags()const
-   { return flags(); }
-   //
-   // str:
-   std::basic_string<charT> BOOST_REGEX_CALL str()const
-   {
-      std::basic_string<charT> result;
-      if(this->error_code() == 0)
-         result = std::basic_string<charT>(_expression, _expression_len);
-      return result;
-   }
-   //
-   // begin, end:
-   const_iterator BOOST_REGEX_CALL begin()const
-   { return (this->error_code() ? 0 : _expression); }
-   const_iterator BOOST_REGEX_CALL end()const
-   { return (this->error_code() ? 0 : _expression + _expression_len); }
-   //
-   // swap:
-   void BOOST_REGEX_CALL swap(reg_expression&)throw();
-   //
-   // size:
-   size_type BOOST_REGEX_CALL size()const
-   { return (this->error_code() ? 0 : _expression_len); }
-   //
-   // max_size:
-   size_type BOOST_REGEX_CALL max_size()const
-   { return UINT_MAX; }
-   //
-   // empty:
-   bool BOOST_REGEX_CALL empty()const
-   { return 0 != this->error_code(); }
-
-   unsigned BOOST_REGEX_CALL mark_count()const { return (this->error_code() ? 0 : marks); }
-   bool BOOST_REGEX_CALL operator==(const reg_expression&)const;
-   bool BOOST_REGEX_CALL operator<(const reg_expression&)const;
-   //
-   // The following are deprecated as public interfaces
-   // but are available for compatibility with earlier versions.
-   allocator_type BOOST_REGEX_CALL allocator()const;
-   const charT* BOOST_REGEX_CALL expression()const { return (this->error_code() ? 0 : _expression); }
-   unsigned int BOOST_REGEX_CALL set_expression(const charT* p, const charT* end, flag_type f = regbase::normal);
-   unsigned int BOOST_REGEX_CALL set_expression(const charT* p, flag_type f = regbase::normal) { return set_expression(p, p + traits_type::length(p), f); }
-   //
-   // this should be private but template friends don't work:
-   const traits_type& get_traits()const { return traits_inst; }
-   unsigned int BOOST_REGEX_CALL error_code()const
-   {
-      return error_code_;
-   }
-
-private:
-   traits_type traits_inst;
-   re_detail::raw_storage<Allocator> data;
-   unsigned _restart_type;
-   unsigned marks;
-   int repeats;
-   unsigned char* startmap;
-   std::size_t _expression_len;
-   std::size_t _leading_len;
-   const charT* _leading_string;
-   std::size_t _leading_string_len;
-   re_detail::kmp_info<charT>* pkmp;
-   unsigned error_code_;
-   charT* _expression;
-
-   void BOOST_REGEX_CALL compile_maps();
-   void BOOST_REGEX_CALL compile_map(re_detail::re_syntax_base* node, unsigned char* _map, unsigned int* pnull, unsigned char mask, re_detail::re_syntax_base* terminal = 0)const;
-   bool BOOST_REGEX_CALL probe_start(re_detail::re_syntax_base* node, charT c, re_detail::re_syntax_base* terminal)const;
-   bool BOOST_REGEX_CALL probe_start_null(re_detail::re_syntax_base* node, re_detail::re_syntax_base* terminal)const;
-   void BOOST_REGEX_CALL fixup_apply(re_detail::re_syntax_base* b, unsigned cbraces);
-   void BOOST_REGEX_CALL move_offsets(re_detail::re_syntax_base* j, unsigned size);
-   re_detail::re_syntax_base* BOOST_REGEX_CALL compile_set(const charT*& first, const charT* last);
-   re_detail::re_syntax_base* BOOST_REGEX_CALL compile_set_aux(re_detail::jstack<traits_string_type, Allocator>& singles, re_detail::jstack<traits_string_type, Allocator>& ranges, re_detail::jstack<boost::uint_fast32_t, Allocator>& classes, re_detail::jstack<traits_string_type, Allocator>& equivalents, bool isnot, const re_detail::_narrow_type&);
-   re_detail::re_syntax_base* BOOST_REGEX_CALL compile_set_aux(re_detail::jstack<traits_string_type, Allocator>& singles, re_detail::jstack<traits_string_type, Allocator>& ranges, re_detail::jstack<boost::uint_fast32_t, Allocator>& classes, re_detail::jstack<traits_string_type, Allocator>& equivalents, bool isnot, const re_detail::_wide_type&);
-   re_detail::re_syntax_base* BOOST_REGEX_CALL compile_set_simple(re_detail::re_syntax_base* dat, unsigned long cls, bool isnot = false);
-   unsigned int BOOST_REGEX_CALL parse_inner_set(const charT*& first, const charT* last);
-
-   re_detail::re_syntax_base* BOOST_REGEX_CALL add_simple(re_detail::re_syntax_base* dat, re_detail::syntax_element_type type, unsigned int size = sizeof(re_detail::re_syntax_base));
-   re_detail::re_syntax_base* BOOST_REGEX_CALL add_literal(re_detail::re_syntax_base* dat, charT c);
-   charT BOOST_REGEX_CALL parse_escape(const charT*& first, const charT* last);
-   void BOOST_REGEX_CALL parse_range(const charT*& first, const charT* last, unsigned& min, unsigned& max);
-   bool BOOST_REGEX_CALL skip_space(const charT*& first, const charT* last);
-   unsigned int BOOST_REGEX_CALL probe_restart(re_detail::re_syntax_base* dat);
-   unsigned int BOOST_REGEX_CALL fixup_leading_rep(re_detail::re_syntax_base* dat, re_detail::re_syntax_base* end);
-   void BOOST_REGEX_CALL fail(unsigned int err);
-
-protected:
-   static int BOOST_REGEX_CALL repeat_count(const reg_expression& e)
-   { return e.repeats; }
-   static unsigned int BOOST_REGEX_CALL restart_type(const reg_expression& e)
-   { return e._restart_type; }
-   static const re_detail::re_syntax_base* BOOST_REGEX_CALL first(const reg_expression& e)
-   { return (const re_detail::re_syntax_base*)e.data.data(); }
-   static const unsigned char* BOOST_REGEX_CALL get_map(const reg_expression& e)
-   { return e.startmap; }
-   static std::size_t BOOST_REGEX_CALL leading_length(const reg_expression& e)
-   { return e._leading_len; }
-   static const re_detail::kmp_info<charT>* get_kmp(const reg_expression& e)
-   { return e.pkmp; }
-   static bool BOOST_REGEX_CALL can_start(charT c, const unsigned char* _map, unsigned char mask, const re_detail::_wide_type&);
-   static bool BOOST_REGEX_CALL can_start(charT c, const unsigned char* _map, unsigned char mask, const re_detail::_narrow_type&);
-};
-
-#ifdef BOOST_MSVC
-#pragma warning (pop)
-#endif
-
-template <class charT, class traits, class Allocator>
-inline void BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::swap(reg_expression& that)throw()
-{
-   // this is not as efficient as it should be,
-   // however swapping traits classes is problematic
-   // so just use 'brute force' method for now:
-   reg_expression<charT, traits, Allocator> e(that);
-   that = *this;
-   *this = e;
-}
-
-
-//
-// class match_results and match_results_base
-// handles what matched where
-
-template <class iterator>
-struct sub_match
-{
-   typedef typename re_detail::regex_iterator_traits<iterator>::value_type       value_type;
-#if defined(BOOST_NO_STD_ITERATOR_TRAITS) || defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
-   typedef std::ptrdiff_t  difference_type;
-#else
-   typedef typename re_detail::regex_iterator_traits<iterator>::difference_type       difference_type;
-#endif
-   typedef iterator                                                  iterator_type;
-   
-   iterator first;
-   iterator second;
-   bool matched;
-
-   operator std::basic_string<value_type> ()const
-   {
-      std::basic_string<value_type> result;
-      std::size_t len = boost::re_detail::distance((iterator)first, (iterator)second);
-      result.reserve(len);
-      iterator i = first;
-      while(i != second)
-      {
-         result.append(1, *i);
-         ++i;
-      }
-      return result;
-   }
-   #ifdef BOOST_OLD_REGEX_H
-   //
-   // the following are deprecated, do not use!!
-   //
-   operator int()const;
-   operator unsigned int()const;
-   operator short()const
-   {
-      return (short)(int)(*this);
-   }
-   operator unsigned short()const
-   {
-      return (unsigned short)(unsigned int)(*this);
-   }
-   #endif
-   sub_match() { matched = false; }
-   sub_match(iterator i) : first(i), second(i), matched(false) {}
-
-   bool operator==(const sub_match& that)const
-   {
-      return (first == that.first) && (second == that.second) && (matched == that.matched);
-   }
-   bool BOOST_REGEX_CALL operator !=(const sub_match& that)const
-   { return !(*this == that); }
-
-   difference_type BOOST_REGEX_CALL length()const
-   {
-      difference_type n = boost::re_detail::distance((iterator)first, (iterator)second);
-      return n;
-   }
-};
-
-#ifdef BOOST_OLD_REGEX_H
-namespace re_detail{
-template <class iterator, class charT>
-int do_toi(iterator i, iterator j, char c, int radix)
-{
-   std::string s(i, j);
-   char* p;
-   int result = std::strtol(s.c_str(), &p, radix);
-#ifndef BOOST_NO_EXCEPTIONS
-   if(*p)throw bad_pattern("Bad sub-expression");
-#endif
-   BOOST_REGEX_NOEH_ASSERT(0 == *p)
-   return result;
-}
-
-//
-// helper:
-template <class I, class charT>
-int do_toi(I& i, I j, charT c)
-{
-   int result = 0;
-   while((i != j) && (isdigit(*i)))
-   {
-      result = result*10 + (*i - '0');
-      ++i;
-   }
-   return result;
-}
-}
-
-
-template <class iterator>
-sub_match<iterator>::operator int()const
-{
-   iterator i = first;
-   iterator j = second;
-#ifndef BOOST_NO_EXCEPTIONS
-   if(i == j)throw bad_pattern("Bad sub-expression");
-#endif
-   BOOST_REGEX_NOEH_ASSERT(i != j)
-   int neg = 1;
-   if((i != j) && (*i == '-'))
-   {
-      neg = -1;
-      ++i;
-   }
-   neg *= re_detail::do_toi(i, j, *i);
-#ifndef BOOST_NO_EXCEPTIONS
-   if(i != j)throw bad_pattern("Bad sub-expression");
-#endif
-   BOOST_REGEX_NOEH_ASSERT(i == j)
-   return neg;
-}
-template <class iterator>
-sub_match<iterator>::operator unsigned int()const
-{
-   iterator i = first;
-   iterator j = second;
-#ifndef BOOST_NO_EXCEPTIONS
-   if(i == j)
-      throw bad_pattern("Bad sub-expression");
-#endif
-   BOOST_REGEX_NOEH_ASSERT(i != j)
-   return re_detail::do_toi(i, j, *first);
-}
-#endif
-
-namespace re_detail{
-
-template <class iterator, class Allocator = BOOST_DEFAULT_ALLOCATOR(typename def_alloc_param_traits<iterator>::type) >
-class match_results_base
-{
-public:
-   typedef Allocator                                                 alloc_type;
-   typedef typename boost::detail::rebind_allocator<iterator, Allocator>::type  iterator_alloc;
-   typedef typename iterator_alloc::size_type                        size_type;
-#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !defined(BOOST_NO_STD_ITERATOR_TRAITS)
-   typedef typename std::iterator_traits<iterator>::difference_type  difference_type;
-   typedef typename std::iterator_traits<iterator>::value_type       char_type;
-#else
-   typedef std::ptrdiff_t                                            difference_type;
-   typedef typename re_detail::regex_iterator_traits<iterator>::value_type char_type;
-#endif
-   typedef sub_match<iterator>                                       value_type;
-   typedef iterator                                                  iterator_type;
-
-protected:
-   typedef typename boost::detail::rebind_allocator<char, Allocator>::type c_alloc;
-   
-   struct c_reference : public c_alloc
-   {
-      std::size_t cmatches;
-      unsigned count;
-      sub_match<iterator> head, tail, re_null;
-      unsigned int lines;
-      iterator line_pos, base;
-      c_reference(const Allocator& a)
-         : c_alloc(a), cmatches(0), count(0), lines(0) {  }
-
-      bool operator==(const c_reference& that)const
-      {
-         return (cmatches == that.cmatches) &&
-                  (count == that.count) &&
-                  (head == that.head) &&
-                  (tail == that.tail) &&
-                  (lines == that.lines) &&
-                  (base == that.base);
-      }
-      bool operator!=(const c_reference& that)const
-      { return !(*this == that); }
-   };
-
-   c_reference* ref;
-
-   void BOOST_REGEX_CALL cow();
-
-   // protected contructor for derived class...
-   match_results_base(bool){}
-   void BOOST_REGEX_CALL m_free();
-
-public:
-
-   match_results_base(const Allocator& a = Allocator());
-
-   match_results_base(const match_results_base& m)
-   {
-      ref = m.ref;
-      ++(ref->count);
-   }
-
-   match_results_base& BOOST_REGEX_CALL operator=(const match_results_base& m);
-
-   ~match_results_base()
-   {
-      m_free();
-   }
-
-   size_type BOOST_REGEX_CALL size()const
-   {
-      //return (*this)[0].matched ? ref->cmatches : 0;
-      return ref->cmatches;
-   }
-
-   const sub_match<iterator>& BOOST_REGEX_CALL operator[](int n) const
-   {
-      if((n >= 0) && ((unsigned int)n < ref->cmatches))
-         return *(sub_match<iterator>*)((char*)ref + sizeof(c_reference) + sizeof(sub_match<iterator>)*n);
-      return (n == -1) ? ref->head : (n == -2) ? ref->tail : ref->re_null;
-   }
-
-   Allocator BOOST_REGEX_CALL allocator()const;
-
-   difference_type BOOST_REGEX_CALL length(unsigned int sub = 0)const
-   {
-      jm_assert(ref->cmatches);
-      const sub_match<iterator>& m = (*this)[sub];
-      if(m.matched == false)
-         return 0;
-      difference_type n = boost::re_detail::distance((iterator)m.first, (iterator)m.second);
-      return n;
-   }
-
-   std::basic_string<char_type> str(int i)const
-   {
-      return static_cast<std::basic_string<char_type> >((*this)[i]);
-   }
-
-   unsigned int BOOST_REGEX_CALL line()const
-   {
-      return ref->lines;
-   }
-
-   difference_type BOOST_REGEX_CALL position(unsigned int sub = 0)const
-   {
-      jm_assert(ref->cmatches);
-      const sub_match<iterator>& s = (*this)[sub];
-      if(s.matched == false)
-         return -1;
-      difference_type n = boost::re_detail::distance((iterator)(ref->base), (iterator)(s.first));
-      return n;
-   }
-
-   iterator BOOST_REGEX_CALL line_start()const
-   {
-      return ref->line_pos;
-   }
-
-   void swap(match_results_base& that)
-   {
-      c_reference* t = that.ref;
-      that.ref = ref;
-      ref = t;
-   }
-
-   bool operator==(const match_results_base& that)const;
-   bool operator<(const match_results_base& that)const
-   { return position() < that.position(); }
-
-   friend class match_results<iterator, Allocator>;
-
-   void BOOST_REGEX_CALL set_size(size_type n);
-   void BOOST_REGEX_CALL set_size(size_type n, iterator i, iterator j);
-   void BOOST_REGEX_CALL maybe_assign(const match_results_base& m);
-   void BOOST_REGEX_CALL init_fail(iterator i, iterator j);
-
-   void BOOST_REGEX_CALL set_first(iterator i);
-   void BOOST_REGEX_CALL set_first(iterator i, std::size_t pos);
-
-   void BOOST_REGEX_CALL set_second(iterator i)
-   {
-      cow();
-      ((sub_match<iterator>*)(ref+1))->second = i;
-      ((sub_match<iterator>*)(ref+1))->matched = true;
-      ref->tail.first = i;
-      ref->tail.matched = (ref->tail.first == ref->tail.second) ? false : true;
-   }
-
-   void BOOST_REGEX_CALL set_second(iterator i, std::size_t pos, bool m = true)
-   {
-      cow();
-      ((sub_match<iterator>*)((char*)ref + sizeof(c_reference) + sizeof(sub_match<iterator>) * pos))->second = i;
-      ((sub_match<iterator>*)((char*)ref + sizeof(c_reference) + sizeof(sub_match<iterator>) * pos))->matched = m;
-      if(pos == 0)
-      {
-         ref->tail.first = i;
-         ref->tail.matched = (ref->tail.first == ref->tail.second) ? false : true;
-      }
-   }
-
-   void BOOST_REGEX_CALL set_line(unsigned int i, iterator pos)
-   {
-      ref->lines = i;
-      ref->line_pos = pos;
-   }
-
-   void BOOST_REGEX_CALL set_base(iterator pos)
-   {
-      ref->base = pos;
-   }
-};
-
-template <class iterator, class Allocator>
-void BOOST_REGEX_CALL match_results_base<iterator, Allocator>::set_first(iterator i)
-{
-   cow();
-   ref->head.second = i;
-   ref->head.matched = (ref->head.first == ref->head.second) ? false : true;
-   sub_match<iterator>* p1 = (sub_match<iterator>*)(ref+1);
-   sub_match<iterator>* p2 = p1 + ref->cmatches;
-   p1->first = i;
-   p1->matched = false;
-   ++p1;
-   while(p1 != p2)
-   {
-      p1->matched = false;
-      p1->first = ref->tail.second;
-      p1->second = ref->tail.second;
-      ++p1;
-   }
-}
-
-template <class iterator, class Allocator>
-void BOOST_REGEX_CALL match_results_base<iterator, Allocator>::set_first(iterator i, std::size_t pos)
-{
-   cow();
-   ((sub_match<iterator>*)((char*)ref + sizeof(c_reference) + sizeof(sub_match<iterator>) * pos))->first = i;
-   if(pos == 0)
-   {
-      ref->head.second = i;
-      ref->head.matched = (ref->head.first == ref->head.second) ? false : true;
-      sub_match<iterator>* p1 = (sub_match<iterator>*)(ref+1);
-      sub_match<iterator>* p2 = p1 + ref->cmatches;
-      p1->first = i;
-      p1->matched = false;
-      ++p1;
-      while(p1 != p2)
-      {
-         p1->matched = false;
-         p1->first = ref->tail.second;
-         p1->second = ref->tail.second;
-         ++p1;
-      }
-   }
-}
-
-
-template <class iterator, class Allocator>
-match_results_base<iterator, Allocator>::match_results_base(const Allocator& a)
-{
-   ref = (c_reference*)c_alloc(a).allocate(sizeof(sub_match<iterator>) + sizeof(c_reference));
-   BOOST_REGEX_NOEH_ASSERT(ref)
-#ifndef BOOST_NO_EXCEPTIONS
-   try
-   {
-#endif
-      new (ref) c_reference(a);
-      ref->cmatches = 1;
-      ref->count = 1;
-      // construct the sub_match<iterator>:
-#ifndef BOOST_NO_EXCEPTIONS
-      try
-      {
-#endif
-         new ((sub_match<iterator>*)(ref+1)) sub_match<iterator>();
-#ifndef BOOST_NO_EXCEPTIONS
-      }
-      catch(...)
-      {
-         ::boost::re_detail::pointer_destroy(ref);
-         throw;
-      }
-   }
-   catch(...)
-   {
-      c_alloc(a).deallocate((char*)(void*)ref, sizeof(sub_match<iterator>) + sizeof(c_reference));
-      throw;
-   }
-#endif
-}
-
-template <class iterator, class Allocator>
-Allocator BOOST_REGEX_CALL match_results_base<iterator, Allocator>::allocator()const
-{
-  return *((c_alloc*)ref);
-}
-
-template <class iterator, class Allocator>
-inline match_results_base<iterator, Allocator>& BOOST_REGEX_CALL match_results_base<iterator, Allocator>::operator=(const match_results_base<iterator, Allocator>& m)
-{
-   if(ref != m.ref)
-   {
-      m_free();
-      ref = m.ref;
-      ++(ref->count);
-   }
-   return *this;
-}
-
-
-template <class iterator, class Allocator>
-void BOOST_REGEX_CALL match_results_base<iterator, Allocator>::m_free()
-{
-   if(--(ref->count) == 0)
-   {
-      c_alloc a(*ref);
-      sub_match<iterator>* p1, *p2;
-      p1 = (sub_match<iterator>*)(ref+1);
-      p2 = p1 + ref->cmatches;
-      while(p1 != p2)
-      {
-         ::boost::re_detail::pointer_destroy(p1);
-         ++p1;
-      }
-      ::boost::re_detail::pointer_destroy(ref);
-      a.deallocate((char*)(void*)ref, sizeof(sub_match<iterator>) * ref->cmatches + sizeof(c_reference));
-   }
-}
-
-template <class iterator, class Allocator>
-bool match_results_base<iterator, Allocator>::operator==(const match_results_base<iterator, Allocator>& that)const
-{
-   if(*ref != *(that.ref))
-      return false;
-   const sub_match<iterator>* p1 = (sub_match<iterator>*)(ref+1);
-   const sub_match<iterator>* p2 = p1 + ref->cmatches;
-   const sub_match<iterator>* p3 = (sub_match<iterator>*)(that.ref+1);
-   while(p1 != p2)
-   {
-      if(*p1 != *p3)
-         return false;
-      ++p1;
-      ++p3;
-   }
-   return true;
-}
-
-template <class iterator, class Allocator>
-void BOOST_REGEX_CALL match_results_base<iterator, Allocator>::set_size(size_type n)
-{
-   if(ref->cmatches != n)
-   {
-      c_reference* newref = (c_reference*)ref->allocate(sizeof(sub_match<iterator>) * n + sizeof(c_reference));
-      BOOST_REGEX_NOEH_ASSERT(newref)
-#ifndef BOOST_NO_EXCEPTIONS
-      try
-      {
-#endif
-         new (newref) c_reference(*ref);
-         newref->count = 1;
-         newref->cmatches = n;
-         sub_match<iterator>* p1, *p2;
-         p1 = (sub_match<iterator>*)(newref+1);
-         p2 = p1 + newref->cmatches;
-#ifndef BOOST_NO_EXCEPTIONS
-         try
-         {
-#endif
-            while(p1 != p2)
-            {
-               new (p1) sub_match<iterator>();
-               ++p1;
-            }
-            m_free();
-#ifndef BOOST_NO_EXCEPTIONS
-         }
-         catch(...)
-         {
-            p2 = (sub_match<iterator>*)(newref+1);
-            while(p2 != p1)
-            {
-               ::boost::re_detail::pointer_destroy(p2);
-               ++p2;
-            }
-            ::boost::re_detail::pointer_destroy(ref);
-            throw;
-         }
-#endif
-         ref = newref;
-#ifndef BOOST_NO_EXCEPTIONS
-      }
-      catch(...)
-      {
-         ref->deallocate((char*)(void*)newref, sizeof(sub_match<iterator>) * n + sizeof(c_reference));
-         throw;
-      }
-#endif
-   }
-}
-
-template <class iterator, class Allocator>
-void BOOST_REGEX_CALL match_results_base<iterator, Allocator>::set_size(size_type n, iterator i, iterator j)
-{
-   if(ref->cmatches != n)
-   {
-      c_reference* newref = (c_reference*)ref->allocate(sizeof(sub_match<iterator>) * n + sizeof(c_reference));
-      BOOST_REGEX_NOEH_ASSERT(newref)
-#ifndef BOOST_NO_EXCEPTIONS
-      try{
-#endif
-         new (newref) c_reference(*ref);
-         newref->count = 1;
-         newref->cmatches = n;
-         sub_match<iterator>* p1 = (sub_match<iterator>*)(newref+1);
-         sub_match<iterator>* p2 = p1 + newref->cmatches;
-#ifndef BOOST_NO_EXCEPTIONS
-         try
-         {
-#endif
-            while(p1 != p2)
-            {
-               new (p1) sub_match<iterator>(j);
-               ++p1;
-            }
-            m_free();
-#ifndef BOOST_NO_EXCEPTIONS
-         }
-         catch(...)
-         { 
-            p2 = (sub_match<iterator>*)(newref+1);
-            while(p2 != p1)
-            {
-               ::boost::re_detail::pointer_destroy(p2);
-               ++p2;
-            }
-            ::boost::re_detail::pointer_destroy(ref);
-            throw; 
-         }
-#endif
-         ref = newref;
-#ifndef BOOST_NO_EXCEPTIONS
-      }
-      catch(...)
-      { 
-         ref->deallocate((char*)(void*)newref, sizeof(sub_match<iterator>) * n + sizeof(c_reference)); 
-         throw; 
-      }
-#endif
-   }
-   else
-   {
-      cow();
-      // set iterators to be i, matched to false:
-      sub_match<iterator>* p1, *p2;
-      p1 = (sub_match<iterator>*)(ref+1);
-      p2 = p1 + ref->cmatches;
-      while(p1 != p2)
-      {
-         p1->first = j;
-         p1->second = j;
-         p1->matched = false;
-         ++p1;
-      }                                 
-   }
-   ref->head.first = i;
-   ref->tail.second = j;
-   ref->head.matched = ref->tail.matched = true;
-   ref->re_null.first = ref->re_null.second = j;
-   ref->re_null.matched = false;
-}
-
-template <class iterator, class Allocator>
-inline void BOOST_REGEX_CALL match_results_base<iterator, Allocator>::init_fail(iterator i, iterator j)
-{
-   set_size(ref->cmatches, i, j);
-}
-
-template <class iterator, class Allocator>
-void BOOST_REGEX_CALL match_results_base<iterator, Allocator>::maybe_assign(const match_results_base<iterator, Allocator>& m)
-{
-   sub_match<iterator>* p1, *p2;
-   p1 = (sub_match<iterator>*)(ref+1);
-   p2 = (sub_match<iterator>*)(m.ref+1);
-   iterator base = (*this)[-1].first;
-   std::size_t len1 = 0;
-   std::size_t len2 = 0;
-   std::size_t base1 = 0;
-   std::size_t base2 = 0;
-   std::size_t i;
-   for(i = 0; i < ref->cmatches; ++i)
-   {
-      //
-      // leftmost takes priority over longest:
-      base1 = boost::re_detail::distance(base, p1->first);
-      base2 = boost::re_detail::distance(base, p2->first);
-      if(base1 < base2) return;
-      if(base2 < base1) break;
-
-      len1 = boost::re_detail::distance(p1->first, p1->second);
-      len2 = boost::re_detail::distance(p2->first, p2->second);
-      if((len1 != len2) || ((p1->matched == false) && (p2->matched == true)))
-         break;
-      if((p1->matched == true) && (p2->matched == false))
-         return;
-      ++p1;
-      ++p2;
-   }
-   if(i == ref->cmatches)
-      return;
-   if(base2 < base1)
-      *this = m;
-   else if((len2 > len1) || ((p1->matched == false) && (p2->matched == true)) )
-      *this = m;
-}
-
-template <class iterator, class Allocator>
-void BOOST_REGEX_CALL match_results_base<iterator, Allocator>::cow()
-{
-   if(ref->count > 1)
-   {
-      c_reference* newref = (c_reference*)ref->allocate(sizeof(sub_match<iterator>) * ref->cmatches + sizeof(c_reference));
-      BOOST_REGEX_NOEH_ASSERT(newref)
-#ifndef BOOST_NO_EXCEPTIONS
-      try{
-#endif
-         new (newref) c_reference(*ref);
-         newref->count = 1;
-         sub_match<iterator>* p1 = (sub_match<iterator>*)(newref+1);
-         sub_match<iterator>* p2 = p1 + newref->cmatches;
-         sub_match<iterator>* p3 = (sub_match<iterator>*)(ref+1);
-#ifndef BOOST_NO_EXCEPTIONS
-         try{
-#endif
-            while(p1 != p2)
-            {
-               new (p1) sub_match<iterator>(*p3);
-               ++p1;
-               ++p3;
-            }
-#ifndef BOOST_NO_EXCEPTIONS
-         }
-         catch(...)
-         { 
-            p2 = (sub_match<iterator>*)(newref+1);
-            while(p2 != p1)
-            {
-               ::boost::re_detail::pointer_destroy(p2);
-               ++p2;
-            }
-            ::boost::re_detail::pointer_destroy(ref);
-            throw; 
-         }
-#endif
-      --(ref->count);
-      ref = newref;
-#ifndef BOOST_NO_EXCEPTIONS
-      }
-      catch(...)
-      { 
-         ref->deallocate((char*)(void*)newref, sizeof(sub_match<iterator>) * ref->cmatches + sizeof(c_reference)); 
-         throw; 
-      }
-#endif
-   }
-}
-
-} // namespace re_detail
-
-//
-// class match_results
-// encapsulates match_results_base, does a deep copy rather than
-// reference counting to ensure thread safety when copying
-// other match_results instances
-
-template <class iterator, class Allocator>
-class match_results : public re_detail::match_results_base<iterator, Allocator>
-{
-   typedef re_detail::match_results_base<iterator, Allocator> base_type;
-public:
-
-   typedef typename base_type::alloc_type          alloc_type;
-   typedef typename base_type::size_type           size_type;
-   typedef typename base_type::char_type           char_type;
-   typedef typename base_type::value_type          value_type;
-   typedef typename base_type::difference_type     difference_type;
-   typedef typename base_type::iterator_type       iterator_type;
-
-   explicit match_results(const Allocator& a = Allocator())
-      : re_detail::match_results_base<iterator, Allocator>(a){}
-
-   match_results(const re_detail::match_results_base<iterator, Allocator>& m)
-      : re_detail::match_results_base<iterator, Allocator>(m){}
-
-   match_results& operator=(const re_detail::match_results_base<iterator, Allocator>& m)
-   {
-      // shallow copy
-      base_type::operator=(m);
-      return *this;
-   }
-
-   match_results(const match_results& m);
-   match_results& operator=(const match_results& m);
-   //
-   // the following function definitions should *not* be required, except
-   // when this class is used as a template inside another template definition,
-   // in which members of the base class are not visible to the calling code.
-   // As a workaround we define simple forwarding functions:
-   //
-   size_type size()const
-   { return static_cast<const base_type*>(this)->size(); }
-
-   const sub_match<iterator>& operator[](int n) const
-   { return (*static_cast<const base_type*>(this))[n]; }
-
-   Allocator allocator()const
-   { return static_cast<const base_type*>(this)->allocator(); }
-
-   difference_type length(int sub = 0)const
-   { return static_cast<const base_type*>(this)->length(sub); }
-
-   difference_type position(unsigned int sub = 0)const
-   { return static_cast<const base_type*>(this)->position(sub); }
-
-   unsigned int line()const
-   { return static_cast<const base_type*>(this)->line(); }
-
-   iterator line_start()const
-   { return static_cast<const base_type*>(this)->line_start(); }
-
-   std::basic_string<char_type> str(int sub = 0)const
-   { return static_cast<const base_type*>(this)->str(sub); }
-
-   void swap(match_results& that)
-   { static_cast<base_type*>(this)->swap(that); }
-
-   bool operator==(const match_results& that)const
-   { return static_cast<const base_type&>(*this) == static_cast<const base_type&>(that); }
-
-   bool operator<(const match_results& that) const
-   { return position() < that.position(); }
-};
-
-template <class iterator, class Allocator>
-match_results<iterator, Allocator>::match_results(const match_results<iterator, Allocator>& m)
-   : re_detail::match_results_base<iterator, Allocator>(false)
-{
-   this->ref =
-      reinterpret_cast<typename re_detail::match_results_base<iterator, Allocator>::c_reference *>
-         (m.ref->allocate(sizeof(sub_match<iterator>) * m.ref->cmatches +
-                          sizeof(typename re_detail::match_results_base<iterator, Allocator>::c_reference)));
-   BOOST_REGEX_NOEH_ASSERT(this->ref)                       
-#ifndef BOOST_NO_EXCEPTIONS
-   try{
-#endif
-      new (this->ref) typename re_detail::match_results_base<iterator, Allocator>::c_reference(*m.ref);
-      this->ref->count = 1;
-      sub_match<iterator>* p1 = (sub_match<iterator>*)(this->ref+1);
-      sub_match<iterator>* p2 = p1 + this->ref->cmatches;
-      sub_match<iterator>* p3 = (sub_match<iterator>*)(m.ref+1);
-#ifndef BOOST_NO_EXCEPTIONS
-      try{
-#endif
-         while(p1 != p2)
-         {
-            new (p1) sub_match<iterator>(*p3);
-            ++p1;
-            ++p3;
-         }
-#ifndef BOOST_NO_EXCEPTIONS
-      }
-      catch(...)
-      { 
-         p2 = (sub_match<iterator>*)(this->ref+1);
-         while(p2 != p1)
-         {
-            re_detail::pointer_destroy(p2);
-            ++p2;
-         }
-         re_detail::pointer_destroy(this->ref);
-         throw; 
-      }
-   }
-   catch(...)
-   { 
-      m.ref->deallocate((char*)(void*)this->ref, sizeof(sub_match<iterator>) * m.ref->cmatches + sizeof(typename re_detail::match_results_base<iterator, Allocator>::c_reference));
-      throw; 
-   }
-#endif
-}
-
-template <class iterator, class Allocator>
-match_results<iterator, Allocator>& match_results<iterator, Allocator>::operator=(const match_results<iterator, Allocator>& m)
-{
-   match_results<iterator, Allocator> t(m);
-   this->swap(t);
-   return *this;
-}
-
-namespace re_detail{
-template <class iterator, class charT, class traits_type, class Allocator>
-iterator BOOST_REGEX_CALL re_is_set_member(iterator next, 
-                          iterator last, 
-                          const re_set_long* set_, 
-                          const reg_expression<charT, traits_type, Allocator>& e);
-} // namepsace re_detail
-
-#ifdef __BORLANDC__
-  #pragma option pop
-#endif
-
-} // namespace boost
-
-#ifndef BOOST_REGEX_COMPILE_HPP
-#include <boost/regex/v3/regex_compile.hpp>
-#endif
-
-//
-// template instances:
-//
-#define BOOST_REGEX_CHAR_T char
-#ifdef BOOST_REGEX_NARROW_INSTANTIATE
-#  define BOOST_REGEX_INSTANTIATE
-#endif
-#include <boost/regex/v3/instances.hpp>
-#undef BOOST_REGEX_CHAR_T
-#ifdef BOOST_REGEX_INSTANTIATE
-#  undef BOOST_REGEX_INSTANTIATE
-#endif
-
-#ifndef BOOST_NO_WREGEX
-#define BOOST_REGEX_CHAR_T wchar_t
-#ifdef BOOST_REGEX_WIDE_INSTANTIATE
-#  define BOOST_REGEX_INSTANTIATE
-#endif
-#include <boost/regex/v3/instances.hpp>
-#undef BOOST_REGEX_CHAR_T
-#ifdef BOOST_REGEX_INSTANTIATE
-#  undef BOOST_REGEX_INSTANTIATE
-#endif
-#endif
-
-
-namespace boost{
-#ifdef BOOST_REGEX_NO_FWD
-typedef reg_expression<char, regex_traits<char>, BOOST_DEFAULT_ALLOCATOR(char)> regex;
-#ifndef BOOST_NO_WREGEX
-typedef reg_expression<wchar_t, regex_traits<wchar_t>, BOOST_DEFAULT_ALLOCATOR(wchar_t)> wregex;
-#endif
-#endif
-
-typedef match_results<const char*> cmatch;
-typedef match_results<std::string::const_iterator> smatch;
-#ifndef BOOST_NO_WREGEX
-typedef match_results<const wchar_t*> wcmatch;
-typedef match_results<std::wstring::const_iterator> wsmatch;
-#endif
-
-} // namespace boost
-#ifndef BOOST_REGEX_MATCH_HPP
-#include <boost/regex/v3/regex_match.hpp>
-#endif
-#ifndef BOOST_REGEX_FORMAT_HPP
-#include <boost/regex/v3/regex_format.hpp>
-#endif
-#ifndef BOOST_REGEX_SPLIT_HPP
-#include <boost/regex/v3/regex_split.hpp>
-#endif
-
-#endif  // __cplusplus
-
-#endif  // include
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/include/boost/regex/v3/regex_compile.hpp b/include/boost/regex/v3/regex_compile.hpp
deleted file mode 100644
index b1b7e972..00000000
--- a/include/boost/regex/v3/regex_compile.hpp
+++ /dev/null
@@ -1,2122 +0,0 @@
-/*
- *
- * Copyright (c) 1998-2002
- * Dr 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         regex_compile.hpp
-  *   VERSION      see <boost/version.hpp>
-  *   DESCRIPTION: Declares reg_expression<> member functions.  This is
-  *                an internal header file, do not include directly.
-  */
-
-#ifndef BOOST_REGEX_COMPILE_HPP
-#define BOOST_REGEX_COMPILE_HPP
-
-namespace boost{
-#ifdef __BORLANDC__
-   #pragma option push -a8 -b -Vx -Ve -pc  -w-8004
-#endif
-   namespace re_detail{
-
-
-template <class traits>
-struct kmp_translator
-{
-   typedef typename traits::char_type char_type;
-   bool icase;
-   const traits* pt;
-   kmp_translator(bool c, traits* p) : icase(c), pt(p) {}
-   char_type operator()(char_type c)
-   {
-      return pt->translate(c, icase);
-   }
-};
-
-
-template <class charT, class traits_type, class Allocator>
-bool BOOST_REGEX_CALL re_maybe_set_member(charT c,
-                                 const re_set_long* set_,
-                                 const reg_expression<charT, traits_type, Allocator>& e)
-{
-   const charT* p = reinterpret_cast<const charT*>(set_+1);
-   bool icase = e.flags() & regbase::icase;
-   charT col = e.get_traits().translate(c, icase);
-   for(unsigned int i = 0; i < set_->csingles; ++i)
-   {
-      if(col == *p)
-         return set_->isnot ? false : true;
-
-      while(*p)++p;
-      ++p;     // skip null
-   }
-   return set_->isnot ? true : false;
-}
-
-} // namespace re_detail
-
-
-template <class charT, class traits, class Allocator>
-inline bool BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::can_start(charT c, const unsigned char* _map, unsigned char mask, const re_detail::_wide_type&)
-{
-   if((traits_size_type)(traits_uchar_type)c >= 256)
-      return true;
-   return BOOST_REGEX_MAKE_BOOL(_map[(traits_uchar_type)c] & mask);
-}
-
-template <class charT, class traits, class Allocator>
-inline bool BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::can_start(charT c, const unsigned char* _map, unsigned char mask, const re_detail::_narrow_type&)
-{
-   return BOOST_REGEX_MAKE_BOOL(_map[(traits_uchar_type)c] & mask);
-}
-
-template <class charT, class traits, class Allocator>
-reg_expression<charT, traits, Allocator>::reg_expression(const Allocator& a)
-    : regbase(), data(a), pkmp(0), error_code_(REG_EMPTY), _expression(0)
-{
-}
-
-template <class charT, class traits, class Allocator>
-reg_expression<charT, traits, Allocator>::reg_expression(const charT* p, flag_type f, const Allocator& a)
-    : data(a), pkmp(0), error_code_(REG_EMPTY), _expression(0)
-{
-   set_expression(p, f | regbase::use_except);
-}
-
-template <class charT, class traits, class Allocator>
-reg_expression<charT, traits, Allocator>::reg_expression(const charT* p1, const charT* p2, flag_type f, const Allocator& a)
-    : data(a), pkmp(0), error_code_(REG_EMPTY), _expression(0)
-{
-    set_expression(p1, p2, f | regbase::use_except);
-}
-
-template <class charT, class traits, class Allocator>
-reg_expression<charT, traits, Allocator>::reg_expression(const charT* p, size_type len, flag_type f, const Allocator& a)
-    : data(a), pkmp(0), error_code_(REG_EMPTY), _expression(0)
-{
-    set_expression(p, p + len, f | regbase::use_except);
-}
-
-template <class charT, class traits, class Allocator>
-reg_expression<charT, traits, Allocator>::reg_expression(const reg_expression<charT, traits, Allocator>& e)
-   : regbase(e), data(e.allocator()), pkmp(0), error_code_(REG_EMPTY), _expression(0)
-{
-   //
-   // we do a deep copy only if e is a valid expression, otherwise fail.
-   //
-   if(e.error_code() == 0)
-   {
-      const charT* pe = e.expression();
-      set_expression(pe, pe + e._expression_len, e.flags() | regbase::use_except);
-   }
-   else
-   {
-      _flags = e.flags() & ~(regbase::use_except);
-      fail(e.error_code());
-   }
-}
-
-template <class charT, class traits, class Allocator>
-reg_expression<charT, traits, Allocator>::~reg_expression()
-{
-   if(pkmp)
-      re_detail::kmp_free(pkmp, data.allocator());
-}
-
-template <class charT, class traits, class Allocator>
-reg_expression<charT, traits, Allocator>& BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::operator=(const reg_expression<charT, traits, Allocator>& e)
-{
-   //
-   // we do a deep copy only if e is a valid expression, otherwise fail.
-   //
-   if(this == &e) return *this;
-   _flags = use_except;
-   fail(e.error_code());
-   if(error_code() == 0)
-      set_expression(e._expression, e._expression + e._expression_len, e.flags() | regbase::use_except);
-   return *this;
-}
-
-template <class charT, class traits, class Allocator>
-inline bool BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::operator==(const reg_expression<charT, traits, Allocator>& e)const
-{
-   return (_flags == e.flags())
-           && (_expression_len == e._expression_len)
-           && (std::memcmp(_expression, e._expression, _expression_len * sizeof(charT)) == 0);
-}
-
-template <class charT, class traits, class Allocator>
-bool BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::operator<(const reg_expression<charT, traits, Allocator>& e)const
-{
-   //
-   // we can't offer a diffinitive ordering, but we can be consistant:
-   if(_flags != e.flags()) return _flags < e.flags();
-   if(_expression_len != e._expression_len) return _expression_len < e._expression_len;
-   return std::memcmp(expression(), e.expression(), _expression_len);
-}
-
-template <class charT, class traits, class Allocator>
-Allocator BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::allocator()const
-{
-    return data.allocator();
-}
-
-template <class charT, class traits, class Allocator>
-Allocator BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::get_allocator()const
-{
-    return data.allocator();
-}
-
-template <class charT, class traits, class Allocator>
-unsigned int BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::parse_inner_set(const charT*& first, const charT* last)
-{
-   //
-   // we have an inner [...] construct
-   //
-   jm_assert(traits_inst.syntax_type((traits_size_type)(traits_uchar_type)*first) == traits_type::syntax_open_set);
-   const charT* base = first;
-   while( (first != last)
-      && (traits_inst.syntax_type((traits_size_type)(traits_uchar_type)*first) != traits_type::syntax_close_set) )
-         ++first;
-   if(first == last)
-      return 0;
-   ++first;
-   if((first-base) < 5)
-      return 0;
-   if(*(base+1) != *(first-2))
-      return 0;
-   unsigned int result = traits_inst.syntax_type((traits_size_type)(traits_uchar_type)*(base+1));
-   if((result == traits_type::syntax_colon) && ((first-base) == 5))
-   {
-      unsigned type = traits_inst.syntax_type((traits_size_type)(traits_uchar_type)*(base+2));
-      if((type == traits_type::syntax_left_word) || (type == traits_type::syntax_right_word))
-         return type;
-   }
-   return ((result == traits_type::syntax_colon) || (result == traits_type::syntax_dot) || (result == traits_type::syntax_equal)) ? result : 0;
-}
-
-
-template <class charT, class traits, class Allocator>
-bool BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::skip_space(const charT*& first, const charT* last)
-{
-   //
-   // returns true if we get to last:
-   //
-   while((first != last) && (traits_inst.is_class(*first, traits_type::char_class_space) == true))
-   {
-      ++first;
-   }
-   return first == last;
-}
-
-template <class charT, class traits, class Allocator>
-void BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::parse_range(const charT*& ptr, const charT* end, unsigned& min, unsigned& max)
-{
-   //
-   // we have {x} or {x,} or {x,y} NB no spaces inside braces
-   // anything else is illegal
-   // On input ptr points to "{"
-   //
-   ++ptr;
-   if(skip_space(ptr, end))
-   {
-      fail(REG_EBRACE);
-      return;
-   }
-   if(traits_inst.syntax_type((traits_size_type)(traits_uchar_type)*ptr) != traits_type::syntax_digit)
-   {
-      fail(REG_BADBR);
-      return;
-   }
-   min = traits_inst.toi(ptr, end, 10);
-   if(skip_space(ptr, end))
-   {
-      fail(REG_EBRACE);
-      return;
-   }
-   if(traits_inst.syntax_type((traits_size_type)(traits_uchar_type)*ptr) == traits_type::syntax_comma)
-   {
-      //we have a second interval:
-      ++ptr;
-      if(skip_space(ptr, end))
-      {
-         fail(REG_EBRACE);
-         return;
-      }
-      if(traits_inst.syntax_type((traits_size_type)(traits_uchar_type)*ptr) == traits_type::syntax_digit)
-         max = traits_inst.toi(ptr, end, 10);
-      else
-         max = (unsigned)-1;
-   }
-   else
-      max = min;
-
-   // validate input:
-   if(skip_space(ptr, end))
-   {
-      fail(REG_EBRACE);
-      return;
-   }
-   if(max < min)
-   {
-      fail(REG_ERANGE);
-      return;
-   }
-   if(_flags & bk_braces)
-   {
-      if(traits_inst.syntax_type((traits_size_type)(traits_uchar_type)*ptr) != traits_type::syntax_slash)
-      {
-         fail(REG_BADBR);
-         return;
-      }
-      else
-      {
-         // back\ is OK now check the }
-         ++ptr;
-         if((ptr == end) || (traits_inst.syntax_type((traits_size_type)(traits_uchar_type)*ptr) != traits_type::syntax_close_brace))
-         {
-            fail(REG_BADBR);
-            return;
-         }
-      }
-   }
-   else if(traits_inst.syntax_type((traits_size_type)(traits_uchar_type)*ptr) != traits_type::syntax_close_brace)
-   {
-      fail(REG_BADBR);
-      return;
-   }
-}
-
-template <class charT, class traits, class Allocator>
-charT BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::parse_escape(const charT*& first, const charT* last)
-{
-   charT c(*first);
-   traits_size_type c_unsigned = (traits_size_type)(traits_uchar_type)*first;
-   // this is only used for the switch(), but cannot be folded in
-   // due to a bug in Comeau 4.2.44beta3
-   traits_size_type syntax = traits_inst.syntax_type(c_unsigned);
-   switch(syntax)
-   {
-   case traits_type::syntax_a:
-      c = '\a';
-      ++first;
-      break;
-   case traits_type::syntax_f:
-      c = '\f';
-      ++first;
-      break;
-   case traits_type::syntax_n:
-      c = '\n';
-      ++first;
-      break;
-   case traits_type::syntax_r:
-      c = '\r';
-      ++first;
-      break;
-   case traits_type::syntax_t:
-      c = '\t';
-      ++first;
-      break;
-   case traits_type::syntax_v:
-      c = '\v';
-      ++first;
-      break;
-   case traits_type::syntax_x:
-      ++first;
-      if(first == last)
-      {
-         fail(REG_EESCAPE);
-         break;
-      }
-      // maybe have \x{ddd}
-      if(traits_inst.syntax_type((traits_size_type)(traits_uchar_type)(*first)) == traits_type::syntax_open_brace)
-      {
-         ++first;
-         if(first == last)
-         {
-            fail(REG_EESCAPE);
-            break;
-         }
-         if(traits_inst.is_class(*first, traits_type::char_class_xdigit) == false)
-         {
-            fail(REG_BADBR);
-            break;
-         }
-         c = (charT)traits_inst.toi(first, last, -16);
-         if((first == last) || (traits_inst.syntax_type((traits_size_type)(traits_uchar_type)(*first)) != traits_type::syntax_close_brace))
-         {
-            fail(REG_BADBR);
-         }
-         ++first;
-         break;
-      }
-      else
-      {
-         if(traits_inst.is_class(*first, traits_type::char_class_xdigit) == false)
-         {
-            fail(REG_BADBR);
-            break;
-         }
-         c = (charT)traits_inst.toi(first, last, -16);
-      }
-      break;
-   case traits_type::syntax_c:
-      ++first;
-      if(first == last)
-      {
-         fail(REG_EESCAPE);
-         break;
-      }
-      if(((traits_uchar_type)(*first) < (traits_uchar_type)'@')
-            || ((traits_uchar_type)(*first) > (traits_uchar_type)127) )
-      {
-         fail(REG_EESCAPE);
-         return (charT)0;
-      }
-      c = (charT)((traits_uchar_type)(*first) - (traits_uchar_type)'@');
-      ++first;
-      break;
-   case traits_type::syntax_e:
-      c = (charT)27;
-      ++first;
-      break;
-   case traits_type::syntax_digit:
-      c = (charT)traits_inst.toi(first, last, -8);
-      break;
-   default:
-      //c = *first;
-      ++first;
-   }
-   return c;
-}
-
-template <class charT, class traits, class Allocator>
-void BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::compile_maps()
-{
-   re_detail::re_syntax_base* record = static_cast<re_detail::re_syntax_base*>(data.data());
-   // always compile the first _map:
-   std::memset(startmap, 0, 256);
-   record->can_be_null = 0;
-   compile_map(record, startmap, 0, re_detail::mask_all);
-
-   while(record->type != re_detail::syntax_element_match)
-   {
-      if((record->type == re_detail::syntax_element_alt) || (record->type == re_detail::syntax_element_rep))
-      {
-         std::memset(&(static_cast<re_detail::re_jump*>(record)->_map), 0, 256);
-         record->can_be_null = 0;
-         compile_map(record->next.p, static_cast<re_detail::re_jump*>(record)->_map, &(record->can_be_null), re_detail::mask_take, static_cast<re_detail::re_jump*>(record)->alt.p);
-         compile_map(static_cast<re_detail::re_jump*>(record)->alt.p, static_cast<re_detail::re_jump*>(record)->_map, &(record->can_be_null), re_detail::mask_skip);
-         if(record->type == re_detail::syntax_element_rep)
-         {
-            re_detail::re_repeat* rep = static_cast<re_detail::re_repeat*>(record);
-            // set whether this is a singleton repeat or not:
-            if(rep->next.p->next.p->next.p == rep->alt.p)
-            {
-               rep->singleton = true;
-            }
-            else
-               rep->singleton = false;
-         }
-      }
-      else
-      {
-         record->can_be_null = 0;
-         compile_map(record, 0, &(record->can_be_null), re_detail::mask_all);
-      }
-      record = record->next.p;
-   }
-   record->can_be_null = re_detail::mask_all;
-}
-
-template <class charT, class traits, class Allocator>
-bool BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::probe_start(
-                        re_detail::re_syntax_base* node, charT cc, re_detail::re_syntax_base* terminal) const
-{
-   unsigned int c;
-
-   switch(node->type)
-   {
-   case re_detail::syntax_element_startmark:
-      if(static_cast<const re_detail::re_brace*>(node)->index == -1)
-      {
-         return probe_start(node->next.p->next.p, cc, terminal)
-            && probe_start(static_cast<const re_detail::re_jump*>(node->next.p)->alt.p, cc, terminal);
-      }
-      // fall through:
-   case re_detail::syntax_element_endmark:
-   case re_detail::syntax_element_start_line:
-   case re_detail::syntax_element_word_boundary:
-   case re_detail::syntax_element_buffer_start:
-   case re_detail::syntax_element_restart_continue:
-      // doesn't tell us anything about the next character, so:
-      return probe_start(node->next.p, cc, terminal);
-   case re_detail::syntax_element_literal:
-      // only the first character of the literal can match:
-      // note these have already been translated:
-      if(*reinterpret_cast<charT*>(static_cast<re_detail::re_literal*>(node)+1) == traits_inst.translate(cc, (_flags & regbase::icase)))
-         return true;
-      return false;
-   case re_detail::syntax_element_end_line:
-      // next character (if there is one!) must be a newline:
-      if(traits_inst.is_separator(traits_inst.translate(cc, (_flags & regbase::icase))))
-         return true;
-      return false;
-   case re_detail::syntax_element_wild:
-      return true;
-   case re_detail::syntax_element_match:
-      return true;
-   case re_detail::syntax_element_within_word:
-   case re_detail::syntax_element_word_start:
-      return traits_inst.is_class(traits_inst.translate(cc, (_flags & regbase::icase)), traits_type::char_class_word);
-   case re_detail::syntax_element_word_end:
-      // what follows must not be a word character,
-      return traits_inst.is_class(traits_inst.translate(cc, (_flags & regbase::icase)), traits_type::char_class_word) ? false : true;
-   case re_detail::syntax_element_buffer_end:
-      // we can be null, nothing must follow,
-      // NB we assume that this is followed by
-      // re_detail::syntax_element_match, if its not then we can
-      // never match anything anyway!!
-      return false;
-   case re_detail::syntax_element_soft_buffer_end:
-      // we can be null, only newlines must follow,
-      // NB we assume that this is followed by
-      // re_detail::syntax_element_match, if its not then we can
-      // never match anything anyway!!
-      return traits_inst.is_separator(traits_inst.translate(cc, (_flags & regbase::icase)));
-   case re_detail::syntax_element_backref:
-      // there's no easy way to determine this
-      // which is not to say it can't be done!
-      // for now:
-      return true;
-   case re_detail::syntax_element_long_set:
-      // we can not be null,
-      // we need to add already translated values in the set
-      // to values in the _map
-      return re_detail::re_maybe_set_member(cc, static_cast<const re_detail::re_set_long*>(node), *this) || (re_detail::re_is_set_member(static_cast<const charT*>(&cc), static_cast<const charT*>(&cc+1), static_cast<re_detail::re_set_long*>(node), *this) != &cc);
-   case re_detail::syntax_element_set:
-      // set all the elements that are set in corresponding set:
-      c = (traits_size_type)(traits_uchar_type)traits_inst.translate(cc, (_flags & regbase::icase));
-      return static_cast<re_detail::re_set*>(node)->_map[c] != 0;
-   case re_detail::syntax_element_jump:
-      if(static_cast<re_detail::re_jump*>(node)->alt.p < node)
-      {
-         // backwards jump,
-         // caused only by end of repeat section, we'll treat this
-         // the same as a match, because the sub-expression has matched.
-         if(node->next.p == terminal)
-            return true; // null repeat - we can always take this
-         else
-         {
-            //
-            // take the jump, add in fix for the fact that if the
-            // repeat that we're jumping to has non-zero minimum count
-            // then we need to add in the possiblity that we could still
-            // skip that repeat.
-            re_detail::re_syntax_base* next = static_cast<re_detail::re_jump*>(node)->alt.p;
-            bool b = probe_start(next, cc, terminal);
-            if((next->type == re_detail::syntax_element_rep) && (static_cast<re_detail::re_repeat*>(next)->min != 0))
-            {
-               b = b || probe_start(static_cast<re_detail::re_jump*>(next)->alt.p, cc, terminal);
-            }
-            return b;
-         }
-      }
-      else
-         // take the jump and compile:
-         return probe_start(static_cast<re_detail::re_jump*>(node)->alt.p, cc, terminal);
-   case re_detail::syntax_element_alt:
-      // we need to take the OR of the two alternatives:
-      return probe_start(static_cast<re_detail::re_jump*>(node)->alt.p, cc, terminal) || probe_start(node->next.p, cc, terminal);
-   case re_detail::syntax_element_rep:
-      // we need to take the OR of the two alternatives
-      if(static_cast<re_detail::re_repeat*>(node)->min == 0)
-         return probe_start(node->next.p, cc, static_cast<re_detail::re_jump*>(node)->alt.p) || probe_start(static_cast<re_detail::re_jump*>(node)->alt.p, cc, terminal);
-      else
-         return probe_start(node->next.p, cc, static_cast<re_detail::re_jump*>(node)->alt.p);
-   case re_detail::syntax_element_combining:
-      return !traits_inst.is_combining(traits_inst.translate(cc, (_flags & regbase::icase)));
-   }
-   return false;
-}
-
-template <class charT, class traits, class Allocator>
-bool BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::probe_start_null(re_detail::re_syntax_base* node, re_detail::re_syntax_base* terminal)const
-{
-   switch(node->type)
-   {
-   case re_detail::syntax_element_startmark:
-   case re_detail::syntax_element_endmark:
-   case re_detail::syntax_element_start_line:
-   case re_detail::syntax_element_word_boundary:
-   case re_detail::syntax_element_buffer_start:
-   case re_detail::syntax_element_restart_continue:
-   case re_detail::syntax_element_end_line:
-   case re_detail::syntax_element_word_end:
-      // doesn't tell us anything about the next character, so:
-      return probe_start_null(node->next.p, terminal);
-   case re_detail::syntax_element_match:
-   case re_detail::syntax_element_buffer_end:
-   case re_detail::syntax_element_soft_buffer_end:
-   case re_detail::syntax_element_backref:
-      return true;
-   case re_detail::syntax_element_jump:
-      if(static_cast<re_detail::re_jump*>(node)->alt.p < node)
-      {
-         // backwards jump,
-         // caused only by end of repeat section, we'll treat this
-         // the same as a match, because the sub-expression has matched.
-         // this is only caused by NULL repeats as in "(a*)*" or "(\<)*"
-         // these are really nonsensence and make the matching code much
-         // harder, it would be nice to get rid of them altogether.
-         if(node->next.p == terminal)
-            return true;
-         else
-            return probe_start_null(static_cast<re_detail::re_jump*>(node)->alt.p, terminal);
-      }
-      else
-         // take the jump and compile:
-         return probe_start_null(static_cast<re_detail::re_jump*>(node)->alt.p, terminal);
-   case re_detail::syntax_element_alt:
-      // we need to take the OR of the two alternatives:
-      return probe_start_null(static_cast<re_detail::re_jump*>(node)->alt.p, terminal) || probe_start_null(node->next.p, terminal);
-   case re_detail::syntax_element_rep:
-      // only need to consider skipping the repeat:
-      return probe_start_null(static_cast<re_detail::re_jump*>(node)->alt.p, terminal);
-   default:
-      break;
-   }
-   return false;
-}
-
-template <class charT, class traits, class Allocator>
-void BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::compile_map(
-                        re_detail::re_syntax_base* node, unsigned char* _map,
-                        unsigned int* pnull, unsigned char mask, re_detail::re_syntax_base* terminal)const
-{
-   if(_map)
-   {
-      for(unsigned int i = 0; i < 256; ++i)
-      {
-         if(probe_start(node, (charT)i, terminal))
-            _map[i] |= mask;
-      }
-   }
-   if(pnull && probe_start_null(node, terminal))
-      *pnull |= mask;
-}
-  
-template <class charT, class traits, class Allocator>
-void BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::move_offsets(re_detail::re_syntax_base* j, unsigned size)
-{
-# ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable: 4127)
-#endif
-   // move all offsets starting with j->link forward by size
-   // called after an insert:
-   j = reinterpret_cast<re_detail::re_syntax_base*>(reinterpret_cast<char*>(data.data()) + j->next.i);
-   while(true)
-   {
-      switch(j->type)
-      {
-      case re_detail::syntax_element_rep:
-         static_cast<re_detail::re_jump*>(j)->alt.i += size;
-         j->next.i += size;
-         break;
-      case re_detail::syntax_element_jump:
-      case re_detail::syntax_element_alt:
-         static_cast<re_detail::re_jump*>(j)->alt.i += size;
-         j->next.i += size;
-         break;
-      default:
-         j->next.i += size;
-         break;
-      }
-      if(j->next.i == size)
-         break;
-      j = reinterpret_cast<re_detail::re_syntax_base*>(reinterpret_cast<char*>(data.data()) + j->next.i);
-   }
-# ifdef BOOST_MSVC
-#  pragma warning(pop)
-#endif
-}
-
-template <class charT, class traits, class Allocator>
-re_detail::re_syntax_base* BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::compile_set_simple(re_detail::re_syntax_base* dat, unsigned long cls, bool isnot)
-{
-   typedef typename re_detail::is_byte<charT>::width_type width_type;
-   re_detail::jstack<traits_string_type, Allocator> singles(64, data.allocator());
-   re_detail::jstack<traits_string_type, Allocator> ranges(64, data.allocator());
-   re_detail::jstack<boost::uint_fast32_t, Allocator> classes(64, data.allocator());
-   re_detail::jstack<traits_string_type, Allocator> equivalents(64, data.allocator());
-   classes.push(cls);
-   if(dat)
-   {
-      data.align();
-      dat->next.i = data.size();
-   }
-   return compile_set_aux(singles, ranges, classes, equivalents, isnot, width_type());
-}
-
-template <class charT, class traits, class Allocator>
-re_detail::re_syntax_base* BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::compile_set(const charT*& first, const charT* last)
-{
-   re_detail::jstack<traits_string_type, Allocator> singles(64, data.allocator());
-   re_detail::jstack<traits_string_type, Allocator> ranges(64, data.allocator());
-   re_detail::jstack<boost::uint_fast32_t, Allocator> classes(64, data.allocator());
-   re_detail::jstack<traits_string_type, Allocator> equivalents(64, data.allocator());
-   bool has_digraphs = false;
-   jm_assert(traits_inst.syntax_type((traits_size_type)(traits_uchar_type)*first) == traits_type::syntax_open_set);
-   ++first;
-   bool started = false;
-   bool done = false;
-   bool isnot = false;
-
-   enum last_type
-   {
-      last_single,
-      last_none,
-      last_dash
-   };
-
-   unsigned l = last_none;
-   traits_string_type s;
-
-   while((first != last) && !done)
-   {
-      traits_size_type c = (traits_size_type)(traits_uchar_type)*first;
-      // this is only used for the switch(), but cannot be folded in
-      // due to a bug in Comeau 4.2.44beta3
-      traits_size_type syntax = traits_inst.syntax_type(c);
-      switch(syntax)
-      {
-      case traits_type::syntax_caret:
-         if(!started && !isnot)
-         {
-            isnot = true;
-         }
-         else
-         {
-            s = (charT)c;
-            goto char_set_literal;
-         }
-         break;
-      case traits_type::syntax_open_set:
-      {
-         if((_flags & char_classes) == 0)
-         {
-            s = (charT)c;
-            goto char_set_literal;
-         }
-         // check to see if we really have a class:
-         const charT* base = first;
-         // this is only used for the switch(), but cannot be folded in
-         // due to a bug in Comeau 4.2.44beta3
-    unsigned int inner_set = parse_inner_set(first, last);
-         switch(inner_set)
-         {
-         case traits_type::syntax_colon:
-            {
-               if(l == last_dash)
-               {
-                  fail(REG_ERANGE);
-                  return 0;
-               }
-               boost::uint_fast32_t id = traits_inst.lookup_classname(base+2, first-2);
-               if(_flags & regbase::icase)
-               {
-                  if((id == traits_type::char_class_upper) || (id == traits_type::char_class_lower))
-                  {
-                     id = traits_type::char_class_alpha;
-                  }
-               }
-               if(id == 0)
-               {
-                  fail(REG_ECTYPE);
-                  return 0;
-               }
-               classes.push(id);
-               started = true;
-               l = last_none;
-            }
-            break;
-         case traits_type::syntax_dot:
-            //
-            // we have a collating element [.collating-name.]
-            //
-            if(traits_inst.lookup_collatename(s, base+2, first-2))
-            {
-               --first;
-               if(s.size() > 1)
-                  has_digraphs = true;
-               if(s.size())goto char_set_literal;
-            }
-            fail(REG_ECOLLATE);
-            return 0;
-         case traits_type::syntax_equal:
-            //
-            // we have an equivalence class [=collating-name=]
-            //
-            if(traits_inst.lookup_collatename(s, base+2, first-2))
-            {
-               std::size_t len = s.size();
-               if(len)
-               {
-                  unsigned i = 0;
-                  while(i < len)
-                  {
-                     s[i] = traits_inst.translate(s[i], (_flags & regbase::icase));
-                     ++i;
-                  }
-                  traits_string_type s2;
-                  traits_inst.transform_primary(s2, s);
-                  equivalents.push(s2);
-                  started = true;
-                  l = last_none;
-                  break;
-               }
-            }
-            fail(REG_ECOLLATE);
-            return 0;
-         case traits_type::syntax_left_word:
-            if((started == false) && (traits_inst.syntax_type((traits_size_type)(traits_uchar_type)*first) == traits_type::syntax_close_set))
-            {
-               ++first;
-               return add_simple(0, re_detail::syntax_element_word_start);
-            }
-            fail(REG_EBRACK);
-            return 0;
-         case traits_type::syntax_right_word:
-            if((started == false) && (traits_inst.syntax_type((traits_size_type)(traits_uchar_type)*first) == traits_type::syntax_close_set))
-            {
-               ++first;
-               return add_simple(0, re_detail::syntax_element_word_end);
-            }
-            fail(REG_EBRACK);
-            return 0;
-         default:
-            if(started == false)
-            {
-               unsigned int t = traits_inst.syntax_type((traits_size_type)(traits_uchar_type)*(base+1));
-               if((t != traits_type::syntax_colon) && (t != traits_type::syntax_dot) && (t != traits_type::syntax_equal))
-               {
-                  first = base;
-                  s = (charT)c;
-                  goto char_set_literal;
-               }
-            }
-            fail(REG_EBRACK);
-            return 0;
-         }
-         if(first == last)
-         {
-            fail(REG_EBRACK);
-            return 0;
-         }
-         continue;
-      }
-      case traits_type::syntax_close_set:
-         if(started == false)
-         {
-            s = (charT)c;
-            goto char_set_literal;
-         }
-         done = true;
-         break;
-      case traits_type::syntax_dash:
-         if(!started)
-         {
-            s = (charT)c;
-            goto char_set_literal;
-         }
-         ++first;
-         if(traits_inst.syntax_type((traits_size_type)(traits_uchar_type)*first) == traits_type::syntax_close_set)
-         {
-            --first;
-            s = (charT)c;
-            goto char_set_literal;
-         }
-         if((singles.empty() == true) || (l != last_single))
-         {
-            fail(REG_ERANGE);
-            return 0;
-         }
-         ranges.push(singles.peek());
-         if(singles.peek().size() <= 1)  // leave digraphs and ligatures in place
-            singles.pop();
-         l = last_dash;
-         continue;
-      case traits_type::syntax_slash:
-         if(_flags & regbase::escape_in_lists)
-         {
-            ++first;
-            if(first == last)
-               continue;
-            traits_size_type c = (traits_size_type)(traits_uchar_type)*first;
-            // this is only used for the switch(), but cannot be folded in
-            // due to a bug in Comeau 4.2.44beta3
-            traits_size_type syntax = traits_inst.syntax_type(c);
-            switch(syntax)
-            {
-            case traits_type::syntax_w:
-               if(l == last_dash)
-               {
-                  fail(REG_ERANGE);
-                  return 0;
-               }
-               classes.push(traits_type::char_class_word);
-               started = true;
-               l = last_none;
-               ++first;
-               continue;
-            case traits_type::syntax_d:
-               if(l == last_dash)
-               {
-                  fail(REG_ERANGE);
-                  return 0;
-               }
-               classes.push(traits_type::char_class_digit);
-               started = true;
-               l = last_none;
-               ++first;
-               continue;
-            case traits_type::syntax_s:
-               if(l == last_dash)
-               {
-                  fail(REG_ERANGE);
-                  return 0;
-               }
-               classes.push(traits_type::char_class_space);
-               started = true;
-               l = last_none;
-               ++first;
-               continue;
-            case traits_type::syntax_l:
-               if(l == last_dash)
-               {
-                  fail(REG_ERANGE);
-                  return 0;
-               }
-               classes.push(traits_type::char_class_lower);
-               started = true;
-               l = last_none;
-               ++first;
-               continue;
-            case traits_type::syntax_u:
-               if(l == last_dash)
-               {
-                  fail(REG_ERANGE);
-                  return 0;
-               }
-               classes.push(traits_type::char_class_upper);
-               started = true;
-               l = last_none;
-               ++first;
-               continue;
-            case traits_type::syntax_W:
-            case traits_type::syntax_D:
-            case traits_type::syntax_S:
-            case traits_type::syntax_U:
-            case traits_type::syntax_L:
-               fail(REG_EESCAPE);
-               return 0;
-            default:
-               c = parse_escape(first, last);
-               --first;
-               s = (charT)c;
-               goto char_set_literal;
-            }
-         }
-         else
-         {
-            s = (charT)c;
-            goto char_set_literal;
-         }
-      default:
-         s = (charT)c;
-         char_set_literal:
-         unsigned i = 0;
-         // get string length to stop us going past the end of string (DWA)
-         std::size_t len = s.size();
-         while(i < len)
-         {
-            s[i] = traits_inst.translate(s[i], (_flags & regbase::icase));
-            ++i;
-         }
-         started = true;
-         if(l == last_dash)
-         {
-            ranges.push(s);
-            l = last_none;
-            if(s.size() > 1)   // add ligatures to singles list as well
-               singles.push(s);
-         }
-         else
-         {
-            singles.push(s);
-            l = last_single;
-         }
-      }
-      ++first;
-   }
-   if(!done)
-      return 0;
-
-   typedef typename re_detail::is_byte<charT>::width_type width_type;
-   
-   re_detail::re_syntax_base* result;
-   if(has_digraphs)
-      result = compile_set_aux(singles, ranges, classes, equivalents, isnot, re_detail::_wide_type());
-   else
-      result = compile_set_aux(singles, ranges, classes, equivalents, isnot, width_type());
-   #ifdef __BORLANDC__
-   // delayed throw:
-   if((result == 0) && (_flags & regbase::use_except))
-      fail(error_code());
-   #endif
-   return result;
-}
-
-template <class charT, class traits, class Allocator>
-re_detail::re_syntax_base* BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::compile_set_aux(re_detail::jstack<traits_string_type, Allocator>& singles, re_detail::jstack<traits_string_type, Allocator>& ranges, re_detail::jstack<boost::uint_fast32_t, Allocator>& classes, re_detail::jstack<traits_string_type, Allocator>& equivalents, bool isnot, const re_detail::_wide_type&)
-{
-   size_type base = data.size();
-   data.extend(sizeof(re_detail::re_set_long));
-   unsigned int csingles = 0;
-   unsigned int cranges = 0;
-   boost::uint_fast32_t cclasses = 0;
-   unsigned int cequivalents = 0;
-   bool nocollate_state = flags() & regbase::nocollate;
-
-   while(singles.empty() == false)
-   {
-      ++csingles;
-      const traits_string_type& s = singles.peek();
-      std::size_t len = (s.size() + 1) * sizeof(charT);
-      std::memcpy(reinterpret_cast<charT*>(data.extend(len)), s.c_str(), len);
-      singles.pop();
-   }
-   while(ranges.empty() == false)
-   {
-      traits_string_type c1, c2;
-      if(nocollate_state)
-         c1 = ranges.peek();
-      else
-         traits_inst.transform(c1, ranges.peek());
-      ranges.pop();
-      if(nocollate_state)
-         c2 = ranges.peek();
-      else
-         traits_inst.transform(c2, ranges.peek());
-      ranges.pop();
-      if(c1 < c2)
-      {
-         // for some reason bc5 crashes when throwing exceptions
-         // from here - probably an EH-compiler bug, but hard to
-         // be sure...
-         // delay throw to later:
-         #ifdef __BORLANDC__
-         boost::uint_fast32_t f = _flags;
-         _flags &= ~regbase::use_except;
-         #endif
-         fail(REG_ERANGE);
-         #ifdef __BORLANDC__
-         _flags = f;
-         #endif
-         return 0;
-      }
-      ++cranges;
-      std::size_t len = (re_detail::re_strlen(c1.c_str()) + 1) * sizeof(charT);
-      std::memcpy(data.extend(len), c1.c_str(), len);
-      len = (re_detail::re_strlen(c2.c_str()) + 1) * sizeof(charT);
-      std::memcpy(data.extend(len), c2.c_str(), len);
-   }
-   while(classes.empty() == false)
-   {
-      cclasses |= classes.peek();
-      classes.pop();
-   }
-   while(equivalents.empty() == false)
-   {
-      ++cequivalents;
-      const traits_string_type& s = equivalents.peek();
-      std::size_t len = (re_detail::re_strlen(s.c_str()) + 1) * sizeof(charT);
-      std::memcpy(reinterpret_cast<charT*>(data.extend(len)), s.c_str(), len);
-      equivalents.pop();
-   }
-
-   re_detail::re_set_long* dat = reinterpret_cast<re_detail::re_set_long*>(reinterpret_cast<unsigned char*>(data.data()) + base);
-   dat->type = re_detail::syntax_element_long_set;
-   dat->csingles = csingles;
-   dat->cranges = cranges;
-   dat->cclasses = cclasses;
-   dat->cequivalents = cequivalents;
-   dat->isnot = isnot;
-   dat->next.i = 0;
-   return dat;
-}
-
-template <class charT, class traits, class Allocator>
-re_detail::re_syntax_base* BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::compile_set_aux(re_detail::jstack<traits_string_type, Allocator>& singles, re_detail::jstack<traits_string_type, Allocator>& ranges, re_detail::jstack<boost::uint_fast32_t, Allocator>& classes, re_detail::jstack<traits_string_type, Allocator>& equivalents, bool isnot, const re_detail::_narrow_type&)
-{
-   re_detail::re_set* dat = reinterpret_cast<re_detail::re_set*>(data.extend(sizeof(re_detail::re_set)));
-   std::memset(dat, 0, sizeof(re_detail::re_set));
-
-   while(singles.empty() == false)
-   {
-      dat->_map[(traits_size_type)(traits_uchar_type)*(singles.peek().c_str())] = re_detail::mask_all;
-      singles.pop();
-   }
-   while(ranges.empty() == false)
-   {
-      traits_string_type c1, c2, c3, c4;
-
-      if(flags() & regbase::nocollate)
-         c1 = ranges.peek();
-      else
-         traits_inst.transform(c1, ranges.peek());
-      ranges.pop();
-      if(flags() & regbase::nocollate)
-         c2 = ranges.peek();
-      else
-         traits_inst.transform(c2, ranges.peek());
-      ranges.pop();
-
-      if(c1 < c2)
-      {
-         // for some reason bc5 crashes when throwing exceptions
-         // from here - probably an EH-compiler bug, but hard to
-         // be sure...
-         // delay throw to later:
-         #ifdef __BORLANDC__
-         boost::uint_fast32_t f = _flags;
-         _flags &= ~regbase::use_except;
-         #endif
-         fail(REG_ERANGE);
-         #ifdef __BORLANDC__
-         _flags = f;
-         #endif
-         return 0;
-      }
-      for(unsigned int i = 0; i < 256; ++i)
-      {
-         c4 = (charT)i;
-         if(flags() & regbase::nocollate)
-            c3 = c4;
-         else
-            traits_inst.transform(c3, c4);
-         if((c3 <= c1) && (c3 >= c2))
-            dat->_map[i] = re_detail::mask_all;
-      }
-   }
-   while(equivalents.empty() == false)
-   {
-      traits_string_type c1, c2;
-      for(unsigned int i = 0; i < 256; ++i)
-      {
-         c2 = (charT)i;
-         traits_inst.transform_primary(c1, c2);
-         if(c1 == equivalents.peek())
-            dat->_map[i] = re_detail::mask_all;
-      }
-      equivalents.pop();
-   }
-
-   boost::uint_fast32_t flags = 0;
-   while(classes.empty() == false)
-   {
-      flags |= classes.peek();
-      classes.pop();
-   }
-   if(flags)
-   {
-      for(unsigned int i = 0; i < 256; ++i)
-      {
-         if(traits_inst.is_class(charT(i), flags))
-            dat->_map[(traits_uchar_type)traits_inst.translate((charT)i, (_flags & regbase::icase))] = re_detail::mask_all;
-      }
-   }
-
-   if(isnot)
-   {
-      for(unsigned int i = 0; i < 256; ++i)
-      {
-         dat->_map[i] = !dat->_map[i];
-      }
-   }
-
-   dat->type = re_detail::syntax_element_set;
-   dat->next.i = 0;
-   return dat;
-}
-
-#ifndef __CODEGUARD__
-// this must not be inline when Borland's codeguard support is turned
-// on, otherwise we _will_ get surious codeguard errors...
-inline
-#endif
- re_detail::re_syntax_base* add_offset(void* base, std::ptrdiff_t off)
-{
-   return reinterpret_cast<re_detail::re_syntax_base*>(reinterpret_cast<char*>(base) + off);
-}
-
-
-template <class charT, class traits, class Allocator>
-void BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::fixup_apply(re_detail::re_syntax_base* b, unsigned cbraces)
-{
-   typedef typename boost::detail::rebind_allocator<bool, Allocator>::type b_alloc;
-   
-   register unsigned char* base = reinterpret_cast<unsigned char*>(b);
-   register re_detail::re_syntax_base* ptr = b;
-   bool* pb = 0;
-   b_alloc a(data.allocator());
-#ifndef BOOST_NO_EXCEPTIONS
-   try
-   {
-#endif
-      pb = a.allocate(cbraces);
-      BOOST_REGEX_NOEH_ASSERT(pb)
-      for(unsigned i = 0; i < cbraces; ++i)
-         pb[i] = false;
-
-      repeats = 0;
-
-      while(ptr->next.i)
-      {
-         switch(ptr->type)
-         {
-         case re_detail::syntax_element_rep:
-            jm_assert(data.size() > static_cast<re_detail::re_jump*>(ptr)->alt.i);
-            static_cast<re_detail::re_jump*>(ptr)->alt.p = add_offset(base, static_cast<re_detail::re_jump*>(ptr)->alt.i);
-#ifdef BOOST_REGEX_DEBUG
-            if((re_detail::padding_mask & reinterpret_cast<int>(static_cast<re_detail::re_jump*>(ptr)->alt.p)) && (static_cast<re_detail::re_jump*>(ptr)->alt.p != b))
-            {
-               jm_trace("padding mis-aligment in repeat jump to object type: " << static_cast<re_detail::re_jump*>(ptr)->alt.p->type)
-               //jm_assert(0 == (padding_mask & (int)((re_detail::re_jump*)ptr)->alt.p));
-            }
-#endif
-            static_cast<re_detail::re_repeat*>(ptr)->id = repeats;
-            ++repeats;
-            goto rebase;
-         case re_detail::syntax_element_jump:
-         case re_detail::syntax_element_alt:
-            jm_assert(data.size() > static_cast<re_detail::re_jump*>(ptr)->alt.i);
-            static_cast<re_detail::re_jump*>(ptr)->alt.p = add_offset(base, static_cast<re_detail::re_jump*>(ptr)->alt.i);
-#ifdef BOOST_REGEX_DEBUG
-            if((re_detail::padding_mask & reinterpret_cast<int>(static_cast<re_detail::re_jump*>(ptr)->alt.p) && (static_cast<re_detail::re_jump*>(ptr)->alt.p != b)))
-            {
-               jm_trace("padding mis-aligment in alternation jump to object type: " << static_cast<re_detail::re_jump*>(ptr)->alt.p->type)
-               //jm_assert(0 == (padding_mask & (int)((re_detail::re_jump*)ptr)->alt.p));
-            }
-#endif
-            goto rebase;
-         case re_detail::syntax_element_backref:
-            if((static_cast<re_detail::re_brace*>(ptr)->index >= (int)cbraces) || (pb[static_cast<re_detail::re_brace*>(ptr)->index] == false) )
-            {
-               fail(REG_ESUBREG);
-               a.deallocate(pb, cbraces);
-               return;
-            }
-            goto rebase;
-         case re_detail::syntax_element_endmark:
-            if(static_cast<re_detail::re_brace*>(ptr)->index > 0)
-               pb[static_cast<re_detail::re_brace*>(ptr)->index] = true;
-            goto rebase;
-         default:
-            rebase:
-            jm_assert(data.size() > ptr->next.i);
-            ptr->next.p = add_offset(base, ptr->next.i);
-#ifdef BOOST_REGEX_DEBUG
-            if((re_detail::padding_mask & (int)(ptr->next.p)) && (static_cast<re_detail::re_jump*>(ptr)->alt.p != b))
-            {
-               jm_trace("padding mis-alignment in next record of type " << ptr->next.p->type)
-               jm_assert(0 == (re_detail::padding_mask & (int)(ptr->next.p)));
-            }
-#endif
-            ptr = ptr->next.p;
-         }
-      }
-      a.deallocate(pb, cbraces);
-      pb = 0;
-#ifndef BOOST_NO_EXCEPTIONS
-   }
-   catch(...)
-   {
-      if(pb)
-         a.deallocate(pb, cbraces);
-      throw;
-   }
-#endif
-}
-
-
-template <class charT, class traits, class Allocator>
-unsigned int BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::set_expression(const charT* p, const charT* end, flag_type f)
-{
-# ifdef BOOST_MSVC
-#  pragma warning(push)
-#  pragma warning(disable: 4127)
-#endif
-#ifdef __OpenBSD__
-   // strxfrm not working on OpenBSD??
-   f |= regbase::nocollate;
-#endif
-
-   if(p == expression())
-   {
-      traits_string_type s(p, end);
-      return set_expression(s.c_str(), s.c_str() + s.size(), f);
-   }
-   typedef typename traits_type::sentry sentry_t;
-   sentry_t sent(traits_inst);
-   if(sent){
-
-   const charT* base = p;
-   data.clear();
-   _flags = f;
-   fail(REG_NOERROR);  // clear any error
-
-   if(p >= end)
-   {
-      fail(REG_EMPTY);
-      return error_code();
-   }
-
-   const charT* ptr = p;
-   marks = 0;
-   re_detail::jstack<std::size_t, Allocator> mark(64, data.allocator());
-   re_detail::jstack<int, Allocator> markid(64, data.allocator());
-   std::size_t last_mark_popped = 0;
-   register traits_size_type c;
-   register re_detail::re_syntax_base* dat;
-
-   unsigned rep_min = 0;
-   unsigned rep_max = 0;
-
-   //
-   // set up header:
-   //
-   ++marks;
-   dat = 0;
-
-   if(_flags & regbase::literal)
-   {
-      while(ptr != end)
-      {
-         dat = add_literal(dat, traits_inst.translate(*ptr, (_flags & regbase::icase)));
-         ++ptr;
-      }
-   }
-
-   while (ptr < end)
-   {
-      c = (traits_size_type)(traits_uchar_type)*ptr;
-      // this is only used for the switch(), but cannot be folded in
-      // due to a bug in Comeau 4.2.44beta3
-      traits_size_type syntax = traits_inst.syntax_type(c);
-      switch(syntax)
-      {
-      case traits_type::syntax_open_bracket:
-         if(_flags & bk_parens)
-         {
-            dat = add_literal(dat, (charT)c);
-            ++ptr;
-            continue;
-         }
-         open_bracked_jump:
-         // extend:
-         dat = add_simple(dat, re_detail::syntax_element_startmark, sizeof(re_detail::re_brace));
-         markid.push(marks);
-         static_cast<re_detail::re_brace*>(dat)->index = marks++;
-         mark.push(data.index(dat));
-         ++ptr;
-         //
-         // check for perl like (?...) extention syntax
-         c = (traits_size_type)(traits_uchar_type)*ptr;
-         if(((_flags & bk_parens) == 0) && (traits_type::syntax_question == traits_inst.syntax_type(c)))
-         {
-            ++ptr;
-            c = (traits_size_type)(traits_uchar_type)*ptr;
-            // this is only used for the switch(), but cannot be folded in
-            // due to a bug in Comeau 4.2.44beta3
-            traits_size_type syntax = traits_inst.syntax_type(c);
-            switch(syntax)
-            {
-            case traits_type::syntax_colon:
-               static_cast<re_detail::re_brace*>(dat)->index = 0;
-               --marks;
-               markid.pop();
-               markid.push(0);
-               ++ptr;
-               continue;
-            case traits_type::syntax_equal:
-               static_cast<re_detail::re_brace*>(dat)->index = -1;
-               markid.pop();
-               markid.push(-1);
-               common_forward_assert:
-               --marks;
-               ++ptr;
-               // extend:
-               dat = add_simple(dat, re_detail::syntax_element_jump, re_detail::re_jump_size);
-               data.align();
-               //
-               // we don't know what value to put here yet,
-               // use an arbitrarily large value for now
-               // and check it later:
-               static_cast<re_detail::re_jump*>(dat)->alt.i = INT_MAX/2;
-               mark.push(data.size() - re_detail::re_jump_size);
-               continue;
-            case traits_type::syntax_not:
-               static_cast<re_detail::re_brace*>(dat)->index = -2;
-               markid.pop();
-               markid.push(-2);
-               goto common_forward_assert;
-            case traits_type::syntax_hash:
-               // comment just skip it:
-               static_cast<re_detail::re_brace*>(dat)->index = 0;
-               --marks;
-               markid.pop();
-               mark.pop();
-               do{
-                  ++ptr;
-                  c = (traits_size_type)(traits_uchar_type)*ptr;
-               }while(traits_type::syntax_close_bracket != traits_inst.syntax_type(c));
-               ++ptr;
-               continue;
-            default:
-               //
-               // error, return to standard parsing and let that handle the error:
-               --ptr;
-               continue;
-            }
-         }
-         break;
-      case traits_type::syntax_close_bracket:
-         if(_flags & bk_parens)
-         {
-            dat = add_literal(dat, (charT)c);
-            ++ptr;
-            continue;
-         }
-         
-         close_bracked_jump:
-         if(dat)
-         {
-            data.align();
-            dat->next.i = data.size();
-         }
-
-         if(mark.empty())
-         {
-            fail(REG_EPAREN);
-            return error_code();
-         }
-         // see if we have an empty alternative:
-         if(mark.peek() == data.index(dat) )
-         {
-            re_detail::re_syntax_base* para = reinterpret_cast<re_detail::re_syntax_base*>(reinterpret_cast<char*>(data.data()) + mark.peek());
-            if(para->type == re_detail::syntax_element_jump)
-            {
-               fail(REG_EMPTY);
-               return error_code();
-            }
-         }
-
-         // pop any pushed alternatives and set the target end destination:
-         dat = reinterpret_cast<re_detail::re_syntax_base*>(reinterpret_cast<unsigned char*>(data.data()) + mark.peek());
-         while(dat->type == re_detail::syntax_element_jump)
-         {
-            static_cast<re_detail::re_jump*>(dat)->alt.i = data.size();
-            mark.pop();
-            if(mark.empty())
-            {
-               fail(REG_EPAREN);
-               return error_code();
-            }
-            dat = reinterpret_cast<re_detail::re_jump*>(reinterpret_cast<unsigned char*>(data.data()) + mark.peek());
-         }
-
-         dat = add_simple(0, re_detail::syntax_element_endmark, sizeof(re_detail::re_brace));
-         static_cast<re_detail::re_brace*>(dat)->index = markid.peek();
-         markid.pop();
-         last_mark_popped = mark.peek();
-         mark.pop();
-         ++ptr;
-         break;
-      case traits_type::syntax_char:
-         dat = add_literal(dat, (charT)c);
-         ++ptr;
-         break;
-      case traits_type::syntax_slash:
-      {
-         if(++ptr == end)
-         {
-            fail(REG_EESCAPE);
-            return error_code();
-         }
-         c = (traits_size_type)(traits_uchar_type)*ptr;
-         // this is only used for the switch(), but cannot be folded in
-         // due to a bug in Comeau 4.2.44beta3
-         traits_size_type syntax = traits_inst.syntax_type(c);
-         switch(syntax)
-         {
-         case traits_type::syntax_open_bracket:
-            if(_flags & bk_parens)
-               goto open_bracked_jump;
-            break;
-         case traits_type::syntax_close_bracket:
-            if(_flags & bk_parens)
-               goto close_bracked_jump;
-            break;
-         case traits_type::syntax_plus:
-            if((_flags & bk_plus_qm) && ((_flags & limited_ops) == 0))
-            {
-               rep_min = 1;
-               rep_max = (unsigned)-1;
-               goto repeat_jump;
-            }
-            break;
-         case traits_type::syntax_question:
-            if((_flags & bk_plus_qm) && ((_flags & limited_ops) == 0))
-            {
-               rep_min = 0;
-               rep_max = 1;
-               goto repeat_jump;
-            }
-            break;
-         case traits_type::syntax_or:
-            if(((_flags & bk_vbar) == 0) || (_flags & limited_ops))
-               break;
-            goto alt_string_jump;
-         case traits_type::syntax_open_brace:
-            if( ((_flags & bk_braces) == 0) || ((_flags & intervals) == 0))
-               break;
-
-            // we have {x} or {x,} or {x,y}:
-            parse_range(ptr, end, rep_min, rep_max);
-            goto repeat_jump;
-
-         case traits_type::syntax_digit:
-            if(_flags & bk_refs)
-            {
-               // update previous:
-               int i = traits_inst.toi((charT)c);
-               if(i == 0)
-               {
-                  // we can have \025 which means take char whose
-                  // code is 25 (octal), so parse string:
-                  c = traits_inst.toi(ptr, end, -8);
-                  --ptr;
-                  break;
-               }
-               dat = add_simple(dat, re_detail::syntax_element_backref, sizeof(re_detail::re_brace));
-               static_cast<re_detail::re_brace*>(dat)->index = i;
-               ++ptr;
-               continue;
-            }
-            break;
-         case traits_type::syntax_b:     // re_detail::syntax_element_word_boundary
-            dat = add_simple(dat, re_detail::syntax_element_word_boundary);
-            ++ptr;
-            continue;
-         case traits_type::syntax_B:
-            dat = add_simple(dat, re_detail::syntax_element_within_word);
-            ++ptr;
-            continue;
-         case traits_type::syntax_left_word:
-            dat = add_simple(dat, re_detail::syntax_element_word_start);
-            ++ptr;
-            continue;
-         case traits_type::syntax_right_word:
-            dat = add_simple(dat, re_detail::syntax_element_word_end);
-            ++ptr;
-            continue;
-         case traits_type::syntax_w:     //re_detail::syntax_element_word_char
-            dat = compile_set_simple(dat, traits_type::char_class_word);
-            ++ptr;
-            continue;
-         case traits_type::syntax_W:
-            dat = compile_set_simple(dat, traits_type::char_class_word, true);
-            ++ptr;
-            continue;
-         case traits_type::syntax_d:     //re_detail::syntax_element_word_char
-            dat = compile_set_simple(dat, traits_type::char_class_digit);
-            ++ptr;
-            continue;
-         case traits_type::syntax_D:
-            dat = compile_set_simple(dat, traits_type::char_class_digit, true);
-            ++ptr;
-            continue;
-         case traits_type::syntax_s:     //re_detail::syntax_element_word_char
-            dat = compile_set_simple(dat, traits_type::char_class_space);
-            ++ptr;
-            continue;
-         case traits_type::syntax_S:
-            dat = compile_set_simple(dat, traits_type::char_class_space, true);
-            ++ptr;
-            continue;
-         case traits_type::syntax_l:     //re_detail::syntax_element_word_char
-            dat = compile_set_simple(dat, traits_type::char_class_lower);
-            ++ptr;
-            continue;
-         case traits_type::syntax_L:
-            dat = compile_set_simple(dat, traits_type::char_class_lower, true);
-            ++ptr;
-            continue;
-         case traits_type::syntax_u:     //re_detail::syntax_element_word_char
-            dat = compile_set_simple(dat, traits_type::char_class_upper);
-            ++ptr;
-            continue;
-         case traits_type::syntax_U:
-            dat = compile_set_simple(dat, traits_type::char_class_upper, true);
-            ++ptr;
-            continue;
-         case traits_type::syntax_Q:
-            ++ptr;
-            while(true)
-            {
-               if(ptr == end)
-               {
-                  fail(REG_EESCAPE);
-                  return error_code();
-               }
-               if(traits_inst.syntax_type((traits_size_type)(traits_uchar_type)*ptr) == traits_type::syntax_slash)
-               {
-                  ++ptr;
-                  if((ptr != end) && (traits_inst.syntax_type((traits_size_type)(traits_uchar_type)*ptr) == traits_type::syntax_E))
-                     break;
-                  else
-                  {
-                     dat = add_literal(dat, *(ptr-1));
-                     continue;
-                  }
-               }
-               dat = add_literal(dat, *ptr);
-               ++ptr;
-            }
-            ++ptr;
-            continue;
-         case traits_type::syntax_C:
-            dat = add_simple(dat, re_detail::syntax_element_wild);
-            ++ptr;
-            continue;
-         case traits_type::syntax_X:
-            dat = add_simple(dat, re_detail::syntax_element_combining);
-            ++ptr;
-            continue;
-         case traits_type::syntax_Z:
-            dat = add_simple(dat, re_detail::syntax_element_soft_buffer_end);
-            ++ptr;
-            continue;
-         case traits_type::syntax_G:
-            dat = add_simple(dat, re_detail::syntax_element_restart_continue);
-            ++ptr;
-            continue;
-         case traits_type::syntax_start_buffer:
-            dat = add_simple(dat, re_detail::syntax_element_buffer_start);
-            ++ptr;
-            continue;
-         case traits_type::syntax_end_buffer:
-            dat = add_simple(dat, re_detail::syntax_element_buffer_end);
-            ++ptr;
-            continue;
-         default:
-            c = (traits_size_type)(traits_uchar_type)parse_escape(ptr, end);
-            dat = add_literal(dat, (charT)c);
-            continue;
-         }
-         dat = add_literal(dat, (charT)c);
-         ++ptr;
-         break;
-      }
-      case traits_type::syntax_dollar:
-         dat = add_simple(dat, re_detail::syntax_element_end_line, sizeof(re_detail::re_syntax_base));
-         ++ptr;
-         continue;
-      case traits_type::syntax_caret:
-         dat = add_simple(dat, re_detail::syntax_element_start_line, sizeof(re_detail::re_syntax_base));
-         ++ptr;
-         continue;
-      case traits_type::syntax_dot:
-         dat = add_simple(dat, re_detail::syntax_element_wild, sizeof(re_detail::re_syntax_base));
-         ++ptr;
-         continue;
-      case traits_type::syntax_star:
-         rep_min = 0;
-         rep_max = (unsigned)-1;
-
-         repeat_jump:
-         {
-          std::ptrdiff_t offset;
-            if(dat == 0)
-            {
-               fail(REG_BADRPT);
-               return error_code();
-            }
-            switch(dat->type)
-            {
-            case re_detail::syntax_element_endmark:
-               offset = last_mark_popped;
-               break;
-            case re_detail::syntax_element_literal:
-               if(static_cast<re_detail::re_literal*>(dat)->length > 1)
-               {
-                  // update previous:
-                  charT lit = *reinterpret_cast<charT*>(reinterpret_cast<char*>(dat) + sizeof(re_detail::re_literal) + ((static_cast<re_detail::re_literal*>(dat)->length-1)*sizeof(charT)));
-                  --static_cast<re_detail::re_literal*>(dat)->length;
-                  dat = add_simple(dat, re_detail::syntax_element_literal, sizeof(re_detail::re_literal) + sizeof(charT));
-                  static_cast<re_detail::re_literal*>(dat)->length = 1;
-                  *reinterpret_cast<charT*>(static_cast<re_detail::re_literal*>(dat)+1) = lit;
-               }
-               offset = reinterpret_cast<char*>(dat) - reinterpret_cast<char*>(data.data());
-               break;
-            case re_detail::syntax_element_backref:
-            case re_detail::syntax_element_long_set:
-            case re_detail::syntax_element_set:
-            case re_detail::syntax_element_wild:
-            case re_detail::syntax_element_combining:
-               // we're repeating a single item:
-               offset = reinterpret_cast<char*>(dat) - reinterpret_cast<char*>(data.data());
-               break;
-            default:
-               fail(REG_BADRPT);
-               return error_code();
-            }
-            data.align();
-            dat->next.i = data.size();
-            //unsigned pos = (char*)dat - (char*)data.data();
-
-            // add the trailing jump:
-            dat = add_simple(dat, re_detail::syntax_element_jump, re_detail::re_jump_size);
-            static_cast<re_detail::re_jump*>(dat)->alt.i = 0;
-
-            // now insert the leading repeater:
-            dat = static_cast<re_detail::re_syntax_base*>(data.insert(offset, re_detail::re_repeater_size));
-            dat->next.i = (reinterpret_cast<char*>(dat) - reinterpret_cast<char*>(data.data())) + re_detail::re_repeater_size;
-            dat->type = re_detail::syntax_element_rep;
-            static_cast<re_detail::re_repeat*>(dat)->alt.i = data.size();
-            static_cast<re_detail::re_repeat*>(dat)->min = rep_min;
-            static_cast<re_detail::re_repeat*>(dat)->max = rep_max;
-            static_cast<re_detail::re_repeat*>(dat)->leading = false;
-            static_cast<re_detail::re_repeat*>(dat)->greedy = true;
-            move_offsets(dat, re_detail::re_repeater_size);
-            ++ptr;
-            //
-            // now check to see if we have a non-greedy repeat:
-            if((ptr != end) && (_flags & (limited_ops | bk_plus_qm | bk_braces)) == 0)
-            {
-               c = (traits_size_type)(traits_uchar_type)*ptr;
-               if(traits_type::syntax_question == traits_inst.syntax_type(c))
-               {
-                  // OK repeat is non-greedy:
-                  static_cast<re_detail::re_repeat*>(dat)->greedy = false;
-                  ++ptr;
-               }
-            }
-            dat = reinterpret_cast<re_detail::re_syntax_base*>(reinterpret_cast<char*>(data.data()) + data.size() - re_detail::re_jump_size);
-            static_cast<re_detail::re_repeat*>(dat)->alt.i = offset;
-            continue;
-         }
-      case traits_type::syntax_plus:
-         if(_flags & (bk_plus_qm | limited_ops))
-         {
-            dat = add_literal(dat, (charT)c);
-            ++ptr;
-            continue;
-         }
-         rep_min = 1;
-         rep_max = (unsigned)-1;
-         goto repeat_jump;
-      case traits_type::syntax_question:
-         if(_flags & (bk_plus_qm | limited_ops))
-         {
-            dat = add_literal(dat, (charT)c);
-            ++ptr;
-            continue;
-         }
-         rep_min = 0;
-         rep_max = 1;
-         goto repeat_jump;
-      case traits_type::syntax_open_set:
-         // update previous:
-         if(dat)
-         {
-            data.align();
-            dat->next.i = data.size();
-         }
-         // extend:
-         dat = compile_set(ptr, end);
-         if(dat == 0)
-         {
-            if((_flags & regbase::failbit) == 0)
-               fail(REG_EBRACK);
-            return error_code();
-         }
-         break;
-      case traits_type::syntax_or:
-      {
-         if(_flags & (bk_vbar | limited_ops))
-         {
-            dat = add_literal(dat, (charT)c);
-            ++ptr;
-            continue;
-         }
-
-         alt_string_jump:
-
-         // update previous:
-         if(dat == 0)
-         {
-            // start of pattern can't have empty "|"
-            fail(REG_EMPTY);
-            return error_code();
-         }
-         // see if we have an empty alternative:
-         if(mark.empty() == false)
-            if(mark.peek() == data.index(dat))
-            {
-               fail(REG_EMPTY);
-               return error_code();
-            }
-         // extend:
-         dat = add_simple(dat, re_detail::syntax_element_jump, re_detail::re_jump_size);
-         data.align();
-         //
-         // we don't know what value to put here yet,
-         // use an arbitrarily large value for now
-         // and check it later (TODO!)
-         static_cast<re_detail::re_jump*>(dat)->alt.i = INT_MAX/2;
-
-         // now work out where to insert:
-         std::size_t offset = 0;
-         if(mark.empty() == false)
-         {
-            // we have a '(' or '|' to go back to:
-            offset = mark.peek();
-            re_detail::re_syntax_base* base = reinterpret_cast<re_detail::re_syntax_base*>(reinterpret_cast<unsigned char*>(data.data()) + offset);
-            offset = base->next.i;
-         }
-         re_detail::re_jump* j = static_cast<re_detail::re_jump*>(data.insert(offset, re_detail::re_jump_size));
-         j->type = re_detail::syntax_element_alt;
-         j->next.i = offset + re_detail::re_jump_size;
-         j->alt.i = data.size();
-         move_offsets(j, re_detail::re_jump_size);
-         dat = reinterpret_cast<re_detail::re_syntax_base*>(reinterpret_cast<unsigned char*>(data.data()) + data.size() - re_detail::re_jump_size);
-         mark.push(data.size() - re_detail::re_jump_size);
-         ++ptr;
-         break;
-      }
-      case traits_type::syntax_open_brace:
-         if((_flags & bk_braces) || ((_flags & intervals) == 0))
-         {
-            dat = add_literal(dat, (charT)c);
-            ++ptr;
-            continue;
-         }
-         // we have {x} or {x,} or {x,y}:
-         parse_range(ptr, end, rep_min, rep_max);
-         goto repeat_jump;
-      case traits_type::syntax_newline:
-         if(_flags & newline_alt)
-            goto alt_string_jump;
-         dat = add_literal(dat, (charT)c);
-         ++ptr;
-         continue;
-      case traits_type::syntax_close_brace:
-         if(_flags & bk_braces)
-         {
-            dat = add_literal(dat, (charT)c);
-            ++ptr;
-            continue;
-         }
-         fail(REG_BADPAT);
-         return error_code();
-      default:
-         dat = add_literal(dat, (charT)c);
-         ++ptr;
-         break;
-      }  // switch
-   }     // while
-
-   //
-   // update previous:
-   if(dat)
-   {
-      data.align();
-      dat->next.i = data.size();
-   }
-
-   // see if we have an empty alternative:
-   if(mark.empty() == false)
-      if(mark.peek() == data.index(dat) )
-      {
-         re_detail::re_syntax_base* para = reinterpret_cast<re_detail::re_syntax_base*>(reinterpret_cast<char*>(data.data()) + mark.peek());
-         if(para->type == re_detail::syntax_element_jump)
-         {
-            fail(REG_EMPTY);
-            return error_code();
-         }
-      }
-   //
-   // set up tail:
-   //
-   if(mark.empty() == false)
-   {
-      // pop any pushed alternatives and set the target end destination:
-      dat = reinterpret_cast<re_detail::re_syntax_base*>(reinterpret_cast<unsigned char*>(data.data()) + mark.peek());
-      while(dat->type == re_detail::syntax_element_jump)
-      {
-         static_cast<re_detail::re_jump*>(dat)->alt.i = data.size();
-         mark.pop();
-         if(mark.empty() == true)
-            break;
-         dat = reinterpret_cast<re_detail::re_jump*>(reinterpret_cast<unsigned char*>(data.data()) + mark.peek());
-      }
-   }
-
-   dat = static_cast<re_detail::re_brace*>(data.extend(sizeof(re_detail::re_syntax_base)));
-   dat->type = re_detail::syntax_element_match;
-   dat->next.i = 0;
-
-   if(mark.empty() == false)
-   {
-      fail(REG_EPAREN);
-      return error_code();
-   }
-
-   //
-   // allocate space for start _map:
-   startmap = reinterpret_cast<unsigned char*>(data.extend(256 + ((end - base + 1) * sizeof(charT))));
-   //
-   // and copy the expression we just compiled:
-   _expression = reinterpret_cast<charT*>(reinterpret_cast<char*>(startmap) + 256);
-   _expression_len = end - base;
-   std::memcpy(_expression, base, _expression_len * sizeof(charT));
-   *(_expression + _expression_len) = charT(0);
-
-   //
-   // now we need to apply fixups to the array
-   // so that we can use pointers and not indexes
-   fixup_apply(static_cast<re_detail::re_syntax_base*>(data.data()), marks);
-
-   // check for error during fixup:
-   if(_flags & regbase::failbit)
-      return error_code();
-
-   //
-   // finally compile the maps so that we can make intelligent choices
-   // whenever we encounter an alternative:
-   compile_maps();
-   if(pkmp)
-   {
-      re_detail::kmp_free(pkmp, data.allocator());
-      pkmp = 0;
-   }
-   re_detail::re_syntax_base* sbase = static_cast<re_detail::re_syntax_base*>(data.data());
-   _restart_type = probe_restart(sbase);
-   _leading_len = fixup_leading_rep(sbase, 0);
-   if((sbase->type == re_detail::syntax_element_literal) && (sbase->next.p->type == re_detail::syntax_element_match))
-   {
-      _restart_type = restart_fixed_lit;
-      if(0 == pkmp)
-      {
-         charT* p1 = reinterpret_cast<charT*>(reinterpret_cast<char*>(sbase) + sizeof(re_detail::re_literal));
-         charT* p2 = p1 + static_cast<re_detail::re_literal*>(sbase)->length;
-         pkmp = re_detail::kmp_compile(p1, p2, charT(), re_detail::kmp_translator<traits>(_flags&regbase::icase, &traits_inst), data.allocator());
-      }
-   }
-   return error_code();
-
-   } // sentry
-   return REG_EMPTY;
-
-# ifdef BOOST_MSVC
-#  pragma warning(pop)
-#endif
-
-}
-
-template <class charT, class traits, class Allocator>
-re_detail::re_syntax_base* BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::add_simple(re_detail::re_syntax_base* dat, re_detail::syntax_element_type type, unsigned int size)
-{
-   if(dat)
-   {
-      data.align();
-      dat->next.i = data.size();
-   }
-   if(size < sizeof(re_detail::re_syntax_base))
-      size = sizeof(re_detail::re_syntax_base);
-   dat = static_cast<re_detail::re_syntax_base*>(data.extend(size));
-   dat->type = type;
-   dat->next.i = 0;
-   return dat;
-}
-
-template <class charT, class traits, class Allocator>
-re_detail::re_syntax_base* BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::add_literal(re_detail::re_syntax_base* dat, charT c)
-{
-   if(dat && (dat->type == re_detail::syntax_element_literal))
-   {
-      // add another charT to the list:
-      std::ptrdiff_t pos = reinterpret_cast<unsigned char*>(dat) - reinterpret_cast<unsigned char*>(data.data());
-      *reinterpret_cast<charT*>(data.extend(sizeof(charT))) = traits_inst.translate(c, (_flags & regbase::icase));
-      dat = reinterpret_cast<re_detail::re_syntax_base*>(reinterpret_cast<unsigned char*>(data.data()) + pos);
-      ++(static_cast<re_detail::re_literal*>(dat)->length);
-   }
-   else
-   {
-      // extend:
-      dat = add_simple(dat, re_detail::syntax_element_literal, sizeof(re_detail::re_literal) + sizeof(charT));
-      static_cast<re_detail::re_literal*>(dat)->length = 1;
-      *reinterpret_cast<charT*>(reinterpret_cast<re_detail::re_literal*>(dat)+1) = traits_inst.translate(c, (_flags & regbase::icase));
-   }
-   return dat;
-}
-
-template <class charT, class traits, class Allocator>
-unsigned int BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::probe_restart(re_detail::re_syntax_base* dat)
-{
-   switch(dat->type)
-   {
-   case re_detail::syntax_element_startmark:
-   case re_detail::syntax_element_endmark:
-      if(static_cast<const re_detail::re_brace*>(dat)->index == -2)
-         return regbase::restart_any;
-      return probe_restart(dat->next.p);
-   case re_detail::syntax_element_start_line:
-      return regbase::restart_line;
-   case re_detail::syntax_element_word_start:
-      return regbase::restart_word;
-   case re_detail::syntax_element_buffer_start:
-      return regbase::restart_buf;
-   case re_detail::syntax_element_restart_continue:
-      return regbase::restart_continue;
-   default:
-      return regbase::restart_any;
-   }
-}
-
-template <class charT, class traits, class Allocator>
-unsigned int BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::fixup_leading_rep(re_detail::re_syntax_base* dat, re_detail::re_syntax_base* end)
-{
-   unsigned int len = 0;
-   bool leading_lit = end ? false : true;
-   while(dat != end)
-   {
-      switch(dat->type)
-      {
-      case re_detail::syntax_element_literal:
-         len += static_cast<re_detail::re_literal*>(dat)->length;
-         if((leading_lit) && (static_cast<re_detail::re_literal*>(dat)->length > 2))
-         {
-            // we can do a literal search for the leading literal string
-            // using Knuth-Morris-Pratt (or whatever), and only then check for
-            // matches.  We need a decent length string though to make it
-            // worth while.
-            _leading_string = reinterpret_cast<charT*>(reinterpret_cast<char*>(dat) + sizeof(re_detail::re_literal));
-            _leading_string_len = static_cast<re_detail::re_literal*>(dat)->length;
-            _restart_type = restart_lit;
-            leading_lit = false;
-            const charT* p1 = _leading_string;
-            const charT* p2 = _leading_string + _leading_string_len;
-            pkmp = re_detail::kmp_compile(p1, p2, charT(), re_detail::kmp_translator<traits>(_flags&regbase::icase, &traits_inst), data.allocator());
-         }
-         leading_lit = false;
-         break;
-      case re_detail::syntax_element_wild:
-         ++len;
-         leading_lit = false;
-         break;
-      case re_detail::syntax_element_match:
-         return len;
-      case re_detail::syntax_element_backref:
-      //case re_detail::syntax_element_jump:
-      case re_detail::syntax_element_alt:
-      case re_detail::syntax_element_combining:
-         return 0;
-      case re_detail::syntax_element_long_set:
-      {
-         // we need to verify that there are no multi-character
-         // collating elements inside the repeat:
-         const charT* p = reinterpret_cast<const charT*>(reinterpret_cast<const char*>(dat) + sizeof(re_detail::re_set_long));
-         unsigned int csingles = static_cast<re_detail::re_set_long*>(dat)->csingles;
-         for(unsigned int i = 0; i < csingles; ++i)
-         {
-            if(re_detail::re_strlen(p) > 1)
-               return 0;
-            while(*p)++p;
-            ++p;
-         }
-         ++len;
-         leading_lit = false;
-         break;
-      }
-      case re_detail::syntax_element_set:
-         ++len;
-         leading_lit = false;
-         break;
-      case re_detail::syntax_element_rep:
-         if((len == 0) && (1 == fixup_leading_rep(dat->next.p, static_cast<re_detail::re_repeat*>(dat)->alt.p) ))
-         {
-            static_cast<re_detail::re_repeat*>(dat)->leading = leading_lit;
-            return len;
-         }
-         return len;
-      case re_detail::syntax_element_startmark:
-         if(static_cast<const re_detail::re_brace*>(dat)->index == -2)
-            return 0;
-         // fall through:
-      default:
-         break;
-      }
-      dat = dat->next.p;
-   }
-   return len;
-}
-
-template <class charT, class traits, class Allocator>
-void BOOST_REGEX_CALL reg_expression<charT, traits, Allocator>::fail(unsigned int err)
-{
-   error_code_  = err;
-   if(err)
-   {
-      _flags |= regbase::failbit;
-#ifndef BOOST_NO_EXCEPTIONS
-      if(_flags & regbase::use_except)
-      {
-         throw bad_expression(traits_inst.error_string(err));
-      }
-#endif
-   }
-   else
-      _flags &= ~regbase::failbit;
-}
-
-
-#ifdef __BORLANDC__
-  #pragma option pop
-#endif
-
-} // namespace boost
-
-
-#endif   // BOOST_REGEX_COMPILE_HPP
-
-
-
-
-
-
-
-
-
-
-
diff --git a/include/boost/regex/v3/regex_cstring.hpp b/include/boost/regex/v3/regex_cstring.hpp
deleted file mode 100644
index 82fd5d02..00000000
--- a/include/boost/regex/v3/regex_cstring.hpp
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- *
- * Copyright (c) 1998-2002
- * Dr 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         regex_cstring.hpp
-  *   VERSION      see <boost/version.hpp>
-  *   DESCRIPTION: This is an internal header file, do not include directly.
-  *                String support and helper functions, for regular
-  *                expression library.
-  */
-
-#ifndef BOOST_REGEX_CSTRING_HPP
-#define BOOST_REGEX_CSTRING_HPP
-
-#ifndef BOOST_REGEX_CONFIG_HPP
-#include <boost/regex/config.hpp>
-#endif
-
-#include <cstring>
-
-namespace boost{
-   namespace re_detail{
-
-#ifdef __BORLANDC__
-   #pragma option push -a8 -b -Vx -Ve -pc
-#endif
-
-//
-// start by defining some template function aliases for C API functions:
-//
-
-template <class charT>
-std::size_t BOOST_REGEX_CALL re_strlen(const charT *s)
-{
-   std::size_t len = 0;
-   while(*s)
-   {
-      ++s;
-      ++len;
-   }
-   return len;
-}
-
-inline std::size_t BOOST_REGEX_CALL re_strlen(const char *s)
-{
-   return std::strlen(s);
-}
-
-#ifndef BOOST_NO_WREGEX
-
-inline std::size_t BOOST_REGEX_CALL re_strlen(const wchar_t *s)
-{
-   return std::wcslen(s);
-}
-
-#endif
-
-#ifndef BOOST_NO_WREGEX
-BOOST_REGEX_DECL void BOOST_REGEX_CALL re_transform(std::basic_string<wchar_t>& out, const std::basic_string<wchar_t>& in);
-#endif
-BOOST_REGEX_DECL void BOOST_REGEX_CALL re_transform(std::string& out, const std::string& in);
-
-template <class charT>
-void BOOST_REGEX_CALL re_trunc_primary(std::basic_string<charT>& s)
-{
-   for(unsigned int i = 0; i < s.size(); ++i)
-   {
-      if(s[i] <= 1)
-      {
-         s.erase(i);
-         break;
-      }
-   }
-}
-
-inline char* BOOST_REGEX_CALL re_strcpy(char *s1, const char *s2)
-{
-   #if defined(__BORLANDC__) && defined(strcpy)
-   return ::strcpy(s1, s2);
-   #else
-   return std::strcpy(s1, s2);
-   #endif
-}
-
-#ifndef BOOST_NO_WREGEX
-
-inline wchar_t* BOOST_REGEX_CALL re_strcpy(wchar_t *s1, const wchar_t *s2)
-{
-   return std::wcscpy(s1, s2);
-}
-
-#endif
-
-
-template <class charT>
-charT* BOOST_REGEX_CALL re_strdup(const charT* p)
-{
-   charT* buf = new charT[re_strlen(p) + 1];
-   re_strcpy(buf, p);
-   return buf;
-}
-
-template <class charT>
-inline void BOOST_REGEX_CALL re_strfree(charT* p)
-{
-   delete[] p;
-}
-
-#ifdef __BORLANDC__
-  #pragma option pop
-#endif
-
-} // namespace re_detail
-} // namespace boost
-
-#endif  // BOOST_REGEX_CSTRING_HPP
-
-
-
-
-
-
diff --git a/include/boost/regex/v3/regex_format.hpp b/include/boost/regex/v3/regex_format.hpp
deleted file mode 100644
index 0d2c691b..00000000
--- a/include/boost/regex/v3/regex_format.hpp
+++ /dev/null
@@ -1,576 +0,0 @@
-/*
- *
- * Copyright (c) 1998-2002
- * Dr 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         regex_format.hpp
-  *   VERSION      see <boost/version.hpp>
-  *   DESCRIPTION: Provides formatting output routines for search and replace
-  *                operations.  Note this is an internal header file included
-  *                by regex.hpp, do not include on its own.
-  */
-
-#ifndef BOOST_REGEX_FORMAT_HPP
-#define BOOST_REGEX_FORMAT_HPP
-
-
-namespace boost{
-
-enum format_flags_t{
-   format_all = 0,                      // enable all extentions to sytax
-   format_sed = match_max << 1,         // sed style replacement.
-   format_perl = format_sed << 1,       // perl style replacement.
-   format_no_copy = format_perl << 1,   // don't copy non-matching segments.
-   format_first_only = format_no_copy << 1,   // Only replace first occurance.
-   format_is_if = format_first_only << 1   // internal use only.
-};
-
-namespace re_detail{
-
-#ifdef __BORLANDC__
-   #pragma option push -a8 -b -Vx -Ve -pc  -w-8037
-#endif
-
-template <class O, class I>
-O BOOST_REGEX_CALL re_copy_out(O out, I first, I last)
-{
-   while(first != last)
-   {
-      *out = *first;
-      ++out;
-      ++first;
-   }
-   return out;
-}
-
-template <class charT, class traits_type>
-void BOOST_REGEX_CALL re_skip_format(const charT*& fmt, const traits_type& traits_inst)
-{
-   // dwa 9/13/00 - suppress incorrect unused parameter warning for MSVC
-   (void)traits_inst;
-
-   typedef typename traits_type::size_type traits_size_type;
-   typedef typename traits_type::uchar_type traits_uchar_type;
-   typedef typename traits_type::string_type traits_string_type;
-
-   unsigned int parens = 0;
-   unsigned int c;
-   while(*fmt)
-   {
-      c = traits_inst.syntax_type((traits_size_type)(traits_uchar_type)(*fmt));
-      if((c == traits_type::syntax_colon) && (parens == 0))
-      {
-         ++fmt;
-         return;
-      }
-      else if(c == traits_type::syntax_close_bracket)
-      {
-         if(parens == 0)
-         {
-            ++fmt;
-            return;
-         }
-         --parens;
-      }
-      else if(c == traits_type::syntax_open_bracket)
-         ++parens;
-      else if(c == traits_type::syntax_slash)
-      {
-         ++fmt;
-         if(*fmt == 0)
-            return;
-      }
-      ++fmt;
-   }
-}
-
-#ifdef BOOST_NO_STD_OUTPUT_ITERATOR_ASSIGN
-
-//
-// ugly hack for buggy output iterators
-
-template <class T>
-inline void oi_assign(T* p, T v)
-{
-   ::boost::re_detail::pointer_destroy(p);
-   pointer_construct(p, v);
-}
-
-#else
-
-template <class T>
-inline void oi_assign(T* p, T v)
-{
-   //
-   // if you get a compile time error in here then you either
-   // need to rewrite your output iterator to make it assignable
-   // (as is required by the standard), or define
-   // BOOST_NO_STD_OUTPUT_ITERATOR_ASSIGN to use the ugly hack above
-   *p = v;
-}
-
-#endif
-
-
-#if defined(BOOST_REGEX_NO_TEMPLATE_SWITCH_MERGE)
-//
-// Ugly ugly hack,
-// template don't merge if they contain switch statements so declare these
-// templates in unnamed namespace (ie with internal linkage), each translation
-// unit then gets its own local copy, it works seemlessly but bloats the app.
-namespace{
-#endif
-
-//
-// algorithm reg_format:
-// takes the result of a match and a format string
-// and merges them to produce a new string which
-// is sent to an OutputIterator,
-// _reg_format_aux does the actual work:
-//
-template <class OutputIterator, class Iterator, class Allocator, class charT, class traits_type>
-OutputIterator BOOST_REGEX_CALL _reg_format_aux(OutputIterator out, 
-                          const match_results<Iterator, Allocator>& m, 
-                          const charT*& fmt,
-                          unsigned flags, const traits_type& traits_inst)
-{
-   const charT* fmt_end = fmt;
-   while(*fmt_end) ++ fmt_end;
-
-   typedef typename traits_type::size_type traits_size_type;
-   typedef typename traits_type::uchar_type traits_uchar_type;
-   typedef typename traits_type::string_type traits_string_type;
-
-   while(*fmt)
-   {
-      switch(traits_inst.syntax_type((traits_size_type)(traits_uchar_type)(*fmt)))
-      {
-      case traits_type::syntax_dollar:
-         if(flags & format_sed)
-         {
-            // no perl style replacement,
-            // $ is an ordinary character:
-            goto default_opt;
-         }
-         ++fmt;
-         if(*fmt == 0) // oops trailing $
-         {
-            --fmt;
-            *out = *fmt;
-            ++out;
-            return out;
-         }
-         switch(traits_inst.syntax_type((traits_size_type)(traits_uchar_type)(*fmt)))
-         {
-         case traits_type::syntax_start_buffer:
-            oi_assign(&out, re_copy_out(out, Iterator(m[-1].first), Iterator(m[-1].second)));
-            ++fmt;
-            continue;
-         case traits_type::syntax_end_buffer:
-            oi_assign(&out, re_copy_out(out, Iterator(m[-2].first), Iterator(m[-2].second)));
-            ++fmt;
-            continue;
-         case traits_type::syntax_digit:
-         {
-expand_sub:
-            unsigned int index = traits_inst.toi(fmt, fmt_end, 10);
-            oi_assign(&out, re_copy_out(out, Iterator(m[index].first), Iterator(m[index].second)));
-            continue;
-         }
-         }
-         // anything else:
-         if(*fmt == '&')
-         {
-            oi_assign(&out, re_copy_out(out, Iterator(m[0].first), Iterator(m[0].second)));
-            ++fmt;
-         }
-         else
-         {
-            // probably an error, treat as a literal '$'
-            --fmt;
-            *out = *fmt;
-            ++out;
-            ++fmt;
-         }
-         continue;
-      case traits_type::syntax_slash:
-      {
-         // escape sequence:
-         ++fmt;
-         charT c(*fmt);
-         if(*fmt == 0)
-         {
-            --fmt;
-            *out = *fmt;
-            ++out;
-            ++fmt;
-            return out;
-         }
-         switch(traits_inst.syntax_type((traits_size_type)(traits_uchar_type)(*fmt)))
-         {
-         case traits_type::syntax_a:
-            c = '\a';
-            ++fmt;
-            break;
-         case traits_type::syntax_f:
-            c = '\f';
-            ++fmt;
-            break;
-         case traits_type::syntax_n:
-            c = '\n';
-            ++fmt;
-            break;
-         case traits_type::syntax_r:
-            c = '\r';
-            ++fmt;
-            break;
-         case traits_type::syntax_t:
-            c = '\t';
-            ++fmt;
-            break;
-         case traits_type::syntax_v:
-            c = '\v';
-            ++fmt;
-            break;
-         case traits_type::syntax_x:
-            ++fmt;
-            if(fmt == fmt_end)
-            {
-               *out = *--fmt;
-               ++out;
-               return out;
-            }
-            // maybe have \x{ddd}
-            if(traits_inst.syntax_type((traits_size_type)(traits_uchar_type)(*fmt)) == traits_type::syntax_open_brace)
-            {
-               ++fmt;
-               if(fmt == fmt_end)
-               {
-                  fmt -= 2;
-                  *out = *fmt;
-                  ++out;
-                  ++fmt;
-                  continue;
-               }
-               if(traits_inst.is_class(*fmt, traits_type::char_class_xdigit) == false)
-               {
-                  fmt -= 2;
-                  *out = *fmt;
-                  ++out;
-                  ++fmt;
-                  continue;
-               }
-               c = (charT)traits_inst.toi(fmt, fmt_end, -16);
-               if(traits_inst.syntax_type((traits_size_type)(traits_uchar_type)(*fmt)) != traits_type::syntax_close_brace)
-               {
-                  while(traits_inst.syntax_type((traits_size_type)(traits_uchar_type)(*fmt)) != traits_type::syntax_slash)
-                     --fmt;
-                  ++fmt;
-                  *out = *fmt;
-                  ++out;
-                  ++fmt;
-                  continue;
-               }
-               ++fmt;
-               break;
-            }
-            else
-            {
-               if(traits_inst.is_class(*fmt, traits_type::char_class_xdigit) == false)
-               {
-                  --fmt;
-                  *out = *fmt;
-                  ++out;
-                  ++fmt;
-                  continue;
-               }
-               c = (charT)traits_inst.toi(fmt, fmt_end, -16);
-            }
-            break;
-         case traits_type::syntax_c:
-            ++fmt;
-            if(fmt == fmt_end)
-            {
-               --fmt;
-               *out = *fmt;
-               ++out;
-               return out;
-            }
-            if(((typename traits_type::uchar_type)(*fmt) < (typename traits_type::uchar_type)'@')
-                  || ((typename traits_type::uchar_type)(*fmt) > (typename traits_type::uchar_type)127) )
-            {
-               --fmt;
-               *out = *fmt;
-               ++out;
-               ++fmt;
-               break;
-            }
-            c = (charT)((typename traits_type::uchar_type)(*fmt) - (typename traits_type::uchar_type)'@');
-            ++fmt;
-            break;
-         case traits_type::syntax_e:
-            c = (charT)27;
-            ++fmt;
-            break;
-         case traits_type::syntax_digit:
-            if(flags & format_sed)
-               goto expand_sub;
-            else
-               c = (charT)traits_inst.toi(fmt, fmt_end, -8);
-            break;
-         default:
-            //c = *fmt;
-            ++fmt;
-         }
-         *out = c;
-         ++out;
-         continue;
-      }
-      case traits_type::syntax_open_bracket:
-         if(flags & (format_sed|format_perl))
-         {
-            *out = *fmt;
-            ++out;
-            ++fmt;
-            continue;
-         }
-         else
-         {
-            ++fmt;  // recurse
-            oi_assign(&out, _reg_format_aux(out, m, fmt, flags, traits_inst));
-            continue;
-         }
-      case traits_type::syntax_close_bracket:
-         if(flags & (format_sed|format_perl))
-         {
-            *out = *fmt;
-            ++out;
-            ++fmt;
-            continue;
-         }
-         else
-         {
-            ++fmt;  // return from recursion
-            return out;
-         }
-      case traits_type::syntax_colon:
-         if(flags & format_is_if)
-         {
-            ++fmt;
-            return out;
-         }
-         *out = *fmt;
-         ++out;
-         ++fmt;
-         continue;
-      case traits_type::syntax_question:
-      {
-         if(flags & (format_sed|format_perl))
-         {
-            *out = *fmt;
-            ++out;
-            ++fmt;
-            continue;
-         }
-         else
-         {
-            ++fmt;
-            if(*fmt == 0)
-            {
-               --fmt;
-               *out = *fmt;
-               ++out;
-               ++fmt;
-               return out;
-            }
-            unsigned int id = traits_inst.toi(fmt, fmt_end, 10);
-            if(m[id].matched)
-            {
-               oi_assign(&out, _reg_format_aux(out, m, fmt, flags | format_is_if, traits_inst));
-               if(traits_inst.syntax_type((traits_size_type)(traits_uchar_type)(*(fmt-1))) == traits_type::syntax_colon)
-                  re_skip_format(fmt, traits_inst);
-            }
-            else
-            {
-               re_skip_format(fmt, traits_inst);
-               if(traits_inst.syntax_type((traits_size_type)(traits_uchar_type)(*(fmt-1))) == traits_type::syntax_colon)
-                  oi_assign(&out, _reg_format_aux(out, m, fmt, flags | format_is_if, traits_inst));
-            }
-            return out;
-         }
-      }
-      default:
-default_opt:
-         if((flags & format_sed) && (*fmt == '&'))
-         {
-            oi_assign(&out, re_copy_out(out, Iterator(m[0].first), Iterator(m[0].second)));
-            ++fmt;
-            continue;
-         }
-         *out = *fmt;
-         ++out;
-         ++fmt;
-      }
-   }
-
-   return out;
-}
-
-#if defined(BOOST_REGEX_NO_TEMPLATE_SWITCH_MERGE)
-} // namespace
-#endif
-
-template <class S>
-class string_out_iterator
-{
-   S* out;
-public:
-   string_out_iterator(S& s) : out(&s) {}
-   string_out_iterator& operator++() { return *this; }
-   string_out_iterator& operator++(int) { return *this; }
-   string_out_iterator& operator*() { return *this; }
-   string_out_iterator& operator=(typename S::value_type v) 
-   { 
-      out->append(1, v); 
-      return *this; 
-   }
-};
-
-template <class OutputIterator, class Iterator, class charT, class Allocator, class traits_type>
-class merge_out_predicate
-{
-   OutputIterator* out;
-   Iterator* last;
-   const charT* fmt;
-   unsigned flags;
-   const traits_type* pt;
-
-public:
-   merge_out_predicate(OutputIterator& o, Iterator& pi, const charT* f, unsigned format_flags, const traits_type& p)
-      : out(&o), last(&pi), fmt(f), flags(format_flags), pt(&p){}
-
-   ~merge_out_predicate() {}
-   bool BOOST_REGEX_CALL operator()(const boost::match_results<Iterator, Allocator>& m)
-   {
-      const charT* f = fmt;
-      if(0 == (flags & format_no_copy))
-         oi_assign(out, re_copy_out(*out, Iterator(m[-1].first), Iterator(m[-1].second)));
-      oi_assign(out, _reg_format_aux(*out, m, f, flags, *pt));
-      *last = m[-2].first;
-      return flags & format_first_only ? false : true;
-   }
-};
-
-} // namespace re_detail
-
-template <class OutputIterator, class Iterator, class Allocator, class charT>
-OutputIterator regex_format(OutputIterator out,
-                          const match_results<Iterator, Allocator>& m,
-                          const charT* fmt,
-                          unsigned flags = 0
-                         )
-{
-   regex_traits<charT> t;
-   return re_detail::_reg_format_aux(out, m, fmt, flags, t);
-}
-
-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,
-                          unsigned flags = 0
-                         )
-{
-   regex_traits<charT> t;
-   const charT* start = fmt.c_str();
-   return re_detail::_reg_format_aux(out, m, start, flags, t);
-}  
-
-template <class Iterator, class Allocator, class charT>
-std::basic_string<charT> regex_format(const match_results<Iterator, Allocator>& m, const charT* fmt, unsigned flags = 0)
-{
-   std::basic_string<charT> result;
-   re_detail::string_out_iterator<std::basic_string<charT> > i(result);
-   regex_format(i, m, fmt, flags);
-   return result;
-}
-
-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, unsigned flags = 0)
-{
-   std::basic_string<charT> result;
-   re_detail::string_out_iterator<std::basic_string<charT> > i(result);
-   regex_format(i, m, fmt.c_str(), flags);
-   return result;
-}
-
-template <class OutputIterator, class Iterator, class traits, class Allocator, class charT>
-OutputIterator regex_merge(OutputIterator out,
-                         Iterator first,
-                         Iterator last,
-                         const reg_expression<charT, traits, Allocator>& e, 
-                         const charT* fmt, 
-                         unsigned int flags = match_default)
-{
-   Iterator l = first;
-   re_detail::merge_out_predicate<OutputIterator, Iterator, charT, Allocator, traits> oi(out, l, fmt, flags, e.get_traits());
-   regex_grep(oi, first, last, e, flags);
-   return (flags & format_no_copy) ? out : re_detail::re_copy_out(out, l, last);
-}
-
-template <class OutputIterator, class Iterator, class traits, class Allocator, class charT>
-inline OutputIterator regex_merge(OutputIterator out,
-                         Iterator first,
-                         Iterator last,
-                         const reg_expression<charT, traits, Allocator>& e, 
-                         const std::basic_string<charT>& fmt,
-                         unsigned int flags = match_default)
-{
-   return regex_merge(out, first, last, e, fmt.c_str(), flags);
-}
-
-template <class traits, class Allocator, class charT>
-std::basic_string<charT> regex_merge(const std::basic_string<charT>& s,
-                         const reg_expression<charT, traits, Allocator>& e, 
-                         const charT* fmt,
-                         unsigned int flags = match_default)
-{
-   std::basic_string<charT> result;
-   re_detail::string_out_iterator<std::basic_string<charT> > i(result);
-   regex_merge(i, s.begin(), s.end(), e, fmt, flags);
-   return result;
-}
-
-template <class traits, class Allocator, class charT>
-std::basic_string<charT> regex_merge(const std::basic_string<charT>& s,
-                         const reg_expression<charT, traits, Allocator>& e, 
-                         const std::basic_string<charT>& fmt,
-                         unsigned int flags = match_default)
-{
-   std::basic_string<charT> result;
-   re_detail::string_out_iterator<std::basic_string<charT> > i(result);
-   regex_merge(i, s.begin(), s.end(), e, fmt.c_str(), flags);
-   return result;
-}
-
-#ifdef __BORLANDC__
-  #pragma option pop
-#endif
-
-} // namespace boost
-
-#endif  // BOOST_REGEX_FORMAT_HPP
-
-
-
-
-
-
diff --git a/include/boost/regex/v3/regex_fwd.hpp b/include/boost/regex/v3/regex_fwd.hpp
deleted file mode 100644
index ef817f70..00000000
--- a/include/boost/regex/v3/regex_fwd.hpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- *
- * Copyright (c) 1998-2002
- * Dr 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         regex_fwd.cpp
-  *   VERSION      see <boost/version.hpp>
-  *   DESCRIPTION: Forward declares boost::reg_expression<> and
-  *                associated typedefs.
-  */
-
-#ifndef BOOST_REGEX_FWD_HPP_INCLUDED
-#define BOOST_REGEX_FWD_HPP_INCLUDED
-
-#ifndef BOOST_REGEX_CONFIG_HPP
-#include <boost/config.hpp>
-#endif
-#include <boost/regex/config/allocator.hpp>
-
-//
-// define BOOST_REGEX_NO_FWD if this
-// header doesn't work!
-//
-#ifdef BOOST_REGEX_NO_FWD
-#  ifndef BOOST_RE_REGEX_HPP
-#     include <boost/regex.hpp>
-#  endif
-#else
-
-//
-// If there isn't good enough wide character support then there will
-// be no wide character regular expressions:
-//
-#if (defined(BOOST_NO_CWCHAR) || defined(BOOST_NO_CWCTYPE) || defined(BOOST_NO_STD_WSTRING)) && !defined(BOOST_NO_WREGEX)
-#  define BOOST_NO_WREGEX
-#endif
-
-namespace boost{
-
-template <class charT>
-class regex_traits;
-
-template <class charT, class traits = regex_traits<charT>, class Allocator = BOOST_DEFAULT_ALLOCATOR(charT) >
-class reg_expression;
-
-typedef reg_expression<char, regex_traits<char>, BOOST_DEFAULT_ALLOCATOR(char) > regex;
-#ifndef BOOST_NO_WREGEX
-typedef reg_expression<wchar_t, regex_traits<wchar_t>, BOOST_DEFAULT_ALLOCATOR(wchar_t) > wregex;
-#endif
-
-} // namespace boost
-
-#endif  // BOOST_REGEX_NO_FWD
-
-#endif
-
-
-
-
diff --git a/include/boost/regex/v3/regex_kmp.hpp b/include/boost/regex/v3/regex_kmp.hpp
deleted file mode 100644
index 55403f64..00000000
--- a/include/boost/regex/v3/regex_kmp.hpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- *
- * Copyright (c) 1998-2002
- * Dr 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         regex_kmp.hpp
-  *   VERSION      see <boost/version.hpp>
-  *   DESCRIPTION: Provides Knuth Morris Pratt search operations.
-  *                Note this is an internal header file included
-  *                by regex.hpp, do not include on its own.
-  */
-
-#ifndef BOOST_REGEX_KMP_HPP
-#define BOOST_REGEX_KMP_HPP
-
-#ifdef BOOST_REGEX_CONFIG_HPP
-#include <boost/regex/config.hpp>
-#endif
-
-
-namespace boost{
-   namespace re_detail{
-
-#ifdef __BORLANDC__
-   #pragma option push -a8 -b -Vx -Ve -pc
-#endif
-
-template <class charT>
-struct kmp_info
-{
-   unsigned int size;
-   unsigned int len;
-   const charT* pstr;
-   int kmp_next[1];
-};
-
-template <class charT, class Allocator>
-void kmp_free(kmp_info<charT>* pinfo, const Allocator& a)
-{
-   typedef typename boost::detail::rebind_allocator<char, Allocator>::type atype;
-   atype(a).deallocate(reinterpret_cast<char*>(pinfo), pinfo->size);
-}
-
-template <class iterator, class charT, class Trans, class Allocator>
-kmp_info<charT>* kmp_compile(iterator first, iterator last, charT, Trans translate, const Allocator& a) 
-{    
-   typedef typename boost::detail::rebind_allocator<char, Allocator>::type atype;
-   int i, j, m;
-   i = 0;
-   m = static_cast<int>(boost::re_detail::distance(first, last));
-   ++m;
-   unsigned int size = sizeof(kmp_info<charT>) + sizeof(int)*m + sizeof(charT)*m;
-   --m;
-   //
-   // allocate struct and fill it in:
-   //
-   kmp_info<charT>* pinfo = reinterpret_cast<kmp_info<charT>*>(atype(a).allocate(size));
-   BOOST_REGEX_NOEH_ASSERT(pinfo)
-   pinfo->size = size;
-   pinfo->len = m;
-   charT* p = reinterpret_cast<charT*>(reinterpret_cast<char*>(pinfo) + sizeof(kmp_info<charT>) + sizeof(int)*(m+1));
-   pinfo->pstr = p;
-   while(first != last)
-   {
-      *p = translate(*first);
-      ++first;
-      ++p;
-   }
-   *p = 0;
-   //
-   // finally do regular kmp compile:
-   //
-   j = pinfo->kmp_next[0] = -1;
-   while (i < m) 
-   {
-      while ((j > -1) && (pinfo->pstr[i] != pinfo->pstr[j])) 
-         j = pinfo->kmp_next[j];
-      ++i;
-      ++j;
-      if (pinfo->pstr[i] == pinfo->pstr[j]) 
-         pinfo->kmp_next[i] = pinfo->kmp_next[j];
-      else 
-         pinfo->kmp_next[i] = j;
-   }
-
-   return pinfo;
-}
-
-#ifdef __BORLANDC__
-  #pragma option pop
-#endif
-
-   } // namepsace re_detail
-} // namespace boost
-
-#endif   // BOOST_REGEX_KMP_HPP
-
-
-
-
diff --git a/include/boost/regex/v3/regex_library_include.hpp b/include/boost/regex/v3/regex_library_include.hpp
deleted file mode 100644
index d054ec2e..00000000
--- a/include/boost/regex/v3/regex_library_include.hpp
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- *
- * Copyright (c) 1998-2002
- * Dr 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         regex_libary_include.hpp
-  *   VERSION      see <boost/version.hpp>
-  *   DESCRIPTION: Automatic library inclusion for Borland/Microsoft compilers.
-  *                Note this is an internal header file included
-  *                by regex.hpp, do not include on its own.
-  */
-
-/*************************************************************************
-
-Libraries for Borland and Microsoft compilers are automatically
-selected here, the name of the lib is selected according to the following
-formula:
-
-BOOST_LIB_NAME
-   + "_"
-   + BOOST_LIB_TOOLSET
-   + "_"
-   + BOOST_LIB_THREAD_OPT
-   + BOOST_LIB_RT_OPT
-   + BOOST_LIB_LINK_OPT
-   + BOOST_LIB_DEBUG_OPT
-
-These are defined as:
-
-BOOST_LIB_NAME:       The base name of the lib (boost_regex).
-
-BOOST_LIB_TOOLSET:    The compiler toolset name (vc6, vc7, bcb5 etc).
-
-BOOST_LIB_THREAD_OPT: "s" for single thread builds,
-                      "m" for multithread builds.
-
-BOOST_LIB_RT_OPT:     "s" for static runtime,
-                      "d" for dynamic runtime.
-
-BOOST_LIB_LINK_OPT:   "s" for static link,
-                      "i" for dynamic link.
-
-BOOST_LIB_DEBUG_OPT:  nothing for release builds,
-                      "d" for debug builds,
-                      "dd" for debug-diagnostic builds (_STLP_DEBUG).
-
-***************************************************************************/
-
-#if !defined(BOOST_REGEX_LIBRARY_INCLUDE_HPP) && !defined(BOOST_REGEX_NO_LIB)
-#define BOOST_REGEX_LIBRARY_INCLUDE_HPP
-
-#define BOOST_LIB_NAME "boost_regex"
-
-//
-// select toolset:
-//
-#if defined(BOOST_MSVC) && (BOOST_MSVC == 1200) && (defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION))
-
-   // vc6-stlport:
-#  define BOOST_LIB_TOOLSET "vc6-stlport"
-
-#elif defined(BOOST_MSVC) && (BOOST_MSVC == 1200)
-
-   // vc6:
-#  define BOOST_LIB_TOOLSET "vc6"
-
-#elif defined(BOOST_MSVC) && (BOOST_MSVC >= 1300)
-
-   // vc7:
-#  define BOOST_LIB_TOOLSET "vc7"
-
-#elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x560)
-
-   // CBuilder 6:
-#  define BOOST_LIB_TOOLSET "bcb6"
-
-#elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x550)
-
-   // CBuilder 6:
-#  define BOOST_LIB_TOOLSET "bcb5"
-
-#elif defined(__BORLANDC__) && (__BORLANDC__ >= 0x540)
-
-   // CBuilder 6:
-#  define BOOST_LIB_TOOLSET "bcb4"
-
-#endif
-
-//
-// select thread opt:
-//
-#if defined(_MT) || defined(__MT__)
-#  define BOOST_LIB_THREAD_OPT "m"
-#else
-#  define BOOST_LIB_THREAD_OPT "s"
-#endif
-
-//
-// select runtime opt:
-//
-#if defined(_DLL) || defined(_RTLDLL)
-#  define BOOST_LIB_RT_OPT "d"
-#else
-#  define BOOST_LIB_RT_OPT "s"
-#endif
-
-//
-// select linkage opt:
-//
-#if (defined(_DLL) || defined(_RTLDLL)) && !defined(BOOST_REGEX_STATIC_LINK)
-#  define BOOST_LIB_LINK_OPT "i"
-#else
-#  define BOOST_LIB_LINK_OPT "s"
-#endif
-
-//
-// select debug opt:
-//
-#if defined(BOOST_MSVC) && defined(_DEBUG) && (defined(_STLP_DEBUG) || defined(__STL_DEBUG))
-#  define BOOST_LIB_DEBUG_OPT "dd"
-#elif defined(BOOST_MSVC) && defined(_DEBUG)
-#  define BOOST_LIB_DEBUG_OPT "d"
-#elif defined(__BORLANDC__) && (__BORLANDC__ == 0x560) && (defined(_STLP_DEBUG) || defined(__STL_DEBUG))
-#  define BOOST_LIB_DEBUG_OPT "dd"
-#else
-#  define BOOST_LIB_DEBUG_OPT 
-#endif
-
-//
-// now include the lib:
-//
-#if defined(BOOST_LIB_NAME) \
-      && defined(BOOST_LIB_TOOLSET) \
-      && defined(BOOST_LIB_THREAD_OPT) \
-      && defined(BOOST_LIB_RT_OPT) \
-      && defined(BOOST_LIB_LINK_OPT) \
-      && defined(BOOST_LIB_DEBUG_OPT)
-
-#  pragma comment(lib, BOOST_LIB_NAME "_" BOOST_LIB_TOOLSET "_" BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT BOOST_LIB_LINK_OPT BOOST_LIB_DEBUG_OPT ".lib")
-
-#endif
-
-//
-// finally undef any macros we may have set:
-//
-#if defined(BOOST_LIB_NAME)
-#  undef BOOST_LIB_NAME
-#endif
-#if defined(BOOST_LIB_TOOLSET)
-#  undef BOOST_LIB_TOOLSET
-#endif
-#if defined(BOOST_LIB_THREAD_OPT)
-#  undef BOOST_LIB_THREAD_OPT
-#endif
-#if defined(BOOST_LIB_RT_OPT)
-#  undef BOOST_LIB_RT_OPT
-#endif
-#if defined(BOOST_LIB_LINK_OPT)
-#  undef BOOST_LIB_LINK_OPT
-#endif
-#if defined(BOOST_LIB_DEBUG_OPT)
-#  undef BOOST_LIB_DEBUG_OPT
-#endif
-
-
-#endif // BOOST_REGEX_LIBRARY_INCLUDE_HPP
-
-
-
-
-
-
-
diff --git a/include/boost/regex/v3/regex_match.hpp b/include/boost/regex/v3/regex_match.hpp
deleted file mode 100644
index 66db56e8..00000000
--- a/include/boost/regex/v3/regex_match.hpp
+++ /dev/null
@@ -1,2013 +0,0 @@
-/*
- *
- * Copyright (c) 1998-2002
- * Dr 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         regex_match.hpp
-  *   VERSION      see <boost/version.hpp>
-  *   DESCRIPTION: Regular expression matching algorithms.
-  *                Note this is an internal header file included
-  *                by regex.hpp, do not include on its own.
-  */
-
-
-#ifndef BOOST_REGEX_MATCH_HPP
-#define BOOST_REGEX_MATCH_HPP
-
-#ifndef BOOST_REGEX_MAX_STATE_COUNT
-#  define BOOST_REGEX_MAX_STATE_COUNT 100000000
-#endif
-
-#include <boost/limits.hpp>
-
-
-namespace boost{
-   namespace re_detail{
-
-#ifdef __BORLANDC__
-   #pragma option push -a8 -b -Vx -Ve -pc  -w-8026 -w-8027
-#endif
-
-//
-// Unfortunately Rogue Waves standard library appears to have a bug
-// in std::basic_string::compare that results in eroneous answers
-// in some cases (tested with Borland C++ 5.1, Rogue Wave lib version
-// 0x020101) the test case was:
-// {39135,0} < {0xff,0}
-// which succeeds when it should not.
-//
-#ifndef _RWSTD_VER
-# define STR_COMP(s,p) s.compare(p)
-#else
-template <class C, class T, class A>
-inline int string_compare(const std::basic_string<C,T,A>& s, const C* p)
-{ return s.compare(p); }
-inline int string_compare(const std::string& s, const char* p)
-{ return std::strcmp(s.c_str(), p); }
-# ifndef BOOST_NO_WREGEX
-inline int string_compare(const std::wstring& s, const wchar_t* p)
-{ return std::wcscmp(s.c_str(), p); }
-# endif
-# define STR_COMP(s,p) string_compare(s,p)
-#endif
-
-template<class charT>
-inline const charT* re_skip_past_null(const charT* p)
-{
-  while (*p != 0) ++p;
-  return ++p;
-}
-
-template <class iterator, class charT, class traits_type, class Allocator>
-iterator BOOST_REGEX_CALL re_is_set_member(iterator next, 
-                          iterator last, 
-                          const re_set_long* set_, 
-                          const reg_expression<charT, traits_type, Allocator>& e)
-{   
-   const charT* p = reinterpret_cast<const charT*>(set_+1);
-   iterator ptr;
-   unsigned int i;
-   bool icase = e.flags() & regbase::icase;
-
-   if(next == last) return next;
-
-   typedef typename traits_type::string_type traits_string_type;
-   const traits_type& traits_inst = e.get_traits();
-   
-   // dwa 9/13/00 suppress incorrect MSVC warning - it claims this is never
-   // referenced
-   (void)traits_inst;
-
-   // try and match a single character, could be a multi-character
-   // collating element...
-   for(i = 0; i < set_->csingles; ++i)
-   {
-      ptr = next;
-      if(*p == 0)
-      {
-         // treat null string as special case:
-         if(traits_inst.translate(*ptr, icase) != *p)
-         {
-            while(*p == 0)++p;
-            continue;
-         }
-         return set_->isnot ? next : (ptr == next) ? ++next : ptr;
-      }
-      else
-      {
-         while(*p && (ptr != last))
-         {
-            if(traits_inst.translate(*ptr, icase) != *p)
-               break;
-            ++p;
-            ++ptr;
-         }
-
-         if(*p == 0) // if null we've matched
-            return set_->isnot ? next : (ptr == next) ? ++next : ptr;
-
-         p = re_skip_past_null(p);     // skip null
-      }
-   }
-
-   charT col = traits_inst.translate(*next, icase);
-
-
-   if(set_->cranges || set_->cequivalents)
-   {
-      traits_string_type s2(1, col);
-      traits_string_type s1;
-      //
-      // try and match a range, NB only a single character can match
-      if(set_->cranges)
-      {
-         if(e.flags() & regbase::nocollate)
-            s1 = s2;
-         else
-            traits_inst.transform(s1, s2);
-         for(i = 0; i < set_->cranges; ++i)
-         {
-            if(STR_COMP(s1, p) <= 0)
-            {
-               while(*p)++p;
-               ++p;
-               if(STR_COMP(s1, p) >= 0)
-                  return set_->isnot ? next : ++next;
-            }
-            else
-            {
-               // skip first string
-               while(*p)++p;
-               ++p;
-            }
-            // skip second string
-            while(*p)++p;
-            ++p;
-         }
-      }
-      //
-      // try and match an equivalence class, NB only a single character can match
-      if(set_->cequivalents)
-      {
-         traits_inst.transform_primary(s1, s2);
-         for(i = 0; i < set_->cequivalents; ++i)
-         {
-            if(STR_COMP(s1, p) == 0)
-               return set_->isnot ? next : ++next;
-            // skip string
-            while(*p)++p;
-            ++p;
-         }
-      }
-   }
-   if(traits_inst.is_class(col, set_->cclasses) == true)
-      return set_->isnot ? next : ++next;
-   return set_->isnot ? ++next : next;
-}
-
-template <class iterator, class Allocator>
-class _priv_match_data
-{
-public:
-   typedef typename boost::detail::rebind_allocator<int, Allocator>::type i_alloc;
-   typedef typename boost::detail::rebind_allocator<iterator, Allocator>::type it_alloc;
-   typedef typename regex_iterator_traits<iterator>::difference_type difference_type;
-
-   match_results_base<iterator, Allocator> temp_match;
-   // failure stacks:
-   jstack<match_results_base<iterator, Allocator>, Allocator> matches;
-   jstack<iterator, Allocator> prev_pos;
-   jstack<const re_syntax_base*, Allocator> prev_record;
-   jstack<int, Allocator> prev_acc;
-   int* accumulators;
-   unsigned int caccumulators;
-   difference_type state_count;
-   difference_type max_state_count;
-   iterator* loop_starts;
-
-   _priv_match_data(const match_results_base<iterator, Allocator>&, iterator, iterator, std::size_t);
-   
-   ~_priv_match_data()
-   {
-      m_free();
-   }
-   void m_free();
-   void set_accumulator_size(unsigned int size);
-   int* get_accumulators()
-   {
-      return accumulators;
-   }
-   iterator* get_loop_starts()
-   {
-      return loop_starts;
-   }
-   void estimate_max_state_count(iterator a, iterator b, std::size_t states, std::random_access_iterator_tag*)
-   {
-      difference_type dist = boost::re_detail::distance(a,b);
-      states *= states;
-      difference_type lim = (std::numeric_limits<difference_type>::max)() - 1000 - states;
-      if(dist > (difference_type)(lim / states))
-         max_state_count = lim;
-      else
-         max_state_count = 1000 + states * dist;
-   }
-   void estimate_max_state_count(iterator a, iterator b, std::size_t states, void*)
-   {
-      // we don't know how long the sequence is:
-      max_state_count = BOOST_REGEX_MAX_STATE_COUNT;
-   }
-};
-
-template <class iterator, class Allocator>
-_priv_match_data<iterator, Allocator>::_priv_match_data(const match_results_base<iterator, Allocator>& m, iterator a, iterator b, std::size_t states)
-  : temp_match(m), matches(64, m.allocator()), prev_pos(64, m.allocator()), prev_record(64, m.allocator())
-{
-  typedef typename regex_iterator_traits<iterator>::iterator_category category;
-  
-  accumulators = 0;
-  caccumulators = 0;
-  loop_starts = 0;
-  state_count = 0;
-  estimate_max_state_count(a, b, states, static_cast<category*>(0));
-}
-
-template <class iterator, class Allocator>
-void _priv_match_data<iterator, Allocator>::set_accumulator_size(unsigned int size)
-{
-   if(size > caccumulators)
-   {
-      m_free();
-      caccumulators = size;
-      accumulators = i_alloc(temp_match.allocator()).allocate(caccumulators);
-      BOOST_REGEX_NOEH_ASSERT(accumulators)
-      loop_starts = it_alloc(temp_match.allocator()).allocate(caccumulators);
-      BOOST_REGEX_NOEH_ASSERT(loop_starts)
-      for(unsigned i = 0; i < caccumulators; ++i)
-         new (loop_starts + i) iterator();
-   }
-}
-
-template <class iterator, class Allocator>
-void _priv_match_data<iterator, Allocator>::m_free()
-{
-   if(caccumulators)
-   {
-      i_alloc temp1(temp_match.allocator());
-      temp1.deallocate(accumulators, caccumulators);
-      for(unsigned i = 0; i < caccumulators; ++i)
-         ::boost::re_detail::pointer_destroy(loop_starts + i);
-      it_alloc temp2(temp_match.allocator());
-      temp2.deallocate(loop_starts, caccumulators);
-   }
-}
-
-template <class charT, class traits, class Allocator>
-struct access_t : public reg_expression<charT, traits, Allocator>
-{
-   typedef typename is_byte<charT>::width_type width_type;
-   typedef reg_expression<charT, traits, Allocator> base_type;
-   typedef charT char_type;
-   typedef traits traits_type;
-   typedef Allocator alloc_type;
-
-   static int repeat_count(const base_type& b) 
-   { return base_type::repeat_count(b); }
-   static unsigned int restart_type(const base_type& b) 
-   { return base_type::restart_type(b); }
-   static const re_syntax_base* first(const base_type& b)
-   { return base_type::first(b); }
-   static const unsigned char* get_map(const base_type& b)
-   { return base_type::get_map(b); }
-   static std::size_t leading_length(const base_type& b)
-   { return base_type::leading_length(b); }
-   static const kmp_info<charT>* get_kmp(const base_type& b)
-   { return base_type::get_kmp(b); }
-   static bool can_start(char_type c, const unsigned char* _map, unsigned char mask)
-   {
-      return reg_expression<char_type, traits_type, alloc_type>::can_start(c, _map, mask, width_type());
-   }
-};
-
-
-#if defined(BOOST_REGEX_NO_TEMPLATE_SWITCH_MERGE)
-//
-// Ugly ugly hack,
-// template don't merge if they contain switch statements so declare these
-// templates in unnamed namespace (ie with internal linkage), each translation
-// unit then gets its own local copy, it works seemlessly but bloats the app.
-namespace{
-#endif
-
-template <class iterator, class Allocator, class charT, class traits, class Allocator2>
-bool query_match_aux(iterator first, 
-                     iterator last, 
-                     match_results<iterator, Allocator>& m, 
-                     const reg_expression<charT, traits, Allocator2>& e, 
-                     unsigned flags,
-                     _priv_match_data<iterator, Allocator>& pd,
-                     iterator* restart)
-{
-   typedef access_t<charT, traits, Allocator2> access;
-
-   if(e.flags() & regbase::failbit)
-      return false;
-
-   typedef typename traits::size_type traits_size_type;
-   typedef typename traits::uchar_type traits_uchar_type;
-   typedef typename is_byte<charT>::width_type width_type;
-   typedef typename re_detail::regex_iterator_traits<iterator>::difference_type difference_type;
-
-   // declare some local aliases to reduce pointer loads
-   // good optimising compilers should make this unnecessary!!
-   jstack<match_results_base<iterator, Allocator>, Allocator>& matches = pd.matches;
-   jstack<iterator, Allocator>& prev_pos = pd.prev_pos;
-   jstack<const re_syntax_base*, Allocator>& prev_record = pd.prev_record;
-   jstack<int, Allocator>& prev_acc = pd.prev_acc;
-   match_results_base<iterator, Allocator>& temp_match = pd.temp_match;
-   temp_match.set_first(first);
-   difference_type& state_count = pd.state_count;
-
-   const re_syntax_base* ptr = access::first(e);
-   bool match_found = false;
-   bool have_partial_match = false;
-   bool unwind_stack = false;
-   bool need_push_match = (e.mark_count() > 1);
-   int cur_acc = -1;    // no active accumulator
-   pd.set_accumulator_size(access::repeat_count(e));
-   int* accumulators = pd.get_accumulators();
-   iterator* start_loop = pd.get_loop_starts();
-   int k; // for loops
-   bool icase = e.flags() & regbase::icase;
-   *restart = first;
-   iterator base = first;
-   const traits& traits_inst = e.get_traits();
-   // dwa 9/13/00 suppress incorrect MSVC warning - it claims this is never
-   // referenced
-   (void)traits_inst;
-
-   // prepare m for failure:
-   /*
-   if((flags & match_init) == 0)
-   {
-      m.init_fail(first, last);
-   } */
-
-   retry:
-
-   while(first != last)
-   {
-      jm_assert(ptr);
-      ++state_count;
-      switch(ptr->type)
-      {
-      case syntax_element_match:
-         match_jump:
-         {
-            // match found, save then fallback in case we missed a
-            // longer one.
-            if((flags & match_not_null) && (first == temp_match[0].first))
-               goto failure;
-            if((flags & match_all) && (first != last))
-               goto failure;
-            temp_match.set_second(first);
-            m.maybe_assign(temp_match);
-            match_found = true;
-            if(((flags & match_any) && ((first == last) || !(flags & match_all))) || ((first == last) && (need_push_match == false)))
-            {
-               // either we don't care what we match or we've matched
-               // the whole string and can't match anything longer.
-               while(matches.empty() == false)
-                  matches.pop();
-               while(prev_pos.empty() == false)
-                  prev_pos.pop();
-               while(prev_record.empty() == false)
-                  prev_record.pop();
-               while(prev_acc.empty() == false)
-                  prev_acc.pop();
-               return true;
-            }
-         }
-         goto failure;
-      case syntax_element_startmark:
-         start_mark_jump:
-         if(static_cast<const re_brace*>(ptr)->index > 0)
-         {
-            temp_match.set_first(first, static_cast<const re_brace*>(ptr)->index);
-         }
-         else if(
-            (static_cast<const re_brace*>(ptr)->index == -1)
-            || (static_cast<const re_brace*>(ptr)->index == -2)
-         )
-         {
-           matches.push(temp_match);
-            for(k = 0; k <= cur_acc; ++k)
-               prev_pos.push(start_loop[k]);
-            prev_pos.push(first);
-            prev_record.push(ptr);
-            for(k = 0; k <= cur_acc; ++k)
-               prev_acc.push(accumulators[k]);
-            prev_acc.push(cur_acc);
-            prev_acc.push(match_found);
-            match_found = false;
-            // skip next jump and fall through:
-            ptr = ptr->next.p;
-         }
-         ptr = ptr->next.p;
-         break;
-      case syntax_element_endmark:
-         end_mark_jump:
-         if(static_cast<const re_brace*>(ptr)->index > 0)
-         {
-            temp_match.set_second(first, static_cast<const re_brace*>(ptr)->index);
-         }
-         else if(
-            (static_cast<const re_brace*>(ptr)->index == -1)
-            || (static_cast<const re_brace*>(ptr)->index == -2)
-         )
-         {
-            match_found = true;
-            unwind_stack = true;
-            goto failure;
-         }
-         ptr = ptr->next.p;
-         break;
-      case syntax_element_literal:
-      {
-         unsigned int len = static_cast<const re_literal*>(ptr)->length;
-         const charT* what = reinterpret_cast<const charT*>(static_cast<const re_literal*>(ptr) + 1);
-         //
-         // compare string with what we stored in
-         // our records:
-         for(unsigned int i = 0; i < len; ++i, ++first)
-         {
-            if((first == last) || (traits_inst.translate(*first, icase) != what[i]))
-               goto failure;
-         }
-         ptr = ptr->next.p;
-         break;
-      }
-      case syntax_element_start_line:
-         outer_line_check:
-         if(first == temp_match[0].first)
-         {
-            // we're at the start of the buffer
-            if(flags & match_prev_avail)
-            {
-               inner_line_check:
-               // check the previous value even though its before
-               // the start of our "buffer".
-               iterator t(first);
-               --t;
-               if(traits::is_separator(*t) && !((*t == '\r') && (*first == '\n')) )
-               {
-                  ptr = ptr->next.p;
-                  continue;
-               }
-               goto failure;
-            }
-            if((flags & match_not_bol) == 0)
-            {
-               ptr = ptr->next.p;
-               continue;
-            }
-            goto failure;
-         }
-         // we're in the middle of the string
-         goto inner_line_check;
-      case syntax_element_end_line:
-         // we're not yet at the end so *first is always valid:
-         if(traits::is_separator(*first))
-         {
-            if((first != base) || (flags & match_prev_avail))
-            {
-               // check that we're not in the middle of \r\n sequence
-               iterator t(first);
-               --t;
-               if((*t == '\r') && (*first == '\n'))
-               {
-                  goto failure;
-               }
-            }
-            ptr = ptr->next.p;
-            continue;
-         }
-         goto failure;
-      case syntax_element_wild:
-         // anything except possibly NULL or \n:
-         if(traits::is_separator(*first))
-         {
-            if(flags & match_not_dot_newline)
-               goto failure;
-            ptr = ptr->next.p;
-            ++first;
-            continue;
-         }
-         if(*first == charT(0))
-         {
-            if(flags & match_not_dot_null)
-               goto failure;
-            ptr = ptr->next.p;
-            ++first;
-            continue;
-         }
-         ptr = ptr->next.p;
-         ++first;
-         break;
-      case syntax_element_word_boundary:
-      {
-         // prev and this character must be opposites:
-#if defined(BOOST_REGEX_USE_C_LOCALE) && defined(__GNUC__) && (__GNUC__ == 2) && (__GNUC_MINOR__ < 95)
-         bool b = traits::is_class(*first, traits::char_class_word);
-#else
-         bool b = traits_inst.is_class(*first, traits::char_class_word);
-#endif
-         if((first == temp_match[0].first)  && ((flags & match_prev_avail) == 0))
-         {
-            if(flags & match_not_bow)
-               b ^= true;
-            else
-               b ^= false;
-         }
-         else
-         {
-            --first;
-            b ^= traits_inst.is_class(*first, traits::char_class_word);
-            ++first;
-         }
-         if(b)
-         {
-            ptr = ptr->next.p;
-            continue;
-         }
-         goto failure;
-      }
-      case syntax_element_within_word:
-         // both prev and this character must be traits::char_class_word:
-         if(traits_inst.is_class(*first, traits::char_class_word))
-         {
-            bool b;
-            if((first == temp_match[0].first) && ((flags & match_prev_avail) == 0))
-               b = false;
-            else
-            {
-               --first;
-               b = traits_inst.is_class(*first, traits::char_class_word);
-               ++first;
-            }
-            if(b)
-            {
-               ptr = ptr->next.p;
-               continue;
-            }
-         }
-         goto failure;
-      case syntax_element_word_start:
-         if((first == temp_match[0].first) && ((flags & match_prev_avail) == 0))
-         {
-            // start of buffer:
-            if(flags & match_not_bow)
-               goto failure;
-            if(traits_inst.is_class(*first, traits::char_class_word))
-            {
-               ptr = ptr->next.p;
-               continue;
-            }
-            goto failure;
-         }
-         // otherwise inside buffer:
-         if(traits_inst.is_class(*first, traits::char_class_word))
-         {
-            iterator t(first);
-            --t;
-            if(traits_inst.is_class(*t, traits::char_class_word) == false)
-            {
-               ptr = ptr->next.p;
-               continue;
-            }
-         }
-         goto failure;      // if we fall through to here then we've failed
-      case syntax_element_word_end:
-         if((first == temp_match[0].first) && ((flags & match_prev_avail) == 0))
-            goto failure;  // start of buffer can't be end of word
-
-         // otherwise inside buffer:
-         if(traits_inst.is_class(*first, traits::char_class_word) == false)
-         {
-            iterator t(first);
-            --t;
-            if(traits_inst.is_class(*t, traits::char_class_word))
-            {
-               ptr = ptr->next.p;
-               continue;
-            }
-         }
-         goto failure;      // if we fall through to here then we've failed
-      case syntax_element_buffer_start:
-         if((first != temp_match[0].first) || (flags & match_not_bob))
-            goto failure;
-         // OK match:
-         ptr = ptr->next.p;
-         break;
-      case syntax_element_buffer_end:
-         if((first != last) || (flags & match_not_eob))
-            goto failure;
-         // OK match:
-         ptr = ptr->next.p;
-         break;
-      case syntax_element_backref:
-      {
-         // compare with what we previously matched:
-         iterator i = temp_match[static_cast<const re_brace*>(ptr)->index].first;
-         iterator j = temp_match[static_cast<const re_brace*>(ptr)->index].second;
-         while(i != j)
-         {
-            if((first == last) || (traits_inst.translate(*first, icase) != traits_inst.translate(*i, icase)))
-               goto failure;
-            ++i;
-            ++first;
-         }
-         ptr = ptr->next.p;
-         break;
-      }
-      case syntax_element_long_set:
-      {
-         // let the traits class do the work:
-         iterator t = re_is_set_member(first, last, static_cast<const re_set_long*>(ptr), e);
-         if(t != first)
-         {
-            ptr = ptr->next.p;
-            first = t;
-            continue;
-         }
-         goto failure;
-      }
-      case syntax_element_set:
-         // lookup character in table:
-         if(static_cast<const re_set*>(ptr)->_map[(traits_uchar_type)traits_inst.translate(*first, icase)])
-         {
-            ptr = ptr->next.p;
-            ++first;
-            continue;
-         }
-         goto failure;
-      case syntax_element_jump:
-         ptr = static_cast<const re_jump*>(ptr)->alt.p;
-         continue;
-      case syntax_element_alt:
-      {
-         // alt_jump:
-         if(access::can_start(*first, static_cast<const re_jump*>(ptr)->_map, (unsigned char)mask_take))
-         {
-            // we can take the first alternative,
-            // see if we need to push next alternative:
-            if(access::can_start(*first, static_cast<const re_jump*>(ptr)->_map, mask_skip))
-            {
-               if(need_push_match)
-                  matches.push(temp_match);
-               for(k = 0; k <= cur_acc; ++k)
-                  prev_pos.push(start_loop[k]);
-               prev_pos.push(first);
-               prev_record.push(ptr);
-               for(k = 0; k <= cur_acc; ++k)
-                  prev_acc.push(accumulators[k]);
-               prev_acc.push(cur_acc);
-            }
-            ptr = ptr->next.p;
-            continue;
-         }
-         if(access::can_start(*first, static_cast<const re_jump*>(ptr)->_map, mask_skip))
-         {
-            ptr = static_cast<const re_jump*>(ptr)->alt.p;
-            continue;
-         }
-         goto failure;  // neither option is possible
-      }
-      case syntax_element_rep:
-      {
-         // repeater_jump:
-         // if we're moving to a higher id (nested repeats etc)
-         // zero out our accumualtors:
-         if(cur_acc < static_cast<const re_repeat*>(ptr)->id)
-         {
-            cur_acc = static_cast<const re_repeat*>(ptr)->id;
-            accumulators[cur_acc] = 0;
-            start_loop[cur_acc] = first;
-         }
-
-         cur_acc = static_cast<const re_repeat*>(ptr)->id;
-
-         if(static_cast<const re_repeat*>(ptr)->leading)
-            *restart = first;
-
-         //charT c = traits_inst.translate(*first);
-
-         // first of all test for special case where this is last element,
-         // if that is the case then repeat as many times as possible,
-         // as long as the repeat is greedy:
-
-         if((static_cast<const re_repeat*>(ptr)->alt.p->type == syntax_element_match)
-            && (static_cast<const re_repeat*>(ptr)->greedy == true))
-         {
-            // see if we can take the repeat:
-            if(((unsigned int)accumulators[cur_acc] < static_cast<const re_repeat*>(ptr)->max)
-                  && access::can_start(*first, static_cast<const re_repeat*>(ptr)->_map, mask_take))
-            {
-               // push terminating match as fallback:
-               if((unsigned int)accumulators[cur_acc] >= static_cast<const re_repeat*>(ptr)->min)
-               {
-                  if((prev_record.empty() == false) && (prev_record.peek() == static_cast<const re_repeat*>(ptr)->alt.p))
-                  {
-                     // we already have the required fallback
-                     // don't add any more, just update this one:
-                     if(need_push_match)
-                        matches.peek() = temp_match;
-                     prev_pos.peek() = first;
-                  }
-                  else
-                  {
-                     if(need_push_match)
-                        matches.push(temp_match);
-                     prev_pos.push(first);
-                     prev_record.push(static_cast<const re_repeat*>(ptr)->alt.p);
-                  }
-               }
-               // move to next item in list:
-               if((first != start_loop[cur_acc]) || !accumulators[cur_acc])
-               {
-                  ++accumulators[cur_acc];
-                  ptr = ptr->next.p;
-                  start_loop[cur_acc] = first;
-                  continue;
-               }
-               else if((unsigned int)accumulators[cur_acc] < static_cast<const re_repeat*>(ptr)->min)
-               {
-                  // the repeat was null, and we haven't gone round min times yet,
-                  // since all subsequent repeats will be null as well, just update
-                  // our repeat count and skip out.
-                  accumulators[cur_acc] = static_cast<const re_repeat*>(ptr)->min;
-                  ptr = static_cast<const re_repeat*>(ptr)->alt.p;
-                  continue;
-               }
-               goto failure;
-            }
-            // see if we can skip the repeat:
-            if(((unsigned int)accumulators[cur_acc] >= static_cast<const re_repeat*>(ptr)->min)
-               && access::can_start(*first, static_cast<const re_repeat*>(ptr)->_map, mask_skip))
-            {
-               ptr = static_cast<const re_repeat*>(ptr)->alt.p;
-               continue;
-            }
-            // otherwise fail:
-            goto failure;
-         }
-
-         // OK if we get to here then the repeat is either non-terminal or non-greedy,
-         // see if we can skip the repeat:
-         if(((unsigned int)accumulators[cur_acc] >= static_cast<const re_repeat*>(ptr)->min)
-            && access::can_start(*first, static_cast<const re_repeat*>(ptr)->_map, mask_skip))
-         {
-            // see if we can push failure info:
-            if(((unsigned int)accumulators[cur_acc] < static_cast<const re_repeat*>(ptr)->max)
-               && access::can_start(*first, static_cast<const re_repeat*>(ptr)->_map, mask_take))
-            {
-               // check to see if the last loop matched a NULL string
-               // if so then we really don't want to loop again:
-               if(((unsigned int)accumulators[cur_acc] == static_cast<const re_repeat*>(ptr)->min)
-                  || (first != start_loop[cur_acc]))
-               {
-                  if(need_push_match)
-                     matches.push(temp_match);
-                  prev_pos.push(first);
-                  prev_record.push(ptr);
-                  for(k = 0; k <= cur_acc; ++k)
-                     prev_acc.push(accumulators[k]);
-                  // for non-greedy repeats save whether we have a match already:
-                  if(static_cast<const re_repeat*>(ptr)->greedy == false)
-                  {
-                     prev_acc.push(match_found);
-                     match_found = false;
-                  }
-               }
-            }
-            ptr = static_cast<const re_repeat*>(ptr)->alt.p;
-            continue;
-         }
-
-         // otherwise see if we can take the repeat:
-         if(((unsigned int)accumulators[cur_acc] < static_cast<const re_repeat*>(ptr)->max)
-               && access::can_start(*first, static_cast<const re_repeat*>(ptr)->_map, mask_take) &&
-               ((first != start_loop[cur_acc]) || !accumulators[cur_acc]))
-         {
-            // move to next item in list:
-            ++accumulators[cur_acc];
-            ptr = ptr->next.p;
-            start_loop[cur_acc] = first;
-            continue;
-         }
-         else if((first == start_loop[cur_acc]) && accumulators[cur_acc] && ((unsigned int)accumulators[cur_acc] < static_cast<const re_repeat*>(ptr)->min))
-         {
-            // the repeat was null, and we haven't gone round min times yet,
-            // since all subsequent repeats will be null as well, just update
-            // our repeat count and skip out.
-            accumulators[cur_acc] = static_cast<const re_repeat*>(ptr)->min;
-            ptr = static_cast<const re_repeat*>(ptr)->alt.p;
-            continue;
-         }
-
-         // if we get here then neither option is allowed so fail:
-         goto failure;
-
-      }
-      case syntax_element_combining:
-         if(traits_inst.is_combining(traits_inst.translate(*first, icase)))
-            goto failure;
-         ++first;
-         while((first != last) && traits_inst.is_combining(traits_inst.translate(*first, icase)))++first;
-         ptr = ptr->next.p;
-         continue;
-      case syntax_element_soft_buffer_end:
-         {
-            if(flags & match_not_eob)
-               goto failure;
-            iterator p(first);
-            while((p != last) && traits_inst.is_separator(traits_inst.translate(*p, icase)))++p;
-            if(p != last)
-               goto failure;
-            ptr = ptr->next.p;
-            continue;
-         }
-      case syntax_element_restart_continue:
-         if(first != temp_match[-1].first)
-            goto failure;
-         ptr = ptr->next.p;
-         continue;
-      default:
-         jm_assert(0); // should never get to here!!
-         return false;
-      }
-   }
-
-   //
-   // if we get to here then we've run out of characters to match against,
-   // we could however still have non-character regex items left
-   if((ptr->can_be_null == 0) && ((flags & match_partial) == 0))
-      goto failure;
-   while(true)
-   {
-      jm_assert(ptr);
-      ++state_count;
-      switch(ptr->type)
-      {
-      case syntax_element_match:
-         goto match_jump;
-      case syntax_element_startmark:
-         goto start_mark_jump;
-      case syntax_element_endmark:
-         goto end_mark_jump;
-      case syntax_element_start_line:
-         goto outer_line_check;
-      case syntax_element_end_line:
-         // we're at the end so *first is never valid:
-         if((flags & match_not_eol) == 0)
-         {
-            ptr = ptr->next.p;
-            continue;
-         }
-         goto failure;
-      case syntax_element_word_boundary:
-      case syntax_element_word_end:
-         if(((flags & match_not_eow) == 0) && (first != temp_match[0].first))
-         {
-            iterator t(first);
-            --t;
-            if(traits_inst.is_class(*t, traits::char_class_word))
-            {
-               ptr = ptr->next.p;
-               continue;
-            }
-         }
-         goto failure;
-      case syntax_element_buffer_end:
-      case syntax_element_soft_buffer_end:
-         if(flags & match_not_eob)
-            goto failure;
-         // OK match:
-         ptr = ptr->next.p;
-         break;
-      case syntax_element_jump:
-         ptr = static_cast<const re_jump*>(ptr)->alt.p;
-         continue;
-      case syntax_element_alt:
-         if(ptr->can_be_null & mask_take)
-         {
-            // we can test the first alternative,
-            // see if we need to push next alternative:
-            if(ptr->can_be_null & mask_skip)
-            {
-               if(need_push_match)
-                  matches.push(temp_match);
-               for(k = 0; k <= cur_acc; ++k)
-                  prev_pos.push(start_loop[k]);
-               prev_pos.push(first);
-               prev_record.push(ptr);
-               for(k = 0; k <= cur_acc; ++k)
-                  prev_acc.push(accumulators[k]);
-               prev_acc.push(cur_acc);
-            }
-            ptr = ptr->next.p;
-            continue;
-         }
-         if(ptr->can_be_null & mask_skip)
-         {
-            ptr = static_cast<const re_jump*>(ptr)->alt.p;
-            continue;
-         }
-         goto failure;  // neither option is possible
-      case syntax_element_rep:
-         // if we're moving to a higher id (nested repeats etc)
-         // zero out our accumualtors:
-         if(cur_acc < static_cast<const re_repeat*>(ptr)->id)
-         {
-            cur_acc = static_cast<const re_repeat*>(ptr)->id;
-            accumulators[cur_acc] = 0;
-            start_loop[cur_acc] = first;
-         }
-
-         cur_acc = static_cast<const re_repeat*>(ptr)->id;
-
-         // see if we can skip the repeat:
-         if(((unsigned int)accumulators[cur_acc] >= static_cast<const re_repeat*>(ptr)->min)
-            && ((ptr->can_be_null & mask_skip) || (flags & match_partial)))
-         {
-            // don't push failure info, there's no point:
-            ptr = static_cast<const re_repeat*>(ptr)->alt.p;
-            continue;
-         }
-
-         // otherwise see if we can take the repeat:
-         if(((unsigned int)accumulators[cur_acc] < static_cast<const re_repeat*>(ptr)->max)
-               && (((ptr->can_be_null & (mask_take | mask_skip)) == (mask_take | mask_skip))) || (flags & match_partial))
-         {
-            // move to next item in list:
-            ++accumulators[cur_acc];
-            ptr = ptr->next.p;
-            start_loop[cur_acc] = first;
-            continue;
-         }
-
-         // if we get here then neither option is allowed so fail:
-         goto failure;
-      case syntax_element_restart_continue:
-         if(first != temp_match[-1].first)
-            goto failure;
-         ptr = ptr->next.p;
-         continue;
-      case syntax_element_backref:
-         if(temp_match[static_cast<const re_brace*>(ptr)->index].first
-               != temp_match[static_cast<const re_brace*>(ptr)->index].second)
-               goto failure;
-         ptr = ptr->next.p;
-         continue;
-      default:
-         goto failure;
-      }
-   }
-
-   failure:
-
-   //
-   // check to see if we've been searching too many states:
-   //
-   if(state_count >= pd.max_state_count)
-   {
-#ifndef BOOST_NO_EXCEPTIONS
-      throw std::runtime_error("Max regex search depth exceeded.");
-#else
-      while(matches.empty() == false)
-         matches.pop();
-      while(prev_pos.empty() == false)
-         prev_pos.pop();
-      while(prev_record.empty() == false)
-         prev_record.pop();
-      while(prev_acc.empty() == false)
-         prev_acc.pop();
-      return false;
-#endif
-   }
-
-   //
-   // check for possible partial match:
-   //
-   if((flags & match_partial)
-      && !match_found          // no full match already
-      && (base != first)       // some charcters have been consumed
-      && (first == last))      // end of input has been reached
-   {
-      have_partial_match = true;
-      temp_match.set_second(first, 0, false);
-      m.maybe_assign(temp_match);
-   }
-
-   if(prev_record.empty() == false)
-   {
-      ptr = prev_record.peek();
-      switch(ptr->type)
-      {
-      case syntax_element_alt:
-         // get next alternative:
-         ptr = static_cast<const re_jump*>(ptr)->alt.p;
-         if(need_push_match)
-            matches.pop(temp_match);
-         prev_acc.pop(cur_acc);
-         for(k = cur_acc; k >= 0; --k)
-            prev_acc.pop(accumulators[k]);
-         prev_pos.pop(first);
-         for(k = cur_acc; k >= 0; --k)
-            prev_pos.pop(start_loop[k]);
-         prev_record.pop();
-         if(unwind_stack) goto failure; // unwinding forward assert
-         goto retry;
-      case syntax_element_rep:
-      {
-         // we're doing least number of repeats first,
-         // increment count and repeat again:
-         bool saved_matched = match_found;
-         if(need_push_match)
-            matches.pop(temp_match);
-         prev_pos.pop(first);
-         cur_acc = static_cast<const re_repeat*>(ptr)->id;
-         if(static_cast<const re_repeat*>(ptr)->greedy == false)
-         {
-            saved_matched = prev_acc.peek();
-            prev_acc.pop();
-         }
-         for(k = cur_acc; k >= 0; --k)
-            prev_acc.pop(accumulators[k]);
-         prev_record.pop();
-         if(unwind_stack) goto failure; // unwinding forward assert
-         if((unsigned int)++accumulators[cur_acc] > static_cast<const re_repeat*>(ptr)->max)
-            goto failure;  // repetions exhausted.
-         //
-         // if the repeat is non-greedy, and we found a match then fail again:
-         if((static_cast<const re_repeat*>(ptr)->greedy == false) && (match_found == true))
-         {
-            goto failure;
-         }
-         else if (match_found == false)
-            match_found = saved_matched;
-         ptr = ptr->next.p;
-         start_loop[cur_acc] = first;
-         goto retry;
-      }
-      case syntax_element_startmark:
-      {
-         bool saved_matched = match_found;
-         matches.pop(temp_match);
-         match_found = prev_acc.peek();
-         prev_acc.pop();
-         prev_acc.pop(cur_acc);
-         for(k = cur_acc; k >= 0; --k)
-            prev_acc.pop(accumulators[k]);
-         prev_pos.pop(first);
-         for(k = cur_acc; k >= 0; --k)
-            prev_pos.pop(start_loop[k]);
-         prev_record.pop();
-         unwind_stack = false;
-         if(static_cast<const re_brace*>(ptr)->index == -1)
-         {
-            if (saved_matched == false)
-               goto failure;
-            ptr = static_cast<const re_jump*>(ptr->next.p)->alt.p->next.p;
-            goto retry;
-         }
-         if(static_cast<const re_brace*>(ptr)->index == -2)
-         {
-            if (saved_matched == true)
-               goto failure;
-            ptr = static_cast<const re_jump*>(ptr->next.p)->alt.p->next.p;
-            goto retry;
-         }
-         else goto failure;
-      }
-      case syntax_element_match:
-         if(need_push_match)
-            matches.pop(temp_match);
-         prev_pos.pop(first);
-         prev_record.pop();
-         if(unwind_stack) goto failure; // unwinding forward assert
-         goto retry;
-     default:
-         jm_assert(0);
-         // mustn't get here!!
-      }
-   }
-
-   if(match_found || have_partial_match)
-   {
-      pd.state_count = 0;
-      return true;
-   }
-
-   // if we get to here then everything has failed
-   // and no match was found:
-   return false;
-}
-#if defined(BOOST_REGEX_NO_TEMPLATE_SWITCH_MERGE)
-} // namespace
-#endif
-
-
-template <class iterator>
-void _skip_and_inc(unsigned int& clines, iterator& last_line, iterator& first, const iterator last)
-{
-   while(first != last)
-   {
-      if(*first == '\n')
-      {
-         last_line = ++first;
-         ++clines;
-      }
-      else
-         ++first;
-   }
-}
-
-template <class iterator>
-void _skip_and_dec(unsigned int& clines, iterator& last_line, iterator& first, iterator base, std::size_t len)
-{
-   bool need_line = false;
-   for(std::size_t i = 0; i < len; ++i)
-   {
-      --first;
-      if(*first == '\n')
-      {
-         need_line = true;
-         --clines;
-      }
-   }
-
-   if(need_line)
-   {
-      last_line = first;
-
-      if(last_line != base)
-         --last_line;
-      else
-         return;
-
-      while((last_line != base) && (*last_line != '\n'))
-         --last_line;
-      if(*last_line == '\n')
-         ++last_line;
-   }
-}
-
-template <class iterator>
-inline void _inc_one(unsigned int& clines, iterator& last_line, iterator& first)
-{
-   if(*first == '\n')
-   {
-      last_line = ++first;
-      ++clines;
-   }
-   else
-      ++first;
-}
-
-template <class iterator, class Allocator>
-struct grep_search_predicate
-{
-   match_results<iterator, Allocator>* pm;
-   grep_search_predicate(match_results<iterator, Allocator>* p) : pm(p) {}
-   bool operator()(const match_results<iterator, Allocator>& m) 
-   {
-      *pm = static_cast<const match_results_base<iterator, Allocator>&>(m);
-      return false;
-   }
-};
-
-#if !defined(BOOST_NO_EXPLICIT_FUNCTION_TEMPLATE_ARGUMENTS) && !defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING)
-
-template <class iterator, class Allocator>
-inline const match_results_base<iterator, Allocator>& grep_out_type(const grep_search_predicate<iterator, Allocator>& o, const Allocator&)
-{
-   return *(o.pm);
-}
-
-#endif
-
-template <class T, class Allocator>
-inline const Allocator& grep_out_type(const T&, const Allocator& a)
-{
-   return a;
-}
-
-#if defined(BOOST_REGEX_NO_TEMPLATE_SWITCH_MERGE)
-//
-// Ugly ugly hack,
-// template don't merge if they contain switch statements so declare these
-// templates in unnamed namespace (ie with internal linkage), each translation
-// unit then gets its own local copy, it works seemlessly but bloats the app.
-namespace{
-#endif
-
-//
-// reg_grep2:
-// find all non-overlapping matches within the sequence first last:
-//
-template <class Predicate, class I, class charT, class traits, class A, class A2>
-unsigned int reg_grep2(Predicate foo, I first, I last, const reg_expression<charT, traits, A>& e, unsigned flags, A2 a)
-{
-   typedef access_t<charT, traits, A> access;
-
-   if(e.flags() & regbase::failbit)
-      return 0;
-
-   typedef typename traits::size_type traits_size_type;
-   typedef typename traits::uchar_type traits_uchar_type;
-   typedef typename is_byte<charT>::width_type width_type;
-
-   match_results<I, A2> m(grep_out_type(foo, a));
-   I restart;
-   m.set_size(e.mark_count(), first, last);
-   m.set_line(1, first);
-   m.set_base(first);
-
-   unsigned int clines = 1;
-   unsigned int cmatches = 0;
-   I last_line = first;
-   I next_base;
-   I base = first;
-   bool need_init;
-   bool leading_match = false;
-   const traits& traits_inst = e.get_traits();
-   // dwa 9/13/00 suppress incorrect MSVC warning - it claims this is never
-   // referenced
-   (void)traits_inst;
-
-   flags |= match_init;
-
-   _priv_match_data<I, A2> pd(m, first, last, e.size());
-
-   const unsigned char* _map = access::get_map(e);
-   unsigned int type;
-
-   if(first == last)
-   {
-      // special case, only test if can_be_null,
-      // don't dereference any pointers!!
-      if(access::first(e)->can_be_null)
-      {
-         if(query_match_aux(first, last, m, e, flags, pd, &restart))
-         {
-            foo(m);
-            ++cmatches;
-         }
-      }
-      return cmatches;
-   }
-
-   // try one time whatever:
-   if( access::can_start(*first, _map, (unsigned char)mask_any) )
-   {
-      if(query_match_aux(first, last, m, e, flags, pd, &restart))
-      {
-         ++cmatches;
-         leading_match = true;
-         if(foo(m) == false)
-            return cmatches;
-         if(m[0].second == last)
-            return cmatches;
-         // update to end of what matched
-         // trying to match again with match_not_null set if this 
-         // is a null match...
-         need_init = true;
-         if(first == m[0].second)
-         {
-            next_base = m[0].second;
-            pd.temp_match.init_fail(next_base, last);
-            m.init_fail(next_base, last);
-            if(query_match_aux(first, last, m, e, flags | match_not_null, pd, &restart))
-            {
-               ++cmatches;
-               if(foo(m) == false)
-                  return cmatches;
-            }
-            else
-            {
-               need_init = false;
-               leading_match = false;
-               for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart)
-                   {} // dwa 10/20/2000 - warning suppression for MWCW
-               if(restart != last)
-                  ++restart;
-               _skip_and_inc(clines, last_line, first, restart);
-            }
-         }
-         if(need_init)
-         {
-            _skip_and_inc(clines, last_line, first, m[0].second);
-            next_base = m[0].second;
-            pd.temp_match.init_fail(next_base, last);
-            m.init_fail(next_base, last);
-         }
-      }
-      else
-      {
-         for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart)
-             {} // dwa 10/20/2000 - warning suppression for MWCW
-         if(restart != last)
-            ++restart;
-         _skip_and_inc(clines, last_line, first, restart);
-      }
-   }
-   else
-      _inc_one(clines, last_line, first); 
-   flags |= match_prev_avail | match_not_bob;
-
-   
-   // depending on what the first record is we may be able to
-   // optimise the search:
-   type = (flags & match_continuous) ? 
-      static_cast<unsigned int>(regbase::restart_continue) 
-         : static_cast<unsigned int>(access::restart_type(e));
-
-   if(type == regbase::restart_buf)
-      return cmatches;
-
-   switch(type)
-   {
-   case regbase::restart_lit: 
-   case regbase::restart_fixed_lit:
-   {
-      const kmp_info<charT>* info = access::get_kmp(e);
-      int len = info->len;
-      const charT* x = info->pstr;
-      int j = 0; 
-      bool icase = e.flags() & regbase::icase;
-      while (first != last) 
-      {
-         while((j > -1) && (x[j] != traits_inst.translate(*first, icase))) 
-            j = info->kmp_next[j];
-         _inc_one(clines, last_line, first);
-         ++j;
-         if(j >= len) 
-         {
-            if(type == regbase::restart_fixed_lit)
-            {
-               _skip_and_dec(clines, last_line, first, base, j);
-               restart = first;
-               std::advance(restart, len);
-               m.set_first(first);
-               m.set_second(restart);
-               m.set_line(clines, last_line);
-               ++cmatches;
-               if(foo(m) == false)
-                  return cmatches;
-               if(m[0].second == last)
-                  return cmatches;
-               _skip_and_inc(clines, last_line, first, restart);
-               next_base = m[0].second;
-               pd.temp_match.init_fail(next_base, last);
-               m.init_fail(next_base, last);
-               j = 0;
-            }
-            else
-            {
-               restart = first;
-               _skip_and_dec(clines, last_line, first, base, j);
-               if(query_match_aux(first, last, m, e, flags, pd, &restart))
-               {
-
-                  m.set_line(clines, last_line);
-                  ++cmatches;
-                  if(foo(m) == false)
-                     return cmatches;
-                  if(m[0].second == last)
-                     return cmatches;
-                  // update to end of what matched
-                 _skip_and_inc(clines, last_line, first, m[0].second);
-                  next_base = m[0].second;
-                  pd.temp_match.init_fail(next_base, last);
-                  m.init_fail(next_base, last);
-                  j = 0;
-               }
-               else
-               {
-                  for(int k = 0; (restart != first) && (k < j); ++k, --restart)
-                      {} // dwa 10/20/2000 - warning suppression for MWCW
-                  if(restart != last)
-                     ++restart;
-                  _skip_and_inc(clines, last_line, first, restart);
-                  j = 0;  //we could do better than this...
-               }
-            }
-         }
-      }
-      break;
-   }
-   case regbase::restart_any:
-   {
-      while(first != last)
-      {
-         if( access::can_start(*first, _map, (unsigned char)mask_any) )
-         {
-            if(query_match_aux(first, last, m, e, flags, pd, &restart))
-            {
-
-               m.set_line(clines, last_line);
-               ++cmatches;
-               if(foo(m) == false)
-                  return cmatches;
-               if(m[0].second == last)
-                  return cmatches;
-               // update to end of what matched
-               // trying to match again with match_not_null set if this 
-               // is a null match...
-               need_init = true;
-               if(first == m[0].second)
-               {
-                  next_base = m[0].second;
-                  pd.temp_match.init_fail(next_base, last);
-                  m.init_fail(next_base, last);
-                  if(query_match_aux(first, last, m, e, flags | match_not_null, pd, &restart))
-                  {
-                     m.set_line(clines, last_line);
-                     ++cmatches;
-                     if(foo(m) == false)
-                        return cmatches;
-                  }
-                  else
-                  {
-                     need_init = false;
-                     for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart)
-                         {} // dwa 10/20/2000 - warning suppression for MWCW
-                     if(restart != last)
-                        ++restart;
-                     _skip_and_inc(clines, last_line, first, restart);
-                  }
-               }
-               if(need_init)
-               {
-                 _skip_and_inc(clines, last_line, first, m[0].second);
-                  next_base = m[0].second;
-                  pd.temp_match.init_fail(next_base, last);
-                  m.init_fail(next_base, last);
-               }
-               continue;
-            }
-            else
-            {
-               for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart)
-                   {} // dwa 10/20/2000 - warning suppression for MWCW
-               if(restart != last)
-                  ++restart;
-               _skip_and_inc(clines, last_line, first, restart);
-            }
-         }
-         else
-            _inc_one(clines, last_line, first);
-      }
-   }
-   break;
-   case regbase::restart_word:
-   {
-      // do search optimised for word starts:
-      while(first != last)
-      {
-         --first;
-         if(*first == '\n')
-            --clines;
-         // skip the word characters:
-         while((first != last) && traits_inst.is_class(*first, traits::char_class_word))
-            ++first;
-         // now skip the white space:
-         while((first != last) && (traits_inst.is_class(*first, traits::char_class_word) == false))
-         {
-         #ifdef __GNUC__
-            //
-            // hack to work around gcc optimisation bug
-            // just expand the contents of _inc_one here:
-            if(*first == '\n')
-            {
-               last_line = ++first;
-               ++clines;
-            }
-            else
-               ++first;
-         #else         
-            _inc_one(clines, last_line, first); 
-         #endif
-         }
-         if(first == last)
-            break;
-
-         if( access::can_start(*first, _map, (unsigned char)mask_any) )
-         {
-            if(query_match_aux(first, last, m, e, flags, pd, &restart))
-            {
-               m.set_line(clines, last_line);
-               ++cmatches;
-               if(foo(m) == false)
-                  return cmatches;
-               if(m[0].second == last)
-                  return cmatches;
-               // update to end of what matched
-               // trying to match again with match_not_null set if this
-               // is a null match...
-               need_init = true;
-               if(first == m[0].second)
-               {
-                  next_base = m[0].second;
-                  pd.temp_match.init_fail(next_base, last);
-                  m.init_fail(next_base, last);
-                  if(query_match_aux(first, last, m, e, flags | match_not_null, pd, &restart))
-                  {
-                     m.set_line(clines, last_line);
-                     ++cmatches;
-                     if(foo(m) == false)
-                        return cmatches;
-                  }
-                  else
-                  {
-                     need_init = false;
-                     for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart)
-                         {} // dwa 10/20/2000 - warning suppression for MWCW
-                     if(restart != last)
-                        ++restart;
-                     _skip_and_inc(clines, last_line, first, restart);
-                  }
-               }
-               if(need_init)
-               {
-                  _skip_and_inc(clines, last_line, first, m[0].second);
-                  next_base = m[0].second;
-                  pd.temp_match.init_fail(next_base, last);
-                  m.init_fail(next_base, last);
-               }
-            }
-            else
-            {
-               for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart)
-                   {} // dwa 10/20/2000 - warning suppression for MWCW
-               if(restart != last)
-                  ++restart;
-               _skip_and_inc(clines, last_line, first, restart);
-            }
-         }
-         else
-            _inc_one(clines, last_line, first);
-      }
-   }
-   break;
-   case regbase::restart_line:
-   {
-      // do search optimised for line starts:
-      while(first != last)
-      {
-         // find first charcter after a line break:
-         --first;
-         if(*first == '\n')
-            --clines;
-         while((first != last) && (*first != '\n'))
-            ++first;
-         if(first == last)
-            break;
-         ++first;
-         if(first == last)
-            break;
-
-         ++clines;
-         last_line = first;
-
-         if( access::can_start(*first, _map, (unsigned char)mask_any) )
-         {
-            if(query_match_aux(first, last, m, e, flags, pd, &restart))
-            {
-               m.set_line(clines, last_line);
-               ++cmatches;
-               if(foo(m) == false)
-                  return cmatches;
-               if(m[0].second == last)
-                  return cmatches;
-               // update to end of what matched
-               // trying to match again with match_not_null set if this
-               // is a null match...
-               need_init = true;
-               if(first == m[0].second)
-               {
-                  next_base = m[0].second;
-                  pd.temp_match.init_fail(next_base, last);
-                  m.init_fail(next_base, last);
-                  if(query_match_aux(first, last, m, e, flags | match_not_null, pd, &restart))
-                  {
-                     m.set_line(clines, last_line);
-                     ++cmatches;
-                     if(foo(m) == false)
-                        return cmatches;
-                  }
-                  else
-                  {
-                     need_init = false;
-                     for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart)
-                         {} // dwa 10/20/2000 - warning suppression for MWCW
-                     if(restart != last)
-                        ++restart;
-                     _skip_and_inc(clines, last_line, first, restart);
-                  }
-               }
-               if(need_init)
-               {
-                  _skip_and_inc(clines, last_line, first, m[0].second);
-                  next_base = m[0].second;
-                  pd.temp_match.init_fail(next_base, last);
-                  m.init_fail(next_base, last);
-               }
-            }
-            else
-            {
-               for(unsigned int i = 0; (restart != first) && (i < access::leading_length(e)); ++i, --restart)
-                   {} // dwa 10/20/2000 - warning suppression for MWCW
-               if(restart != last)
-                  ++restart;
-               _skip_and_inc(clines, last_line, first, restart);
-            }
-         }
-         else
-            _inc_one(clines, last_line, first);
-      }
-   }
-   break;
-   case regbase::restart_continue:
-   {
-      if(!leading_match)
-         return cmatches;
-      while(first != last)
-      {
-         if( access::can_start(*first, _map, (unsigned char)mask_any) )
-         {
-            if(query_match_aux(first, last, m, e, flags, pd, &restart))
-            {
-               m.set_line(clines, last_line);
-               ++cmatches;
-               if(foo(m) == false)
-                  return cmatches;
-               if(m[0].second == last)
-                  return cmatches;
-               // update to end of what matched
-               // trying to match again with match_not_null set if this
-               // is a null match...
-               if(first == m[0].second)
-               {
-                  next_base = m[0].second;
-                  pd.temp_match.init_fail(next_base, last);
-                  m.init_fail(next_base, last);
-                  if(query_match_aux(first, last, m, e, flags | match_not_null, pd, &restart))
-                  {
-                     m.set_line(clines, last_line);
-                     ++cmatches;
-                     if(foo(m) == false)
-                        return cmatches;
-                  }
-                  else
-                     return cmatches;  // can't continue from null match
-               }
-               _skip_and_inc(clines, last_line, first, m[0].second);
-               next_base = m[0].second;
-               pd.temp_match.init_fail(next_base, last);
-               m.init_fail(next_base, last);
-               continue;
-            }
-         }
-         return cmatches;
-      }
-   }
-   break;
-   }
-
-
-   // finally check trailing null string:
-   if(access::first(e)->can_be_null)
-   {
-      if(query_match_aux(first, last, m, e, flags, pd, &restart))
-      {
-         m.set_line(clines, last_line);
-         ++cmatches;
-         if(foo(m) == false)
-            return cmatches;
-      }
-   }
-
-   return cmatches;
-}
-#if defined(BOOST_REGEX_NO_TEMPLATE_SWITCH_MERGE)
-} // namespace {anon}
-#endif
-
-} // namespace re_detail
-
-//
-// proc regex_match
-// returns true if the specified regular expression matches
-// the whole of the input.  Fills in what matched in m.
-//
-template <class iterator, class Allocator, class charT, class traits, class Allocator2>
-bool regex_match(iterator first, iterator last, match_results<iterator, Allocator>& m, const reg_expression<charT, traits, Allocator2>& e, unsigned flags = match_default)
-{
-   // prepare m for failure:
-   if((flags & match_init) == 0)
-   {
-      m.set_size(e.mark_count(), first, last);
-      m.set_base(first);
-      m.set_line(1, first);
-   }
-   flags |= match_all; // must match all of input.
-   re_detail::_priv_match_data<iterator, Allocator> pd(m, first, last, e.size());
-   iterator restart;
-   bool result = re_detail::query_match_aux(first, last, m, e, flags, pd, &restart);
-   return result;
-}
-template <class iterator, class charT, class traits, class Allocator2>
-bool regex_match(iterator first, iterator last, const reg_expression<charT, traits, Allocator2>& e, unsigned flags = match_default)
-{
-   match_results<iterator> m;
-   return regex_match(first, last, m, e, flags);
-}
-//
-// query_match convenience interfaces:
-#ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
-//
-// this isn't really a partial specialisation, but template function
-// overloading - if the compiler doesn't support partial specialisation
-// then it really won't support this either:
-template <class charT, class Allocator, class traits, class Allocator2>
-inline bool regex_match(const charT* str, 
-                        match_results<const charT*, Allocator>& m, 
-                        const reg_expression<charT, traits, Allocator2>& e, 
-                        unsigned flags = match_default)
-{
-   return regex_match(str, str + traits::length(str), m, e, flags);
-}
-
-template <class ST, class SA, class Allocator, class charT, class traits, class Allocator2>
-inline bool regex_match(const std::basic_string<charT, ST, SA>& s, 
-                 match_results<typename std::basic_string<charT, ST, SA>::const_iterator, Allocator>& m, 
-                 const reg_expression<charT, traits, Allocator2>& e, 
-                 unsigned flags = match_default)
-{
-   return regex_match(s.begin(), s.end(), m, e, flags);
-}
-template <class charT, class traits, class Allocator2>
-inline bool regex_match(const charT* str, 
-                        const reg_expression<charT, traits, Allocator2>& e, 
-                        unsigned flags = match_default)
-{
-   match_results<const charT*> m;
-   return regex_match(str, str + traits::length(str), m, e, flags);
-}
-
-template <class ST, class SA, class charT, class traits, class Allocator2>
-inline bool regex_match(const std::basic_string<charT, ST, SA>& s, 
-                 const reg_expression<charT, traits, Allocator2>& e, 
-                 unsigned flags = match_default)
-{
-   typedef typename std::basic_string<charT, ST, SA>::const_iterator iterator;
-   match_results<iterator> m;
-   return regex_match(s.begin(), s.end(), m, e, flags);
-}
-#else  // partial ordering
-inline bool regex_match(const char* str, 
-                        cmatch& m, 
-                        const regex& e, 
-                        unsigned flags = match_default)
-{
-   return regex_match(str, str + regex::traits_type::length(str), m, e, flags);
-}
-inline bool regex_match(const char* str, 
-                        const regex& e, 
-                        unsigned flags = match_default)
-{
-   match_results<const char*> m;
-   return regex_match(str, str + regex::traits_type::length(str), m, e, flags);
-}
-#ifndef BOOST_NO_WREGEX
-inline bool regex_match(const wchar_t* str, 
-                        wcmatch& m, 
-                        const wregex& e, 
-                        unsigned flags = match_default)
-{
-   return regex_match(str, str + wregex::traits_type::length(str), m, e, flags);
-}
-inline bool regex_match(const wchar_t* str, 
-                        const wregex& e, 
-                        unsigned flags = match_default)
-{
-   match_results<const wchar_t*> m;
-   return regex_match(str, str + wregex::traits_type::length(str), m, e, flags);
-}
-#endif
-inline bool regex_match(const std::string& s, 
-                        match_results<std::string::const_iterator, regex::allocator_type>& m,
-                        const regex& e, 
-                        unsigned flags = match_default)
-{
-   return regex_match(s.begin(), s.end(), m, e, flags);
-}
-inline bool regex_match(const std::string& s, 
-                        const regex& e, 
-                        unsigned flags = match_default)
-{
-   match_results<std::string::const_iterator, regex::allocator_type> m;
-   return regex_match(s.begin(), s.end(), m, e, flags);
-}
-#if !defined(BOOST_NO_WREGEX)
-inline bool regex_match(const std::basic_string<wchar_t>& s, 
-                        match_results<std::basic_string<wchar_t>::const_iterator, wregex::allocator_type>& m,
-                        const wregex& e, 
-                        unsigned flags = match_default)
-{
-   return regex_match(s.begin(), s.end(), m, e, flags);
-}
-inline bool regex_match(const std::basic_string<wchar_t>& s, 
-                        const wregex& e, 
-                        unsigned flags = match_default)
-{
-   match_results<std::basic_string<wchar_t>::const_iterator, wregex::allocator_type> m;
-   return regex_match(s.begin(), s.end(), m, e, flags);
-}
-#endif
-
-#endif
-
-template <class iterator, class Allocator, class charT, class traits, class Allocator2>
-bool regex_search(iterator first, iterator last, match_results<iterator, Allocator>& m, const reg_expression<charT, traits, Allocator2>& e, unsigned flags = match_default)
-{
-   if(e.flags() & regbase::failbit)
-      return false;
-
-   typedef typename traits::size_type traits_size_type;
-   typedef typename traits::uchar_type traits_uchar_type;
-
-   return re_detail::reg_grep2(re_detail::grep_search_predicate<iterator, Allocator>(&m), first, last, e, flags, m.allocator());
-}
-
-//
-// regex_search convenience interfaces:
-#ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
-//
-// this isn't really a partial specialisation, but template function
-// overloading - if the compiler doesn't support partial specialisation
-// then it really won't support this either:
-template <class charT, class Allocator, class traits, class Allocator2>
-inline bool regex_search(const charT* str, 
-                        match_results<const charT*, Allocator>& m, 
-                        const reg_expression<charT, traits, Allocator2>& e, 
-                        unsigned flags = match_default)
-{
-   return regex_search(str, str + traits::length(str), m, e, flags);
-}
-
-template <class ST, class SA, class Allocator, class charT, class traits, class Allocator2>
-inline bool regex_search(const std::basic_string<charT, ST, SA>& s, 
-                 match_results<typename std::basic_string<charT, ST, SA>::const_iterator, Allocator>& m, 
-                 const reg_expression<charT, traits, Allocator2>& e, 
-                 unsigned flags = match_default)
-{
-   return regex_search(s.begin(), s.end(), m, e, flags);
-}
-#else  // partial specialisation
-inline bool regex_search(const char* str, 
-                        cmatch& m, 
-                        const regex& e, 
-                        unsigned flags = match_default)
-{
-   return regex_search(str, str + regex::traits_type::length(str), m, e, flags);
-}
-#ifndef BOOST_NO_WREGEX
-inline bool regex_search(const wchar_t* str, 
-                        wcmatch& m, 
-                        const wregex& e, 
-                        unsigned flags = match_default)
-{
-   return regex_search(str, str + wregex::traits_type::length(str), m, e, flags);
-}
-#endif
-inline bool regex_search(const std::string& s, 
-                        match_results<std::string::const_iterator, regex::allocator_type>& m,
-                        const regex& e, 
-                        unsigned flags = match_default)
-{
-   return regex_search(s.begin(), s.end(), m, e, flags);
-}
-#if !defined(BOOST_NO_WREGEX)
-inline bool regex_search(const std::basic_string<wchar_t>& s, 
-                        match_results<std::basic_string<wchar_t>::const_iterator, wregex::allocator_type>& m,
-                        const wregex& e, 
-                        unsigned flags = match_default)
-{
-   return regex_search(s.begin(), s.end(), m, e, flags);
-}
-#endif
-
-#endif
-
-
-//
-// regex_grep:
-// find all non-overlapping matches within the sequence first last:
-//
-template <class Predicate, class iterator, class charT, class traits, class Allocator>
-inline unsigned int regex_grep(Predicate foo, iterator first, iterator last, const reg_expression<charT, traits, Allocator>& e, unsigned flags = match_default)
-{
-   return re_detail::reg_grep2(foo, first, last, e, flags, e.allocator());
-}
-
-//
-// regex_grep convenience interfaces:
-#ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
-//
-// this isn't really a partial specialisation, but template function
-// overloading - if the compiler doesn't support partial specialisation
-// then it really won't support this either:
-template <class Predicate, class charT, class Allocator, class traits>
-inline unsigned int regex_grep(Predicate foo, const charT* str, 
-                        const reg_expression<charT, traits, Allocator>& e, 
-                        unsigned flags = match_default)
-{
-   return regex_grep(foo, str, str + traits::length(str), e, flags);
-}
-
-template <class Predicate, class ST, class SA, class Allocator, class charT, class traits>
-inline unsigned int regex_grep(Predicate foo, const std::basic_string<charT, ST, SA>& s, 
-                 const reg_expression<charT, traits, Allocator>& e, 
-                 unsigned flags = match_default)
-{
-   return regex_grep(foo, s.begin(), s.end(), e, flags);
-}
-#else  // partial specialisation
-inline unsigned int regex_grep(bool (*foo)(const cmatch&), const char* str, 
-                        const regex& e, 
-                        unsigned flags = match_default)
-{
-   return regex_grep(foo, str, str + regex::traits_type::length(str), e, flags);
-}
-#ifndef BOOST_NO_WREGEX
-inline unsigned int regex_grep(bool (*foo)(const wcmatch&), const wchar_t* str, 
-                        const wregex& e, 
-                        unsigned flags = match_default)
-{
-   return regex_grep(foo, str, str + wregex::traits_type::length(str), e, flags);
-}
-#endif
-inline unsigned int regex_grep(bool (*foo)(const match_results<std::string::const_iterator, regex::allocator_type>&), const std::string& s,
-                        const regex& e, 
-                        unsigned flags = match_default)
-{
-   return regex_grep(foo, s.begin(), s.end(), e, flags);
-}
-#if !defined(BOOST_NO_WREGEX)
-inline unsigned int regex_grep(bool (*foo)(const match_results<std::basic_string<wchar_t>::const_iterator, wregex::allocator_type>&), 
-                     const std::basic_string<wchar_t>& s, 
-                        const wregex& e, 
-                        unsigned flags = match_default)
-{
-   return regex_grep(foo, s.begin(), s.end(), e, flags);
-}
-#endif
-
-#endif
-
-
-#ifdef __BORLANDC__
-  #pragma option pop
-#endif
-
-} // namespace boost
-
-#endif   // BOOST_REGEX_MATCH_HPP
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/include/boost/regex/v3/regex_raw_buffer.hpp b/include/boost/regex/v3/regex_raw_buffer.hpp
deleted file mode 100644
index 71f912ce..00000000
--- a/include/boost/regex/v3/regex_raw_buffer.hpp
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- *
- * Copyright (c) 1998-2002
- * Dr 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         regex_raw_buffer.hpp
-  *   VERSION      see <boost/version.hpp>
-  *   DESCRIPTION: Raw character buffer for regex code.
-  *                Note this is an internal header file included
-  *                by regex.hpp, do not include on its own.
-  */
-
-#ifndef BOOST_REGEX_RAW_BUFFER_HPP
-#define BOOST_REGEX_RAW_BUFFER_HPP
-
-#ifndef BOOST_REGEX_CONFIG_HPP
-#include <boost/regex/config.hpp>
-#endif
-
-namespace boost{
-   namespace re_detail{
-
-#ifdef __BORLANDC__
-   #pragma option push -a8 -b -Vx -Ve -pc
-#endif
-
-struct empty_padding{};
-
-union padding
-{
-   void* p;
-   unsigned int i;
-};
-
-template <int N>
-struct padding3
-{
-   enum{
-      padding_size = 8,
-      padding_mask = 7
-   };
-};
-
-template<>
-struct padding3<2>
-{
-   enum{
-      padding_size = 2,
-      padding_mask = 1
-   };
-};
-
-template<>
-struct padding3<4>
-{
-   enum{
-      padding_size = 4,
-      padding_mask = 3
-   };
-};
-
-template<>
-struct padding3<8>
-{
-   enum{
-      padding_size = 8,
-      padding_mask = 7
-   };
-};
-
-template<>
-struct padding3<16>
-{
-   enum{
-      padding_size = 16,
-      padding_mask = 15
-   };
-};
-
-enum{
-   padding_size = padding3<sizeof(padding)>::padding_size,
-   padding_mask = padding3<sizeof(padding)>::padding_mask
-};
-
-//
-// class raw_storage
-// basically this is a simplified vector<unsigned char>
-// this is used by reg_expression for expression storage
-//
-
-template <class Allocator>
-class raw_storage
-{
-public:
-   typedef Allocator allocator_type;
-   typedef typename boost::detail::rebind_allocator<unsigned char, allocator_type>::type alloc_inst_type;
-   typedef typename alloc_inst_type::size_type                                size_type;
-   typedef typename alloc_inst_type::pointer                                  pointer;
-private:
-   //
-   // empty member optimisation:
-   struct alloc_data : public alloc_inst_type
-   {
-      typename alloc_inst_type::pointer last;
-      alloc_data(const Allocator& a) : alloc_inst_type(a){}
-   } alloc_inst;
-   pointer start, end;
-public:
-
-   raw_storage(const Allocator& a = Allocator());
-   raw_storage(size_type n, const Allocator& a = Allocator());
-
-   ~raw_storage()
-   {
-      alloc_inst.deallocate(start, (alloc_inst.last - start));
-   }
-
-   void BOOST_REGEX_CALL resize(size_type n);
-   
-   void* BOOST_REGEX_CALL extend(size_type n)
-   {
-      if(size_type(alloc_inst.last - end) < n)
-         resize(n + (end - start));
-      register void* result = end;
-      end += n;
-      return result;
-   }
-
-   void* BOOST_REGEX_CALL insert(size_type pos, size_type n);
-
-   size_type BOOST_REGEX_CALL size()
-   {
-      return end - start;
-   }
-
-   size_type BOOST_REGEX_CALL capacity()
-   {
-      return alloc_inst.last - start;
-   }
-
-   void* BOOST_REGEX_CALL data()const
-   {
-      return start;
-   }
-
-   size_type BOOST_REGEX_CALL index(void* ptr)
-   {
-      return reinterpret_cast<unsigned char*>(ptr) - reinterpret_cast<unsigned char*>(data());
-   }
-
-   void BOOST_REGEX_CALL clear()
-   {
-      end = start;
-   }
-
-   void BOOST_REGEX_CALL align()
-   {
-      // move end up to a boundary:
-      end = reinterpret_cast<unsigned char*>(start) + (((reinterpret_cast<unsigned char*>(end) - reinterpret_cast<unsigned char*>(start)) + padding_mask) & ~padding_mask);
-   }
-
-   Allocator BOOST_REGEX_CALL allocator()const;
-};
-
-template <class Allocator>
-raw_storage<Allocator>::raw_storage(const Allocator& a)
-  : alloc_inst(a)
-{
-  start = end = alloc_inst.allocate(1024);
-  BOOST_REGEX_NOEH_ASSERT(start)
-  alloc_inst.last = start + 1024;
-}
-
-template <class Allocator>
-raw_storage<Allocator>::raw_storage(size_type n, const Allocator& a)
-  : alloc_inst(a)
-{
-  start = end = alloc_inst.allocate(n);
-  BOOST_REGEX_NOEH_ASSERT(start)
-  alloc_inst.last = start + n;
-}
-
-template <class Allocator>
-Allocator BOOST_REGEX_CALL raw_storage<Allocator>::allocator()const
-{
-  return alloc_inst;
-}
-
-template <class Allocator>
-void BOOST_REGEX_CALL raw_storage<Allocator>::resize(size_type n)
-{
-   register size_type newsize = (alloc_inst.last - start) * 2;
-   register size_type datasize = end - start;
-   if(newsize < n)
-      newsize = n;
-   // extend newsize to WORD/DWORD boundary:
-   newsize = (newsize + padding_mask) & ~(padding_mask);
-
-   // allocate and copy data:
-   register unsigned char* ptr = alloc_inst.allocate(newsize);
-   BOOST_REGEX_NOEH_ASSERT(ptr)
-   std::memcpy(ptr, start, datasize);
-
-   // get rid of old buffer:
-   alloc_inst.deallocate(start, (alloc_inst.last - start));
-
-   // and set up pointers:
-   start = ptr;
-   end = ptr + datasize;
-   alloc_inst.last = ptr + newsize;
-}
-
-template <class Allocator>
-void* BOOST_REGEX_CALL raw_storage<Allocator>::insert(size_type pos, size_type n)
-{
-   jm_assert(pos <= size_type(end - start));
-   if(size_type(alloc_inst.last - end) < n)
-      resize(n + (end - start));
-   register void* result = start + pos;
-   std::memmove(start + pos + n, start + pos, (end - start) - pos);
-   end += n;
-   return result;
-}
-
-#ifdef __BORLANDC__
-  #pragma option pop
-#endif
-
-} // namespace re_detail
-} // namespace boost
-
-#endif
-
-
-
-
-
-
diff --git a/include/boost/regex/v3/regex_split.hpp b/include/boost/regex/v3/regex_split.hpp
deleted file mode 100644
index ee94e30f..00000000
--- a/include/boost/regex/v3/regex_split.hpp
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- *
- * Copyright (c) 1998-2002
- * Dr 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         regex_split.hpp
-  *   VERSION      see <boost/version.hpp>
-  *   DESCRIPTION: Implements regex_split and associated functions.
-  *                Note this is an internal header file included
-  *                by regex.hpp, do not include on its own.
-  */
-
-#ifndef BOOST_REGEX_SPLIT_HPP
-#define BOOST_REGEX_SPLIT_HPP
-
-namespace boost{
-
-#ifdef __BORLANDC__
-   #pragma option push -a8 -b -Vx -Ve -pc
-#endif
-
-namespace re_detail{
-
-template <class charT>
-const reg_expression<charT>& get_default_expression(charT)
-{
-   static const charT expression_text[4] = { '\\', 's', '+', '\00', };
-   static const reg_expression<charT> e(expression_text);
-   return e;
-}
-
-template <class OutputIterator, class charT, class Traits1, class Alloc1, class Alloc2>
-class split_pred
-{
-   typedef std::basic_string<charT, Traits1, Alloc1> string_type;
-   typedef typename string_type::const_iterator iterator_type;
-   iterator_type* p_last;
-   OutputIterator* p_out;
-   std::size_t* p_max;
-   std::size_t initial_max;
-public:
-   split_pred(iterator_type* a, OutputIterator* b, std::size_t* c)
-      : p_last(a), p_out(b), p_max(c), initial_max(*c) {}
-
-   bool operator()(const match_results<iterator_type, Alloc2>& what);
-};
-
-template <class OutputIterator, class charT, class Traits1, class Alloc1, class Alloc2>
-bool split_pred<OutputIterator, charT, Traits1, Alloc1, Alloc2>::operator()
-   (const match_results<iterator_type, Alloc2>& what)
-{
-   *p_last = what[0].second;
-   if(what.size() > 1)
-   {
-      // output sub-expressions only:
-      for(unsigned i = 1; i < what.size(); ++i)
-      {
-         *(*p_out) = static_cast<string_type>(what[i]);
-         ++(*p_out);
-         if(0 == --*p_max) return false;
-      }
-      return *p_max != 0;
-   }
-   else
-   {
-      // output $` only if it's not-null or not at the start of the input:
-      const sub_match<iterator_type>& sub = what[-1];
-      if((sub.first != sub.second) || (*p_max != initial_max))
-      {
-         *(*p_out) = static_cast<string_type>(sub);
-         ++(*p_out);
-         return --*p_max;
-      }
-   }
-   //
-   // initial null, do nothing:
-   return true;
-}
-
-} // namespace re_detail
-
-template <class OutputIterator, class charT, class Traits1, class Alloc1, class Traits2, class Alloc2>
-std::size_t regex_split(OutputIterator out,
-                   std::basic_string<charT, Traits1, Alloc1>& s, 
-                   const reg_expression<charT, Traits2, Alloc2>& e,
-                   unsigned flags,
-                   std::size_t max_split)
-{
-   typedef typename std::basic_string<charT, Traits1, Alloc1>::const_iterator ci_t;
-   ci_t last = s.begin();
-   std::size_t init_size = max_split;
-   re_detail::split_pred<OutputIterator, charT, Traits1, Alloc1, Alloc2> pred(&last, &out, &max_split);
-   ci_t i, j;
-   i = s.begin();
-   j = s.end();
-   regex_grep(pred, i, j, e, flags);
-   //
-   // if there is still input left, do a final push as long as max_split
-   // is not exhausted, and we're not splitting sub-expressions rather 
-   // than whitespace:
-   if(max_split && (last != s.end()) && (e.mark_count() == 1))
-   {
-      *out = std::basic_string<charT, Traits1, Alloc1>((ci_t)last, (ci_t)s.end());
-      ++out;
-      last = s.end();
-      --max_split;
-   }
-   //
-   // delete from the string everything that has been processed so far:
-   s.erase(0, last - s.begin());
-   //
-   // return the number of new records pushed:
-   return init_size - max_split;
-}
-
-template <class OutputIterator, class charT, class Traits1, class Alloc1, class Traits2, class Alloc2>
-inline std::size_t regex_split(OutputIterator out,
-                   std::basic_string<charT, Traits1, Alloc1>& s, 
-                   const reg_expression<charT, Traits2, Alloc2>& e,
-                   unsigned flags = match_default)
-{
-   return regex_split(out, s, e, flags, UINT_MAX);
-}
-
-template <class OutputIterator, class charT, class Traits1, class Alloc1>
-inline std::size_t regex_split(OutputIterator out,
-                   std::basic_string<charT, Traits1, Alloc1>& s)
-{
-   return regex_split(out, s, re_detail::get_default_expression(charT(0)), match_default, UINT_MAX);
-}
-
-#ifdef __BORLANDC__
-  #pragma option pop
-#endif
-
-} // namespace boost
-
-#endif
-
-
-
diff --git a/include/boost/regex/v3/regex_stack.hpp b/include/boost/regex/v3/regex_stack.hpp
deleted file mode 100644
index 58e3ef1d..00000000
--- a/include/boost/regex/v3/regex_stack.hpp
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- *
- * Copyright (c) 1998-2002
- * Dr 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         regex_stack.hpp
-  *   VERSION      see <boost/version.hpp>
-  *   DESCRIPTION: Implements customised internal regex stacks.
-  *                Note this is an internal header file included
-  *                by regex.hpp, do not include on its own.
-  */
-
-#ifndef BOOST_REGEX_STACK_HPP
-#define BOOST_REGEX_STACK_HPP
-
-#ifndef BOOST_REGEX_CONFIG_HPP
-#include <boost/regex/config.hpp>
-#endif
-#ifndef BOOST_REGEX_RAW_BUFFER_HPP
-#include <boost/regex/v3/regex_raw_buffer.hpp>
-#endif
-
-namespace boost{
-   namespace re_detail{
-
-#ifdef __BORLANDC__
-   #pragma option push -a8 -b -Vx -Ve -pc
-#endif
-
-//
-// class jstack
-// simplified stack optimised for push/peek/pop
-// operations, we could use std::stack<std::vector<T>> instead...
-//
-template <class T, class Allocator = BOOST_DEFAULT_ALLOCATOR(T) >
-class jstack
-{
-private:
-   typedef typename boost::detail::rebind_allocator<unsigned char, Allocator>::type allocator_type;
-   typedef typename boost::detail::rebind_allocator<T, Allocator>::type             T_alloc_type;
-   typedef typename T_alloc_type::size_type                              size_type;
-   typedef T value_type;
-   struct node
-   {
-      node* next;
-      T* start;  // first item
-      T* end;    // last item
-      T* last;   // end of storage
-   };
-   
-   //
-   // empty base member optimisation:
-   struct data : public allocator_type
-   {
-      padding buf[(sizeof(T) * 16 + sizeof(padding) - 1) / sizeof(padding)];
-      data(const Allocator& a) : allocator_type(a){}
-   };
-
-   data alloc_inst;
-   mutable node* m_stack;
-   mutable node* unused;
-   node base;
-   size_type block_size;
-
-   void BOOST_REGEX_CALL pop_aux()const;
-   void BOOST_REGEX_CALL push_aux();
-
-public:
-   jstack(size_type n = 64, const Allocator& a = Allocator());
-
-   ~jstack();
-
-   node* BOOST_REGEX_CALL get_node()
-   {
-      node* new_stack = reinterpret_cast<node*>(alloc_inst.allocate(sizeof(node) + sizeof(T) * block_size));
-      BOOST_REGEX_NOEH_ASSERT(new_stack)
-      new_stack->last = reinterpret_cast<T*>(new_stack+1);
-      new_stack->start = new_stack->end = new_stack->last + block_size;
-      new_stack->next = 0;
-      return new_stack;
-   }
-
-   bool BOOST_REGEX_CALL empty()
-   {
-      return (m_stack->start == m_stack->end) && (m_stack->next == 0);
-   }
-
-   bool BOOST_REGEX_CALL good()
-   {
-      return (m_stack->start != m_stack->end) || (m_stack->next != 0);
-   }
-
-   T& BOOST_REGEX_CALL peek()
-   {
-      if(m_stack->start == m_stack->end)
-         pop_aux();
-      return *m_stack->end;
-   }
-
-   const T& BOOST_REGEX_CALL peek()const
-   {
-      if(m_stack->start == m_stack->end)
-         pop_aux();
-      return *m_stack->end;
-   }
-
-   void BOOST_REGEX_CALL pop()
-   {
-      if(m_stack->start == m_stack->end)
-         pop_aux();
-      ::boost::re_detail::pointer_destroy(m_stack->end);
-      ++(m_stack->end);
-   }
-
-   void BOOST_REGEX_CALL pop(T& t)
-   {
-      if(m_stack->start == m_stack->end)
-         pop_aux();
-      t = *m_stack->end;
-      ::boost::re_detail::pointer_destroy(m_stack->end);
-      ++(m_stack->end);
-   }
-
-   void BOOST_REGEX_CALL push(const T& t)
-   {
-      if(m_stack->end == m_stack->last)
-         push_aux();
-      --(m_stack->end);
-      pointer_construct(m_stack->end, t);
-   }
-
-};
-
-template <class T, class Allocator>
-jstack<T, Allocator>::jstack(size_type n, const Allocator& a)
-    : alloc_inst(a)
-{
-  unused = 0;
-  block_size = n;
-  m_stack = &base;
-  base.last = reinterpret_cast<T*>(alloc_inst.buf);
-  base.end = base.start = base.last + 16;
-  base.next = 0;
-}
-
-template <class T, class Allocator>
-void BOOST_REGEX_CALL jstack<T, Allocator>::push_aux()
-{
-   // make sure we have spare space on TOS:
-   register node* new_node;
-   if(unused)
-   {
-      new_node = unused;
-      unused = new_node->next;
-      new_node->next = m_stack;
-      m_stack = new_node;
-   }
-   else
-   {
-      new_node = get_node();
-      new_node->next = m_stack;
-      m_stack = new_node;
-   }
-}
-
-template <class T, class Allocator>
-void BOOST_REGEX_CALL jstack<T, Allocator>::pop_aux()const
-{
-   // make sure that we have a valid item
-   // on TOS:
-   jm_assert(m_stack->next);
-   register node* p = m_stack;
-   m_stack = p->next;
-   p->next = unused;
-   unused = p;
-}
-
-template <class T, class Allocator>
-jstack<T, Allocator>::~jstack()
-{
-   node* condemned;
-   while(good())
-      pop();
-   while(unused)
-   {
-      condemned = unused;
-      unused = unused->next;
-      alloc_inst.deallocate(reinterpret_cast<unsigned char*>(condemned), sizeof(node) + sizeof(T) * block_size);
-   }
-   while(m_stack != &base)
-   {
-      condemned = m_stack;
-      m_stack = m_stack->next;
-      alloc_inst.deallocate(reinterpret_cast<unsigned char*>(condemned), sizeof(node) + sizeof(T) * block_size);
-   }
-}
-
-#ifdef __BORLANDC__
-  #pragma option pop
-#endif
-
-} // namespace re_detail
-} // namespace boost
-
-#endif
-
-
-
-
-
-
-
-
-
-
-
diff --git a/include/boost/regex/v3/regex_synch.hpp b/include/boost/regex/v3/regex_synch.hpp
deleted file mode 100644
index 3d9faafa..00000000
--- a/include/boost/regex/v3/regex_synch.hpp
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- *
- * Copyright (c) 1998-2002
- * Dr 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         regex_synch.hpp
-  *   VERSION      see <boost/version.hpp>
-  *   DESCRIPTION: Thread synchronisation for regex code.
-  *                Note this is an internal header file included
-  *                by regex.hpp, do not include on its own.
-  */
-
-#ifndef BOOST_REGEX_SYNCH_HPP
-#define BOOST_REGEX_SYNCH_HPP
-
-#ifndef BOOST_REGEX_CONFIG_HPP
-#include <boost/regex/config.hpp>
-#endif
-
-#if defined(BOOST_HAS_THREADS)
-#  if defined(BOOST_HAS_WINTHREADS)
-#     include <windows.h>
-#  elif defined(BOOST_HAS_BETHREADS)
-#     include <OS.h>
-#     include <cassert>
-#  elif defined(BOOST_HAS_PTHREADS)
-#     include <pthread.h>
-#  else
-#     error "Unknown threading API"
-#  endif
-#endif
-
-
-namespace boost{
-   namespace re_detail{
-
-#ifdef __BORLANDC__
-   #pragma option push -a8 -b -Vx -Ve -pc
-#endif
-
-void BOOST_REGEX_CALL re_init_threads();
-void BOOST_REGEX_CALL re_free_threads();
-
-#ifdef BOOST_HAS_THREADS
-
-#  ifdef BOOST_HAS_BETHREADS
-
-typedef sem_id CRITICAL_SECTION;
-
-inline void BOOST_REGEX_CALL InitializeCriticalSection(CRITICAL_SECTION* ps)
-{
-    *ps = create_sem(1, "regex++");
-    assert(*ps > 0);
-}
-
-inline void BOOST_REGEX_CALL DeleteCriticalSection(CRITICAL_SECTION* ps)
-{
-    int t = delete_sem(*ps);
-    assert(t == B_NO_ERROR);
-}
-
-inline void BOOST_REGEX_CALL EnterCriticalSection(CRITICAL_SECTION* ps)
-{
-   status_t t = acquire_sem(*ps);
-   assert(t == B_NO_ERROR);
-}
-
-inline void BOOST_REGEX_CALL LeaveCriticalSection(CRITICAL_SECTION* ps)
-{
-    status_t t = release_sem(*ps);
-    assert(t == B_NO_ERROR);
-}
-
-#  elif defined(BOOST_HAS_PTHREADS)
-
-typedef pthread_mutex_t CRITICAL_SECTION;
-
-inline void BOOST_REGEX_CALL InitializeCriticalSection(CRITICAL_SECTION* ps)
-{
-   pthread_mutex_init(ps, 0);
-}
-
-inline void BOOST_REGEX_CALL DeleteCriticalSection(CRITICAL_SECTION* ps)
-{
-   pthread_mutex_destroy(ps);
-}
-
-inline void BOOST_REGEX_CALL EnterCriticalSection(CRITICAL_SECTION* ps)
-{
-   pthread_mutex_lock(ps);
-}
-
-inline void BOOST_REGEX_CALL LeaveCriticalSection(CRITICAL_SECTION* ps)
-{
-   pthread_mutex_unlock(ps);
-}
-
-#  elif !defined(BOOST_HAS_WINTHREADS)
-#    error "Unknown threading API"
-#  endif
-
-template <class Lock>
-class lock_guard
-{
-   typedef Lock lock_type;
-public:
-   lock_guard(lock_type& m, bool aq = true)
-      : mut(m), owned(false){ acquire(aq); }
-
-   ~lock_guard()
-   { acquire(false); }
-
-   void BOOST_REGEX_CALL acquire(bool aq = true)
-   {
-      if(aq && !owned)
-      {
-         mut.acquire(true);
-         owned = true;
-      }
-      else if(!aq && owned)
-      {
-         mut.acquire(false);
-         owned = false;
-      }
-   }
-private:
-   lock_type& mut;
-   bool owned;
-   // VC6 warning suppression:
-   lock_guard& operator=(const lock_guard&);
-};
-
-
-class critical_section
-{
-public:
-   critical_section()
-   { InitializeCriticalSection(&hmutex);}
-
-   critical_section(const critical_section&)
-   { InitializeCriticalSection(&hmutex);}
-
-   const critical_section& BOOST_REGEX_CALL operator=(const critical_section&)
-   {return *this;}
-
-   ~critical_section()
-   {DeleteCriticalSection(&hmutex);}
-
-private:
-
-   void BOOST_REGEX_CALL acquire(bool aq)
-   { if(aq) EnterCriticalSection(&hmutex);
-      else LeaveCriticalSection(&hmutex);
-   }
-
-   CRITICAL_SECTION hmutex;
-
-public:
-   typedef lock_guard<critical_section> ro_guard;
-   typedef lock_guard<critical_section> rw_guard;
-
-   friend class lock_guard<critical_section>;
-};
-
-inline bool BOOST_REGEX_CALL operator==(const critical_section&, const critical_section&)
-{
-   return false;
-}
-
-inline bool BOOST_REGEX_CALL operator<(const critical_section&, const critical_section&)
-{
-   return true;
-}
-
-typedef lock_guard<critical_section> cs_guard;
-
-BOOST_REGEX_DECL extern critical_section* p_re_lock;
-BOOST_REGEX_DECL extern unsigned int re_lock_count;
-
-#define BOOST_REGEX_GUARD(inst) boost::re_detail::critical_section::rw_guard g(inst);
-
-#else  // BOOST_HAS_THREADS
-
-#define BOOST_REGEX_GUARD(inst)
-
-#endif // BOOST_HAS_THREADS
-
-#ifdef __BORLANDC__
-  #pragma option pop
-#endif
-
-} // namespace re_detail
-} // namespace boost
-
-#endif // sentry
-
-
-
-
-
-
-
diff --git a/include/boost/regex/v3/regex_traits.hpp b/include/boost/regex/v3/regex_traits.hpp
deleted file mode 100644
index 8f7f3b78..00000000
--- a/include/boost/regex/v3/regex_traits.hpp
+++ /dev/null
@@ -1,815 +0,0 @@
-/*
- *
- * Copyright (c) 1998-2002
- * Dr 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         regex_traits.hpp
-  *   VERSION      see <boost/version.hpp>
-  *   DESCRIPTION: Declares regular expression traits classes.
-  */
-
-#ifndef BOOST_REGEX_TRAITS_HPP_INCLUDED
-#define BOOST_REGEX_TRAITS_HPP_INCLUDED
-
-#ifndef BOOST_RE_CREGEX_HPP
-#include <boost/cregex.hpp>
-#endif
-#ifndef BOOST_REGEX_CSTRING_HPP
-#include <boost/regex/v3/regex_cstring.hpp>
-#endif
-
-namespace boost{
-
-#ifdef __BORLANDC__
-   #pragma option push -a8 -b -Vx -Ve -pc
-#endif
-
-template <class charT>
-class c_regex_traits;
-
-namespace re_detail{
-
-struct mss
-{
-   unsigned int id;
-   const char* what;
-};
-
-BOOST_REGEX_DECL bool BOOST_REGEX_CALL re_lookup_def_collate_name(std::string& buf, const char* name);
-BOOST_REGEX_DECL std::size_t BOOST_REGEX_CALL re_get_default_message(char* buf, std::size_t len, std::size_t id);
-extern BOOST_REGEX_DECL const char *re_default_error_messages[];
-
-#ifndef BOOST_NO_WREGEX
-extern BOOST_REGEX_DECL wchar_t wide_lower_case_map[];
-extern BOOST_REGEX_DECL unsigned short wide_unicode_classes[];
-BOOST_REGEX_DECL bool BOOST_REGEX_CALL is_combining(wchar_t c);
-#endif
-
-
-struct BOOST_REGEX_DECL regex_traits_base
-{
-   enum char_syntax_type
-   {
-      syntax_char = 0,
-      syntax_open_bracket = 1,                  // (
-      syntax_close_bracket = 2,                 // )
-      syntax_dollar = 3,                        // $
-      syntax_caret = 4,                         // ^
-      syntax_dot = 5,                           // .
-      syntax_star = 6,                          // *
-      syntax_plus = 7,                          // +
-      syntax_question = 8,                      // ?
-      syntax_open_set = 9,                      // [
-      syntax_close_set = 10,                    // ]
-      syntax_or = 11,                           // |
-      syntax_slash = 12,                        //
-      syntax_hash = 13,                         // #
-      syntax_dash = 14,                         // -
-      syntax_open_brace = 15,                   // {
-      syntax_close_brace = 16,                  // }
-      syntax_digit = 17,                        // 0-9
-      syntax_b = 18,                            // for \b
-      syntax_B = 19,                            // for \B
-      syntax_left_word = 20,                    // for \<
-      syntax_right_word = 21,                   // for \>
-      syntax_w = 22,                            // for \w
-      syntax_W = 23,                            // for \W
-      syntax_start_buffer = 24,                 // for \`
-      syntax_end_buffer = 25,                   // for \'
-      syntax_newline = 26,                      // for newline alt
-      syntax_comma = 27,                        // for {x,y}
-
-      syntax_a = 28,                            // for \a
-      syntax_f = 29,                            // for \f
-      syntax_n = 30,                            // for \n
-      syntax_r = 31,                            // for \r
-      syntax_t = 32,                            // for \t
-      syntax_v = 33,                            // for \v
-      syntax_x = 34,                            // for \xdd
-      syntax_c = 35,                            // for \cx
-      syntax_colon = 36,                        // for [:...:]
-      syntax_equal = 37,                        // for [=...=]
-   
-      // perl ops:
-      syntax_e = 38,                            // for \e
-      syntax_l = 39,                            // for \l
-      syntax_L = 40,                            // for \L
-      syntax_u = 41,                            // for \u
-      syntax_U = 42,                            // for \U
-      syntax_s = 43,                            // for \s
-      syntax_S = 44,                            // for \S
-      syntax_d = 45,                            // for \d
-      syntax_D = 46,                            // for \D
-      syntax_E = 47,                            // for \Q\E
-      syntax_Q = 48,                            // for \Q\E
-      syntax_X = 49,                            // for \X
-      syntax_C = 50,                            // for \C
-      syntax_Z = 51,                            // for \Z
-      syntax_G = 52,                            // for \G
-
-      // new extentions:
-      syntax_not = 53,                          // for (?!...)
-
-      syntax_max = 54
-   };
-#ifdef __BORLANDC__
-private:
-   char dummy_member;
-#endif
-};
-
-struct BOOST_REGEX_DECL c_traits_base : public regex_traits_base
-{
-public:
-   enum{
-      char_class_none = 0,
-      char_class_alpha = 0x0001,
-      char_class_cntrl = 0x0002,
-      char_class_digit = 0x0004,
-      char_class_lower = 0x0008,
-      char_class_punct = 0x0010,
-      char_class_space = 0x0020,
-      char_class_upper = 0x0040,
-      char_class_xdigit = 0x0080,
-      char_class_blank = 0x0100,
-      char_class_underscore = 0x4000,
-      char_class_unicode = 0x8000,
-
-      char_class_alnum = char_class_alpha | char_class_digit,
-      char_class_graph = char_class_alpha | char_class_digit | char_class_punct | char_class_underscore,
-      char_class_print = char_class_alpha | char_class_digit | char_class_punct | char_class_underscore | char_class_blank,
-      char_class_word = char_class_alpha | char_class_digit | char_class_underscore
-   };
-   static std::string BOOST_REGEX_CALL set_message_catalogue(const std::string& s);
-protected:
-#if defined(__MWERKS__) && __MWERKS__ <= 0x6000
-   friend class c_regex_traits<char>;
-   friend class c_regex_traits<wchar_t>;
-#endif 
-
-   static char regex_message_catalogue[BOOST_REGEX_MAX_PATH];
-   enum syntax_map_size
-   {
-      map_size = UCHAR_MAX + 1
-   };
-
-   static unsigned char syntax_map[map_size];
-   static unsigned short class_map[map_size];
-   static char lower_case_map[map_size];
-
-   static boost::uint_fast32_t BOOST_REGEX_CALL do_lookup_class(const char* p);
-   static bool BOOST_REGEX_CALL do_lookup_collate(std::string& buf, const char* p);
-   static void BOOST_REGEX_CALL do_update_ctype();
-   static void BOOST_REGEX_CALL do_update_collate();
-public:
-   static std::string BOOST_REGEX_CALL error_string(unsigned id);
-   static char* BOOST_REGEX_CALL get_catalogue() { return regex_message_catalogue; }
-};
-
-} // namespace re_detail
-
-
-template<>
-class BOOST_REGEX_DECL c_regex_traits<char> : public re_detail::c_traits_base
-{
-   typedef re_detail::c_traits_base base_type;
-public:
-   typedef char char_type;
-   typedef unsigned char uchar_type;
-   typedef unsigned int size_type;
-   typedef std::string string_type;
-   typedef int locale_type;
-
-   static std::size_t BOOST_REGEX_CALL length(const char_type* p)
-   {
-      return std::strlen(p);
-   }
-   static unsigned int BOOST_REGEX_CALL syntax_type(size_type c)
-   {
-      return syntax_map[c];
-   }
-   static char BOOST_REGEX_CALL translate(char c, bool icase)
-   {
-      return icase ? lower_case_map[(size_type)(uchar_type)c] : c;
-   }
-   static void BOOST_REGEX_CALL transform(std::string& out, const std::string& in);
-
-   static void BOOST_REGEX_CALL transform_primary(std::string& out, const std::string& in);
-
-   static bool BOOST_REGEX_CALL is_separator(char c)
-   {
-      return BOOST_REGEX_MAKE_BOOL((c == '\n') || (c == '\r'));
-   }
-
-   static bool BOOST_REGEX_CALL is_combining(char)
-   {
-      return false;
-   }
-   
-   static bool BOOST_REGEX_CALL is_class(char c, boost::uint_fast32_t f)
-   {
-      return BOOST_REGEX_MAKE_BOOL(class_map[(size_type)(uchar_type)c] & f);
-   }
-
-   static int BOOST_REGEX_CALL toi(char c);
-   static int BOOST_REGEX_CALL toi(const char*& first, const char* last, int radix);
-
-   static boost::uint_fast32_t BOOST_REGEX_CALL lookup_classname(const char* first, const char* last)
-   {
-      std::string s(first, last);
-      return do_lookup_class(s.c_str());
-   }
-
-   static bool BOOST_REGEX_CALL lookup_collatename(std::string& buf, const char* first, const char* last)
-   {
-      std::string s(first, last);
-      return do_lookup_collate(buf, s.c_str());
-   }
-
-   static locale_type BOOST_REGEX_CALL imbue(locale_type l){ return l; }
-   locale_type BOOST_REGEX_CALL getloc()const{ return locale_type(); }
-
-   c_regex_traits()
-   {
-      init();
-   }
-   ~c_regex_traits()
-   {
-      m_free();
-   }
-   struct sentry
-   {
-      sentry(const c_regex_traits<char>&)
-      { c_regex_traits<char>::update(); }
-      operator void*() { return this; }
-   };
-   static void BOOST_REGEX_CALL update();
-private:
-   static void BOOST_REGEX_CALL init();
-   static void BOOST_REGEX_CALL m_free();
-   static c_regex_traits<char> i;
-
-   static unsigned sort_type;
-   static char sort_delim;
-};
-
-#ifndef BOOST_NO_WREGEX
-template<>
-class BOOST_REGEX_DECL c_regex_traits<wchar_t> : public re_detail::c_traits_base
-{
-   typedef re_detail::c_traits_base base_type;
-public:
-   typedef wchar_t char_type;
-   typedef unsigned short uchar_type;
-   typedef unsigned int size_type;
-   typedef std::basic_string<wchar_t> string_type;
-   typedef int locale_type; 
-   static std::size_t BOOST_REGEX_CALL length(const char_type* p)
-   {
-      return std::wcslen(p);
-   }
-   static unsigned int BOOST_REGEX_CALL syntax_type(size_type c);
-   static wchar_t BOOST_REGEX_CALL translate(wchar_t c, bool icase)
-   {
-      return icase ? ((c < 256) ? re_detail::wide_lower_case_map[(uchar_type)c] : std::towlower(c)) : c;
-   }
-
-   static void BOOST_REGEX_CALL transform(std::basic_string<wchar_t>& out, const std::basic_string<wchar_t>& in);
-
-   static void BOOST_REGEX_CALL transform_primary(std::basic_string<wchar_t>& out, const std::basic_string<wchar_t>& in);
-
-   static bool BOOST_REGEX_CALL is_separator(wchar_t c)
-   {
-      return BOOST_REGEX_MAKE_BOOL((c == L'\n') || (c == L'\r') || (c == (wchar_t)0x2028) || (c == (wchar_t)0x2029));
-   }
-
-   static bool BOOST_REGEX_CALL is_combining(wchar_t c)
-   { return re_detail::is_combining(c); }
-   
-   static bool BOOST_REGEX_CALL is_class(wchar_t c, boost::uint_fast32_t f)
-   {
-      return BOOST_REGEX_MAKE_BOOL(((uchar_type)c < 256) ? (re_detail::wide_unicode_classes[(size_type)(uchar_type)c] & f) : do_iswclass(c, f));
-   }
-
-   static int BOOST_REGEX_CALL toi(wchar_t c);
-   static int BOOST_REGEX_CALL toi(const wchar_t*& first, const wchar_t* last, int radix);
-
-   static boost::uint_fast32_t BOOST_REGEX_CALL lookup_classname(const wchar_t* first, const wchar_t* last);
-
-   static bool BOOST_REGEX_CALL lookup_collatename(std::basic_string<wchar_t>& s, const wchar_t* first, const wchar_t* last);
-
-   static locale_type BOOST_REGEX_CALL imbue(locale_type l){ return l; }
-   locale_type BOOST_REGEX_CALL getloc()const{ return locale_type(); }
-   c_regex_traits<wchar_t>()
-   { init(); }
-   ~c_regex_traits<wchar_t>()
-   { m_free(); }
-   struct sentry
-   {
-      sentry(const c_regex_traits<wchar_t>&)
-      { c_regex_traits<wchar_t>::update(); }
-      operator void*() { return this; }
-   };
-   static void BOOST_REGEX_CALL update();
-   static std::size_t BOOST_REGEX_CALL strnarrow(char *s1, std::size_t len, const wchar_t *s2);
-   static std::size_t BOOST_REGEX_CALL strwiden(wchar_t *s1, std::size_t len, const char *s2);
-private:
-   static bool BOOST_REGEX_CALL do_iswclass(wchar_t c, boost::uint_fast32_t f);
-   static void BOOST_REGEX_CALL m_free();
-   static void BOOST_REGEX_CALL init();
-   static bool BOOST_REGEX_CALL do_lookup_collate(std::basic_string<wchar_t>& out, const wchar_t* first, const wchar_t* last);
-   static c_regex_traits<wchar_t> init_;
-
-   static unsigned sort_type;
-   static wchar_t sort_delim;
-};
-#endif
-
-#if defined(_WIN32) && !defined(BOOST_REGEX_NO_W32)
-
-namespace re_detail{
-
-struct BOOST_REGEX_DECL w32_traits_base : public regex_traits_base
-{
-   enum{
-   char_class_none = 0,
-   char_class_alnum = C1_ALPHA | C1_DIGIT,
-   char_class_alpha = C1_ALPHA,
-   char_class_cntrl = C1_CNTRL,
-   char_class_digit = C1_DIGIT,
-   char_class_graph = C1_UPPER | C1_LOWER | C1_DIGIT | C1_PUNCT | C1_ALPHA,
-   char_class_lower = C1_LOWER,
-   char_class_print = C1_UPPER | C1_LOWER | C1_DIGIT | C1_PUNCT | C1_BLANK | C1_ALPHA,
-   char_class_punct = C1_PUNCT,
-   char_class_space = C1_SPACE,
-   char_class_upper = C1_UPPER,
-   char_class_xdigit = C1_XDIGIT,
-   char_class_blank = C1_BLANK,
-   char_class_underscore = 0x4000,
-   char_class_word = C1_ALPHA | C1_DIGIT | char_class_underscore,
-   char_class_unicode = 0x8000,
-   char_class_win = 0x01FF
-   };
-
-
-public:
-   static std::string BOOST_REGEX_CALL set_message_catalogue(const std::string& s);
-protected:
-   static char regex_message_catalogue[BOOST_REGEX_MAX_PATH];
-   enum syntax_map_size
-   {
-      map_size = UCHAR_MAX + 1
-   };
-
-   static unsigned char syntax_map[map_size];
-   static unsigned short class_map[map_size];
-   static char lower_case_map[map_size];
-
-   static boost::uint_fast32_t BOOST_REGEX_CALL do_lookup_class(const char* p);
-   static bool BOOST_REGEX_CALL do_lookup_collate(std::string& buf, const char* p);
-   static void BOOST_REGEX_CALL do_free();
-   static void BOOST_REGEX_CALL do_init();
-public:
-   static std::string BOOST_REGEX_CALL error_string(unsigned id);
-   static char* BOOST_REGEX_CALL get_catalogue() { return regex_message_catalogue; }
-};
-
-
-} // namespace re_detail
-
-template<class charT>
-class w32_regex_traits;
-
-template<>
-class BOOST_REGEX_DECL w32_regex_traits<char> : public re_detail::w32_traits_base
-{
-   typedef re_detail::w32_traits_base base_type;
-public:
-   typedef char char_type;
-   typedef unsigned char uchar_type;
-   typedef unsigned int size_type;
-   typedef std::string string_type;
-   typedef int locale_type;
-
-   static std::size_t BOOST_REGEX_CALL length(const char_type* p)
-   {
-      return std::strlen(p);
-   }
-   static unsigned int BOOST_REGEX_CALL syntax_type(size_type c)
-   {
-      return syntax_map[c];
-   }
-   static char BOOST_REGEX_CALL translate(char c, bool icase)
-   {
-      return icase ? lower_case_map[(size_type)(uchar_type)c] : c;
-   }
-   static void BOOST_REGEX_CALL transform(std::string& out, const std::string& in);
-
-   static void BOOST_REGEX_CALL transform_primary(std::string& out, const std::string& in);
-
-   static bool BOOST_REGEX_CALL is_separator(char c)
-   {
-      return BOOST_REGEX_MAKE_BOOL((c == '\n') || (c == '\r'));
-   }
-
-   static bool BOOST_REGEX_CALL is_combining(char)
-   {
-      return false;
-   }
-   
-   static bool BOOST_REGEX_CALL is_class(char c, boost::uint_fast32_t f)
-   {
-      return BOOST_REGEX_MAKE_BOOL(class_map[(size_type)(uchar_type)c] & f);
-   }
-
-   static int BOOST_REGEX_CALL toi(char c);
-   static int BOOST_REGEX_CALL toi(const char*& first, const char* last, int radix);
-
-   static boost::uint_fast32_t BOOST_REGEX_CALL lookup_classname(const char* first, const char* last)
-   {
-      std::string s(first, last);
-      return do_lookup_class(s.c_str());
-   }
-
-   static bool BOOST_REGEX_CALL lookup_collatename(std::string& buf, const char* first, const char* last)
-   {
-      std::string s(first, last);
-      return do_lookup_collate(buf, s.c_str());
-   }
-
-   static locale_type BOOST_REGEX_CALL imbue(locale_type l){ return l; }
-   locale_type BOOST_REGEX_CALL getloc()const{ return locale_type(); }
-
-   struct sentry
-   {
-      sentry(const w32_regex_traits<char>&)
-      { w32_regex_traits<char>::update(); }
-      ~sentry(){}
-      operator void*() { return this; }
-   };
-   static void BOOST_REGEX_CALL update();
-   w32_regex_traits();
-   ~w32_regex_traits();
-private:
-   static w32_regex_traits<char> i;
-};
-
-#ifndef BOOST_NO_WREGEX
-template<>
-class BOOST_REGEX_DECL w32_regex_traits<wchar_t> : public re_detail::w32_traits_base
-{
-   typedef re_detail::w32_traits_base base_type;
-public:
-   typedef wchar_t char_type;
-   typedef unsigned short uchar_type;
-   typedef unsigned int size_type;
-   typedef std::basic_string<wchar_t> string_type;
-   typedef int locale_type; 
-   static std::size_t BOOST_REGEX_CALL length(const char_type* p)
-   {
-      return std::wcslen(p);
-   }
-   static unsigned int BOOST_REGEX_CALL syntax_type(size_type c);
-   static wchar_t BOOST_REGEX_CALL translate(wchar_t c, bool icase)
-   {
-      return icase ? ((c < 256) ? re_detail::wide_lower_case_map[(uchar_type)c] : wtolower(c)) : c;
-   }
-
-   static void BOOST_REGEX_CALL transform(std::basic_string<wchar_t>& out, const std::basic_string<wchar_t>& in);
-
-   static void BOOST_REGEX_CALL transform_primary(std::basic_string<wchar_t>& out, const std::basic_string<wchar_t>& in);
-
-   static bool BOOST_REGEX_CALL is_separator(wchar_t c)
-   {
-      return BOOST_REGEX_MAKE_BOOL((c == L'\n') || (c == L'\r') || (c == (wchar_t)0x2028) || (c == (wchar_t)0x2029));
-   }
-
-   static bool BOOST_REGEX_CALL is_combining(wchar_t c)
-   { return re_detail::is_combining(c); }
-   
-   static bool BOOST_REGEX_CALL is_class(wchar_t c, boost::uint_fast32_t f)
-   {
-      return BOOST_REGEX_MAKE_BOOL(((uchar_type)c < 256) ? (wide_unicode_classes[(size_type)(uchar_type)c] & f) : do_iswclass(c, f));
-   }
-
-   static int BOOST_REGEX_CALL toi(wchar_t c);
-   static int BOOST_REGEX_CALL toi(const wchar_t*& first, const wchar_t* last, int radix);
-
-   static boost::uint_fast32_t BOOST_REGEX_CALL lookup_classname(const wchar_t* first, const wchar_t* last);
-
-   static bool BOOST_REGEX_CALL lookup_collatename(std::basic_string<wchar_t>& s, const wchar_t* first, const wchar_t* last);
-
-   static locale_type BOOST_REGEX_CALL imbue(locale_type l){ return l; }
-   locale_type BOOST_REGEX_CALL getloc()const{ return locale_type(); }
-
-   struct sentry
-   {
-      sentry(const w32_regex_traits<wchar_t>&)
-      { w32_regex_traits<wchar_t>::update(); }
-      ~sentry(){}
-      operator void*() { return this; }
-   };
-   static void BOOST_REGEX_CALL update();
-   w32_regex_traits();
-   ~w32_regex_traits();
-   static std::size_t BOOST_REGEX_CALL strnarrow(char *s1, std::size_t len, const wchar_t *s2);
-   static std::size_t BOOST_REGEX_CALL strwiden(wchar_t *s1, std::size_t len, const char *s2);
-
-private:
-   static bool BOOST_REGEX_CALL do_iswclass(wchar_t c, boost::uint_fast32_t f);
-   static bool BOOST_REGEX_CALL do_lookup_collate(std::basic_string<wchar_t>& out, const wchar_t* first, const wchar_t* last);
-   static w32_regex_traits<wchar_t> init_;
-   static wchar_t BOOST_REGEX_CALL wtolower(wchar_t c);
-   static unsigned short wide_unicode_classes[];
-};
-#endif // Wide strings
-#endif // Win32
-
-#if !defined(BOOST_NO_STD_LOCALE) && !defined(BOOST_NO_STD_WSTREAMBUF)
-
-} // namspace boost
-
-#ifdef __BORLANDC__
-  #pragma option pop
-#endif
-#include <locale>
-#ifdef __BORLANDC__
-   #pragma option push -a4 -b -Ve -pc
-#endif
-
-namespace boost{
-
-namespace re_detail
-{
-
-template <class charT>
-struct message_data;
-
-template <>
-struct message_data<char>;
-
-template <>
-struct message_data<wchar_t>;
-
-struct BOOST_REGEX_DECL cpp_regex_traits_base : public regex_traits_base
-{
-   enum char_class_type
-   {
-      char_class_none = 0,
-      char_class_alnum = std::ctype_base::alnum,
-      char_class_alpha = std::ctype_base::alpha,
-      char_class_cntrl = std::ctype_base::cntrl,
-      char_class_digit = std::ctype_base::digit,
-      char_class_graph = std::ctype_base::graph,
-      char_class_lower = std::ctype_base::lower,
-      char_class_print = std::ctype_base::print,
-      char_class_punct = std::ctype_base::punct,
-      char_class_space = std::ctype_base::space,
-      char_class_upper = std::ctype_base::upper,
-      char_class_xdigit = std::ctype_base::xdigit,
-      char_class_blank = 1<<12,
-      char_class_underscore = 1<<13,
-      char_class_word = std::ctype_base::alnum | char_class_underscore,
-      char_class_unicode = 1<<14,
-      char_class_all_base = char_class_alnum | char_class_alpha | char_class_cntrl
-                         | char_class_digit | char_class_graph | char_class_lower
-                         | char_class_print | char_class_punct | char_class_space
-                         | char_class_upper | char_class_xdigit
-   };
-
-   static std::string BOOST_REGEX_CALL set_message_catalogue(const std::string& s);
-protected:
-   static char regex_message_cat[BOOST_REGEX_MAX_PATH];
-};
-
-} // namespace re_detail
-
-template <class charT>
-class cpp_regex_traits;
-
-template<>
-class BOOST_REGEX_DECL cpp_regex_traits<char> : public re_detail::cpp_regex_traits_base
-{
-   typedef re_detail::cpp_regex_traits_base base_type;
-private:
-   re_detail::message_data<char>* pmd;
-   const unsigned char* psyntax;
-   char* lower_map;
-   const std::ctype<char>* pctype;
-   const std::collate<char>* pcollate;
-   std::locale locale_inst;
-   unsigned sort_type;
-   char sort_delim;
-
-   cpp_regex_traits(const cpp_regex_traits&);
-   cpp_regex_traits& operator=(const cpp_regex_traits&);
-
-public:
-   typedef char char_type;
-   typedef unsigned char uchar_type;
-   typedef unsigned int size_type;
-   typedef std::string string_type;
-   typedef std::locale locale_type;
-
-   cpp_regex_traits();
-   ~cpp_regex_traits();
-
-   void swap(cpp_regex_traits&);
-
-   static std::size_t BOOST_REGEX_CALL length(const char_type* p)
-   {
-      return std::strlen(p);
-   }
-   unsigned int BOOST_REGEX_CALL syntax_type(size_type c)const
-   {
-      return psyntax[c];
-   }
-   char BOOST_REGEX_CALL translate(char c, bool icase)const
-   {
-      return icase ? lower_map[(size_type)(uchar_type)c] : c;
-   }
-   void BOOST_REGEX_CALL transform(std::string& out, const std::string& in)const
-   {
-      out = pcollate->transform(in.c_str(), in.c_str() + in.size()).c_str();
-   }
-
-   void BOOST_REGEX_CALL transform_primary(std::string& out, const std::string& in)const;
-
-   static bool BOOST_REGEX_CALL is_separator(char c)
-   {
-      return BOOST_REGEX_MAKE_BOOL((c == '\n') || (c == '\r'));
-   }
-
-   static bool BOOST_REGEX_CALL is_combining(char)
-   {
-      return false;
-   }
-   
-   bool BOOST_REGEX_CALL is_class(char c, boost::uint_fast32_t f)const
-   {
-      if(pctype->is((std::ctype<char>::mask)(f & char_class_all_base), c))
-         return true;
-      if((f & char_class_underscore) && (c == '_'))
-         return true;
-      if((f & char_class_blank) && ((c == ' ') || (c == '\t')))
-         return true;
-      return false;
-   }
-
-   int BOOST_REGEX_CALL toi(char c)const;
-   int BOOST_REGEX_CALL toi(const char*& first, const char* last, int radix)const;
-
-   boost::uint_fast32_t BOOST_REGEX_CALL lookup_classname(const char* first, const char* last)const;
-   bool BOOST_REGEX_CALL lookup_collatename(std::string& s, const char* first, const char* last)const;
-
-   std::string BOOST_REGEX_CALL error_string(unsigned id)const;
-   locale_type BOOST_REGEX_CALL imbue(locale_type l);
-   locale_type BOOST_REGEX_CALL getloc()const{ return locale_inst; }
-
-   struct sentry
-   {
-      sentry(const cpp_regex_traits<char>&){}
-      operator void*() { return this; }
-   };
-};
-
-#ifndef BOOST_NO_WREGEX
-template<>
-class BOOST_REGEX_DECL cpp_regex_traits<wchar_t> : public re_detail::cpp_regex_traits_base
-{
-   typedef re_detail::cpp_regex_traits_base base_type;
-public:
-   typedef wchar_t char_type;
-   typedef unsigned short uchar_type;
-   typedef unsigned int size_type;
-   typedef std::basic_string<wchar_t> string_type;
-   typedef std::locale locale_type;
-
-private:
-   re_detail::message_data<wchar_t>* pmd;
-   const unsigned char* psyntax;
-   wchar_t* lower_map;
-   const std::ctype<wchar_t>* pctype;
-   const std::collate<wchar_t>* pcollate;
-   const std::codecvt<wchar_t, char, std::mbstate_t>* pcdv;
-   std::locale locale_inst;
-   unsigned int BOOST_REGEX_CALL do_syntax_type(size_type c)const;
-   unsigned sort_type;
-   wchar_t sort_delim;
-
-   cpp_regex_traits(const cpp_regex_traits&);
-   cpp_regex_traits& operator=(const cpp_regex_traits&);
-
-public:
-
-   static std::size_t BOOST_REGEX_CALL length(const char_type* p)
-   {
-      return std::wcslen(p);
-   }
-   unsigned int BOOST_REGEX_CALL syntax_type(size_type c)const
-   {
-      return (c < UCHAR_MAX) ? psyntax[c] : do_syntax_type(c);
-   }
-   wchar_t BOOST_REGEX_CALL translate(wchar_t c, bool icase)const
-   {
-      return icase ? (((uchar_type)c) <= UCHAR_MAX) ? lower_map[c] : pctype->tolower(c) : c;
-   }
-   void BOOST_REGEX_CALL transform(std::basic_string<wchar_t>& out, const std::basic_string<wchar_t>& in)const
-   {
-      out = pcollate->transform(in.c_str(), in.c_str() + in.size());
-   }
-
-   void BOOST_REGEX_CALL transform_primary(std::basic_string<wchar_t>& out, const std::basic_string<wchar_t>& in)const;
-
-   static bool BOOST_REGEX_CALL is_separator(wchar_t c)
-   {
-      return BOOST_REGEX_MAKE_BOOL((c == L'\n') || (c == L'\r') || (c == (wchar_t)0x2028) || (c == (wchar_t)0x2029));
-   }
-
-   static bool BOOST_REGEX_CALL is_combining(wchar_t c)
-   { return re_detail::is_combining(c); }
-   
-   bool BOOST_REGEX_CALL is_class(wchar_t c, boost::uint_fast32_t f)const
-   {
-      if(pctype->is((std::ctype<wchar_t>::mask)(f & char_class_all_base), c))
-         return true;
-      if((f & char_class_underscore) && (c == '_'))
-         return true;
-      if((f & char_class_blank) && ((c == ' ') || (c == '\t')))
-         return true;
-      if((f & char_class_unicode) && ((uchar_type)c > (uchar_type)255))
-         return true;
-      return false;
-   }
-
-   int BOOST_REGEX_CALL toi(wchar_t c)const;
-   int BOOST_REGEX_CALL toi(const wchar_t*& first, const wchar_t* last, int radix)const;
-
-   boost::uint_fast32_t BOOST_REGEX_CALL lookup_classname(const wchar_t* first, const wchar_t* last)const;
-   bool BOOST_REGEX_CALL lookup_collatename(std::basic_string<wchar_t>& s, const wchar_t* first, const wchar_t* last)const;
-
-   std::string BOOST_REGEX_CALL error_string(unsigned id)const;
-   cpp_regex_traits();
-   ~cpp_regex_traits();
-   locale_type BOOST_REGEX_CALL imbue(locale_type l);
-   locale_type BOOST_REGEX_CALL getloc()const{ return locale_inst; }
-   std::size_t BOOST_REGEX_CALL strwiden(wchar_t *s1, std::size_t len, const char *s2)const;
-   void swap(cpp_regex_traits&);
-
-   struct sentry
-   {
-      sentry(const cpp_regex_traits<wchar_t>&){}
-      operator void*() { return this; }
-   };
-};
-#endif // BOOST_NO_WREGEX
-
-#endif // BOOST_NO_STD_LOCALE
-
-#ifdef BOOST_REGEX_USE_WIN32_LOCALE
-
-template <class charT>
-class regex_traits : public w32_regex_traits<charT>
-{
-};
-
-#elif defined(BOOST_REGEX_USE_C_LOCALE)
-
-template <class charT>
-class regex_traits : public c_regex_traits<charT>
-{
-};
-
-#elif defined(BOOST_REGEX_USE_CPP_LOCALE)
-
-template <class charT>
-class regex_traits : public cpp_regex_traits<charT>
-{
-};
-
-#else
-#error No default localisation model defined
-#endif
-
-#ifdef __BORLANDC__
-  #pragma option pop
-#endif
-
-} // namespace boost
-
-#endif // include
-
-
-
-
-
-
-
diff --git a/include/boost/regex/v4/basic_regex.hpp b/include/boost/regex/v4/basic_regex.hpp
index 737a24bd..013efb59 100644
--- a/include/boost/regex/v4/basic_regex.hpp
+++ b/include/boost/regex/v4/basic_regex.hpp
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 1998-2002
+ * Copyright (c) 1998-2004
  * Dr John Maddock
  *
  * Use, modification and distribution are subject to the 
@@ -13,8 +13,7 @@
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         basic_regex.cpp
   *   VERSION      see <boost/version.hpp>
-  *   DESCRIPTION: Declares template class basic_regex (note that member function
-  *                bodies are in regex_compile.hpp).
+  *   DESCRIPTION: Declares template class basic_regex.
   */
 
 #ifndef BOOST_REGEX_V4_BASIC_REGEX_HPP
@@ -25,28 +24,166 @@
 #endif
 
 namespace boost{
-//
-// class reg_expression
-// represents the compiled
-// regular expression:
-//
-
 #ifdef BOOST_MSVC
 #pragma warning(push)
 #pragma warning(disable : 4251 4231 4660)
 #endif
 
+namespace re_detail{
+
+//
+// forward declaration, we will need this one later:
+//
+template <class charT, class traits>
+class basic_regex_parser;
+
+//
+// class regex_data:
+// represents the data we wish to expose to the matching algorithms.
+//
+template <class charT, class traits>
+struct regex_data
+{
+   typedef regex_constants::syntax_option_type   flag_type;
+   typedef std::size_t                           size_type;  
+
+   regex_data(const ::boost::shared_ptr<
+      ::boost::regex_traits_wrapper<traits> >& t) 
+      : m_ptraits(t) {}
+   regex_data() 
+      : m_ptraits(new ::boost::regex_traits_wrapper<traits>()) {}
+
+   ::boost::shared_ptr<
+      ::boost::regex_traits_wrapper<traits>
+      >                        m_ptraits;                 // traits class instance
+   flag_type                   m_flags;                   // flags with which we were compiled
+   int                         m_status;                  // error code (0 implies OK).
+   const charT*                m_expression;              // the original expression
+   std::ptrdiff_t              m_expression_len;          // the length of the original expression
+   size_type                   m_mark_count;              // the number of marked sub-expressions
+   re_detail::re_syntax_base*  m_first_state;             // the first state of the machine
+   unsigned                    m_restart_type;            // search optimisation type
+   unsigned char               m_startmap[1 << CHAR_BIT]; // which characters can start a match
+   unsigned int                m_can_be_null;             // whether we can match a null string
+   re_detail::raw_storage      m_data;                    // the buffer in which our states are constructed
+};
+//
+// class basic_regex_implementation
+// pimpl implementation class for basic_regex.
+//
+template <class charT, class traits>
+class basic_regex_implementation
+   : public regex_data<charT, traits>
+{
+public:
+   typedef regex_constants::syntax_option_type   flag_type;
+   typedef std::ptrdiff_t                        difference_type;
+   typedef std::size_t                           size_type; 
+   typedef typename traits::locale_type          locale_type;
+   typedef const charT*                          const_iterator;
+
+   basic_regex_implementation(){}
+   basic_regex_implementation(const ::boost::shared_ptr<
+      ::boost::regex_traits_wrapper<traits> >& t)
+      : regex_data<charT, traits>(t) {}
+   void assign(const charT* arg_first,
+                          const charT* arg_last,
+                          flag_type f)
+   {
+      regex_data<charT, traits>* pdat = this;
+      basic_regex_parser<charT, traits> parser(pdat);
+      parser.parse(arg_first, arg_last, f);
+   }
+
+   locale_type BOOST_REGEX_CALL imbue(locale_type l)
+   { 
+      return this->m_ptraits->imbue(l); 
+   }
+   locale_type BOOST_REGEX_CALL getloc()const
+   { 
+      return this->m_ptraits->getloc(); 
+   }
+   std::basic_string<charT> BOOST_REGEX_CALL str()const
+   {
+      std::basic_string<charT> result;
+      if(this->m_status == 0)
+         result = std::basic_string<charT>(this->m_expression, this->m_expression_len);
+      return result;
+   }
+   const_iterator BOOST_REGEX_CALL expression()const
+   {
+      return this->m_expression;
+   }
+   //
+   // begin, end:
+   const_iterator BOOST_REGEX_CALL begin()const
+   { 
+      return (!this->m_status ? 0 : this->m_expression); 
+   }
+   const_iterator BOOST_REGEX_CALL end()const
+   { 
+      return (!this->m_status ? 0 : this->m_expression + this->m_expression_len); 
+   }
+   flag_type BOOST_REGEX_CALL flags()const
+   {
+      return this->m_flags;
+   }
+   size_type BOOST_REGEX_CALL size()const
+   {
+      return this->m_expression_len;
+   }
+   int BOOST_REGEX_CALL status()const
+   {
+      return this->m_status;
+   }
+   size_type BOOST_REGEX_CALL mark_count()const
+   {
+      return this->m_mark_count;
+   }
+   const re_detail::re_syntax_base* get_first_state()const
+   {
+      return this->m_first_state;
+   }
+   unsigned get_restart_type()const
+   {
+      return this->m_restart_type;
+   }
+   const unsigned char* get_map()const
+   {
+      return this->m_startmap;
+   }
+   const ::boost::regex_traits_wrapper<traits>& get_traits()const
+   {
+      return *(this->m_ptraits);
+   }
+   bool can_be_null()const
+   {
+      return this->m_can_be_null;
+   }
+   const regex_data<charT, traits>& get_data()const
+   {
+      basic_regex_implementation<charT, traits> const* p = this;
+      return *static_cast<const regex_data<charT, traits>*>(p);
+   }
+};
+
+} // namespace re_detail
+//
+// class basic_regex:
+// represents the compiled
+// regular expression:
+//
+
 #ifdef BOOST_REGEX_NO_FWD
-template <class charT, class traits = regex_traits<charT>, class Allocator = BOOST_DEFAULT_ALLOCATOR(charT) >
+template <class charT, class traits = regex_traits<charT> >
 #else
-template <class charT, class traits, class Allocator >
+template <class charT, class traits >
 #endif
-class reg_expression : public regbase
+class basic_regex : public regbase
 {
 public:
    // typedefs:
    typedef typename traits::size_type            traits_size_type;
-   typedef typename traits::uchar_type           traits_uchar_type;
    typedef typename traits::string_type          traits_string_type;
    typedef charT                                 char_type;
    typedef traits                                traits_type;
@@ -56,10 +193,8 @@ public:
    typedef const charT&                          const_reference;
    typedef const charT*                          const_iterator;
    typedef const_iterator                        iterator;
-   typedef typename Allocator::difference_type   difference_type;
-   typedef typename Allocator::size_type         size_type;   
-   typedef Allocator                             allocator_type;
-   typedef Allocator                             alloc_type;
+   typedef std::ptrdiff_t                        difference_type;
+   typedef std::size_t                           size_type;   
    typedef regex_constants::syntax_option_type   flag_type;
    // locale_type
    // placeholder for actual locale type used by the
@@ -67,319 +202,411 @@ public:
    typedef typename traits::locale_type          locale_type;
    
 public:
-   explicit reg_expression(const Allocator& a = Allocator());
-   explicit reg_expression(const charT* p, flag_type f = regex_constants::normal, const Allocator& a = Allocator());
-   reg_expression(const charT* p1, const charT* p2, flag_type f = regex_constants::normal, const Allocator& a = Allocator());
-   reg_expression(const charT* p, size_type len, flag_type f, const Allocator& a = Allocator());
-   reg_expression(const reg_expression&);
-   ~reg_expression();
-   reg_expression& BOOST_REGEX_CALL operator=(const reg_expression&);
-   reg_expression& BOOST_REGEX_CALL operator=(const charT* ptr)
+   explicit basic_regex(){}
+   explicit basic_regex(const charT* p, flag_type f = regex_constants::normal)
    {
-      set_expression(ptr, regex_constants::normal | regex_constants::use_except);
-      return *this;
+      assign(p, f);
+   }
+   basic_regex(const charT* p1, const charT* p2, flag_type f = regex_constants::normal)
+   {
+      assign(p1, p2, f);
+   }
+   basic_regex(const charT* p, size_type len, flag_type f)
+   {
+      assign(p, len, f);
+   }
+   basic_regex(const basic_regex& that)
+      : m_pimpl(that.m_pimpl) {}
+   ~basic_regex(){}
+   basic_regex& BOOST_REGEX_CALL operator=(const basic_regex& that)
+   {
+      return assign(that);
+   }
+   basic_regex& BOOST_REGEX_CALL operator=(const charT* ptr)
+   {
+      return assign(ptr);
    }
 
    //
    // assign:
-   reg_expression& assign(const reg_expression& that)
-   { return *this = that; }
-   reg_expression& assign(const charT* ptr, flag_type f = regex_constants::normal)
-   {
-      set_expression(ptr, f | regex_constants::use_except);
-      return *this;
+   basic_regex& assign(const basic_regex& that)
+   { 
+      m_pimpl = that.m_pimpl;
+      return *this; 
    }
-   reg_expression& assign(const charT* ptr, size_type len, flag_type f)
+   basic_regex& assign(const charT* p, flag_type f = regex_constants::normal)
    {
-      std::basic_string<charT> s(ptr, len);
-      set_expression(s.c_str(), f | regex_constants::use_except);
-      return *this;
+      return assign(p, p + traits::length(p), f);
+   }
+   basic_regex& assign(const charT* p, size_type len, flag_type f)
+   {
+      return assign(p, p + len, f);
    }
 
-   reg_expression& assign(const charT* arg_first,
-                          const charT* arg_last,
-                          flag_type f = regex_constants::normal)
-   {
-      set_expression(arg_first, arg_last, f | regex_constants::use_except);
-      return *this;
-   }
+   basic_regex& assign(const charT* p1,
+                          const charT* p2,
+                          flag_type f = regex_constants::normal);
 #if !defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(__IBMCPP__)
 
    template <class ST, class SA>
    unsigned int BOOST_REGEX_CALL set_expression(const std::basic_string<charT, ST, SA>& p, flag_type f = regex_constants::normal)
-   { return set_expression(p.data(), p.data() + p.size(), f); }
+   { 
+      return set_expression(p.data(), p.data() + p.size(), f); 
+   }
 
    template <class ST, class SA>
-   explicit reg_expression(const std::basic_string<charT, ST, SA>& p, flag_type f = regex_constants::normal, const Allocator& a = Allocator())
-    : data(a), pkmp(0), error_code_(REG_EMPTY), _expression(0) { set_expression(p, f | regex_constants::use_except); }
+   explicit basic_regex(const std::basic_string<charT, ST, SA>& p, flag_type f = regex_constants::normal)
+   { 
+      assign(p, f); 
+   }
 
    template <class InputIterator>
-   reg_expression(InputIterator arg_first, InputIterator arg_last, flag_type f = regex_constants::normal, const Allocator& al = Allocator())
-    : data(al), pkmp(0), error_code_(REG_EMPTY), _expression(0)
+   basic_regex(InputIterator arg_first, InputIterator arg_last, flag_type f = regex_constants::normal)
+   {
+      typedef typename traits::string_type seq_type;
+      seq_type a(arg_first, arg_last);
+      assign(&*a.begin(), &*a.begin() + a.size(), f);
+   }
+
+   template <class ST, class SA>
+   basic_regex& BOOST_REGEX_CALL operator=(const std::basic_string<charT, ST, SA>& p)
+   {
+      return assign(p.data(), p.data() + p.size(), regex_constants::normal);
+   }
+
+   template <class string_traits, class A>
+   basic_regex& BOOST_REGEX_CALL assign(
+       const std::basic_string<charT, string_traits, A>& s,
+       flag_type f = regex_constants::normal)
+   {
+      return assign(s.data(), s.data() + s.size(), f);
+   }
+
+   template <class InputIterator>
+   basic_regex& BOOST_REGEX_CALL assign(InputIterator arg_first,
+                          InputIterator arg_last,
+                          flag_type f = regex_constants::normal)
+   {
+      typedef typename traits::string_type seq_type;
+      seq_type a(arg_first, arg_last);
+      const charT* p1 = &*a.begin();
+      const charT* p2 = &*a.begin() + a.size();
+      return assign(p1, p2, f);
+   }
+#else
+   unsigned int BOOST_REGEX_CALL set_expression(const std::basic_string<charT>& p, flag_type f = regex_constants::normal)
+   { 
+      return set_expression(p.data(), p.data() + p.size(), f); 
+   }
+
+   basic_regex(const std::basic_string<charT>& p, flag_type f = regex_constants::normal)
+   { 
+      assign(p, f); 
+   }
+
+   basic_regex& BOOST_REGEX_CALL operator=(const std::basic_string<charT>& p)
+   {
+      return assign(p.data(), p.data() + p.size(), regex_constants::normal);
+   }
+
+   basic_regex& BOOST_REGEX_CALL assign(
+       const std::basic_string<charT>& s,
+       flag_type f = regex_constants::normal)
+   {
+      return assign(s.data(), s.data() + s.size(), f);
+   }
+
+#endif
+
+   //
+   // locale:
+   locale_type BOOST_REGEX_CALL imbue(locale_type l);
+   locale_type BOOST_REGEX_CALL getloc()const
+   { 
+      return m_pimpl.get() ? m_pimpl->getloc() : locale_type(); 
+   }
+   //
+   // getflags:
+   // retained for backwards compatibility only, "flags"
+   // is now the prefered name:
+   flag_type BOOST_REGEX_CALL getflags()const
+   { 
+      return flags();
+   }
+   flag_type BOOST_REGEX_CALL flags()const
+   { 
+      return m_pimpl.get() ? m_pimpl->flags() : 0;
+   }
+   //
+   // str:
+   std::basic_string<charT> BOOST_REGEX_CALL str()const
+   {
+      return m_pimpl.get() ? m_pimpl->str() : std::basic_string<charT>();
+   }
+   //
+   // begin, end:
+   const_iterator BOOST_REGEX_CALL begin()const
+   { 
+      return (m_pimpl.get() ? m_pimpl->begin() : 0); 
+   }
+   const_iterator BOOST_REGEX_CALL end()const
+   { 
+      return (m_pimpl.get() ? m_pimpl->end() : 0); 
+   }
+   //
+   // swap:
+   void BOOST_REGEX_CALL swap(basic_regex& that)throw()
+   {
+      m_pimpl.swap(that.m_pimpl);
+   }
+   //
+   // size:
+   size_type BOOST_REGEX_CALL size()const
+   { 
+      return (m_pimpl.get() ? m_pimpl->size() : 0); 
+   }
+   //
+   // max_size:
+   size_type BOOST_REGEX_CALL max_size()const
+   { 
+      return UINT_MAX; 
+   }
+   //
+   // empty:
+   bool BOOST_REGEX_CALL empty()const
+   { 
+      return (m_pimpl.get() ? 0 != m_pimpl->status() : 0); 
+   }
+
+   size_type BOOST_REGEX_CALL mark_count()const 
+   { 
+      return (m_pimpl.get() ? m_pimpl->mark_count() : 0); 
+   }
+
+   int status()const
+   {
+      return (m_pimpl.get() ? m_pimpl->status() : regex_constants::error_empty);
+   }
+
+   int BOOST_REGEX_CALL compare(const basic_regex& that) const
+   {
+      if(m_pimpl.get() == that.m_pimpl.get())
+         return 0;
+      if(!m_pimpl.get())
+         return -1;
+      if(!that.m_pimpl.get())
+         return 1;
+      if(status() != that.status())
+         return status() - that.status();
+      if(flags() != that.flags())
+         return flags() - that.flags();
+      return str().compare(that.str());
+   }
+   bool BOOST_REGEX_CALL operator==(const basic_regex& e)const
+   { 
+      return compare(e) == 0; 
+   }
+   bool BOOST_REGEX_CALL operator != (const basic_regex& e)const
+   { 
+      return compare(e) != 0; 
+   }
+   bool BOOST_REGEX_CALL operator<(const basic_regex& e)const
+   { 
+      return compare(e) < 0; 
+   }
+   bool BOOST_REGEX_CALL operator>(const basic_regex& e)const
+   { 
+      return compare(e) > 0; 
+   }
+   bool BOOST_REGEX_CALL operator<=(const basic_regex& e)const
+   { 
+      return compare(e) <= 0; 
+   }
+   bool BOOST_REGEX_CALL operator>=(const basic_regex& e)const
+   { 
+      return compare(e) >= 0; 
+   }
+
+   //
+   // The following are deprecated as public interfaces
+   // but are available for compatibility with earlier versions.
+   const charT* BOOST_REGEX_CALL expression()const 
+   { 
+      return (m_pimpl.get() && !m_pimpl->status() ? m_pimpl->expression() : 0); 
+   }
+   unsigned int BOOST_REGEX_CALL set_expression(const charT* p1, const charT* p2, flag_type f = regex_constants::normal)
+   {
+      assign(p1, p2, f | regex_constants::no_except);
+      return status();
+   }
+   unsigned int BOOST_REGEX_CALL set_expression(const charT* p, flag_type f = regex_constants::normal) 
+   { 
+      assign(p, f | regex_constants::no_except); 
+      return status();
+   }
+   unsigned int BOOST_REGEX_CALL error_code()const
+   {
+      return status();
+   }
+   //
+   // private access methods:
+   //
+   const re_detail::re_syntax_base* get_first_state()const
+   {
+      assert(0 != m_pimpl.get());
+      return m_pimpl->get_first_state();
+   }
+   unsigned get_restart_type()const
+   {
+      assert(0 != m_pimpl.get());
+      return m_pimpl->get_restart_type();
+   }
+   const unsigned char* get_map()const
+   {
+      assert(0 != m_pimpl.get());
+      return m_pimpl->get_map();
+   }
+   const ::boost::regex_traits_wrapper<traits>& get_traits()const
+   {
+      assert(0 != m_pimpl.get());
+      return m_pimpl->get_traits();
+   }
+   bool can_be_null()const
+   {
+      assert(0 != m_pimpl.get());
+      return m_pimpl->can_be_null();
+   }
+   const re_detail::regex_data<charT, traits>& get_data()const
+   {
+      assert(0 != m_pimpl.get());
+      return m_pimpl->get_data();
+   }
+
+private:
+   shared_ptr<re_detail::basic_regex_implementation<charT, traits> > m_pimpl;
+};
+
+//
+// out of line members;
+// these are the only members that mutate the basic_regex object,
+// and are designed to provide the strong exception guarentee
+// (in the event of a throw, the state of the object remains unchanged).
+//
+template <class charT, class traits>
+basic_regex<charT, traits>& basic_regex<charT, traits>::assign(const charT* p1,
+                        const charT* p2,
+                        flag_type f)
+{
+   shared_ptr<re_detail::basic_regex_implementation<charT, traits> > temp;
+   if(!m_pimpl.get())
+   {
+      temp = shared_ptr<re_detail::basic_regex_implementation<charT, traits> >(new re_detail::basic_regex_implementation<charT, traits>());
+   }
+   else
+   {
+      temp = shared_ptr<re_detail::basic_regex_implementation<charT, traits> >(new re_detail::basic_regex_implementation<charT, traits>(m_pimpl->m_ptraits));
+   }
+   temp->assign(p1, p2, f);
+   temp.swap(m_pimpl);
+   return *this;
+}
+
+template <class charT, class traits>
+typename basic_regex<charT, traits>::locale_type BOOST_REGEX_CALL basic_regex<charT, traits>::imbue(locale_type l)
+{ 
+   shared_ptr<re_detail::basic_regex_implementation<charT, traits> > temp(new re_detail::basic_regex_implementation<charT, traits>());
+   locale_type result = temp->imbue(l);
+   temp.swap(m_pimpl);
+   return result;
+}
+
+//
+// non-members:
+//
+template <class charT, class traits>
+void swap(basic_regex<charT, traits>& e1, basic_regex<charT, traits>& e2)
+{
+   e1.swap(e2);
+}
+
+#ifndef BOOST_NO_STD_LOCALE
+template <class charT, class traits, class traits2>
+std::basic_ostream<charT, traits>& 
+   operator << (std::basic_ostream<charT, traits>& os, 
+                const basic_regex<charT, traits2>& e)
+{
+   return (os << e.str());
+}
+#else
+template <class traits>
+std::ostream& operator << (std::ostream& os, const basic_regex<char, traits>& e)
+{
+   return (os << e.str());
+}
+#endif
+
+//
+// class reg_expression:
+// this is provided for backwards compatibility only,
+// it is deprecated, no not use!
+//
+#ifdef BOOST_REGEX_NO_FWD
+template <class charT, class traits = regex_traits<charT> >
+#else
+template <class charT, class traits >
+#endif
+class reg_expression : public basic_regex<charT, traits>
+{
+public:
+   typedef typename basic_regex<charT, traits>::flag_type flag_type;
+   typedef typename basic_regex<charT, traits>::size_type size_type;
+   explicit reg_expression(){}
+   explicit reg_expression(const charT* p, flag_type f = regex_constants::normal)
+      : basic_regex<charT, traits>(p, f){}
+   reg_expression(const charT* p1, const charT* p2, flag_type f = regex_constants::normal)
+      : basic_regex<charT, traits>(p1, p2, f){}
+   reg_expression(const charT* p, size_type len, flag_type f)
+      : basic_regex<charT, traits>(p, len, f){}
+   reg_expression(const reg_expression& that)
+      : basic_regex<charT, traits>(that) {}
+   ~reg_expression(){}
+   reg_expression& BOOST_REGEX_CALL operator=(const reg_expression& that)
+   {
+      return this->assign(that);
+   }
+
+#if !defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(__IBMCPP__)
+   template <class ST, class SA>
+   explicit reg_expression(const std::basic_string<charT, ST, SA>& p, flag_type f = regex_constants::normal)
+   : basic_regex<charT, traits>(p, f)
+   { 
+   }
+
+   template <class InputIterator>
+   reg_expression(InputIterator arg_first, InputIterator arg_last, flag_type f = regex_constants::normal)
+   : basic_regex<charT, traits>(arg_first, arg_last, f)
    {
-      std::basic_string<charT> a(arg_first, arg_last);
-      set_expression(a.data(), a.data() + a.size(), f | regex_constants::use_except);
    }
 
    template <class ST, class SA>
    reg_expression& BOOST_REGEX_CALL operator=(const std::basic_string<charT, ST, SA>& p)
    {
-      set_expression(p.c_str(), p.c_str() + p.size(), regex_constants::normal | regex_constants::use_except);
-      return *this;
-   }
-
-   template <class string_traits, class A>
-   reg_expression& BOOST_REGEX_CALL assign(
-       const std::basic_string<charT, string_traits, A>& s,
-       flag_type f = regex_constants::normal)
-   {
-      set_expression(s.c_str(), s.c_str() + s.size(), f | regex_constants::use_except);
-      return *this;
-   }
-
-   template <class InputIterator>
-   reg_expression& BOOST_REGEX_CALL assign(InputIterator arg_first,
-                          InputIterator arg_last,
-                          flag_type f = regex_constants::normal)
-   {
-      std::basic_string<charT> a(arg_first, arg_last);
-      set_expression(a.data(), a.data() + a.size(), f | regex_constants::use_except);
+      this->assign(p);
       return *this;
    }
 #else
-   unsigned int BOOST_REGEX_CALL set_expression(const std::basic_string<charT>& p, flag_type f = regex_constants::normal)
-   { return set_expression(p.data(), p.data() + p.size(), f | regex_constants::use_except); }
-
-   reg_expression(const std::basic_string<charT>& p, flag_type f = regex_constants::normal, const Allocator& a = Allocator())
-    : data(a), pkmp(0) { set_expression(p, f | regex_constants::use_except); }
+   explicit reg_expression(const std::basic_string<charT>& p, flag_type f = regex_constants::normal)
+   : basic_regex<charT, traits>(p, f)
+   { 
+   }
 
    reg_expression& BOOST_REGEX_CALL operator=(const std::basic_string<charT>& p)
-   {
-      set_expression(p.c_str(), p.c_str() + p.size(), regex_constants::normal | regex_constants::use_except);
-      return *this;
-   }
-
-   reg_expression& BOOST_REGEX_CALL assign(
-       const std::basic_string<charT>& s,
-       flag_type f = regex_constants::normal)
-   {
-      set_expression(s.c_str(), s.c_str() + s.size(), f | regex_constants::use_except);
-      return *this;
-   }
-
-#endif
-
-
-   //
-   // allocator access:
-   Allocator BOOST_REGEX_CALL get_allocator()const;
-   //
-   // locale:
-   locale_type BOOST_REGEX_CALL imbue(locale_type l){ return traits_inst.imbue(l); }
-   locale_type BOOST_REGEX_CALL getloc()const{ return traits_inst.getloc(); }
-   //
-   // getflags:
-   // retained for backwards compatibility only, the base class has "flags"
-   // member which is now the prefered name:
-   flag_type BOOST_REGEX_CALL getflags()const
-   { return this->flags(); }
-   //
-   // str:
-   std::basic_string<charT> BOOST_REGEX_CALL str()const
-   {
-      std::basic_string<charT> result;
-      if(this->error_code() == 0)
-         result = std::basic_string<charT>(_expression, _expression_len);
-      return result;
-   }
-   //
-   // begin, end:
-   const_iterator BOOST_REGEX_CALL begin()const
-   { return (this->error_code() ? 0 : _expression); }
-   const_iterator BOOST_REGEX_CALL end()const
-   { return (this->error_code() ? 0 : _expression + _expression_len); }
-   //
-   // swap:
-   void BOOST_REGEX_CALL swap(reg_expression&)throw();
-   //
-   // size:
-   size_type BOOST_REGEX_CALL size()const
-   { return (this->error_code() ? 0 : _expression_len); }
-   //
-   // max_size:
-   size_type BOOST_REGEX_CALL max_size()const
-   { return UINT_MAX; }
-   //
-   // empty:
-   bool BOOST_REGEX_CALL empty()const
-   { return 0 != this->error_code(); }
-
-   unsigned BOOST_REGEX_CALL mark_count()const { return (this->error_code() ? 0 : marks); }
-   int BOOST_REGEX_CALL compare(const reg_expression&) const;
-   bool BOOST_REGEX_CALL operator==(const reg_expression& e)const
-   { return compare(e) == 0; }
-   bool operator != (const reg_expression& e)
-   { return compare(e) != 0; }
-   bool BOOST_REGEX_CALL operator<(const reg_expression& e)const
-   { return compare(e) < 0; }
-   bool BOOST_REGEX_CALL operator>(const reg_expression& e)const
-   { return compare(e) > 0; }
-   bool BOOST_REGEX_CALL operator<=(const reg_expression& e)const
-   { return compare(e) <= 0; }
-   bool BOOST_REGEX_CALL operator>=(const reg_expression& e)const
-   { return compare(e) >= 0; }
-
-   //
-   // The following are deprecated as public interfaces
-   // but are available for compatibility with earlier versions.
-   allocator_type BOOST_REGEX_CALL allocator()const;
-   const charT* BOOST_REGEX_CALL expression()const { return (this->error_code() ? 0 : _expression); }
-   unsigned int BOOST_REGEX_CALL set_expression(const charT* p, const charT* end, flag_type f = regex_constants::normal);
-   unsigned int BOOST_REGEX_CALL set_expression(const charT* p, flag_type f = regex_constants::normal) { return set_expression(p, p + traits_type::length(p), f); }
-   //
-   // this should be private but template friends don't work:
-   const traits_type& get_traits()const { return traits_inst; }
-   unsigned int BOOST_REGEX_CALL error_code()const
-   {
-      return error_code_;
-   }
-
-private:
-   traits_type                          traits_inst;          // traits class in use
-   re_detail::raw_storage<Allocator>    data;                 // our state machine
-   unsigned                             _restart_type;        // search method to use
-   unsigned                             marks;                // number of marked sub-expressions
-   int                                  repeats;              // number of repeats
-   unsigned char*                       startmap;             // characters that can match the first state(s) in the machine
-   std::size_t                          _expression_len;      // length of the expression
-   std::size_t                          _leading_len;         // length of any leading literal 
-   const charT*                         _leading_string;      // leading literal string
-   std::size_t                          _leading_string_len;  // and it's length
-   re_detail::kmp_info<charT>*          pkmp;                 // pointer to Knuth Morris Pratt state machine when available
-   unsigned                             error_code_;          // our current status
-   charT*                               _expression;          // the expression we just compiled if any
-
-   void BOOST_REGEX_CALL compile_maps();
-   void BOOST_REGEX_CALL compile_map(re_detail::re_syntax_base* node, unsigned char* _map, unsigned int* pnull, unsigned char mask, re_detail::re_syntax_base* terminal = 0)const;
-   bool BOOST_REGEX_CALL probe_start(re_detail::re_syntax_base* node, charT c, re_detail::re_syntax_base* terminal)const;
-   bool BOOST_REGEX_CALL probe_start_null(re_detail::re_syntax_base* node, re_detail::re_syntax_base* terminal)const;
-   void BOOST_REGEX_CALL fixup_apply(re_detail::re_syntax_base* b, unsigned cbraces);
-   void BOOST_REGEX_CALL move_offsets(re_detail::re_syntax_base* j, unsigned size);
-   re_detail::re_syntax_base* BOOST_REGEX_CALL compile_set(const charT*& first, const charT* last);
-   re_detail::re_syntax_base* BOOST_REGEX_CALL compile_set_aux(re_detail::jstack<traits_string_type, Allocator>& singles, re_detail::jstack<traits_string_type, Allocator>& ranges, re_detail::jstack<boost::uint_fast32_t, Allocator>& classes, re_detail::jstack<traits_string_type, Allocator>& equivalents, bool isnot, const re_detail::_narrow_type&);
-   re_detail::re_syntax_base* BOOST_REGEX_CALL compile_set_aux(re_detail::jstack<traits_string_type, Allocator>& singles, re_detail::jstack<traits_string_type, Allocator>& ranges, re_detail::jstack<boost::uint_fast32_t, Allocator>& classes, re_detail::jstack<traits_string_type, Allocator>& equivalents, bool isnot, const re_detail::_wide_type&);
-   re_detail::re_syntax_base* BOOST_REGEX_CALL compile_set_simple(re_detail::re_syntax_base* dat, unsigned long cls, bool isnot = false);
-   unsigned int BOOST_REGEX_CALL parse_inner_set(const charT*& first, const charT* last);
-
-   re_detail::re_syntax_base* BOOST_REGEX_CALL add_simple(re_detail::re_syntax_base* dat, re_detail::syntax_element_type type, unsigned int size = sizeof(re_detail::re_syntax_base));
-   re_detail::re_syntax_base* BOOST_REGEX_CALL add_literal(re_detail::re_syntax_base* dat, charT c);
-   charT BOOST_REGEX_CALL parse_escape(const charT*& first, const charT* last);
-   void BOOST_REGEX_CALL parse_range(const charT*& first, const charT* last, unsigned& min, unsigned& max);
-   bool BOOST_REGEX_CALL skip_space(const charT*& first, const charT* last);
-   unsigned int BOOST_REGEX_CALL probe_restart(re_detail::re_syntax_base* dat);
-   unsigned int BOOST_REGEX_CALL fixup_leading_rep(re_detail::re_syntax_base* dat, re_detail::re_syntax_base* end);
-   void BOOST_REGEX_CALL fail(unsigned int err);
-
-protected:
-   static int BOOST_REGEX_CALL repeat_count(const reg_expression& e)
-   { return e.repeats; }
-   static unsigned int BOOST_REGEX_CALL restart_type(const reg_expression& e)
-   { return e._restart_type; }
-   static const re_detail::re_syntax_base* BOOST_REGEX_CALL first(const reg_expression& e)
-   { return (const re_detail::re_syntax_base*)e.data.data(); }
-   static const unsigned char* BOOST_REGEX_CALL get_map(const reg_expression& e)
-   { return e.startmap; }
-   static std::size_t BOOST_REGEX_CALL leading_length(const reg_expression& e)
-   { return e._leading_len; }
-   static const re_detail::kmp_info<charT>* get_kmp(const reg_expression& e)
-   { return e.pkmp; }
-   static bool BOOST_REGEX_CALL can_start(charT c, const unsigned char* _map, unsigned char mask, const re_detail::_wide_type&);
-   static bool BOOST_REGEX_CALL can_start(charT c, const unsigned char* _map, unsigned char mask, const re_detail::_narrow_type&);
-};
-
-template <class charT, class traits, class Allocator >
-void swap(reg_expression<charT, traits, Allocator>& a, reg_expression<charT, traits, Allocator>& b)
-{
-   a.swap(b);
-}
-
-#ifndef BOOST_NO_STD_LOCALE
-template <class charT, class traits, class traits2, class Allocator>
-std::basic_ostream<charT, traits>& 
-   operator << (std::basic_ostream<charT, traits>& os, 
-                const reg_expression<charT, traits2, Allocator>& e)
-{
-   return (os << e.str());
-}
-#else
-template <class traits, class Allocator>
-std::ostream& operator << (std::ostream& os, const reg_expression<char, traits, Allocator>& e)
-{
-   return (os << e.str());
-}
-#endif
-
-//
-// We want to rename reg_expression basic_regex but maintain 
-// backwards compatibility, so class basic_regex is just a thin
-// wrapper around reg_expression:
-//
-#ifdef BOOST_REGEX_NO_FWD
-template <class charT, class traits = regex_traits<charT>, class Allocator = BOOST_DEFAULT_ALLOCATOR(charT) >
-#else
-template <class charT, class traits, class Allocator >
-#endif
-class basic_regex : public reg_expression<charT, traits, Allocator>
-{
-public:
-   typedef typename reg_expression<charT, traits, Allocator>::flag_type flag_type;
-   typedef typename reg_expression<charT, traits, Allocator>::size_type size_type;
-   explicit basic_regex(const Allocator& a = Allocator())
-      : reg_expression<charT, traits, Allocator>(a){}
-   explicit basic_regex(const charT* p, flag_type f = regex_constants::normal, const Allocator& a = Allocator())
-      : reg_expression<charT, traits, Allocator>(p,f,a){}
-   basic_regex(const charT* p1, const charT* p2, flag_type f = regex_constants::normal, const Allocator& a = Allocator())
-      : reg_expression<charT, traits, Allocator>(p1,p2,f,a){}
-   basic_regex(const charT* p, size_type len, flag_type f, const Allocator& a = Allocator())
-      : reg_expression<charT, traits, Allocator>(p,len,f,a){}
-   basic_regex(const basic_regex& that)
-      : reg_expression<charT, traits, Allocator>(that){}
-   ~basic_regex(){}
-   basic_regex& BOOST_REGEX_CALL operator=(const basic_regex& that)
-   {
-      this->assign(that);
-      return *this;
-   }
-   basic_regex& BOOST_REGEX_CALL operator=(const charT* ptr)
-   {
-      this->assign(ptr);
-      return *this;
-   }
-#if !defined(BOOST_NO_MEMBER_TEMPLATES) && !(defined(__IBMCPP__) && (__IBMCPP__ <= 502))
-   template <class ST, class SA>
-   explicit basic_regex(const std::basic_string<charT, ST, SA>& p, flag_type f = regex_constants::normal, const Allocator& a = Allocator())
-      : reg_expression<charT, traits, Allocator>(p,f,a){}
-
-   template <class I>
-   basic_regex(I arg_first, I arg_last, flag_type f = regex_constants::normal, const Allocator& al = Allocator())
-      : reg_expression<charT, traits, Allocator>(arg_first, arg_last, f, al){}
-
-   template <class ST, class SA>
-   basic_regex& BOOST_REGEX_CALL operator=(const std::basic_string<charT, ST, SA>& p)
-   {
-      this->assign(p);
-      return *this;
-   }
-#else
-   basic_regex(const std::basic_string<charT>& p, flag_type f = regex_constants::normal, const Allocator& a = Allocator())
-      : reg_expression<charT, traits, Allocator>(p,f,a){}
-
-   basic_regex& BOOST_REGEX_CALL operator=(const std::basic_string<charT>& p)
    {
       this->assign(p);
       return *this;
    }
 #endif
+
 };
 
 #ifdef BOOST_MSVC
diff --git a/include/boost/regex/v4/basic_regex_creator.hpp b/include/boost/regex/v4/basic_regex_creator.hpp
new file mode 100644
index 00000000..17f619d8
--- /dev/null
+++ b/include/boost/regex/v4/basic_regex_creator.hpp
@@ -0,0 +1,1201 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         basic_regex_creator.cpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Declares template class basic_regex_creator which fills in
+  *                the data members of a regex_data object.
+  */
+
+#ifndef BOOST_REGEX_V4_BASIC_REGEX_CREATOR_HPP
+#define BOOST_REGEX_V4_BASIC_REGEX_CREATOR_HPP
+
+#ifdef BOOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
+#endif
+
+namespace boost{
+
+namespace re_detail{
+
+template <class charT>
+struct digraph : public std::pair<charT, charT>
+{
+   digraph() : std::pair<charT, charT>(0, 0){}
+   digraph(charT c1) : std::pair<charT, charT>(c1, 0){}
+   digraph(charT c1, charT c2) : std::pair<charT, charT>(c1, c2)
+   {}
+#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+   digraph(const digraph<charT>& d) : std::pair<charT, charT>(d.first, d.second){}
+#endif
+   template <class Seq>
+   digraph(const Seq& s) : std::pair<charT, charT>()
+   {
+      BOOST_ASSERT(s.size() <= 2);
+      BOOST_ASSERT(s.size());
+      this->first = s[0];
+      this->second = (s.size() > 1) ? s[1] : 0;
+   }
+};
+
+template <class charT, class traits>
+class basic_char_set
+{
+public:
+   typedef digraph<charT>                   digraph_type;
+   typedef typename traits::string_type     string_type;
+   typedef typename traits::char_class_type mask_type;
+
+   basic_char_set()
+   {
+      m_negate = false;
+      m_has_digraphs = false;
+      m_classes = 0;
+      m_empty = true;
+   }
+
+   void add_single(const digraph_type& s)
+   {
+      m_singles.insert(m_singles.end(), s);
+      if(s.second)
+         m_has_digraphs = true;
+      m_empty = false;
+   }
+   void add_range(const digraph_type& first, const digraph_type& end)
+   {
+      m_ranges.insert(m_ranges.end(), first);
+      m_ranges.insert(m_ranges.end(), end);
+      if(first.second)
+      {
+         m_has_digraphs = true;
+         add_single(first);
+      }
+      if(end.second)
+      {
+         m_has_digraphs = true;
+         add_single(end);
+      }
+      m_empty = false;
+   }
+   void add_class(mask_type m)
+   {
+      m_classes |= m;
+      m_empty = false;
+   }
+   void add_equivalent(const digraph_type& s)
+   {
+      m_equivalents.insert(m_equivalents.end(), s);
+      if(s.second)
+      {
+         m_has_digraphs = true;
+         add_single(s);
+      }
+      m_empty = false;
+   }
+   void negate()
+   { 
+      m_negate = true;
+      //m_empty = false;
+   }
+
+   //
+   // accessor functions:
+   //
+   bool has_digraphs()const
+   {
+      return m_has_digraphs;
+   }
+   bool is_negated()const
+   {
+      return m_negate;
+   }
+   typedef typename std::vector<digraph_type>::const_iterator  list_iterator;
+   list_iterator singles_begin()const
+   {
+      return m_singles.begin();
+   }
+   list_iterator singles_end()const
+   {
+      return m_singles.end();
+   }
+   list_iterator ranges_begin()const
+   {
+      return m_ranges.begin();
+   }
+   list_iterator ranges_end()const
+   {
+      return m_ranges.end();
+   }
+   list_iterator equivalents_begin()const
+   {
+      return m_equivalents.begin();
+   }
+   list_iterator equivalents_end()const
+   {
+      return m_equivalents.end();
+   }
+   mask_type classes()const
+   {
+      return m_classes;
+   }
+   bool empty()const
+   {
+      return m_empty;
+   }
+private:
+   std::vector<digraph_type> m_singles;        // a list of single characters to match
+   std::vector<digraph_type> m_ranges;         // a list of end points of our ranges
+   bool                      m_negate;         // true if the set is to be negated
+   bool                      m_has_digraphs;   // true if we have digraphs present
+   mask_type                 m_classes;        // character classes to match
+   bool                      m_empty;          // whether we've added anything yet
+   std::vector<digraph_type> m_equivalents;    // a list of equivalence classes
+};
+   
+template <class charT, class traits>
+class basic_regex_creator
+{
+public:
+   basic_regex_creator(regex_data<charT, traits>* data);
+   std::ptrdiff_t getoffset(void* addr)
+   {
+      return getoffset(addr, m_pdata->m_data.data());
+   }
+   std::ptrdiff_t getoffset(const void* addr, const void* base)
+   {
+      return static_cast<const char*>(addr) - static_cast<const char*>(base);
+   }
+   re_syntax_base* getaddress(std::ptrdiff_t off)
+   {
+      return getaddress(off, m_pdata->m_data.data());
+   }
+   re_syntax_base* getaddress(std::ptrdiff_t off, void* base)
+   {
+      return static_cast<re_syntax_base*>(static_cast<void*>(static_cast<char*>(base) + off));
+   }
+   void init(unsigned flags)
+   {
+      m_pdata->m_flags = flags;
+      m_icase = flags & regex_constants::icase;
+   }
+   regbase::flag_type flags()
+   {
+      return m_pdata->m_flags;
+   }
+   void flags(regbase::flag_type f)
+   {
+      m_pdata->m_flags = f;
+      if(m_icase != static_cast<bool>(f & regbase::icase))
+      {
+         m_icase = static_cast<bool>(f & regbase::icase);
+      }
+   }
+   re_syntax_base* append_state(syntax_element_type t, std::size_t s = sizeof(re_syntax_base));
+   re_syntax_base* insert_state(std::ptrdiff_t pos, syntax_element_type t, std::size_t s = sizeof(re_syntax_base));
+   re_literal* append_literal(charT c);
+   re_syntax_base* append_set(const basic_char_set<charT, traits>& char_set);
+   re_syntax_base* append_set(const basic_char_set<charT, traits>& char_set, mpl::false_*);
+   re_syntax_base* append_set(const basic_char_set<charT, traits>& char_set, mpl::true_*);
+   void finalize(const charT* p1, const charT* p2);
+protected:
+   regex_data<charT, traits>*    m_pdata;              // pointer to the basic_regex_data struct we are filling in
+   const ::boost::regex_traits_wrapper<traits>&  
+                                 m_traits;             // convenience reference to traits class
+   re_syntax_base*               m_last_state;         // the last state we added
+   bool                          m_icase;              // true for case insensitive matches
+   unsigned                      m_repeater_id;        // the id of the next repeater
+   bool                          m_has_backrefs;       // true if there are actually any backrefs
+   unsigned                      m_backrefs;           // bitmask of permitted backrefs
+   boost::uintmax_t              m_bad_repeats;        // bitmask of repeats we can't deduce a startmap for;
+   typename traits::char_class_type m_word_mask;       // mask used to determine if a character is a word character
+   typename traits::char_class_type m_mask_space;      // mask used to determine if a character is a word character
+   typename traits::char_class_type m_lower_mask;       // mask used to determine if a character is a lowercase character
+   typename traits::char_class_type m_upper_mask;      // mask used to determine if a character is an uppercase character
+   typename traits::char_class_type m_alpha_mask;      // mask used to determine if a character is an alphabetic character
+private:
+   basic_regex_creator& operator=(const basic_regex_creator&);
+   basic_regex_creator(const basic_regex_creator&);
+
+   void fixup_pointers(re_syntax_base* state);
+   void create_startmaps(re_syntax_base* state);
+   int calculate_backstep(re_syntax_base* state);
+   void create_startmap(re_syntax_base* state, unsigned char* l_map, unsigned int* pnull, unsigned char mask);
+   unsigned get_restart_type(re_syntax_base* state);
+   void set_all_masks(unsigned char* bits, unsigned char);
+   bool is_bad_repeat(re_syntax_base* pt);
+   void set_bad_repeat(re_syntax_base* pt);
+   syntax_element_type get_repeat_type(re_syntax_base* state);
+   void probe_leading_repeat(re_syntax_base* state);
+};
+
+template <class charT, class traits>
+basic_regex_creator<charT, traits>::basic_regex_creator(regex_data<charT, traits>* data)
+   : m_pdata(data), m_traits(*(data->m_ptraits)), m_last_state(0), m_repeater_id(0), m_has_backrefs(false), m_backrefs(0)
+{
+   m_pdata->m_data.clear();
+   m_pdata->m_status = ::boost::regex_constants::error_ok;
+   static const charT w = 'w';
+   static const charT s = 's';
+   static const charT l[] = { 'l', 'o', 'w', 'e', 'r', };
+   static const charT u[] = { 'u', 'p', 'p', 'e', 'r', };
+   static const charT a[] = { 'a', 'l', 'p', 'h', 'a', };
+   m_word_mask = m_traits.lookup_classname(&w, &w +1);
+   m_mask_space = m_traits.lookup_classname(&s, &s +1);
+   m_lower_mask = m_traits.lookup_classname(l, l + 5);
+   m_upper_mask = m_traits.lookup_classname(u, u + 5);
+   m_alpha_mask = m_traits.lookup_classname(a, a + 5);
+   BOOST_ASSERT(m_word_mask != 0); 
+   BOOST_ASSERT(m_mask_space != 0); 
+   BOOST_ASSERT(m_lower_mask != 0); 
+   BOOST_ASSERT(m_upper_mask != 0); 
+   BOOST_ASSERT(m_alpha_mask != 0); 
+}
+
+template <class charT, class traits>
+re_syntax_base* basic_regex_creator<charT, traits>::append_state(syntax_element_type t, std::size_t s)
+{
+   // if the state is a backref then make a note of it:
+   if(t == syntax_element_backref)
+      this->m_has_backrefs = true;
+   // append a new state, start by aligning our last one:
+   m_pdata->m_data.align();
+   // set the offset to the next state in our last one:
+   if(m_last_state)
+      m_last_state->next.i = m_pdata->m_data.size() - getoffset(m_last_state);
+   // now actually extent our data:
+   m_last_state = static_cast<re_syntax_base*>(m_pdata->m_data.extend(s));
+   // fill in boilerplate options in the new state:
+   m_last_state->next.i = 0;
+   m_last_state->type = t;
+   return m_last_state;
+}
+
+template <class charT, class traits>
+re_syntax_base* basic_regex_creator<charT, traits>::insert_state(std::ptrdiff_t pos, syntax_element_type t, std::size_t s)
+{
+   // append a new state, start by aligning our last one:
+   m_pdata->m_data.align();
+   // set the offset to the next state in our last one:
+   if(m_last_state)
+      m_last_state->next.i = m_pdata->m_data.size() - getoffset(m_last_state);
+   // remember the last state position:
+   std::ptrdiff_t off = getoffset(m_last_state) + s;
+   // now actually insert our data:
+   re_syntax_base* new_state = static_cast<re_syntax_base*>(m_pdata->m_data.insert(pos, s));
+   // fill in boilerplate options in the new state:
+   new_state->next.i = s;
+   new_state->type = t;
+   m_last_state = getaddress(off);
+   return new_state;
+}
+
+template <class charT, class traits>
+re_literal* basic_regex_creator<charT, traits>::append_literal(charT c)
+{
+   re_literal* result;
+   // start by seeing if we have an existing re_literal we can extend:
+   if((0 == m_last_state) || (m_last_state->type != syntax_element_literal))
+   {
+      // no existing re_literal, create a new one:
+      result = static_cast<re_literal*>(append_state(syntax_element_literal, sizeof(re_literal) + sizeof(charT)));
+      result->length = 1;
+      *static_cast<charT*>(static_cast<void*>(result+1)) = m_traits.translate(c, m_icase);
+   }
+   else
+   {
+      // we have an existing re_literal, extend it:
+      std::ptrdiff_t off = getoffset(m_last_state);
+      m_pdata->m_data.extend(sizeof(charT));
+      m_last_state = result = static_cast<re_literal*>(getaddress(off));
+      charT* characters = static_cast<charT*>(static_cast<void*>(result+1));
+      characters[result->length] = m_traits.translate(c, m_icase);
+      ++(result->length);
+   }
+   return result;
+}
+
+template <class charT, class traits>
+inline re_syntax_base* basic_regex_creator<charT, traits>::append_set(
+   const basic_char_set<charT, traits>& char_set)
+{
+   typedef mpl::bool_< (sizeof(charT) == 1) > truth_type;
+   return char_set.has_digraphs() 
+      ? append_set(char_set, static_cast<mpl::false_*>(0))
+      : append_set(char_set, static_cast<truth_type*>(0));
+}
+
+template <class charT, class traits>
+re_syntax_base* basic_regex_creator<charT, traits>::append_set(
+   const basic_char_set<charT, traits>& char_set, mpl::false_*)
+{
+   typedef typename traits::string_type string_type;
+   typedef typename basic_char_set<charT, traits>::list_iterator item_iterator;
+   typedef typename traits::char_class_type mask_type;
+   
+   re_set_long<mask_type>* result = static_cast<re_set_long<mask_type>*>(append_state(syntax_element_long_set, sizeof(re_set_long<mask_type>)));
+   //
+   // fill in the basics:
+   //
+   result->csingles = static_cast<unsigned int>(::boost::re_detail::distance(char_set.singles_begin(), char_set.singles_end()));
+   result->cranges = static_cast<unsigned int>(::boost::re_detail::distance(char_set.ranges_begin(), char_set.ranges_end())) / 2;
+   result->cequivalents = static_cast<unsigned int>(::boost::re_detail::distance(char_set.equivalents_begin(), char_set.equivalents_end()));
+   result->cclasses = char_set.classes();
+   if(flags() & regbase::icase)
+   {
+      // adjust classes as needed:
+      if(((result->cclasses & m_lower_mask) == m_lower_mask) || ((result->cclasses & m_upper_mask) == m_upper_mask))
+         result->cclasses |= m_alpha_mask;
+   }
+
+   result->isnot = char_set.is_negated();
+   result->singleton = !char_set.has_digraphs();
+   //
+   // remember where the state is for later:
+   //
+   std::ptrdiff_t offset = getoffset(result);
+   //
+   // now extend with all the singles:
+   //
+   item_iterator first, last;
+   first = char_set.singles_begin();
+   last = char_set.singles_end();
+   while(first != last)
+   {
+      charT* p = static_cast<charT*>(this->m_pdata->m_data.extend(sizeof(charT) * (first->second ? 3 : 2)));
+      p[0] = m_traits.translate(first->first, m_icase);
+      if(first->second)
+      {
+         p[1] = m_traits.translate(first->second, m_icase);
+         p[2] = 0;
+      }
+      else
+         p[1] = 0;
+      ++first;
+   }
+   //
+   // now extend with all the ranges:
+   //
+   first = char_set.ranges_begin();
+   last = char_set.ranges_end();
+   while(first != last)
+   {
+      // first grab the endpoints of the range:
+      digraph<charT> c1 = *first;
+      c1.first = this->m_traits.translate(c1.first, this->m_icase);
+      c1.second = this->m_traits.translate(c1.second, this->m_icase);
+      ++first;
+      digraph<charT> c2 = *first;
+      c2.first = this->m_traits.translate(c2.first, this->m_icase);
+      c2.second = this->m_traits.translate(c2.second, this->m_icase);
+      ++first;
+      string_type s1, s2;
+      // different actions now depending upon whether collation is turned on:
+      if(flags() & regex_constants::collate)
+      {
+         // we need to transform our range into sort keys:
+         charT a1[3] = { c1.first, c1.second, charT(0), };
+         charT a2[3] = { c2.first, c2.second, charT(0), };
+         s1 = this->m_traits.transform(a1, (a1[1] ? a1+2 : a1+1));
+         s2 = this->m_traits.transform(a2, (a2[1] ? a2+2 : a2+1));
+      }
+      else
+      {
+         if(c1.second)
+         {
+            s1.insert(s1.end(), c1.first);
+            s1.insert(s1.end(), c1.second);
+         }
+         else
+            s1 = string_type(1, c1.first);
+         if(c2.second)
+         {
+            s2.insert(s2.end(), c2.first);
+            s2.insert(s2.end(), c2.second);
+         }
+         else
+            s2.insert(s2.end(), c2.first);
+      }
+      if(s1 > s2)
+      {
+         // Oops error:
+         return 0;
+      }
+      charT* p = static_cast<charT*>(this->m_pdata->m_data.extend(sizeof(charT) * (s1.size() + s2.size() + 2) ) );
+      std::copy(s1.begin(), s1.end(), p);
+      p[s1.size()] = charT(0);
+      p += s1.size() + 1;
+      std::copy(s2.begin(), s2.end(), p);
+      p[s2.size()] = charT(0);
+   }
+   //
+   // now process the equivalence classes:
+   //
+   first = char_set.equivalents_begin();
+   last = char_set.equivalents_end();
+   while(first != last)
+   {
+      string_type s;
+      if(first->second)
+      {
+         charT cs[3] = { first->first, first->second, charT(0), };
+         s = m_traits.transform_primary(cs, cs+2);
+      }
+      else
+         s = m_traits.transform_primary(&first->first, &first->first+1);
+      if(s.empty())
+         return 0;  // invalid or unsupported equivalence class
+      charT* p = static_cast<charT*>(this->m_pdata->m_data.extend(sizeof(charT) * (s.size()+1) ) );
+      std::copy(s.begin(), s.end(), p);
+      p[s.size()] = charT(0);
+      ++first;
+   }
+   //
+   // finally reset the address of our last state:
+   //
+   m_last_state = result = static_cast<re_set_long<mask_type>*>(getaddress(offset));
+   return result;
+}
+
+namespace{
+
+template<class T>
+inline bool char_less(T t1, T t2)
+{
+   return t1 < t2;
+}
+template<>
+inline bool char_less<char>(char t1, char t2)
+{
+   return static_cast<unsigned char>(t1) < static_cast<unsigned char>(t2);
+}
+template<>
+inline bool char_less<signed char>(signed char t1, signed char t2)
+{
+   return static_cast<unsigned char>(t1) < static_cast<unsigned char>(t2);
+}
+}
+
+template <class charT, class traits>
+re_syntax_base* basic_regex_creator<charT, traits>::append_set(
+   const basic_char_set<charT, traits>& char_set, mpl::true_*)
+{
+   typedef typename traits::string_type string_type;
+   typedef typename basic_char_set<charT, traits>::list_iterator item_iterator;
+   
+   re_set* result = static_cast<re_set*>(append_state(syntax_element_set, sizeof(re_set)));
+   bool negate = char_set.is_negated();
+   std::memset(result->_map, 0, sizeof(result->_map));
+   //
+   // handle singles first:
+   //
+   item_iterator first, last;
+   first = char_set.singles_begin();
+   last = char_set.singles_end();
+   while(first != last)
+   {
+      for(unsigned int i = 0; i < (1 << CHAR_BIT); ++i)
+      {
+         if(this->m_traits.translate(static_cast<charT>(i), this->m_icase)
+            == this->m_traits.translate(first->first, this->m_icase))
+            result->_map[i] = true;
+      }
+      ++first;
+   }
+   //
+   // OK now handle ranges:
+   //
+   first = char_set.ranges_begin();
+   last = char_set.ranges_end();
+   while(first != last)
+   {
+      // first grab the endpoints of the range:
+      charT c1 = this->m_traits.translate(first->first, this->m_icase);
+      ++first;
+      charT c2 = this->m_traits.translate(first->first, this->m_icase);
+      ++first;
+      // different actions now depending upon whether collation is turned on:
+      if(flags() & regex_constants::collate)
+      {
+         // we need to transform our range into sort keys:
+         charT c3[2] = { c1, charT(0), };
+         string_type s1 = this->m_traits.transform(c3, c3+1);
+         c3[0] = c2;
+         string_type s2 = this->m_traits.transform(c3, c3+1);
+         if(s1 > s2)
+         {
+            // Oops error:
+            return 0;
+         }
+         for(unsigned i = 0; i < (1u << CHAR_BIT); ++i)
+         {
+            charT c3[] = { static_cast<charT>(i), charT(0), };
+            string_type s3 = this->m_traits.transform(c3, c3 +1);
+            if((s1 <= s3) && (s3 <= s2))
+               result->_map[i] = true;
+         }
+      }
+      else
+      {
+         if(!char_less<charT>(c1, c2))
+         {
+            // Oops error:
+            return 0;
+         }
+         // everything in range matches:
+         std::memset(result->_map + static_cast<unsigned char>(c1), true, 1 + static_cast<unsigned char>(c2) - static_cast<unsigned char>(c1));
+      }
+   }
+   //
+   // and now the classes:
+   //
+   typedef typename traits::char_class_type mask_type;
+   mask_type m = char_set.classes();
+   if(flags() & regbase::icase)
+   {
+      // adjust m as needed:
+      if(((m & m_lower_mask) == m_lower_mask) || ((m & m_upper_mask) == m_upper_mask))
+         m |= m_alpha_mask;
+   }
+   if(m != 0)
+   {
+      for(unsigned i = 0; i < (1u << CHAR_BIT); ++i)
+      {
+         if(this->m_traits.isctype(static_cast<charT>(i), m))
+            result->_map[i] = true;
+      }
+   }
+   //
+   // now process the equivalence classes:
+   //
+   first = char_set.equivalents_begin();
+   last = char_set.equivalents_end();
+   while(first != last)
+   {
+      string_type s;
+      BOOST_ASSERT(static_cast<charT>(0) == first->second);
+      s = m_traits.transform_primary(&first->first, &first->first+1);
+      if(s.empty())
+         return 0;  // invalid or unsupported equivalence class
+      for(unsigned i = 0; i < (1u << CHAR_BIT); ++i)
+      {
+         charT c[2] = { (static_cast<charT>(i)), charT(0), };
+         string_type s2 = this->m_traits.transform_primary(c, c+1);
+         if(s == s2)
+            result->_map[i] = true;
+      }
+      ++first;
+   }
+   if(negate)
+   {
+      for(unsigned i = 0; i < (1u << CHAR_BIT); ++i)
+      {
+         result->_map[i] = !(result->_map[i]);
+      }
+   }
+   return result;
+}
+
+template <class charT, class traits>
+void basic_regex_creator<charT, traits>::finalize(const charT* p1, const charT* p2)
+{
+   // we've added all the states we need, now finish things off.
+   // start by adding a terminating state:
+   append_state(syntax_element_match);
+   // extend storage to store original expression:
+   std::ptrdiff_t len = p2 - p1;
+   m_pdata->m_expression_len = len;
+   charT* ps = static_cast<charT*>(m_pdata->m_data.extend(sizeof(charT) * (1 + (p2 - p1))));
+   m_pdata->m_expression = ps;
+   std::copy(p1, p2, ps);
+   ps[p2 - p1] = 0;
+   // fill in our other data...
+   // successful parsing implies a zero status:
+   m_pdata->m_status = 0;
+   // get the first state of the machine:
+   m_pdata->m_first_state = static_cast<re_syntax_base*>(m_pdata->m_data.data());
+   // fixup pointers in the machine:
+   fixup_pointers(m_pdata->m_first_state);
+   // create nested startmaps:
+   create_startmaps(m_pdata->m_first_state);
+   // create main startmap:
+   std::memset(m_pdata->m_startmap, 0, sizeof(m_pdata->m_startmap));
+   m_pdata->m_can_be_null = 0;
+
+   m_bad_repeats = 0;
+   create_startmap(m_pdata->m_first_state, m_pdata->m_startmap, &(m_pdata->m_can_be_null), mask_all);
+   // get the restart type:
+   m_pdata->m_restart_type = get_restart_type(m_pdata->m_first_state);
+   // optimise a leading repeat if there is one:
+   probe_leading_repeat(m_pdata->m_first_state);
+}
+
+template <class charT, class traits>
+void basic_regex_creator<charT, traits>::fixup_pointers(re_syntax_base* state)
+{
+   while(state)
+   {
+      switch(state->type)
+      {
+      case syntax_element_rep:
+      case syntax_element_dot_rep:
+      case syntax_element_char_rep:
+      case syntax_element_short_set_rep:
+      case syntax_element_long_set_rep:
+         // set the id of this repeat:
+         static_cast<re_repeat*>(state)->id = m_repeater_id++;
+         // fall through:
+      case syntax_element_alt:
+         std::memset(static_cast<re_alt*>(state)->_map, 0, sizeof(static_cast<re_alt*>(state)->_map));
+         static_cast<re_alt*>(state)->can_be_null = 0;
+         // fall through:
+      case syntax_element_jump:
+         static_cast<re_jump*>(state)->alt.p = getaddress(static_cast<re_jump*>(state)->alt.i, state);
+         // fall through again:
+      default:
+         if(state->next.i)
+            state->next.p = getaddress(state->next.i, state);
+         else
+            state->next.p = 0;
+      }
+      state = state->next.p;
+   }
+}
+
+template <class charT, class traits>
+void basic_regex_creator<charT, traits>::create_startmaps(re_syntax_base* state)
+{
+   // non-recursive implementation:
+   // create the last map in the machine first, so that earlier maps
+   // can make use of the result...
+   //
+   // This was originally a recursive implementation, but that caused stack
+   // overflows with complex expressions on small stacks (think COM+).
+
+   // start by saving the case setting:
+   bool l_icase = m_icase;
+   std::vector<std::pair<bool, re_syntax_base*> > v;
+
+   while(state)
+   {
+      switch(state->type)
+      {
+      case syntax_element_toggle_case:
+         // we need to track case changes here:
+         m_icase = static_cast<re_case*>(state)->icase;
+         state = state->next.p;
+         continue;
+      case syntax_element_alt:
+      case syntax_element_rep:
+      case syntax_element_dot_rep:
+      case syntax_element_char_rep:
+      case syntax_element_short_set_rep:
+      case syntax_element_long_set_rep:
+         // just push the state onto our stack for now:
+         v.push_back(std::pair<bool, re_syntax_base*>(m_icase, state));
+         state = state->next.p;
+         break;
+      case syntax_element_backstep:
+         // we need to calculate how big the backstep is:
+         static_cast<re_brace*>(state)->index
+            = this->calculate_backstep(state->next.p);
+         if(static_cast<re_brace*>(state)->index < 0)
+         {
+            // Oops error:
+            if(0 == this->m_pdata->m_status) // update the error code if not already set
+               this->m_pdata->m_status = boost::regex_constants::error_brack;
+            if(0 == (this->flags() & regex_constants::no_except))
+            {
+               std::string message = this->m_pdata->m_ptraits->error_string(boost::regex_constants::error_brack);
+               boost::regex_error e(message, boost::regex_constants::error_brack, 0);
+               e.raise();
+            }
+         }
+         // fall through:
+      default:
+         state = state->next.p;
+      }
+   }
+   // now work through our list, building all the maps as we go:
+   while(v.size())
+   {
+      const std::pair<bool, re_syntax_base*>& p = v.back();
+      m_icase = p.first;
+      state = p.second;
+      v.pop_back();
+
+      create_startmap(state->next.p, static_cast<re_alt*>(state)->_map, &static_cast<re_alt*>(state)->can_be_null, mask_take);
+      m_bad_repeats = 0;
+      create_startmap(static_cast<re_alt*>(state)->alt.p, static_cast<re_alt*>(state)->_map, &static_cast<re_alt*>(state)->can_be_null, mask_skip);
+      // adjust the type of the state to allow for faster matching:
+      state->type = this->get_repeat_type(state);
+   }
+   // restore case sensitivity:
+   m_icase = l_icase;
+}
+
+template <class charT, class traits>
+int basic_regex_creator<charT, traits>::calculate_backstep(re_syntax_base* state)
+{
+   typedef typename traits::char_class_type mask_type;
+   int result = 0;
+   while(state)
+   {
+      switch(state->type)
+      {
+      case syntax_element_startmark:
+         if((static_cast<re_brace*>(state)->index == -1)
+            || (static_cast<re_brace*>(state)->index == -2))
+         {
+            state = static_cast<re_jump*>(state->next.p)->alt.p->next.p;
+            continue;
+         }
+         else if(static_cast<re_brace*>(state)->index == -3)
+         {
+            state = state->next.p->next.p;
+            continue;
+         }
+         break;
+      case syntax_element_endmark:
+         if((static_cast<re_brace*>(state)->index == -1)
+            || (static_cast<re_brace*>(state)->index == -2))
+            return result;
+         break;
+      case syntax_element_literal:
+         result += static_cast<re_literal*>(state)->length;
+         break;
+      case syntax_element_wild:
+      case syntax_element_set:
+         result += 1;
+         break;
+      case syntax_element_backref:
+      case syntax_element_rep:
+      case syntax_element_combining:
+      case syntax_element_dot_rep:
+      case syntax_element_char_rep:
+      case syntax_element_short_set_rep:
+      case syntax_element_long_set_rep:
+      case syntax_element_backstep:
+         return -1;
+      case syntax_element_long_set:
+         if(static_cast<re_set_long<mask_type>*>(state)->singleton == 0)
+            return -1;
+         result += 1;
+         break;
+      case syntax_element_jump:
+         state = static_cast<re_jump*>(state)->alt.p;
+         continue;
+      default:
+         break;
+      }
+      state = state->next.p;
+   }
+   return -1;
+}
+
+template <class charT, class traits>
+void basic_regex_creator<charT, traits>::create_startmap(re_syntax_base* state, unsigned char* l_map, unsigned int* pnull, unsigned char mask)
+{
+   int not_last_jump = 1;
+
+   // track case sensitivity:
+   bool l_icase = m_icase;
+
+   while(state)
+   {
+      switch(state->type)
+      {
+      case syntax_element_toggle_case:
+         l_icase = static_cast<re_case*>(state)->icase;
+         state = state->next.p;
+         break;
+      case syntax_element_literal:
+      {
+         // don't set anything in *pnull, set each element in l_map
+         // that could match the first character in the literal:
+         if(l_map)
+         {
+            l_map[0] |= mask_init;
+            charT first_char = *static_cast<charT*>(static_cast<void*>(static_cast<re_literal*>(state) + 1));
+            for(unsigned int i = 0; i < (1u << CHAR_BIT); ++i)
+            {
+               if(m_traits.translate(static_cast<charT>(i), l_icase) == first_char)
+                  l_map[i] |= mask;
+            }
+         }
+         return;
+      }
+      case syntax_element_end_line:
+      {
+         // next character must be a line separator (if there is one):
+         if(l_map)
+         {
+            l_map[0] |= mask_init;
+            l_map['\n'] |= mask;
+            l_map['\r'] |= mask;
+            l_map['\f'] |= mask;
+            l_map[0x85] |= mask;
+         }
+         // now figure out if we can match a NULL string at this point:
+         if(pnull)
+            create_startmap(state->next.p, 0, pnull, mask);
+         return;
+      }
+      case syntax_element_backref:
+         // can be null, and any character can match:
+         if(pnull)
+            *pnull |= mask;
+         // fall through:
+      case syntax_element_wild:
+      {
+         // can't be null, any character can match:
+         set_all_masks(l_map, mask);
+         return;
+      }
+      case syntax_element_match:
+      {
+         // must be null, any character can match:
+         set_all_masks(l_map, mask);
+         if(pnull)
+            *pnull |= mask;
+         return;
+      }
+      case syntax_element_word_start:
+      {
+         // recurse, then AND with all the word characters:
+         create_startmap(state->next.p, l_map, pnull, mask);
+         if(l_map)
+         {
+            l_map[0] |= mask_init;
+            for(unsigned int i = 0; i < (1u << CHAR_BIT); ++i)
+            {
+               if(!m_traits.isctype(static_cast<charT>(i), m_word_mask))
+                  l_map[i] &= static_cast<unsigned char>(~mask);
+            }
+         }
+         return;
+      }
+      case syntax_element_word_end:
+      {
+         // recurse, then AND with all the word characters:
+         create_startmap(state->next.p, l_map, pnull, mask);
+         if(l_map)
+         {
+            l_map[0] |= mask_init;
+            for(unsigned int i = 0; i < (1u << CHAR_BIT); ++i)
+            {
+               if(m_traits.isctype(static_cast<charT>(i), m_word_mask))
+                  l_map[i] &= static_cast<unsigned char>(~mask);
+            }
+         }
+         return;
+      }
+      case syntax_element_buffer_end:
+      {
+         // we *must be null* :
+         if(pnull)
+            *pnull |= mask;
+         return;
+      }
+      case syntax_element_long_set:
+         if(l_map)
+         {
+            typedef typename traits::char_class_type mask_type;
+            if(static_cast<re_set_long<mask_type>*>(state)->singleton)
+            {
+               l_map[0] |= mask_init;
+               for(unsigned int i = 0; i < (1u << CHAR_BIT); ++i)
+               {
+                  charT c = static_cast<charT>(i);
+                  if(&c != re_is_set_member(&c, &c + 1, static_cast<re_set_long<mask_type>*>(state), *m_pdata, m_icase))
+                     l_map[i] |= mask;
+               }
+            }
+            else
+               set_all_masks(l_map, mask);
+         }
+         return;
+      case syntax_element_set:
+         if(l_map)
+         {
+            l_map[0] |= mask_init;
+            for(unsigned int i = 0; i < (1u << CHAR_BIT); ++i)
+            {
+               if(static_cast<re_set*>(state)->_map[
+                  static_cast<unsigned char>(m_traits.translate(static_cast<charT>(i), l_icase))])
+                  l_map[i] |= mask;
+            }
+         }
+         return;
+      case syntax_element_jump:
+         // take the jump:
+         state = static_cast<re_alt*>(state)->alt.p;
+         not_last_jump = -1;
+         break;
+      case syntax_element_alt:
+      case syntax_element_rep:
+      case syntax_element_dot_rep:
+      case syntax_element_char_rep:
+      case syntax_element_short_set_rep:
+      case syntax_element_long_set_rep:
+         {
+            re_alt* rep = static_cast<re_alt*>(state);
+            if(rep->_map[0] & mask_init)
+            {
+               if(l_map)
+               {
+                  // copy previous results:
+                  l_map[0] |= mask_init;
+                  for(unsigned int i = 0; i <= UCHAR_MAX; ++i)
+                  {
+                     if(rep->_map[i] & mask_any)
+                        l_map[i] |= mask;
+                  }
+               }
+               if(pnull)
+               {
+                  if(rep->can_be_null & mask_any)
+                     *pnull |= mask;
+               }
+            }
+            else
+            {
+               // we haven't created a startmap for this alternative yet
+               // so take the union of the two options:
+               if(is_bad_repeat(state))
+               {
+                  set_all_masks(l_map, mask);
+                  return;
+               }
+               set_bad_repeat(state);
+               create_startmap(state->next.p, l_map, pnull, mask);
+               if((state->type == syntax_element_alt)
+                  || (static_cast<re_repeat*>(state)->min == 0)
+                  || (not_last_jump == 0))
+                  create_startmap(rep->alt.p, l_map, pnull, mask);
+            }
+         }
+         return;
+      case syntax_element_soft_buffer_end:
+         // match newline or null:
+         if(l_map)
+         {
+            l_map[0] |= mask_init;
+            l_map['\n'] |= mask;
+            l_map['\r'] |= mask;
+         }
+         if(pnull)
+            *pnull |= mask;
+         return;
+      case syntax_element_endmark:
+         // need to handle independent subs as a special case:
+         if(static_cast<re_brace*>(state)->index == -3)
+         {
+            // can be null, any character can match:
+            set_all_masks(l_map, mask);
+            if(pnull)
+               *pnull |= mask;
+            return;
+         }
+         else
+         {
+            state = state->next.p;
+            break;
+         }
+
+      case syntax_element_startmark:
+         // need to handle independent subs as a special case:
+         if(static_cast<re_brace*>(state)->index == -3)
+         {
+            state = state->next.p->next.p;
+            break;
+         }
+         // otherwise fall through:
+      default:
+         state = state->next.p;
+      }
+      ++not_last_jump;
+   }
+}
+
+template <class charT, class traits>
+unsigned basic_regex_creator<charT, traits>::get_restart_type(re_syntax_base* state)
+{
+   //
+   // find out how the machine starts, so we can optimise the search:
+   //
+   while(state)
+   {
+      switch(state->type)
+      {
+      case syntax_element_startmark:
+      case syntax_element_endmark:
+         state = state->next.p;
+         continue;
+      case syntax_element_start_line:
+         return regbase::restart_line;
+      case syntax_element_word_start:
+         return regbase::restart_word;
+      case syntax_element_buffer_start:
+         return regbase::restart_buf;
+      case syntax_element_restart_continue:
+         return regbase::restart_continue;
+      default:
+         state = 0;
+         continue;
+      }
+   }
+   return regbase::restart_any;
+}
+
+template <class charT, class traits>
+void basic_regex_creator<charT, traits>::set_all_masks(unsigned char* bits, unsigned char mask)
+{
+   //
+   // set mask in all of bits elements, 
+   // if bits[0] has mask_init not set then we can 
+   // optimise this to a call to memset:
+   //
+   if(bits)
+   {
+      if(bits[0] == 0)
+         (std::memset)(bits, mask, 1u << CHAR_BIT);
+      else
+      {
+         for(unsigned i = 0; i < (1u << CHAR_BIT); ++i)
+            bits[i] |= mask;
+      }
+      bits[0] |= mask_init;
+   }
+}
+
+template <class charT, class traits>
+bool basic_regex_creator<charT, traits>::is_bad_repeat(re_syntax_base* pt)
+{
+   switch(pt->type)
+   {
+   case syntax_element_rep:
+   case syntax_element_dot_rep:
+   case syntax_element_char_rep:
+   case syntax_element_short_set_rep:
+   case syntax_element_long_set_rep:
+      {
+         unsigned id = static_cast<re_repeat*>(pt)->id;
+         if(id > sizeof(m_bad_repeats) * CHAR_BIT)
+            return true;  // run out of bits, assume we can't traverse this one.
+         return m_bad_repeats & static_cast<boost::uintmax_t>(1uL << id);
+      }
+   default:
+      return false;
+   }
+}
+
+template <class charT, class traits>
+void basic_regex_creator<charT, traits>::set_bad_repeat(re_syntax_base* pt)
+{
+   switch(pt->type)
+   {
+   case syntax_element_rep:
+   case syntax_element_dot_rep:
+   case syntax_element_char_rep:
+   case syntax_element_short_set_rep:
+   case syntax_element_long_set_rep:
+      {
+         unsigned id = static_cast<re_repeat*>(pt)->id;
+         if(id <= sizeof(m_bad_repeats) * CHAR_BIT)
+            m_bad_repeats |= static_cast<boost::uintmax_t>(1uL << id);
+      }
+   default:
+      break;
+   }
+}
+
+template <class charT, class traits>
+syntax_element_type basic_regex_creator<charT, traits>::get_repeat_type(re_syntax_base* state)
+{
+   typedef typename traits::char_class_type mask_type;
+   if(state->type == syntax_element_rep)
+   {
+      // check to see if we are repeating a single state:
+      if(state->next.p->next.p->next.p == static_cast<re_alt*>(state)->alt.p)
+      {
+         switch(state->next.p->type)
+         {
+         case re_detail::syntax_element_wild:
+            return re_detail::syntax_element_dot_rep;
+         case re_detail::syntax_element_literal:
+            return re_detail::syntax_element_char_rep;
+         case re_detail::syntax_element_set:
+            return re_detail::syntax_element_short_set_rep;
+         case re_detail::syntax_element_long_set:
+            if(static_cast<re_detail::re_set_long<mask_type>*>(state->next.p)->singleton)
+               return re_detail::syntax_element_long_set_rep;
+            break;
+         default:
+            break;
+         }
+      }
+   }
+   return state->type;
+}
+
+template <class charT, class traits>
+void basic_regex_creator<charT, traits>::probe_leading_repeat(re_syntax_base* state)
+{
+   // enumerate our states, and see if we have a leading repeat 
+   // for which failed search restarts can be optimised;
+   do
+   {
+      switch(state->type)
+      {
+      case syntax_element_startmark:
+         if(static_cast<re_brace*>(state)->index >= 0)
+         {
+            state = state->next.p;
+            continue;
+         }
+         return;
+      case syntax_element_endmark:
+      case syntax_element_start_line:
+      case syntax_element_end_line:
+      case syntax_element_word_boundary:
+      case syntax_element_within_word:
+      case syntax_element_word_start:
+      case syntax_element_word_end:
+      case syntax_element_buffer_start:
+      case syntax_element_buffer_end:
+      case syntax_element_restart_continue:
+         state = state->next.p;
+         break;
+      case syntax_element_dot_rep:
+      case syntax_element_char_rep:
+      case syntax_element_short_set_rep:
+      case syntax_element_long_set_rep:
+         if(this->m_has_backrefs == 0)
+            static_cast<re_repeat*>(state)->leading = true;
+         // fall through:
+      default:
+         return;
+      }
+   }while(state);
+}
+
+
+} // namespace re_detail
+
+} // namespace boost
+
+#ifdef BOOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
+#endif
+
+#endif
diff --git a/include/boost/regex/v4/basic_regex_parser.hpp b/include/boost/regex/v4/basic_regex_parser.hpp
new file mode 100644
index 00000000..f6b01bcf
--- /dev/null
+++ b/include/boost/regex/v4/basic_regex_parser.hpp
@@ -0,0 +1,2032 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         basic_regex_parser.cpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Declares template class basic_regex_parser.
+  */
+
+#ifndef BOOST_REGEX_V4_BASIC_REGEX_PARSER_HPP
+#define BOOST_REGEX_V4_BASIC_REGEX_PARSER_HPP
+
+#ifdef BOOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
+#endif
+
+namespace boost{
+namespace re_detail{
+
+#ifdef BOOST_MSVC
+#pragma warning(push)
+#pragma warning(disable:4244)
+#endif
+
+template <class charT, class traits>
+class basic_regex_parser : public basic_regex_creator<charT, traits>
+{
+public:
+   basic_regex_parser(regex_data<charT, traits>* data);
+   void parse(const charT* p1, const charT* p2, unsigned flags);
+   void fail(regex_constants::error_type error_code, std::ptrdiff_t position);
+
+   bool parse_all();
+   bool parse_basic();
+   bool parse_extended();
+   bool parse_literal();
+   bool parse_open_paren();
+   bool parse_basic_escape();
+   bool parse_extended_escape();
+   bool parse_match_any();
+   bool parse_repeat(std::size_t low = 0, std::size_t high = (std::numeric_limits<std::size_t>::max)());
+   bool parse_repeat_range(bool isbasic);
+   bool parse_alt();
+   bool parse_set();
+   bool parse_backref();
+   void parse_set_literal(basic_char_set<charT, traits>& char_set);
+   bool parse_inner_set(basic_char_set<charT, traits>& char_set);
+   bool parse_QE();
+   bool parse_perl_extension();
+   bool add_emacs_code(bool negate);
+   bool unwind_alts(std::ptrdiff_t last_paren_start);
+   digraph<charT> get_next_set_literal(basic_char_set<charT, traits>& char_set);
+   charT unescape_character();
+   regex_constants::syntax_option_type parse_options();
+
+private:
+   typedef bool (basic_regex_parser::*parser_proc_type)();
+   typedef typename traits::string_type string_type;
+   typedef typename traits::char_class_type char_class_type;
+   parser_proc_type           m_parser_proc;    // the main parser to use
+   const charT*               m_base;           // the start of the string being parsed
+   const charT*               m_end;            // the end of the string being parsed
+   const charT*               m_position;       // our current parser position
+   unsigned                   m_mark_count;     // how many sub-expressions we have
+   std::ptrdiff_t             m_paren_start;    // where the last seen ')' began (where repeats are inserted).
+   std::ptrdiff_t             m_alt_insert_point; // where to insert the next alternative
+   bool                       m_has_case_change; // true if somewhere in the current block the case has changed
+#ifdef BOOST_MSVC
+   // This is an ugly warning suppression workaround (for warnings *inside* std::vector
+   // that can not otherwise be suppressed)...
+   BOOST_STATIC_ASSERT(sizeof(long) >= sizeof(void*));
+   std::vector<long>           m_alt_jumps;      // list of alternative in the current scope.
+#else
+   std::vector<std::ptrdiff_t> m_alt_jumps;      // list of alternative in the current scope.
+#endif
+
+   basic_regex_parser& operator=(const basic_regex_parser&);
+   basic_regex_parser(const basic_regex_parser&);
+};
+
+template <class charT, class traits>
+basic_regex_parser<charT, traits>::basic_regex_parser(regex_data<charT, traits>* data)
+   : basic_regex_creator<charT, traits>(data), m_mark_count(0), m_paren_start(0), m_alt_insert_point(0), m_has_case_change(false)
+{
+}
+
+template <class charT, class traits>
+void basic_regex_parser<charT, traits>::parse(const charT* p1, const charT* p2, unsigned flags)
+{
+   // pass flags on to base class:
+   this->init(flags);
+   // set up pointers:
+   m_position = m_base = p1;
+   m_end = p2;
+   // empty strings are errors:
+   if(p1 == p2)
+   {
+      fail(regex_constants::error_empty, 0);
+      return;
+   }
+   // select which parser to use:
+   switch(flags & regbase::main_option_type)
+   {
+   case regbase::perl_syntax_group:
+      m_parser_proc = &basic_regex_parser<charT, traits>::parse_extended;
+      break;
+   case regbase::basic_syntax_group:
+      m_parser_proc = &basic_regex_parser<charT, traits>::parse_basic;
+      break;
+   case regbase::literal:
+      m_parser_proc = &basic_regex_parser<charT, traits>::parse_literal;
+      break;
+   }
+
+   // parse all our characters:
+   bool result = parse_all();
+   //
+   // Unwind our alternatives:
+   //
+   unwind_alts(-1);
+   // reset flags as a global scope (?imsx) may have altered them:
+   this->flags(flags);
+   // if we haven't gobbled up all the characters then we must
+   // have had an unexpected ')' :
+   if(!result)
+   {
+      fail(regex_constants::error_paren, ::boost::re_detail::distance(m_base, m_position));
+      return;
+   }
+   // if an error has been set then give up now:
+   if(this->m_pdata->m_status)
+      return;
+   // fill in our sub-expression count:
+   this->m_pdata->m_mark_count = 1 + m_mark_count;
+   this->finalize(p1, p2);
+}
+
+template <class charT, class traits>
+void basic_regex_parser<charT, traits>::fail(regex_constants::error_type error_code, std::ptrdiff_t position)
+{
+   if(0 == this->m_pdata->m_status) // update the error code if not already set
+      this->m_pdata->m_status = error_code;
+   m_position = m_end; // don't bother parsing anything else
+   // get the error message:
+   std::string message = this->m_pdata->m_ptraits->error_string(error_code);
+   // and raise the exception, this will do nothing if exceptions are disabled:
+#ifndef BOOST_NO_EXCEPTIONS
+   if(0 == (this->flags() & regex_constants::no_except))
+   {
+      boost::regex_error e(message, error_code, position);
+      e.raise();
+   }
+#endif
+}
+
+template <class charT, class traits>
+bool basic_regex_parser<charT, traits>::parse_all()
+{
+   bool result = true;
+   while(result && (m_position != m_end))
+   {
+      result = (this->*m_parser_proc)();
+   }
+   return result;
+}
+
+#ifdef BOOST_MSVC
+#pragma warning(push)
+#pragma warning(disable:4702)
+#endif
+template <class charT, class traits>
+bool basic_regex_parser<charT, traits>::parse_basic()
+{
+   switch(this->m_traits.syntax_type(*m_position))
+   {
+   case regex_constants::syntax_escape:
+      return parse_basic_escape();
+   case regex_constants::syntax_dot:
+      return parse_match_any();
+   case regex_constants::syntax_caret:
+      ++m_position;
+      this->append_state(syntax_element_start_line);
+      break;
+   case regex_constants::syntax_dollar:
+      ++m_position;
+      this->append_state(syntax_element_end_line);
+      break;
+   case regex_constants::syntax_star:
+      if(!(this->m_last_state) || (this->m_last_state->type == syntax_element_start_line))
+         return parse_literal();
+      else
+      {
+         ++m_position;
+         return parse_repeat();
+      }
+   case regex_constants::syntax_plus:
+      if(!(this->m_last_state) || (this->m_last_state->type == syntax_element_start_line) || !(this->flags() & regbase::emacs_ex))
+         return parse_literal();
+      else
+      {
+         ++m_position;
+         return parse_repeat(1);
+      }
+   case regex_constants::syntax_question:
+      if(!(this->m_last_state) || (this->m_last_state->type == syntax_element_start_line) || !(this->flags() & regbase::emacs_ex))
+         return parse_literal();
+      else
+      {
+         ++m_position;
+         return parse_repeat(0, 1);
+      }
+   case regex_constants::syntax_open_set:
+      return parse_set();
+   default:
+      return parse_literal();
+   }
+   return true;
+}
+
+template <class charT, class traits>
+bool basic_regex_parser<charT, traits>::parse_extended()
+{
+   bool result = true;
+   switch(this->m_traits.syntax_type(*m_position))
+   {
+   case regex_constants::syntax_open_mark:
+      return parse_open_paren();
+   case regex_constants::syntax_close_mark:
+      return false;
+   case regex_constants::syntax_escape:
+      return parse_extended_escape();
+   case regex_constants::syntax_dot:
+      return parse_match_any();
+   case regex_constants::syntax_caret:
+      ++m_position;
+      this->append_state(
+         (this->flags() & regex_constants::no_mod_m ? syntax_element_buffer_start : syntax_element_start_line));
+      break;
+   case regex_constants::syntax_dollar:
+      ++m_position;
+      this->append_state(
+         (this->flags() & regex_constants::no_mod_m ? syntax_element_buffer_end : syntax_element_end_line));
+      break;
+   case regex_constants::syntax_star:
+      if(m_position == this->m_base)
+      {
+         fail(regex_constants::error_badrepeat, 0);
+         return false;
+      }
+      ++m_position;
+      return parse_repeat();
+   case regex_constants::syntax_question:
+      if(m_position == this->m_base)
+      {
+         fail(regex_constants::error_badrepeat, 0);
+         return false;
+      }
+      ++m_position;
+      return parse_repeat(0,1);
+   case regex_constants::syntax_plus:
+      if(m_position == this->m_base)
+      {
+         fail(regex_constants::error_badrepeat, 0);
+         return false;
+      }
+      ++m_position;
+      return parse_repeat(1);
+   case regex_constants::syntax_open_brace:
+      ++m_position;
+      return parse_repeat_range(false);
+   case regex_constants::syntax_close_brace:
+      fail(regex_constants::error_brace, this->m_position - this->m_end);
+      return false;
+   case regex_constants::syntax_or:
+      return parse_alt();
+   case regex_constants::syntax_open_set:
+      return parse_set();
+   case regex_constants::syntax_hash:
+      //
+      // If we have a mod_x flag set, then skip until
+      // we get to a newline character:
+      //
+      if((this->flags() 
+         & (regbase::no_perl_ex|regbase::mod_x))
+         == regbase::mod_x)
+      {
+         while((m_position != m_end) && !is_separator(*m_position++)){}
+         return true;
+      }
+      // Otherwise fall through:
+   default:
+      result = parse_literal();
+      break;
+   }
+   return result;
+}
+#ifdef BOOST_MSVC
+#pragma warning(pop)
+#endif
+
+template <class charT, class traits>
+bool basic_regex_parser<charT, traits>::parse_literal()
+{
+   // append this as a literal provided it's not a space character
+   // or the perl option regbase::mod_x is not set:
+   if(
+      ((this->flags() 
+         & (regbase::main_option_type|regbase::mod_x|regbase::no_perl_ex)) 
+            != regbase::mod_x)
+      || !this->m_traits.isctype(*m_position, this->m_mask_space))
+         this->append_literal(*m_position);
+   ++m_position;
+   return true;
+}
+
+template <class charT, class traits>
+bool basic_regex_parser<charT, traits>::parse_open_paren()
+{
+   //
+   // skip the '(' and error check:
+   //
+   if(++m_position == m_end)
+   {
+      fail(regex_constants::error_paren, m_position - m_base);
+      return false;
+   }
+   //
+   // begin by checking for a perl-style (?...) extension:
+   //
+   if(
+         ((this->flags() & (regbase::main_option_type | regbase::no_perl_ex)) == 0)
+         || ((this->flags() & (regbase::main_option_type | regbase::emacs_ex)) == (regbase::basic_syntax_group|regbase::emacs_ex))
+     )
+   {
+      if(this->m_traits.syntax_type(*m_position) == regex_constants::syntax_question)
+         return parse_perl_extension();
+   }
+   //
+   // update our mark count, and append the required state:
+   //
+   unsigned markid = 0;
+   if(0 == (this->flags() & regbase::nosubs))
+      markid = ++m_mark_count;
+   re_brace* pb = static_cast<re_brace*>(this->append_state(syntax_element_startmark, sizeof(re_brace)));
+   pb->index = markid;
+   std::ptrdiff_t last_paren_start = this->getoffset(pb);
+   // back up insertion point for alternations, and set new point:
+   std::ptrdiff_t last_alt_point = m_alt_insert_point;
+   this->m_pdata->m_data.align();
+   m_alt_insert_point = this->m_pdata->m_data.size();
+   //
+   // back up the current flags in case we have a nested (?imsx) group:
+   //
+   regex_constants::syntax_option_type opts = this->flags();
+   bool old_case_change = m_has_case_change;
+   m_has_case_change = false; // no changes to this scope as yet...
+   //
+   // now recursively add more states, this will terminate when we get to a
+   // matching ')' :
+   //
+   parse_all();
+   //
+   // Unwind pushed alternatives:
+   //
+   if(0 == unwind_alts(last_paren_start))
+      return false;
+   //
+   // restore flags:
+   //
+   if(m_has_case_change)
+   {
+      // the case has changed in one or more of the alternatives
+      // within the scoped (...) block: we have to add a state
+      // to reset the case sensitivity:
+      static_cast<re_case*>(
+         this->append_state(syntax_element_toggle_case, sizeof(re_case))
+         )->icase = opts & regbase::icase;
+   }
+   this->flags(opts);
+   m_has_case_change = old_case_change;
+   //
+   // we either have a ')' or we have run out of characters prematurely:
+   //
+   if(m_position == m_end)
+   {
+      this->fail(regex_constants::error_paren, ::boost::re_detail::distance(m_base, m_end));
+      return false;
+   }
+   BOOST_ASSERT(this->m_traits.syntax_type(*m_position) == regex_constants::syntax_close_mark);
+   ++m_position;
+   //
+   // append closing parenthesis state:
+   //
+   pb = static_cast<re_brace*>(this->append_state(syntax_element_endmark, sizeof(re_brace)));
+   pb->index = markid;
+   this->m_paren_start = last_paren_start;
+   //
+   // restore the alternate insertion point:
+   //
+   this->m_alt_insert_point = last_alt_point;
+   //
+   // allow backrefs to this mark:
+   //
+   if((markid > 0) && (markid < sizeof(unsigned) * CHAR_BIT))
+      this->m_backrefs |= 1u << (markid - 1);
+
+   return true;
+}
+
+template <class charT, class traits>
+bool basic_regex_parser<charT, traits>::parse_basic_escape()
+{
+   ++m_position;
+   bool result = true;
+   switch(this->m_traits.escape_syntax_type(*m_position))
+   {
+   case regex_constants::syntax_open_mark:
+      return parse_open_paren();
+   case regex_constants::syntax_close_mark:
+      return false;
+   case regex_constants::syntax_plus:
+      if(this->flags() & regex_constants::bk_plus_qm)
+      {
+         ++m_position;
+         return parse_repeat(1);
+      }
+      else
+         return parse_literal();
+   case regex_constants::syntax_question:
+      if(this->flags() & regex_constants::bk_plus_qm)
+      {
+         ++m_position;
+         return parse_repeat(0, 1);
+      }
+      else
+         return parse_literal();
+   case regex_constants::syntax_open_brace:
+      if(this->flags() & regbase::no_intervals)
+         return parse_literal();
+      ++m_position;
+      return parse_repeat_range(true);
+   case regex_constants::syntax_close_brace:
+      if(this->flags() & regbase::no_intervals)
+         return parse_literal();
+      fail(regex_constants::error_brace, this->m_position - this->m_base);
+      return false;
+   case regex_constants::syntax_or:
+      if(this->flags() & regbase::bk_vbar)
+         return parse_alt();
+      else
+         result = parse_literal();
+      break;
+   case regex_constants::syntax_digit:
+      return parse_backref();
+   case regex_constants::escape_type_start_buffer:
+      if(this->flags() & regbase::emacs_ex)
+      {
+         ++m_position;
+         this->append_state(syntax_element_buffer_start);
+      }
+      else
+         result = parse_literal();
+      break;
+   case regex_constants::escape_type_end_buffer:
+      if(this->flags() & regbase::emacs_ex)
+      {
+         ++m_position;
+         this->append_state(syntax_element_buffer_end);
+      }
+      else
+         result = parse_literal();
+      break;
+   case regex_constants::escape_type_word_assert:
+      if(this->flags() & regbase::emacs_ex)
+      {
+         ++m_position;
+         this->append_state(syntax_element_word_boundary);
+      }
+      else
+         result = parse_literal();
+      break;
+   case regex_constants::escape_type_not_word_assert:
+      if(this->flags() & regbase::emacs_ex)
+      {
+         ++m_position;
+         this->append_state(syntax_element_within_word);
+      }
+      else
+         result = parse_literal();
+      break;
+   case regex_constants::escape_type_left_word:
+      if(this->flags() & regbase::emacs_ex)
+      {
+         ++m_position;
+         this->append_state(syntax_element_word_start);
+      }
+      else
+         result = parse_literal();
+      break;
+   case regex_constants::escape_type_right_word:
+      if(this->flags() & regbase::emacs_ex)
+      {
+         ++m_position;
+         this->append_state(syntax_element_word_end);
+      }
+      else
+         result = parse_literal();
+      break;
+   default:
+      if(this->flags() & regbase::emacs_ex)
+      {
+         bool negate = true;
+         switch(*m_position)
+         {
+         case 'w':
+            negate = false;
+            // fall through:
+         case 'W':
+            {
+            basic_char_set<charT, traits> char_set;
+            if(negate)
+               char_set.negate();
+            char_set.add_class(this->m_word_mask);
+            if(0 == this->append_set(char_set))
+            {
+               fail(regex_constants::error_ctype, m_position - m_base);
+               return false;
+            }
+            ++m_position;
+            return true;
+            }
+         case 's':
+            negate = false;
+            // fall through:
+         case 'S':
+            return add_emacs_code(negate);
+         case 'c':
+         case 'C':
+            // not supported yet:
+            fail(regex_constants::error_escape, m_position - m_base);
+            return false;
+         default:
+            break;
+         }
+      }
+      result = parse_literal();
+      break;
+   }
+   return result;
+}
+
+template <class charT, class traits>
+bool basic_regex_parser<charT, traits>::parse_extended_escape()
+{
+   ++m_position;
+   bool negate = false; // in case this is a character class escape: \w \d etc
+   switch(this->m_traits.escape_syntax_type(*m_position))
+   {
+   case regex_constants::escape_type_not_class:
+      negate = true;
+      // fall through:
+   case regex_constants::escape_type_class:
+      {
+         typedef typename traits::char_class_type mask_type;
+         mask_type m = this->m_traits.lookup_classname(m_position, m_position+1);
+         if(m != 0)
+         {
+            basic_char_set<charT, traits> char_set;
+            if(negate)
+               char_set.negate();
+            char_set.add_class(m);
+            if(0 == this->append_set(char_set))
+            {
+               fail(regex_constants::error_ctype, m_position - m_base);
+               return false;
+            }
+            ++m_position;
+            return true;
+         }
+         //
+         // not a class, just a regular unknown escape:
+         //
+         this->append_literal(unescape_character());
+         break;
+      }
+   case regex_constants::syntax_digit:
+      return parse_backref();
+   case regex_constants::escape_type_left_word:
+      ++m_position;
+      this->append_state(syntax_element_word_start);
+      break;
+   case regex_constants::escape_type_right_word:
+      ++m_position;
+      this->append_state(syntax_element_word_end);
+      break;
+   case regex_constants::escape_type_start_buffer:
+      ++m_position;
+      this->append_state(syntax_element_buffer_start);
+      break;
+   case regex_constants::escape_type_end_buffer:
+      ++m_position;
+      this->append_state(syntax_element_buffer_end);
+      break;
+   case regex_constants::escape_type_word_assert:
+      ++m_position;
+      this->append_state(syntax_element_word_boundary);
+      break;
+   case regex_constants::escape_type_not_word_assert:
+      ++m_position;
+      this->append_state(syntax_element_within_word);
+      break;
+   case regex_constants::escape_type_Z:
+      ++m_position;
+      this->append_state(syntax_element_soft_buffer_end);
+      break;
+   case regex_constants::escape_type_Q:
+      return parse_QE();
+   case regex_constants::escape_type_C:
+      return parse_match_any();
+   case regex_constants::escape_type_X:
+      ++m_position;
+      this->append_state(syntax_element_combining);
+      break;
+   case regex_constants::escape_type_G:
+      ++m_position;
+      this->append_state(syntax_element_restart_continue);
+      break;
+   case regex_constants::escape_type_not_property:
+      negate = true;
+      // fall through:
+   case regex_constants::escape_type_property:
+      {
+         ++m_position;
+         char_class_type m;
+         if(m_position == m_end)
+         {
+            fail(regex_constants::error_escape, m_position - m_base);
+            return false;
+         }
+         // maybe have \p{ddd}
+         if(this->m_traits.syntax_type(*m_position) == regex_constants::syntax_open_brace)
+         {
+            const charT* base = m_position;
+            // skip forward until we find enclosing brace:
+            while((m_position != m_end) && (this->m_traits.syntax_type(*m_position) != regex_constants::syntax_close_brace))
+               ++m_position;
+            if(m_position == m_end)
+            {
+               fail(regex_constants::error_escape, m_position - m_base);
+               return false;
+            }
+            m = this->m_traits.lookup_classname(++base, m_position++);
+         }
+         else
+         {
+            m = this->m_traits.lookup_classname(m_position, m_position+1);
+            ++m_position;
+         }
+         if(m != 0)
+         {
+            basic_char_set<charT, traits> char_set;
+            if(negate)
+               char_set.negate();
+            char_set.add_class(m);
+            if(0 == this->append_set(char_set))
+            {
+               fail(regex_constants::error_ctype, m_position - m_base);
+               return false;
+            }
+            return true;
+         }
+         fail(regex_constants::error_ctype, m_position - m_base);
+      }
+   default:
+      this->append_literal(unescape_character());
+      break;
+   }
+   return true;
+}
+
+template <class charT, class traits>
+bool basic_regex_parser<charT, traits>::parse_match_any()
+{
+   //
+   // we have a '.' that can match any character:
+   //
+   ++m_position;
+   static_cast<re_dot*>(
+      this->append_state(syntax_element_wild, sizeof(re_dot))
+      )->mask = static_cast<unsigned char>(this->flags() & regbase::no_mod_s 
+      ? re_detail::force_not_newline 
+         : this->flags() & regbase::mod_s ?
+            re_detail::force_newline : re_detail::dont_care);
+   return true;
+}
+
+template <class charT, class traits>
+bool basic_regex_parser<charT, traits>::parse_repeat(std::size_t low, std::size_t high)
+{
+   bool greedy = true;
+   std::size_t insert_point;
+   // 
+   // when we get to here we may have a non-greedy ? mark still to come:
+   //
+   if((m_position != m_end) 
+      && (
+            (0 == (this->flags() & (regbase::main_option_type | regbase::no_perl_ex)))
+            || ((regbase::basic_syntax_group|regbase::emacs_ex) == (this->flags() & (regbase::main_option_type | regbase::emacs_ex)))
+         )
+      )
+   {
+      // OK we have a perl regex, check for a '?':
+      if(this->m_traits.syntax_type(*m_position) == regex_constants::syntax_question)
+      {
+         greedy = false;
+         ++m_position;
+      }
+   }
+   if(0 == this->m_last_state)
+   {
+      fail(regex_constants::error_badrepeat, ::boost::re_detail::distance(m_base, m_position));
+      return false;
+   }
+   if(this->m_last_state->type == syntax_element_endmark)
+   {
+      // insert a repeat before the '(' matching the last ')':
+      insert_point = this->m_paren_start;
+   }
+   else if((this->m_last_state->type == syntax_element_literal) && (static_cast<re_literal*>(this->m_last_state)->length > 1))
+   {
+      // the last state was a literal with more than one character, split it in two:
+      re_literal* lit = static_cast<re_literal*>(this->m_last_state);
+      charT c = (static_cast<charT*>(static_cast<void*>(lit+1)))[lit->length - 1];
+      --(lit->length);
+      // now append new state:
+      lit = static_cast<re_literal*>(this->append_state(syntax_element_literal, sizeof(re_literal) + sizeof(charT)));
+      lit->length = 1;
+      (static_cast<charT*>(static_cast<void*>(lit+1)))[0] = c;
+      insert_point = this->getoffset(this->m_last_state);
+   }
+   else
+   {
+      // repeat the last state whatever it was, need to add some error checking here:
+      switch(this->m_last_state->type)
+      {
+      case syntax_element_start_line:
+      case syntax_element_end_line:
+      case syntax_element_word_boundary:
+      case syntax_element_within_word:
+      case syntax_element_word_start:
+      case syntax_element_word_end:
+      case syntax_element_buffer_start:
+      case syntax_element_buffer_end:
+      case syntax_element_alt:
+      case syntax_element_soft_buffer_end:
+      case syntax_element_restart_continue:
+      case syntax_element_jump:
+         // can't legally repeat any of the above:
+         fail(regex_constants::error_badrepeat, m_position - m_base);
+         return false;
+      default:
+         // do nothing...
+         break;
+      }
+      insert_point = this->getoffset(this->m_last_state);
+   }
+   //
+   // OK we now know what to repeat, so insert the repeat around it:
+   //
+   re_repeat* rep = static_cast<re_repeat*>(this->insert_state(insert_point, syntax_element_rep, re_repeater_size));
+   rep->min = low;
+   rep->max = high;
+   rep->greedy = greedy;
+   rep->leading = false;
+   // store our repeater position for later:
+   std::ptrdiff_t rep_off = this->getoffset(rep);
+   // and append a back jump to the repeat:
+   re_jump* jmp = static_cast<re_jump*>(this->append_state(syntax_element_jump, sizeof(re_jump)));
+   jmp->alt.i = rep_off - this->getoffset(jmp);
+   this->m_pdata->m_data.align();
+   // now fill in the alt jump for the repeat:
+   rep = static_cast<re_repeat*>(this->getaddress(rep_off));
+   rep->alt.i = this->m_pdata->m_data.size() - rep_off;
+   return true;
+}
+
+template <class charT, class traits>
+bool basic_regex_parser<charT, traits>::parse_repeat_range(bool isbasic)
+{
+   //
+   // parse a repeat-range:
+   //
+   std::size_t min, max;
+   int v;
+   // skip whitespace:
+   while((m_position != m_end) && this->m_traits.isctype(*m_position, this->m_mask_space))
+      ++m_position;
+   // fail if at end:
+   if(this->m_position == this->m_end)
+   {
+      fail(regex_constants::error_brace, this->m_position - this->m_base);
+      return false;
+   }
+   // get min:
+   v = this->m_traits.toi(m_position, m_end, 10);
+   // skip whitespace:
+   while((m_position != m_end) && this->m_traits.isctype(*m_position, this->m_mask_space))
+      ++m_position;
+   if(v < 0)
+   {
+      fail(regex_constants::error_badbrace, this->m_position - this->m_base);
+      return false;
+   }
+   else if(this->m_position == this->m_end)
+   {
+      fail(regex_constants::error_brace, this->m_position - this->m_base);
+      return false;
+   }
+   min = v;
+   // see if we have a comma:
+   if(this->m_traits.syntax_type(*m_position) == regex_constants::syntax_comma)
+   {
+      // move on and error check:
+      ++m_position;
+      // skip whitespace:
+      while((m_position != m_end) && this->m_traits.isctype(*m_position, this->m_mask_space))
+         ++m_position;
+      if(this->m_position == this->m_end)
+      {
+         fail(regex_constants::error_brace, this->m_position - this->m_base);
+         return false;
+      }
+      // get the value if any:
+      v = this->m_traits.toi(m_position, m_end, 10);
+      max = (v >= 0) ? v : (std::numeric_limits<std::size_t>::max)();
+   }
+   else
+   {
+      // no comma, max = min:
+      max = min;
+   }
+   // skip whitespace:
+   while((m_position != m_end) && this->m_traits.isctype(*m_position, this->m_mask_space))
+      ++m_position;
+   // OK now check trailing }:
+   if(this->m_position == this->m_end)
+   {
+      fail(regex_constants::error_brace, this->m_position - this->m_base);
+      return false;
+   }
+   if(isbasic)
+   {
+      if(this->m_traits.syntax_type(*m_position) == regex_constants::syntax_escape)
+      {
+         ++m_position;
+         if(this->m_position == this->m_end)
+         {
+            fail(regex_constants::error_brace, this->m_position - this->m_base);
+            return false;
+         }
+      }
+      else
+      {
+         fail(regex_constants::error_badbrace, this->m_position - this->m_base);
+         return false;
+      }
+   }
+   if(this->m_traits.syntax_type(*m_position) == regex_constants::syntax_close_brace)
+      ++m_position;
+   else
+   {
+      fail(regex_constants::error_badbrace, this->m_position - this->m_base);
+      return false;
+   }
+   //
+   // finally go and add the repeat, unless error:
+   //
+   if(min > max)
+   {
+      fail(regex_constants::error_range, this->m_position - this->m_base);
+      return false;
+   }
+   return parse_repeat(min, max);
+}
+
+template <class charT, class traits>
+bool basic_regex_parser<charT, traits>::parse_alt()
+{
+   //
+   // error check: if there have been no previous states,
+   // or if the last state was a '(' then error:
+   //
+   if((this->m_last_state == 0) || (this->m_last_state->type == syntax_element_startmark))
+   {
+      fail(regex_constants::error_empty, this->m_position - this->m_base);
+      return false;
+   }
+   ++m_position;
+   //
+   // we need to append a trailing jump: 
+   //
+   re_syntax_base* pj = this->append_state(re_detail::syntax_element_jump, sizeof(re_jump));
+   std::ptrdiff_t jump_offset = this->getoffset(pj);
+   //
+   // now insert the alternative:
+   //
+   re_alt* palt = static_cast<re_alt*>(this->insert_state(this->m_alt_insert_point, syntax_element_alt, re_alt_size));
+   jump_offset += re_alt_size;
+   this->m_pdata->m_data.align();
+   palt->alt.i = this->m_pdata->m_data.size() - this->getoffset(palt);
+   //
+   // update m_alt_insert_point so that the next alternate gets
+   // inserted at the start of the second of the two we've just created:
+   //
+   this->m_alt_insert_point = this->m_pdata->m_data.size();
+   //
+   // the start of this alternative must have a case changes state
+   // if the current block has messed around with case changes:
+   //
+   if(m_has_case_change)
+   {
+      static_cast<re_case*>(
+         this->append_state(syntax_element_toggle_case, sizeof(re_case))
+         )->icase = this->m_icase;
+   }
+   //
+   // push the alternative onto our stack, a recursive
+   // implementation here is easier to understand (and faster
+   // as it happens), but causes all kinds of stack overflow problems
+   // on programs with small stacks (COM+).
+   //
+   m_alt_jumps.push_back(jump_offset);
+   return true;
+}
+
+template <class charT, class traits>
+bool basic_regex_parser<charT, traits>::parse_set()
+{
+   ++m_position;
+   if(m_position == m_end)
+   {
+      fail(regex_constants::error_brack, m_position - m_base);
+      return false;
+   }
+   basic_char_set<charT, traits> char_set;
+
+   const charT* base = m_position;  // where the '[' was
+   const charT* item_base = m_position;  // where the '[' or '^' was
+
+   while(m_position != m_end)
+   {
+      switch(this->m_traits.syntax_type(*m_position))
+      {
+      case regex_constants::syntax_caret:
+         if(m_position == base)
+         {
+            char_set.negate();
+            ++m_position;
+            item_base = m_position;
+         }
+         else
+            parse_set_literal(char_set);
+         break;
+      case regex_constants::syntax_close_set:
+         if(m_position == item_base)
+         {
+            parse_set_literal(char_set);
+            break;
+         }
+         else
+         {
+            ++m_position;
+            if(0 == this->append_set(char_set))
+            {
+               fail(regex_constants::error_range, m_position - m_base);
+               return false;
+            }
+         }
+         return true;
+      case regex_constants::syntax_open_set:
+         if(parse_inner_set(char_set))
+            break;
+         return true;
+      case regex_constants::syntax_escape:
+         {
+            // 
+            // look ahead and see if this is a character class shortcut
+            // \d \w \s etc...
+            //
+            ++m_position;
+            if(this->m_traits.escape_syntax_type(*m_position)
+               == regex_constants::escape_type_class)
+            {
+               char_class_type m = this->m_traits.lookup_classname(m_position, m_position+1);
+               if(m != 0)
+               {
+                  char_set.add_class(m);
+                  ++m_position;
+                  break;
+               }
+            }
+            else if(this->m_traits.escape_syntax_type(*m_position)
+               == regex_constants::escape_type_not_class)
+            {
+               // negated character classes aren't supported:
+               char_class_type m = this->m_traits.lookup_classname(m_position, m_position+1);
+               if(m != 0)
+               {
+                  fail(regex_constants::error_escape, m_position - m_base);
+                  return false;
+               }
+            }
+            // not a character class, just a regular escape:
+            --m_position;
+            parse_set_literal(char_set);
+            break;
+         }
+      default:
+         parse_set_literal(char_set);
+         break;
+      }
+   }
+   return m_position != m_end;
+}
+
+template <class charT, class traits>
+bool basic_regex_parser<charT, traits>::parse_inner_set(basic_char_set<charT, traits>& char_set)
+{
+   //
+   // we have either a character class [:name:]
+   // a collating element [.name.]
+   // or an equivalence class [=name=]
+   //
+   if(m_end == ++m_position)
+   {
+      fail(regex_constants::error_brack, m_position - m_base);
+      return false;
+   }
+   switch(this->m_traits.syntax_type(*m_position))
+   {
+   case regex_constants::syntax_dot:
+      //
+      // a collating element is treated as a literal:
+      //
+      --m_position;
+      parse_set_literal(char_set);
+      return true;
+   case regex_constants::syntax_colon:
+      {
+      // check that character classes are actually enabled:
+      if((this->flags() & (regbase::main_option_type | regbase::no_char_classes)) 
+         == (regbase::basic_syntax_group  | regbase::no_char_classes))
+      {
+         --m_position;
+         parse_set_literal(char_set);
+         return true;
+      }
+      // skip the ':'
+      if(m_end == ++m_position)
+      {
+         fail(regex_constants::error_brack, m_position - m_base);
+         return false;
+      }
+      const charT* name_first = m_position;
+      // skip at least one character, then find the matching ':]'
+      if(m_end == ++m_position)
+      {
+         fail(regex_constants::error_brack, m_position - m_base);
+         return false;
+      }
+      while((m_position != m_end) 
+         && (this->m_traits.syntax_type(*m_position) != regex_constants::syntax_colon)) 
+         ++m_position;
+      const charT* name_last = m_position;
+      if(m_end == m_position)
+      {
+         fail(regex_constants::error_brack, m_position - m_base);
+         return false;
+      }
+      if((m_end == ++m_position) 
+         || (this->m_traits.syntax_type(*m_position) != regex_constants::syntax_close_set))
+      {
+         fail(regex_constants::error_brack, m_position - m_base);
+         return false;
+      }
+      typedef typename traits::char_class_type mask_type;
+      mask_type m = this->m_traits.lookup_classname(name_first, name_last);
+      if(m == 0)
+      {
+         if(char_set.empty() && (name_last - name_first == 1))
+         {
+            // maybe a special case:
+            ++m_position;
+            if( (m_position != m_end) 
+               && (this->m_traits.syntax_type(*m_position) 
+                  == regex_constants::syntax_close_set))
+            {
+               if(this->m_traits.escape_syntax_type(*name_first) 
+                  == regex_constants::escape_type_left_word)
+               {
+                  ++m_position;
+                  this->append_state(syntax_element_word_start);
+                  return false;
+               }
+               if(this->m_traits.escape_syntax_type(*name_first) 
+                  == regex_constants::escape_type_right_word)
+               {
+                  ++m_position;
+                  this->append_state(syntax_element_word_end);
+                  return false;
+               }
+            }
+         }
+         fail(regex_constants::error_ctype, name_first - m_base);
+         return false;
+      }
+      char_set.add_class(m);
+      ++m_position;
+      break;
+   }
+   case regex_constants::syntax_equal:
+      {
+      // skip the '='
+      if(m_end == ++m_position)
+      {
+         fail(regex_constants::error_brack, m_position - m_base);
+         return false;
+      }
+      const charT* name_first = m_position;
+      // skip at least one character, then find the matching '=]'
+      if(m_end == ++m_position)
+      {
+         fail(regex_constants::error_brack, m_position - m_base);
+         return false;
+      }
+      while((m_position != m_end) 
+         && (this->m_traits.syntax_type(*m_position) != regex_constants::syntax_equal)) 
+         ++m_position;
+      const charT* name_last = m_position;
+      if(m_end == m_position)
+      {
+         fail(regex_constants::error_brack, m_position - m_base);
+         return false;
+      }
+      if((m_end == ++m_position) 
+         || (this->m_traits.syntax_type(*m_position) != regex_constants::syntax_close_set))
+      {
+         fail(regex_constants::error_brack, m_position - m_base);
+         return false;
+      }
+      string_type m = this->m_traits.lookup_collatename(name_first, name_last);
+      if((0 == m.size()) || (m.size() > 2))
+      {
+         fail(regex_constants::error_collate, name_first - m_base);
+         return false;
+      }
+      digraph<charT> d;
+      d.first = m[0];
+      if(m.size() > 1)
+         d.second = m[1];
+      else
+         d.second = 0;
+      char_set.add_equivalent(d);
+      ++m_position;
+      break;
+   }
+   default:
+      --m_position;
+      parse_set_literal(char_set);
+      break;
+   }
+   return true;
+}
+
+template <class charT, class traits>
+void basic_regex_parser<charT, traits>::parse_set_literal(basic_char_set<charT, traits>& char_set)
+{
+   digraph<charT> start_range(get_next_set_literal(char_set));
+   if(m_end == m_position)
+   {
+      fail(regex_constants::error_brack, m_position - m_base);
+      return;
+   }
+   if(this->m_traits.syntax_type(*m_position) == regex_constants::syntax_dash)
+   {
+      // we have a range:
+      if(m_end == ++m_position)
+      {
+         fail(regex_constants::error_brack, m_position - m_base);
+         return;
+      }
+      if(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_close_set)
+      {
+         digraph<charT> end_range = get_next_set_literal(char_set);
+         char_set.add_range(start_range, end_range);
+         if(this->m_traits.syntax_type(*m_position) == regex_constants::syntax_dash)
+         {
+            fail(regex_constants::error_range, m_position - m_base);
+            return;
+         }
+         return;
+      }
+      --m_position;
+   }
+   char_set.add_single(start_range);
+}
+
+template <class charT, class traits>
+digraph<charT> basic_regex_parser<charT, traits>::get_next_set_literal(basic_char_set<charT, traits>& char_set)
+{
+   typedef typename traits::string_type string_type;
+   digraph<charT> result;
+   switch(this->m_traits.syntax_type(*m_position))
+   {
+   case regex_constants::syntax_dash:
+      if(!char_set.empty())
+      {
+         // see if we are at the end of the set:
+         if((++m_position == m_end) || (this->m_traits.syntax_type(*m_position) != regex_constants::syntax_close_set))
+         {
+            fail(regex_constants::error_range, m_position - m_base);
+            return result;
+         }
+         --m_position;
+      }
+      result.first = *m_position++;
+      return result;
+   case regex_constants::syntax_escape:
+      // check to see if escapes are supported first:
+      if(this->flags() & regex_constants::no_escape_in_lists)
+      {
+         result = *m_position++;
+         break;
+      }
+      ++m_position;
+      result = unescape_character();
+      break;
+   case regex_constants::syntax_open_set:
+   {
+      if(m_end == ++m_position)
+      {
+         fail(regex_constants::error_collate, m_position - m_base);
+         return result;
+      }
+      if(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_dot)
+      {
+         --m_position;
+         result.first = *m_position;
+         ++m_position;
+         return result;
+      }
+      if(m_end == ++m_position)
+      {
+         fail(regex_constants::error_collate, m_position - m_base);
+         return result;
+      }
+      const charT* name_first = m_position;
+      // skip at least one character, then find the matching ':]'
+      if(m_end == ++m_position)
+      {
+         fail(regex_constants::error_collate, name_first - m_base);
+         return result;
+      }
+      while((m_position != m_end) 
+         && (this->m_traits.syntax_type(*m_position) != regex_constants::syntax_dot)) 
+         ++m_position;
+      const charT* name_last = m_position;
+      if(m_end == m_position)
+      {
+         fail(regex_constants::error_collate, name_first - m_base);
+         return result;
+      }
+      if((m_end == ++m_position) 
+         || (this->m_traits.syntax_type(*m_position) != regex_constants::syntax_close_set))
+      {
+         fail(regex_constants::error_collate, name_first - m_base);
+         return result;
+      }
+      ++m_position;
+      string_type s = this->m_traits.lookup_collatename(name_first, name_last);
+      if(s.empty() || (s.size() > 2))
+      {
+         fail(regex_constants::error_collate, name_first - m_base);
+         return result;
+      }
+      result.first = s[0];
+      if(s.size() > 1)
+         result.second = s[1];
+      else
+         result.second = 0;
+      return result;
+   }
+   default:
+      result = *m_position++;
+   }
+   return result;
+}
+
+//
+// does a value fit in the specified charT type?
+//
+template <class charT>
+bool valid_value(charT, int v, const mpl::true_&)
+{
+   return (v >> (sizeof(charT) * CHAR_BIT)) == 0;
+}
+template <class charT>
+bool valid_value(charT, int, const mpl::false_&)
+{
+   return true; // v will alsways fit in a charT
+}
+template <class charT>
+bool valid_value(charT c, int v)
+{
+   return valid_value(c, v, mpl::bool_<(sizeof(charT) < sizeof(int))>());
+}
+
+template <class charT, class traits>
+charT basic_regex_parser<charT, traits>::unescape_character()
+{
+   charT result(0);
+   if(m_position == m_end)
+   {
+      fail(regex_constants::error_escape, m_position - m_base);
+      return false;
+   }
+   switch(this->m_traits.escape_syntax_type(*m_position))
+   {
+   case regex_constants::escape_type_control_a:
+      result = charT('\a');
+      break;
+   case regex_constants::escape_type_e:
+      result = charT(27);
+      break;
+   case regex_constants::escape_type_control_f:
+      result = charT('\f');
+      break;
+   case regex_constants::escape_type_control_n:
+      result = charT('\n');
+      break;
+   case regex_constants::escape_type_control_r:
+      result = charT('\r');
+      break;
+   case regex_constants::escape_type_control_t:
+      result = charT('\t');
+      break;
+   case regex_constants::escape_type_control_v:
+      result = charT('\v');
+      break;
+   case regex_constants::escape_type_word_assert:
+      result = charT('\b');
+      break;
+   case regex_constants::escape_type_ascii_control:
+      ++m_position;
+      if(m_position == m_end)
+      {
+         fail(regex_constants::error_escape, m_position - m_base);
+         return result;
+      }
+      /*
+      if((*m_position < charT('@'))
+            || (*m_position > charT(125)) )
+      {
+         fail(regex_constants::error_escape, m_position - m_base);
+         return result;
+      }
+      */
+      result = static_cast<charT>(*m_position % 32);
+      break;
+   case regex_constants::escape_type_hex:
+      ++m_position;
+      if(m_position == m_end)
+      {
+         fail(regex_constants::error_escape, m_position - m_base);
+         return result;
+      }
+      // maybe have \x{ddd}
+      if(this->m_traits.syntax_type(*m_position) == regex_constants::syntax_open_brace)
+      {
+         ++m_position;
+         if(m_position == m_end)
+         {
+            fail(regex_constants::error_escape, m_position - m_base);
+            return result;
+         }
+         int i = this->m_traits.toi(m_position, m_end, 16);
+         if((m_position == m_end)
+            || (i < 0)
+            || (i > (std::numeric_limits<charT>::max)())
+            || (this->m_traits.syntax_type(*m_position) != regex_constants::syntax_close_brace))
+         {
+            fail(regex_constants::error_badbrace, m_position - m_base);
+            return result;
+         }
+         ++m_position;
+         result = charT(i);
+      }
+      else
+      {
+         std::ptrdiff_t len = (std::min)(static_cast<std::ptrdiff_t>(2), m_end - m_position);
+         int i = this->m_traits.toi(m_position, m_position + len, 16);
+         if((i < 0)
+            || !valid_value(charT(0), i))
+         {
+            fail(regex_constants::error_escape, m_position - m_base);
+            return result;
+         }
+         result = charT(i);
+      }
+      return result;
+   case regex_constants::syntax_digit:
+      {
+      // an octal escape sequence, the first character must be a zero
+      // followed by up to 3 octal digits:
+      std::ptrdiff_t len = (std::min)(::boost::re_detail::distance(m_position, m_end), static_cast<std::ptrdiff_t>(4));
+      int val = this->m_traits.toi(m_position, m_position + len, 8);
+      if(val < 0) 
+      {
+         fail(regex_constants::error_escape, m_position - m_base);
+         return result;
+      }
+      return static_cast<charT>(val);
+      }
+   case regex_constants::escape_type_named_char:
+      {
+         ++m_position;
+         if(m_position == m_end)
+         {
+            fail(regex_constants::error_escape, m_position - m_base);
+            return false;
+         }
+         // maybe have \N{name}
+         if(this->m_traits.syntax_type(*m_position) == regex_constants::syntax_open_brace)
+         {
+            const charT* base = m_position;
+            // skip forward until we find enclosing brace:
+            while((m_position != m_end) && (this->m_traits.syntax_type(*m_position) != regex_constants::syntax_close_brace))
+               ++m_position;
+            if(m_position == m_end)
+            {
+               fail(regex_constants::error_escape, m_position - m_base);
+               return false;
+            }
+            string_type s = this->m_traits.lookup_collatename(++base, m_position++);
+            if(s.empty())
+            {
+               fail(regex_constants::error_collate, m_position - m_base);
+               return false;
+            }
+            if(s.size() == 1)
+            {
+               return s[0];
+            }
+         }
+         // fall through is a failure:
+         fail(regex_constants::error_escape, m_position - m_base);
+         return false;
+      }
+   default:
+      result = *m_position;
+      break;
+   }
+   ++m_position;
+   return result;
+}
+
+template <class charT, class traits>
+bool basic_regex_parser<charT, traits>::parse_backref()
+{
+   BOOST_ASSERT(m_position != m_end);
+   int i = this->m_traits.toi(m_position, m_position + 1, 10);
+   if((i > 0) && (this->m_backrefs & (1u << (i-1))))
+   {
+      re_brace* pb = static_cast<re_brace*>(this->append_state(syntax_element_backref, sizeof(re_brace)));
+      pb->index = i;
+   }
+   else if(i == 0)
+   {
+      // not a backref at all but an octal escape sequence:
+      --m_position;
+      charT c = unescape_character();
+      this->append_literal(c);
+   }
+   else
+   {
+      fail(regex_constants::error_backref, m_position - m_end);
+      return false;
+   }
+   return true;
+}
+
+template <class charT, class traits>
+bool basic_regex_parser<charT, traits>::parse_QE()
+{
+#ifdef BOOST_MSVC
+#pragma warning(push)
+#pragma warning(disable:4127)
+#endif
+   //
+   // parse a \Q...\E sequence:
+   //
+   ++m_position; // skip the Q
+   const charT* start = m_position;
+   const charT* end;
+   do
+   {
+      while((m_position != m_end) 
+         && (this->m_traits.syntax_type(*m_position) != regex_constants::syntax_escape))
+         ++m_position;
+      if(m_position == m_end)
+      {
+         //  a \Q...\E sequence may terminate with the end of the expression:
+         end = m_position;
+         break;  
+      }
+      if(++m_position == m_end) // skip the escape
+      {
+         fail(regex_constants::error_escape, m_position - m_base);
+         return false;
+      }
+      // check to see if it's a \E:
+      if(this->m_traits.escape_syntax_type(*m_position) == regex_constants::escape_type_E)
+      {
+         ++m_position;
+         end = m_position - 2;
+         break;
+      }
+      // otherwise go round again:
+   }while(true);
+   //
+   // now add all the character between the two escapes as literals:
+   //
+   while(start != end)
+   {
+      this->append_literal(*start);
+      ++start;
+   }
+   return true;
+#ifdef BOOST_MSVC
+#pragma warning(pop)
+#endif
+}
+
+template <class charT, class traits>
+bool basic_regex_parser<charT, traits>::parse_perl_extension()
+{
+   if(++m_position == m_end)
+   {
+      fail(regex_constants::error_badrepeat, m_position - m_base);
+      return false;
+   }
+   //
+   // treat comments as a special case, as these
+   // are the only ones that don't start with a leading
+   // startmark state:
+   //
+   if(this->m_traits.syntax_type(*m_position) == regex_constants::syntax_hash)
+   {
+      while((m_position != m_end) 
+         && (this->m_traits.syntax_type(*m_position++) != regex_constants::syntax_close_mark))
+      {}      
+      return true;
+   }
+   //
+   // backup some state, and prepare the way:
+   //
+   int markid = 0;
+   std::ptrdiff_t jump_offset = 0;
+   re_brace* pb = static_cast<re_brace*>(this->append_state(syntax_element_startmark, sizeof(re_brace)));
+   std::ptrdiff_t last_paren_start = this->getoffset(pb);
+   // back up insertion point for alternations, and set new point:
+   std::ptrdiff_t last_alt_point = m_alt_insert_point;
+   this->m_pdata->m_data.align();
+   m_alt_insert_point = this->m_pdata->m_data.size();
+   std::ptrdiff_t expected_alt_point = m_alt_insert_point;
+   bool restore_flags = true;
+   regex_constants::syntax_option_type old_flags = this->flags();
+   bool old_case_change = m_has_case_change;
+   m_has_case_change = false;
+   //
+   // select the actual extension used:
+   //
+   switch(this->m_traits.syntax_type(*m_position))
+   {
+   case regex_constants::syntax_colon:
+      //
+      // a non-capturing mark:
+      //
+      pb->index = markid = 0;
+      ++m_position;
+      break;
+   case regex_constants::syntax_equal:
+      pb->index = markid = -1;
+      ++m_position;
+      jump_offset = this->getoffset(this->append_state(syntax_element_jump, sizeof(re_jump)));
+      this->m_pdata->m_data.align();
+      m_alt_insert_point = this->m_pdata->m_data.size();
+      break;
+   case regex_constants::syntax_not:
+      pb->index = markid = -2;
+      ++m_position;
+      jump_offset = this->getoffset(this->append_state(syntax_element_jump, sizeof(re_jump)));
+      this->m_pdata->m_data.align();
+      m_alt_insert_point = this->m_pdata->m_data.size();
+      break;
+   case regex_constants::escape_type_left_word:
+      {
+         // a lookbehind assertion:
+         if(++m_position == m_end)
+         {
+            fail(regex_constants::error_badrepeat, m_position - m_base);
+            return false;
+         }
+         regex_constants::syntax_type t = this->m_traits.syntax_type(*m_position);
+         if(t == regex_constants::syntax_not)
+            pb->index = markid = -2;
+         else if(t == regex_constants::syntax_equal)
+            pb->index = markid = -1;
+         else
+         {
+            fail(regex_constants::error_badrepeat, m_position - m_base);
+            return false;
+         }
+         ++m_position;
+         jump_offset = this->getoffset(this->append_state(syntax_element_jump, sizeof(re_jump)));
+         this->append_state(syntax_element_backstep, sizeof(re_brace));
+         this->m_pdata->m_data.align();
+         m_alt_insert_point = this->m_pdata->m_data.size();
+         break;
+      }
+   case regex_constants::escape_type_right_word:
+      //
+      // an independent sub-expression:
+      //
+      pb->index = markid = -3;
+      ++m_position;
+      jump_offset = this->getoffset(this->append_state(syntax_element_jump, sizeof(re_jump)));
+      this->m_pdata->m_data.align();
+      m_alt_insert_point = this->m_pdata->m_data.size();
+      break;
+   case regex_constants::syntax_open_mark:
+      {
+      // a conditional expression:
+      pb->index = markid = -4;
+      if(++m_position == m_end)
+      {
+         fail(regex_constants::error_badrepeat, m_position - m_base);
+         return false;
+      }
+      int v = this->m_traits.toi(m_position, m_end, 10);
+      if(v > 0)
+      {
+         re_brace* br = static_cast<re_brace*>(this->append_state(syntax_element_assert_backref, sizeof(re_brace)));
+         br->index = v;
+         if(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_close_mark)
+         {
+            fail(regex_constants::error_badrepeat, m_position - m_base);
+            return false;
+         }
+         if(++m_position == m_end)
+         {
+            fail(regex_constants::error_badrepeat, m_position - m_base);
+            return false;
+         }
+      }
+      else
+      {
+         // verify that we have a lookahead or lookbehind assert:
+         if(this->m_traits.syntax_type(*m_position) != regex_constants::syntax_question)
+         {
+            fail(regex_constants::error_badrepeat, m_position - m_base);
+            return false;
+         }
+         if(++m_position == m_end)
+         {
+            fail(regex_constants::error_badrepeat, m_position - m_base);
+            return false;
+         }
+         if(this->m_traits.syntax_type(*m_position) == regex_constants::escape_type_left_word)
+         {
+            if(++m_position == m_end)
+            {
+               fail(regex_constants::error_badrepeat, m_position - m_base);
+               return false;
+            }
+            if((this->m_traits.syntax_type(*m_position) != regex_constants::syntax_equal)
+               && (this->m_traits.syntax_type(*m_position) != regex_constants::syntax_not))
+            {
+               fail(regex_constants::error_badrepeat, m_position - m_base);
+               return false;
+            }
+            m_position -= 3;
+         }
+         else
+         {
+            if((this->m_traits.syntax_type(*m_position) != regex_constants::syntax_equal)
+               && (this->m_traits.syntax_type(*m_position) != regex_constants::syntax_not))
+            {
+               fail(regex_constants::error_badrepeat, m_position - m_base);
+               return false;
+            }
+            m_position -= 2;
+         }
+      }
+      break;
+      }
+   default:
+      //
+      // lets assume that we have a (?imsx) group and try and parse it:
+      //
+      regex_constants::syntax_option_type opts = parse_options();
+      // make a note of whether we have a case change:
+      m_has_case_change = ((opts & regbase::icase) != (this->flags() & regbase::icase));
+      pb->index = markid = 0;
+      if(this->m_traits.syntax_type(*m_position) == regex_constants::syntax_close_mark)
+      {
+         // update flags and carry on as normal:
+         this->flags(opts);
+         restore_flags = false;
+         old_case_change |= m_has_case_change; // defer end of scope by one ')'
+      }
+      else if(this->m_traits.syntax_type(*m_position) == regex_constants::syntax_colon)
+      {
+         // update flags and carry on until the matching ')' is found:
+         this->flags(opts);
+         ++m_position;
+      }
+      else
+      {
+         fail(regex_constants::error_badrepeat, m_position - m_base);
+         return false;
+      }
+
+      // finally append a case change state if we need it:
+      if(m_has_case_change)
+      {
+         static_cast<re_case*>(
+            this->append_state(syntax_element_toggle_case, sizeof(re_case))
+            )->icase = opts & regbase::icase;
+      }
+
+   }
+   //
+   // now recursively add more states, this will terminate when we get to a
+   // matching ')' :
+   //
+   parse_all();
+   //
+   // Unwind alternatives:
+   //
+   if(0 == unwind_alts(last_paren_start))
+      return false;
+   //
+   // we either have a ')' or we have run out of characters prematurely:
+   //
+   if(m_position == m_end)
+   {
+      this->fail(regex_constants::error_paren, ::boost::re_detail::distance(m_base, m_end));
+      return false;
+   }
+   BOOST_ASSERT(this->m_traits.syntax_type(*m_position) == regex_constants::syntax_close_mark);
+   ++m_position;
+   //
+   // restore the flags:
+   //
+   if(restore_flags)
+   {
+      // append a case change state if we need it:
+      if(m_has_case_change)
+      {
+         static_cast<re_case*>(
+            this->append_state(syntax_element_toggle_case, sizeof(re_case))
+            )->icase = old_flags & regbase::icase;
+      }
+      this->flags(old_flags);
+   }
+   //
+   // set up the jump pointer if we have one:
+   //
+   if(jump_offset)
+   {
+      this->m_pdata->m_data.align();
+      re_jump* jmp = static_cast<re_jump*>(this->getaddress(jump_offset));
+      jmp->alt.i = this->m_pdata->m_data.size() - this->getoffset(jmp);
+      if(this->m_last_state == jmp)
+      {
+         // Oops... we didn't have anything inside the assertion:
+         fail(regex_constants::error_empty, m_position - m_base);
+         return false;
+      }
+   }
+   //
+   // verify that if this is conditional expression, that we do have
+   // an alternative, if not add one:
+   //
+   if(markid == -4)
+   {
+      re_syntax_base* b = this->getaddress(expected_alt_point);
+      if(b->type != syntax_element_alt)
+      {
+         re_alt* alt = static_cast<re_alt*>(this->insert_state(expected_alt_point, syntax_element_alt, sizeof(re_alt)));
+         alt->alt.i = this->m_pdata->m_data.size() - this->getoffset(alt);
+      }
+      else if(this->getaddress(static_cast<re_alt*>(b)->alt.i, b)->type == syntax_element_alt)
+      {
+         fail(regex_constants::error_bad_pattern, m_position - m_base);
+         return false;
+      }
+   }
+   //
+   // append closing parenthesis state:
+   //
+   pb = static_cast<re_brace*>(this->append_state(syntax_element_endmark, sizeof(re_brace)));
+   pb->index = markid;
+   this->m_paren_start = last_paren_start;
+   //
+   // restore the alternate insertion point:
+   //
+   this->m_alt_insert_point = last_alt_point;
+   //
+   // and the case change data:
+   //
+   m_has_case_change = old_case_change;
+   return true;
+}
+
+template <class charT, class traits>
+bool basic_regex_parser<charT, traits>::add_emacs_code(bool negate)
+{
+   //
+   // parses an emacs style \sx or \Sx construct.
+   //
+   if(++m_position == m_end)
+   {
+      fail(regex_constants::error_escape, m_position - m_base);
+      return false;
+   }
+   basic_char_set<charT, traits> char_set;
+   if(negate)
+      char_set.negate();
+
+   static const charT s_punct[] = { 'p', 'u', 'n', 'c', 't', };
+
+   switch(*m_position)
+   {
+   case 's':
+   case ' ':
+      char_set.add_class(this->m_mask_space);
+      break;
+   case 'w':
+      char_set.add_class(this->m_word_mask);
+      break;
+   case '_':
+      char_set.add_single(digraph<charT>(charT('$'))); 
+      char_set.add_single(digraph<charT>(charT('&'))); 
+      char_set.add_single(digraph<charT>(charT('*'))); 
+      char_set.add_single(digraph<charT>(charT('+'))); 
+      char_set.add_single(digraph<charT>(charT('-'))); 
+      char_set.add_single(digraph<charT>(charT('_'))); 
+      char_set.add_single(digraph<charT>(charT('<'))); 
+      char_set.add_single(digraph<charT>(charT('>'))); 
+      break;
+   case '.':
+      char_set.add_class(this->m_traits.lookup_classname(s_punct, s_punct+5));
+      break;
+   case '(':
+      char_set.add_single(digraph<charT>(charT('('))); 
+      char_set.add_single(digraph<charT>(charT('['))); 
+      char_set.add_single(digraph<charT>(charT('{'))); 
+      break;
+   case ')':
+      char_set.add_single(digraph<charT>(charT(')'))); 
+      char_set.add_single(digraph<charT>(charT(']'))); 
+      char_set.add_single(digraph<charT>(charT('}'))); 
+      break;
+   case '"':
+      char_set.add_single(digraph<charT>(charT('"'))); 
+      char_set.add_single(digraph<charT>(charT('\''))); 
+      char_set.add_single(digraph<charT>(charT('`'))); 
+      break;
+   case '\'':
+      char_set.add_single(digraph<charT>(charT('\''))); 
+      char_set.add_single(digraph<charT>(charT(','))); 
+      char_set.add_single(digraph<charT>(charT('#'))); 
+      break;
+   case '<':
+      char_set.add_single(digraph<charT>(charT(';'))); 
+      break;
+   case '>':
+      char_set.add_single(digraph<charT>(charT('\n'))); 
+      char_set.add_single(digraph<charT>(charT('\f'))); 
+      break;
+   default:
+      fail(regex_constants::error_ctype, m_position - m_base);
+      return false;
+   }
+   if(0 == this->append_set(char_set))
+   {
+      fail(regex_constants::error_ctype, m_position - m_base);
+      return false;
+   }
+   ++m_position;
+   return true;
+}
+
+template <class charT, class traits>
+regex_constants::syntax_option_type basic_regex_parser<charT, traits>::parse_options()
+{
+   // we have a (?imsx-imsx) group, convert it into a set of flags:
+   regex_constants::syntax_option_type f = this->flags();
+   bool breakout = false;
+   do
+   {
+      switch(*m_position)
+      {
+      case 's':
+         f |= regex_constants::mod_s;
+         f &= ~regex_constants::no_mod_s;
+         break;
+      case 'm':
+         f &= ~regex_constants::no_mod_m;
+         break;
+      case 'i':
+         f |= regex_constants::icase;
+         break;
+      case 'x':
+         f |= regex_constants::mod_x;
+         break;
+      default:
+         breakout = true;
+         continue;
+      }
+      if(++m_position == m_end)
+      {
+         fail(regex_constants::error_paren, m_position - m_base);
+         return false;
+      }
+   }
+   while(!breakout);
+
+   if(*m_position == static_cast<charT>('-'))
+   {
+      if(++m_position == m_end)
+      {
+         fail(regex_constants::error_paren, m_position - m_base);
+         return false;
+      }
+      do
+      {
+         switch(*m_position)
+         {
+         case 's':
+            f &= ~regex_constants::mod_s;
+            f |= regex_constants::no_mod_s;
+            break;
+         case 'm':
+            f |= regex_constants::no_mod_m;
+            break;
+         case 'i':
+            f &= ~regex_constants::icase;
+            break;
+         case 'x':
+            f &= ~regex_constants::mod_x;
+            break;
+         default:
+            breakout = true;
+            continue;
+         }
+         if(++m_position == m_end)
+         {
+            fail(regex_constants::error_paren, m_position - m_base);
+            return false;
+         }
+      }
+      while(!breakout);
+   }
+   return f;
+}
+
+template <class charT, class traits>
+bool basic_regex_parser<charT, traits>::unwind_alts(std::ptrdiff_t last_paren_start)
+{
+   //
+   // If we didn't actually add any states after the last 
+   // alternative then that's an error:
+   //
+   if((this->m_alt_insert_point == static_cast<std::ptrdiff_t>(this->m_pdata->m_data.size()))
+      && m_alt_jumps.size() && (m_alt_jumps.back() > last_paren_start))
+   {
+      fail(regex_constants::error_empty, this->m_position - this->m_base);
+      return false;
+   }
+   // 
+   // Fix up our alternatives:
+   //
+   while(m_alt_jumps.size() && (m_alt_jumps.back() > last_paren_start))
+   {
+      //
+      // fix up the jump to point to the end of the states
+      // that we've just added:
+      //
+      std::ptrdiff_t jump_offset = m_alt_jumps.back();
+      m_alt_jumps.pop_back();
+      this->m_pdata->m_data.align();
+      re_jump* jmp = static_cast<re_jump*>(this->getaddress(jump_offset));
+      BOOST_ASSERT(jmp->type == syntax_element_jump);
+      jmp->alt.i = this->m_pdata->m_data.size() - jump_offset;
+   }
+   return true;
+}
+
+#ifdef BOOST_MSVC
+#pragma warning(pop)
+#endif
+
+} // namespace re_detail
+} // namespace boost
+
+#ifdef BOOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
+#endif
+
+#endif
diff --git a/include/boost/regex/v4/c_regex_traits.hpp b/include/boost/regex/v4/c_regex_traits.hpp
new file mode 100644
index 00000000..dc7e24a1
--- /dev/null
+++ b/include/boost/regex/v4/c_regex_traits.hpp
@@ -0,0 +1,197 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         c_regex_traits.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Declares regular expression traits class that wraps the global C locale.
+  */
+
+#ifndef BOOST_C_REGEX_TRAITS_HPP_INCLUDED
+#define BOOST_C_REGEX_TRAITS_HPP_INCLUDED
+
+#ifndef BOOST_REGEX_CONFIG_HPP
+#include <boost/regex/config.hpp>
+#endif
+#ifndef BOOST_REGEX_WORKAROUND_HPP
+#include <boost/regex/v4/regex_workaround.hpp>
+#endif
+
+#include <cctype>
+
+#ifdef BOOST_NO_STDC_NAMESPACE
+namespace std{
+   using ::strlen; using ::tolower;
+}
+#endif
+
+#ifdef BOOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
+#endif
+
+namespace boost{
+
+template <class charT>
+struct c_regex_traits;
+
+template<>
+struct BOOST_REGEX_DECL c_regex_traits<char>
+{
+   c_regex_traits(){}
+   typedef char char_type;
+   typedef std::size_t size_type;
+   typedef std::string string_type;
+   struct locale_type{};
+   typedef boost::uint32_t char_class_type;
+
+   static size_type length(const char_type* p) 
+   { 
+      return (std::strlen)(p); 
+   }
+
+   char translate(char c) const 
+   { 
+      return c; 
+   }
+   char translate_nocase(char c) const 
+   { 
+      return static_cast<char>((std::tolower)(static_cast<unsigned char>(c))); 
+   }
+
+   static string_type BOOST_REGEX_CALL transform(const char* p1, const char* p2);
+   static string_type BOOST_REGEX_CALL transform_primary(const char* p1, const char* p2);
+
+   static char_class_type BOOST_REGEX_CALL lookup_classname(const char* p1, const char* p2);
+   static string_type BOOST_REGEX_CALL lookup_collatename(const char* p1, const char* p2);
+
+   static bool BOOST_REGEX_CALL isctype(char, char_class_type);
+   static int BOOST_REGEX_CALL value(char, int);
+
+   locale_type imbue(locale_type l)
+   { return l; }
+   locale_type getloc()const
+   { return locale_type(); }
+
+private:
+   // this type is not copyable:
+   c_regex_traits(const c_regex_traits&);
+   c_regex_traits& operator=(const c_regex_traits&);
+};
+
+#ifndef BOOST_NO_WREGEX
+template<>
+struct BOOST_REGEX_DECL c_regex_traits<wchar_t>
+{
+   c_regex_traits(){}
+   typedef wchar_t char_type;
+   typedef std::size_t size_type;
+   typedef std::wstring string_type;
+   struct locale_type{};
+   typedef boost::uint32_t char_class_type;
+
+   static size_type length(const char_type* p) 
+   { 
+      return (std::wcslen)(p); 
+   }
+
+   wchar_t translate(wchar_t c) const 
+   { 
+      return c; 
+   }
+   wchar_t translate_nocase(wchar_t c) const 
+   { 
+      return (std::towlower)(c); 
+   }
+
+   static string_type BOOST_REGEX_CALL transform(const wchar_t* p1, const wchar_t* p2);
+   static string_type BOOST_REGEX_CALL transform_primary(const wchar_t* p1, const wchar_t* p2);
+
+   static char_class_type BOOST_REGEX_CALL lookup_classname(const wchar_t* p1, const wchar_t* p2);
+   static string_type BOOST_REGEX_CALL lookup_collatename(const wchar_t* p1, const wchar_t* p2);
+
+   static bool BOOST_REGEX_CALL isctype(wchar_t, char_class_type);
+   static int BOOST_REGEX_CALL value(wchar_t, int);
+
+   locale_type imbue(locale_type l)
+   { return l; }
+   locale_type getloc()const
+   { return locale_type(); }
+
+private:
+   // this type is not copyable:
+   c_regex_traits(const c_regex_traits&);
+   c_regex_traits& operator=(const c_regex_traits&);
+};
+
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+//
+// Provide an unsigned short version as well, so the user can link to this
+// no matter whether they build with /Zc:wchar_t or not (MSVC specific).
+//
+template<>
+struct BOOST_REGEX_DECL c_regex_traits<unsigned short>
+{
+   c_regex_traits(){}
+   typedef unsigned short char_type;
+   typedef std::size_t size_type;
+   typedef std::basic_string<unsigned short> string_type;
+   struct locale_type{};
+   typedef boost::uint32_t char_class_type;
+
+   static size_type length(const char_type* p) 
+   { 
+      return (std::wcslen)((const wchar_t*)p); 
+   }
+
+   unsigned short translate(unsigned short c) const 
+   { 
+      return c; 
+   }
+   unsigned short translate_nocase(unsigned short c) const 
+   { 
+      return (std::towlower)((wchar_t)c); 
+   }
+
+   static string_type BOOST_REGEX_CALL transform(const unsigned short* p1, const unsigned short* p2);
+   static string_type BOOST_REGEX_CALL transform_primary(const unsigned short* p1, const unsigned short* p2);
+
+   static char_class_type BOOST_REGEX_CALL lookup_classname(const unsigned short* p1, const unsigned short* p2);
+   static string_type BOOST_REGEX_CALL lookup_collatename(const unsigned short* p1, const unsigned short* p2);
+
+   static bool BOOST_REGEX_CALL isctype(unsigned short, char_class_type);
+   static int BOOST_REGEX_CALL value(unsigned short, int);
+
+   locale_type imbue(locale_type l)
+   { return l; }
+   locale_type getloc()const
+   { return locale_type(); }
+
+private:
+   // this type is not copyable:
+   c_regex_traits(const c_regex_traits&);
+   c_regex_traits& operator=(const c_regex_traits&);
+};
+
+#endif
+
+#endif // BOOST_NO_WREGEX
+
+}
+
+#ifdef BOOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
+#endif
+
+#endif
+
+
+
diff --git a/include/boost/regex/v4/char_regex_traits.hpp b/include/boost/regex/v4/char_regex_traits.hpp
index 67cc3677..32d21465 100644
--- a/include/boost/regex/v4/char_regex_traits.hpp
+++ b/include/boost/regex/v4/char_regex_traits.hpp
@@ -42,10 +42,6 @@ public:
    typedef unsigned int size_type;
    typedef regex_traits<char> base_type;
 
-   char BOOST_REGEX_CALL translate(char c, bool)const
-   {
-      return static_cast<const regex_traits<char>*>(this)->translate(c, true);
-   }
 };
 
 #ifndef BOOST_NO_WREGEX
@@ -58,17 +54,6 @@ public:
    typedef unsigned int size_type;
    typedef regex_traits<wchar_t> base_type;
 
-   wchar_t BOOST_REGEX_CALL translate(wchar_t c, bool)const
-   {
-      return static_cast<const regex_traits<wchar_t>*>(this)->translate(c, true);
-   }
-   boost::uint_fast32_t BOOST_REGEX_CALL lookup_classname(const wchar_t* first, const wchar_t* last)const
-   {
-      boost::uint_fast32_t result = static_cast<const regex_traits<wchar_t>*>(this)->lookup_classname(first, last);
-      if((result & base_type::char_class_upper) == base_type::char_class_upper)
-         result |= base_type::char_class_alpha;
-      return result;
-   }
 };
 #endif
 } // namespace deprecated
diff --git a/include/boost/regex/v4/cpp_regex_traits.hpp b/include/boost/regex/v4/cpp_regex_traits.hpp
new file mode 100644
index 00000000..40e57ab8
--- /dev/null
+++ b/include/boost/regex/v4/cpp_regex_traits.hpp
@@ -0,0 +1,1048 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         cpp_regex_traits.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Declares regular expression traits class cpp_regex_traits.
+  */
+
+#ifndef BOOST_CPP_REGEX_TRAITS_HPP_INCLUDED
+#define BOOST_CPP_REGEX_TRAITS_HPP_INCLUDED
+
+#include <boost/config.hpp>
+
+#ifndef BOOST_NO_STD_LOCALE
+
+#ifndef BOOST_RE_PAT_EXCEPT_HPP
+#include <boost/regex/pattern_except.hpp>
+#endif
+#ifndef BOOST_REGEX_TRAITS_DEFAULTS_HPP_INCLUDED
+#include <boost/regex/v4/regex_traits_defaults.hpp>
+#endif
+#ifdef BOOST_HAS_THREADS
+#include <boost/regex/pending/static_mutex.hpp>
+#endif
+#ifndef BOOST_REGEX_PRIMARY_TRANSFORM
+#include <boost/regex/v4/primary_transform.hpp>
+#endif
+#ifndef BOOST_REGEX_OBJECT_CACHE_HPP
+#include <boost/regex/pending/object_cache.hpp>
+#endif
+
+#ifdef BOOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
+#endif
+
+#ifdef BOOST_MSVC
+#pragma warning(push)
+#pragma warning(disable:4786)
+#endif
+
+namespace boost{ 
+
+//
+// forward declaration is needed by some compilers:
+//
+template <class charT>
+class cpp_regex_traits;
+   
+namespace re_detail{
+
+//
+// class parser_buf:
+// acts as a stream buffer which wraps around a pair of pointers:
+//
+template <class charT,
+          class traits = ::std::char_traits<charT> >
+class parser_buf : public ::std::basic_streambuf<charT, traits>
+{
+   typedef ::std::basic_streambuf<charT, traits> base_type;
+   typedef typename base_type::int_type int_type;
+   typedef typename base_type::char_type char_type;
+   typedef typename base_type::pos_type pos_type;
+   typedef ::std::streamsize streamsize;
+   typedef typename base_type::off_type off_type;
+public:
+   parser_buf() : base_type() { setbuf(0, 0); }
+   const charT* getnext() { return this->gptr(); }
+protected:
+   std::basic_streambuf<charT, traits>* setbuf(char_type* s, streamsize n);
+   typename parser_buf<charT, traits>::pos_type seekpos(pos_type sp, ::std::ios_base::openmode which);
+   typename parser_buf<charT, traits>::pos_type seekoff(off_type off, ::std::ios_base::seekdir way, ::std::ios_base::openmode which);
+private:
+   parser_buf& operator=(const parser_buf&);
+   parser_buf(const parser_buf&);
+};
+
+template<class charT, class traits>
+std::basic_streambuf<charT, traits>*
+parser_buf<charT, traits>::setbuf(char_type* s, streamsize n)
+{
+   this->setg(s, s, s + n);
+   return this;
+}
+
+template<class charT, class traits>
+typename parser_buf<charT, traits>::pos_type
+parser_buf<charT, traits>::seekoff(off_type off, ::std::ios_base::seekdir way, ::std::ios_base::openmode which)
+{
+   if(which & ::std::ios_base::out)
+      return pos_type(off_type(-1));
+   std::ptrdiff_t size = this->egptr() - this->eback();
+   std::ptrdiff_t pos = this->gptr() - this->eback();
+   charT* g = this->eback();
+   switch(way)
+   {
+   case ::std::ios_base::beg:
+      if((off < 0) || (off > size))
+         return pos_type(off_type(-1));
+      else
+         this->setg(g, g + off, g + size);
+      break;
+   case ::std::ios_base::end:
+      if((off < 0) || (off > size))
+         return pos_type(off_type(-1));
+      else
+         this->setg(g, g + size - off, g + size);
+      break;
+   case ::std::ios_base::cur:
+   {
+      std::ptrdiff_t newpos = pos + off;
+      if((newpos < 0) || (newpos > size))
+         return pos_type(off_type(-1));
+      else
+         this->setg(g, g + newpos, g + size);
+      break;
+   }
+   default: ;
+   }
+#ifdef BOOST_MSVC
+#pragma warning(push)
+#pragma warning(disable:4244)
+#endif
+   return static_cast<pos_type>(this->gptr() - this->eback());
+#ifdef BOOST_MSVC
+#pragma warning(pop)
+#endif
+}
+
+template<class charT, class traits>
+typename parser_buf<charT, traits>::pos_type
+parser_buf<charT, traits>::seekpos(pos_type sp, ::std::ios_base::openmode which)
+{
+   if(which & ::std::ios_base::out)
+      return pos_type(off_type(-1));
+   off_type size = static_cast<off_type>(this->egptr() - this->eback());
+   charT* g = this->eback();
+   if(off_type(sp) <= size)
+   {
+      this->setg(g, g + off_type(sp), g + size);
+   }
+   return pos_type(off_type(-1));
+}
+
+//
+// class cpp_regex_traits_base:
+// acts as a container for locale and the facets we are using.
+//
+template <class charT>
+struct cpp_regex_traits_base
+{
+   cpp_regex_traits_base(const std::locale& l)
+   { imbue(l); }
+   std::locale imbue(const std::locale& l);
+
+   std::locale m_locale;
+   std::ctype<charT> const* m_pctype;
+#ifndef BOOST_NO_STD_MESSAGES
+   std::messages<charT> const* m_pmessages;
+#endif
+   std::collate<charT> const* m_pcollate;
+
+   bool operator<(const cpp_regex_traits_base& b)const
+   {
+      if(m_pctype == b.m_pctype)
+      {
+         if(m_pmessages == b.m_pmessages)
+         {
+            return m_pcollate < b.m_pcollate;
+         }
+         return m_pmessages < b.m_pmessages;
+      }
+      return m_pctype < b.m_pctype;
+   }
+   bool operator==(const cpp_regex_traits_base& b)const
+   {
+      return (m_pctype == b.m_pctype) 
+         && (m_pmessages == b.m_pmessages) 
+         && (m_pcollate == b.m_pcollate);
+   }
+};
+
+template <class charT>
+std::locale cpp_regex_traits_base<charT>::imbue(const std::locale& l)
+{
+   std::locale result(m_locale);
+   m_locale = l;
+   m_pctype = &BOOST_USE_FACET(std::ctype<charT>, l);
+#ifndef BOOST_NO_STD_MESSAGES
+   m_pmessages = &BOOST_USE_FACET(std::messages<charT>, l);
+#endif
+   m_pcollate = &BOOST_USE_FACET(std::collate<charT>, l);
+   return result;
+}
+
+//
+// class cpp_regex_traits_char_layer:
+// implements methods that require specialisation for narrow characters:
+//
+template <class charT>
+class cpp_regex_traits_char_layer : public cpp_regex_traits_base<charT>
+{
+   typedef std::basic_string<charT> string_type;
+   typedef std::map<charT, regex_constants::syntax_type> map_type;
+   typedef typename map_type::const_iterator map_iterator_type;
+public:
+   cpp_regex_traits_char_layer(const std::locale& l)
+      : cpp_regex_traits_base<charT>(l)
+   {
+      init();
+   }
+   cpp_regex_traits_char_layer(const cpp_regex_traits_base<charT>& b)
+      : cpp_regex_traits_base<charT>(b)
+   {
+      init();
+   }
+   void init();
+
+   regex_constants::syntax_type syntax_type(charT c)const
+   {
+      map_iterator_type i = m_char_map.find(c);
+      return ((i == m_char_map.end()) ? 0 : i->second);
+   }
+   regex_constants::escape_syntax_type escape_syntax_type(charT c) const
+   {
+      map_iterator_type i = m_char_map.find(c);
+      if(i == m_char_map.end())
+      {
+         if(this->m_pctype->is(std::ctype_base::lower, c)) return regex_constants::escape_type_class;
+         if(this->m_pctype->is(std::ctype_base::upper, c)) return regex_constants::escape_type_not_class;
+         return 0;
+      }
+      return i->second;
+   }
+
+private:
+   string_type get_default_message(regex_constants::syntax_type);
+   // TODO: use a hash table when available!
+   map_type m_char_map;
+};
+
+template <class charT>
+void cpp_regex_traits_char_layer<charT>::init()
+{
+   // we need to start by initialising our syntax map so we know which
+   // character is used for which purpose:
+#ifndef BOOST_NO_STD_MESSAGES
+#ifndef __IBMCPP__
+   typename std::messages<charT>::catalog cat = static_cast<std::messages<char>::catalog>(-1);
+#else
+   typename std::messages<charT>::catalog cat = reinterpret_cast<std::messages<char>::catalog>(-1);
+#endif
+   std::string cat_name(cpp_regex_traits<charT>::get_catalog_name());
+   if(cat_name.size())
+   {
+      cat = this->m_pmessages->open(
+         cat_name, 
+         this->m_locale);
+      if((int)cat < 0)
+      {
+         std::string m("Unable to open message catalog: ");
+         std::runtime_error err(m + cat_name);
+         boost::re_detail::raise_runtime_error(err);
+      }
+   }
+   //
+   // if we have a valid catalog then load our messages:
+   //
+   if((int)cat >= 0)
+   {
+      try{
+         for(regex_constants::syntax_type i = 1; i < regex_constants::syntax_max; ++i)
+         {
+            string_type mss = this->m_pmessages->get(cat, 0, i, get_default_message(i));
+            for(typename string_type::size_type j = 0; j < mss.size(); ++j)
+            {
+               m_char_map[mss[j]] = i;
+            }
+         }
+         this->m_pmessages->close(cat);
+      }
+      catch(...)
+      {
+         this->m_pmessages->close(cat);
+         throw;
+      }
+   }
+   else
+   {
+#endif
+      for(regex_constants::syntax_type i = 1; i < regex_constants::syntax_max; ++i)
+      {
+         const char* ptr = get_default_syntax(i);
+         while(ptr && *ptr)
+         {
+            m_char_map[this->m_pctype->widen(*ptr)] = i;
+            ++ptr;
+         }
+      }
+#ifndef BOOST_NO_STD_MESSAGES
+   }
+#endif
+}
+
+template <class charT>
+typename cpp_regex_traits_char_layer<charT>::string_type 
+   cpp_regex_traits_char_layer<charT>::get_default_message(regex_constants::syntax_type i)
+{
+   const char* ptr = get_default_syntax(i);
+   string_type result;
+   while(ptr && *ptr)
+   {
+      result.append(1, this->m_pctype->widen(*ptr));
+      ++ptr;
+   }
+   return result;
+}
+
+//
+// specialised version for narrow characters:
+//
+template <>
+class BOOST_REGEX_DECL cpp_regex_traits_char_layer<char> : public cpp_regex_traits_base<char>
+{
+   typedef std::string string_type;
+public:
+   cpp_regex_traits_char_layer(const std::locale& l)
+   : cpp_regex_traits_base<char>(l)
+   {
+      init();
+   }
+   cpp_regex_traits_char_layer(const cpp_regex_traits_base<char>& l)
+   : cpp_regex_traits_base<char>(l)
+   {
+      init();
+   }
+
+   regex_constants::syntax_type syntax_type(char c)const
+   {
+      return m_char_map[static_cast<unsigned char>(c)];
+   }
+   regex_constants::escape_syntax_type escape_syntax_type(char c) const
+   {
+      return m_char_map[static_cast<unsigned char>(c)];
+   }
+
+private:
+   regex_constants::syntax_type m_char_map[1u << CHAR_BIT];
+   void init();
+};
+
+#ifdef BOOST_REGEX_BUGGY_CTYPE_FACET
+enum
+{
+   char_class_space=1<<0, 
+   char_class_print=1<<1, 
+   char_class_cntrl=1<<2, 
+   char_class_upper=1<<3, 
+   char_class_lower=1<<4,
+   char_class_alpha=1<<5, 
+   char_class_digit=1<<6, 
+   char_class_punct=1<<7, 
+   char_class_xdigit=1<<8,
+   char_class_alnum=char_class_alpha|char_class_digit, 
+   char_class_graph=char_class_alnum|char_class_punct,
+   char_class_blank=1<<9,
+   char_class_word=1<<10,
+   char_class_unicode=1<<11
+};
+
+#endif
+
+//
+// class cpp_regex_traits_implementation:
+// provides pimpl implementation for cpp_regex_traits.
+//
+template <class charT>
+class cpp_regex_traits_implementation : public cpp_regex_traits_char_layer<charT>
+{
+public:
+   typedef typename cpp_regex_traits<charT>::char_class_type char_class_type;
+   typedef typename std::ctype<charT>::mask                  native_mask_type;
+#ifndef BOOST_REGEX_BUGGY_CTYPE_FACET
+   BOOST_STATIC_CONSTANT(char_class_type, mask_blank = 1u << 16);
+   BOOST_STATIC_CONSTANT(char_class_type, mask_word = 1u << 17);
+   BOOST_STATIC_CONSTANT(char_class_type, mask_unicode = 1u << 18);
+#ifdef __GNUC__
+   BOOST_STATIC_CONSTANT(native_mask_type, 
+      mask_base = 
+         static_cast<native_mask_type>(
+            std::ctype<charT>::alnum 
+            | std::ctype<charT>::alpha
+            | std::ctype<charT>::cntrl
+            | std::ctype<charT>::digit
+            | std::ctype<charT>::graph
+            | std::ctype<charT>::lower
+            | std::ctype<charT>::print
+            | std::ctype<charT>::punct
+            | std::ctype<charT>::space
+            | std::ctype<charT>::upper
+            | std::ctype<charT>::xdigit));
+#else
+   BOOST_STATIC_CONSTANT(char_class_type, 
+      mask_base = 
+         std::ctype<charT>::alnum 
+         | std::ctype<charT>::alpha
+         | std::ctype<charT>::cntrl
+         | std::ctype<charT>::digit
+         | std::ctype<charT>::graph
+         | std::ctype<charT>::lower
+         | std::ctype<charT>::print
+         | std::ctype<charT>::punct
+         | std::ctype<charT>::space
+         | std::ctype<charT>::upper
+         | std::ctype<charT>::xdigit);
+#endif
+#endif
+   //BOOST_STATIC_ASSERT(0 == (mask_base & (mask_word | mask_unicode)));
+
+
+   typedef std::basic_string<charT> string_type;
+   typedef charT char_type;
+   //cpp_regex_traits_implementation();
+   cpp_regex_traits_implementation(const std::locale& l)
+      : cpp_regex_traits_char_layer<charT>(l), m_is(&m_sbuf)
+   {
+      init();
+   }
+   cpp_regex_traits_implementation(const cpp_regex_traits_base<charT>& l)
+      : cpp_regex_traits_char_layer<charT>(l), m_is(&m_sbuf)
+   {
+      init();
+   }
+   std::string error_string(regex_constants::error_type n) const
+   {
+      if(!m_error_strings.empty())
+      {
+         std::map<int, std::string>::const_iterator p = m_error_strings.find(n);
+         return (p == m_error_strings.end()) ? std::string(get_default_error_string(n)) : p->second;
+      }
+      return get_default_error_string(n);
+   }
+   char_class_type lookup_classname(const charT* p1, const charT* p2) const
+   {
+      char_class_type result = lookup_classname_imp(p1, p2);
+      if(result == 0)
+      {
+         string_type temp(p1, p2);
+         this->m_pctype->tolower(&*temp.begin(), &*temp.begin() + temp.size());
+         result = lookup_classname_imp(&*temp.begin(), &*temp.begin() + temp.size());
+      }
+      return result;
+   }
+   string_type lookup_collatename(const charT* p1, const charT* p2) const;
+   string_type transform_primary(const charT* p1, const charT* p2) const;
+   string_type transform(const charT* p1, const charT* p2) const;
+   re_detail::parser_buf<charT>   m_sbuf;            // buffer for parsing numbers.
+   std::basic_istream<charT>      m_is;              // stream for parsing numbers.
+private:
+   std::map<int, std::string>     m_error_strings;   // error messages indexed by numberic ID
+   std::map<string_type, char_class_type>  m_custom_class_names; // character class names
+   std::map<string_type, string_type>      m_custom_collate_names; // collating element names
+   unsigned                       m_collate_type;    // the form of the collation string
+   charT                          m_collate_delim;   // the collation group delimiter
+   //
+   // helpers:
+   //
+   char_class_type lookup_classname_imp(const charT* p1, const charT* p2) const;
+   void init();
+#ifdef BOOST_REGEX_BUGGY_CTYPE_FACET
+public:
+   bool isctype(charT c, char_class_type m)const;
+#endif
+};
+
+#ifndef BOOST_REGEX_BUGGY_CTYPE_FACET
+#if !defined(BOOST_NO_INCLASS_MEMBER_INITIALIZATION)
+
+template <class charT>
+typename cpp_regex_traits_implementation<charT>::char_class_type const cpp_regex_traits_implementation<charT>::mask_blank;
+template <class charT>
+typename cpp_regex_traits_implementation<charT>::char_class_type const cpp_regex_traits_implementation<charT>::mask_word;
+template <class charT>
+typename cpp_regex_traits_implementation<charT>::char_class_type const cpp_regex_traits_implementation<charT>::mask_unicode;
+#ifdef __GNUC__
+template <class charT>
+typename cpp_regex_traits_implementation<charT>::native_mask_type const cpp_regex_traits_implementation<charT>::mask_base;
+#else
+template <class charT>
+typename cpp_regex_traits_implementation<charT>::char_class_type const cpp_regex_traits_implementation<charT>::mask_base;
+#endif
+
+#endif
+#endif
+
+template <class charT>
+typename cpp_regex_traits_implementation<charT>::string_type 
+   cpp_regex_traits_implementation<charT>::transform_primary(const charT* p1, const charT* p2) const
+{
+   //
+   // PRECONDITIONS:
+   //
+   // A bug in gcc 3.2 (and maybe other versions as well) treats
+   // p1 as a null terminated string, for efficiency reasons 
+   // we work around this elsewhere, but just assert here that
+   // we adhere to gcc's (buggy) preconditions...
+   //
+   BOOST_ASSERT(*p2 == 0);
+
+   string_type result;
+   //
+   // swallowing all exceptions here is a bad idea
+   // however at least one std lib will always throw
+   // std::bad_alloc for certain arguments...
+   //
+   try{
+      //
+      // What we do here depends upon the format of the sort key returned by
+      // sort key returned by this->transform:
+      //
+      switch(m_collate_type)
+      {
+      case sort_C:
+      case sort_unknown:
+         // the best we can do is translate to lower case, then get a regular sort key:
+         {
+            result.assign(p1, p2);
+            this->m_pctype->tolower(&*result.begin(), &*result.begin() + result.size());
+            result = this->m_pcollate->transform(&*result.begin(), &*result.begin() + result.size());
+            break;
+         }
+      case sort_fixed:
+         {
+            // get a regular sort key, and then truncate it:
+            result.assign(this->m_pcollate->transform(p1, p2));
+            result.erase(this->m_collate_delim);
+            break;
+         }
+      case sort_delim:
+            // get a regular sort key, and then truncate everything after the delim:
+            result.assign(this->m_pcollate->transform(p1, p2));
+            std::size_t i;
+            for(i = 0; i < result.size(); ++i)
+            {
+               if(result[i] == m_collate_delim)
+                  break;
+            }
+            result.erase(i);
+            break;
+      }
+   }catch(...){}
+   while(result.size() && (charT(0) == *result.rbegin()))
+      result.erase(result.size() - 1);
+   return result;
+}
+
+template <class charT>
+typename cpp_regex_traits_implementation<charT>::string_type 
+   cpp_regex_traits_implementation<charT>::transform(const charT* p1, const charT* p2) const
+{
+   //
+   // PRECONDITIONS:
+   //
+   // A bug in gcc 3.2 (and maybe other versions as well) treats
+   // p1 as a null terminated string, for efficiency reasons 
+   // we work around this elsewhere, but just assert here that
+   // we adhere to gcc's (buggy) preconditions...
+   //
+   BOOST_ASSERT(*p2 == 0);
+   //
+   // swallowing all exceptions here is a bad idea
+   // however at least one std lib will always throw
+   // std::bad_alloc for certain arguments...
+   //
+   string_type result;
+   try{
+      result = this->m_pcollate->transform(p1, p2);
+      //
+      // Borland's STLPort version returns a NULL-terminated
+      // string that has garbage at the end - each call to
+      // std::collate<wchar_t>::transform returns a different string!
+      // So as a workaround, we'll truncate the string at the first NULL
+      // which _seems_ to work....
+#if BOOST_WORKAROUND(__BORLANDC__, < 0x600)
+      result.erase(result.find(charT(0)));
+#else
+      //
+      // some implementations (Dinkumware) append unnecessary trailing \0's:
+      while(result.size() && (charT(0) == *result.rbegin()))
+         result.erase(result.size() - 1);
+#endif
+      BOOST_ASSERT(result.find(charT(0)) == string_type::npos);
+   }
+   catch(...)
+   {
+   }
+   return result;
+}
+
+
+template <class charT>
+typename cpp_regex_traits_implementation<charT>::string_type 
+   cpp_regex_traits_implementation<charT>::lookup_collatename(const charT* p1, const charT* p2) const
+{
+   typedef typename std::map<string_type, string_type>::const_iterator iter_type;
+   if(m_custom_collate_names.size())
+   {
+      iter_type pos = m_custom_collate_names.find(string_type(p1, p2));
+      if(pos != m_custom_collate_names.end())
+         return pos->second;
+   }
+#if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS)\
+               && !BOOST_WORKAROUND(BOOST_MSVC, < 1300)\
+               && !BOOST_WORKAROUND(__BORLANDC__, <= 0x0551)
+   std::string name(p1, p2);
+#else
+   std::string name;
+   const charT* p0 = p1;
+   while(p0 != p2)
+	   name.append(1, char(*p0++));
+#endif
+   name = lookup_default_collate_name(name);
+#if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS)\
+               && !BOOST_WORKAROUND(BOOST_MSVC, < 1300)\
+               && !BOOST_WORKAROUND(__BORLANDC__, <= 0x0551)
+   if(name.size())
+      return string_type(name.begin(), name.end());
+#else
+   if(name.size())
+   {
+	   string_type result;
+	   typedef std::string::const_iterator iter;
+	   iter b = name.begin();
+	   iter e = name.end();
+	   while(b != e)
+		   result.append(1, charT(*b++));
+	   return result;
+   }
+#endif
+   if(p2 - p1 == 1)
+      return string_type(1, *p1);
+   return string_type();
+}
+
+template <class charT>
+void cpp_regex_traits_implementation<charT>::init()
+{
+#ifndef BOOST_NO_STD_MESSAGES
+#ifndef __IBMCPP__
+   typename std::messages<charT>::catalog cat = static_cast<std::messages<char>::catalog>(-1);
+#else
+   typename std::messages<charT>::catalog cat = reinterpret_cast<std::messages<char>::catalog>(-1);
+#endif
+   std::string cat_name(cpp_regex_traits<charT>::get_catalog_name());
+   if(cat_name.size())
+   {
+      cat = this->m_pmessages->open(
+         cat_name, 
+         this->m_locale);
+      if((int)cat < 0)
+      {
+         std::string m("Unable to open message catalog: ");
+         std::runtime_error err(m + cat_name);
+         boost::re_detail::raise_runtime_error(err);
+      }
+   }
+   //
+   // if we have a valid catalog then load our messages:
+   //
+   if((int)cat >= 0)
+   {
+      //
+      // Error messages:
+      //
+      for(boost::regex_constants::error_type i = static_cast<boost::regex_constants::error_type>(0); 
+         i <= boost::regex_constants::error_unknown; 
+         i = static_cast<boost::regex_constants::error_type>(i + 1))
+      {
+         const char* p = get_default_error_string(i);
+         string_type default_message;
+         while(*p)
+         {
+            default_message.append(1, this->m_pctype->widen(*p));
+            ++p;
+         }
+         string_type s = this->m_pmessages->get(cat, 0, i+200, default_message);
+         std::string result;
+         for(std::string::size_type j = 0; j < s.size(); ++j)
+         {
+            result.append(1, this->m_pctype->narrow(s[j], 0));
+         }
+         m_error_strings[i] = result;
+      }
+      //
+      // Custom class names:
+      //
+#ifndef BOOST_REGEX_BUGGY_CTYPE_FACET
+      static const char_class_type masks[] = 
+      {
+         std::ctype<charT>::alnum,
+         std::ctype<charT>::alpha,
+         std::ctype<charT>::cntrl,
+         std::ctype<charT>::digit,
+         std::ctype<charT>::graph,
+         std::ctype<charT>::lower,
+         std::ctype<charT>::print,
+         std::ctype<charT>::punct,
+         std::ctype<charT>::space,
+         std::ctype<charT>::upper,
+         std::ctype<charT>::xdigit,
+         cpp_regex_traits_implementation<charT>::mask_blank,
+         cpp_regex_traits_implementation<charT>::mask_word,
+         cpp_regex_traits_implementation<charT>::mask_unicode,
+      };
+#else
+      static const char_class_type masks[] = 
+      {
+         ::boost::re_detail::char_class_alnum,
+         ::boost::re_detail::char_class_alpha,
+         ::boost::re_detail::char_class_cntrl,
+         ::boost::re_detail::char_class_digit,
+         ::boost::re_detail::char_class_graph,
+         ::boost::re_detail::char_class_lower,
+         ::boost::re_detail::char_class_print,
+         ::boost::re_detail::char_class_punct,
+         ::boost::re_detail::char_class_space,
+         ::boost::re_detail::char_class_upper,
+         ::boost::re_detail::char_class_xdigit,
+         ::boost::re_detail::char_class_blank,
+         ::boost::re_detail::char_class_word,
+         ::boost::re_detail::char_class_unicode,
+      };
+#endif
+      static const string_type null_string;
+      for(unsigned int j = 0; j <= 13; ++j)
+      {
+         string_type s(this->m_pmessages->get(cat, 0, j+300, null_string));
+         if(s.size())
+            this->m_custom_class_names[s] = masks[j];
+      }
+   }
+#endif
+   //
+   // get the collation format used by m_pcollate:
+   //
+   m_collate_type = re_detail::find_sort_syntax(this, &m_collate_delim);
+}
+
+template <class charT>
+typename cpp_regex_traits_implementation<charT>::char_class_type 
+   cpp_regex_traits_implementation<charT>::lookup_classname_imp(const charT* p1, const charT* p2) const
+{
+#ifndef BOOST_REGEX_BUGGY_CTYPE_FACET
+   static const char_class_type masks[] = 
+   {
+      0,
+      std::ctype<char>::alnum, 
+      std::ctype<char>::alpha,
+      cpp_regex_traits_implementation<charT>::mask_blank,
+      std::ctype<char>::cntrl,
+      std::ctype<char>::digit,
+      std::ctype<char>::digit,
+      std::ctype<char>::graph,
+      std::ctype<char>::lower,
+      std::ctype<char>::lower,
+      std::ctype<char>::print,
+      std::ctype<char>::punct,
+      std::ctype<char>::space,
+      std::ctype<char>::space,
+      std::ctype<char>::upper,
+      cpp_regex_traits_implementation<charT>::mask_unicode,
+      std::ctype<char>::upper,
+      std::ctype<char>::alnum | cpp_regex_traits_implementation<charT>::mask_word, 
+      std::ctype<char>::alnum | cpp_regex_traits_implementation<charT>::mask_word, 
+      std::ctype<char>::xdigit,
+   };
+#else
+   static const char_class_type masks[] = 
+   {
+      0,
+      ::boost::re_detail::char_class_alnum, 
+      ::boost::re_detail::char_class_alpha,
+      ::boost::re_detail::char_class_blank,
+      ::boost::re_detail::char_class_cntrl,
+      ::boost::re_detail::char_class_digit,
+      ::boost::re_detail::char_class_digit,
+      ::boost::re_detail::char_class_graph,
+      ::boost::re_detail::char_class_lower,
+      ::boost::re_detail::char_class_lower,
+      ::boost::re_detail::char_class_print,
+      ::boost::re_detail::char_class_punct,
+      ::boost::re_detail::char_class_space,
+      ::boost::re_detail::char_class_space,
+      ::boost::re_detail::char_class_upper,
+      ::boost::re_detail::char_class_unicode,
+      ::boost::re_detail::char_class_upper,
+      ::boost::re_detail::char_class_alnum | ::boost::re_detail::char_class_word, 
+      ::boost::re_detail::char_class_alnum | ::boost::re_detail::char_class_word, 
+      ::boost::re_detail::char_class_xdigit,
+   };
+#endif
+   if(m_custom_class_names.size())
+   {
+      typedef typename std::map<std::basic_string<charT>, char_class_type>::const_iterator map_iter;
+      map_iter pos = m_custom_class_names.find(string_type(p1, p2));
+      if(pos != m_custom_class_names.end())
+         return pos->second;
+   }
+   std::size_t id = 1 + re_detail::get_default_class_id(p1, p2);
+   assert(id < sizeof(masks) / sizeof(masks[0]));
+   return masks[id];
+}
+
+#ifdef BOOST_REGEX_BUGGY_CTYPE_FACET
+template <class charT>
+bool cpp_regex_traits_implementation<charT>::isctype(const charT c, char_class_type mask) const
+{
+   return
+      ((mask & ::boost::re_detail::char_class_space) && (m_pctype->is(std::ctype<charT>::space, c)))
+      || ((mask & ::boost::re_detail::char_class_print) && (m_pctype->is(std::ctype<charT>::print, c)))
+      || ((mask & ::boost::re_detail::char_class_cntrl) && (m_pctype->is(std::ctype<charT>::cntrl, c)))
+      || ((mask & ::boost::re_detail::char_class_upper) && (m_pctype->is(std::ctype<charT>::upper, c)))
+      || ((mask & ::boost::re_detail::char_class_lower) && (m_pctype->is(std::ctype<charT>::lower, c)))
+      || ((mask & ::boost::re_detail::char_class_alpha) && (m_pctype->is(std::ctype<charT>::alpha, c)))
+      || ((mask & ::boost::re_detail::char_class_digit) && (m_pctype->is(std::ctype<charT>::digit, c)))
+      || ((mask & ::boost::re_detail::char_class_punct) && (m_pctype->is(std::ctype<charT>::punct, c)))
+      || ((mask & ::boost::re_detail::char_class_xdigit) && (m_pctype->is(std::ctype<charT>::xdigit, c)))
+      || ((mask & ::boost::re_detail::char_class_blank) && (m_pctype->is(std::ctype<charT>::space, c)) && !::boost::re_detail::is_separator(c))
+      || ((mask & ::boost::re_detail::char_class_word) && (c == '_'))
+      || ((mask & ::boost::re_detail::char_class_unicode) && ::boost::re_detail::is_extended(c));
+}
+#endif
+
+
+template <class charT>
+boost::shared_ptr<cpp_regex_traits_implementation<charT> > create_cpp_regex_traits(const std::locale& l BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(charT))
+{
+   cpp_regex_traits_base<charT> key(l);
+   return ::boost::object_cache<cpp_regex_traits_base<charT>, cpp_regex_traits_implementation<charT> >::get(key, 5);
+}
+
+} // re_detail
+
+template <class charT>
+class cpp_regex_traits
+{
+private:
+   typedef std::ctype<charT>            ctype_type;
+public:
+   typedef charT                        char_type;
+   typedef std::size_t                  size_type;
+   typedef std::basic_string<char_type> string_type;
+   typedef std::locale                  locale_type;
+   typedef boost::uint_least32_t        char_class_type;
+
+   struct boost_extensions_tag{};
+
+   cpp_regex_traits()
+      : m_pimpl(re_detail::create_cpp_regex_traits<charT>(std::locale()))
+   { }
+   static size_type length(const char_type* p)
+   {
+      return std::char_traits<charT>::length(p);
+   }
+   regex_constants::syntax_type syntax_type(charT c)const
+   {
+      return m_pimpl->syntax_type(c);
+   }
+   regex_constants::escape_syntax_type escape_syntax_type(charT c) const
+   {
+      return m_pimpl->escape_syntax_type(c);
+   }
+   charT translate(charT c) const
+   {
+      return c;
+   }
+   charT translate_nocase(charT c) const
+   {
+      return m_pimpl->m_pctype->tolower(c);
+   }
+   charT translate(charT c, bool icase) const
+   {
+      return icase ? m_pimpl->m_pctype->tolower(c) : c;
+   }
+   charT tolower(charT c) const
+   {
+      return m_pimpl->m_pctype->tolower(c);
+   }
+   charT toupper(charT c) const
+   {
+      return m_pimpl->m_pctype->toupper(c);
+   }
+   string_type transform(const charT* p1, const charT* p2) const
+   {
+      return m_pimpl->transform(p1, p2);
+   }
+   string_type transform_primary(const charT* p1, const charT* p2) const
+   {
+      return m_pimpl->transform_primary(p1, p2);
+   }
+   char_class_type lookup_classname(const charT* p1, const charT* p2) const
+   {
+      return m_pimpl->lookup_classname(p1, p2);
+   }
+   string_type lookup_collatename(const charT* p1, const charT* p2) const
+   {
+      return m_pimpl->lookup_collatename(p1, p2);
+   }
+   bool isctype(charT c, char_class_type f) const
+   {
+#ifndef BOOST_REGEX_BUGGY_CTYPE_FACET
+      typedef typename std::ctype<charT>::mask ctype_mask;
+      if((f & re_detail::cpp_regex_traits_implementation<charT>::mask_base) 
+         && (m_pimpl->m_pctype->is(
+            static_cast<ctype_mask>(f & re_detail::cpp_regex_traits_implementation<charT>::mask_base), c)))
+         return true;
+      else if((f & re_detail::cpp_regex_traits_implementation<charT>::mask_unicode) && re_detail::is_extended(c))
+         return true;
+      else if((f & re_detail::cpp_regex_traits_implementation<charT>::mask_word) && (c == '_'))
+         return true;
+      else if((f & re_detail::cpp_regex_traits_implementation<charT>::mask_blank) 
+         && m_pimpl->m_pctype->is(std::ctype<charT>::space, c)
+         && !re_detail::is_separator(c))
+         return true;
+      return false;
+#else
+      return m_pimpl->isctype(c, f);
+#endif
+   }
+   int toi(const charT*& p1, const charT* p2, int radix)const;
+   int value(charT c, int radix)const
+   {
+      const charT* pc = &c;
+      return toi(pc, pc + 1, radix);
+   }
+   locale_type imbue(locale_type l)
+   {
+      std::locale result(getloc());
+      m_pimpl = re_detail::create_cpp_regex_traits<charT>(l);
+      return result;
+   }
+   locale_type getloc()const
+   {
+      return m_pimpl->m_locale;
+   }
+   std::string error_string(regex_constants::error_type n) const
+   {
+      return m_pimpl->error_string(n);
+   }
+
+   //
+   // extension:
+   // set the name of the message catalog in use (defaults to "boost_regex").
+   //
+   static std::string catalog_name(const std::string& name);
+   static std::string get_catalog_name();
+
+private:
+   boost::shared_ptr<re_detail::cpp_regex_traits_implementation<charT> > m_pimpl;
+   //
+   // catalog name handler:
+   //
+   static std::string& get_catalog_name_inst();
+
+#ifdef BOOST_HAS_THREADS
+   static static_mutex& get_mutex_inst();
+#endif
+};
+
+
+template <class charT>
+int cpp_regex_traits<charT>::toi(const charT*& first, const charT* last, int radix)const
+{
+   m_pimpl->m_sbuf.pubsetbuf(const_cast<charT*>(static_cast<const charT*>(first)), static_cast<std::streamsize>(last-first));
+   m_pimpl->m_is.clear();
+   if(std::abs(radix) == 16) m_pimpl->m_is >> std::hex;
+   else if(std::abs(radix) == 8) m_pimpl->m_is >> std::oct;
+   else m_pimpl->m_is >> std::dec;
+   int val;
+   if(m_pimpl->m_is >> val)
+   {
+      first = first + ((last - first) - m_pimpl->m_sbuf.in_avail());
+      return val;
+   }
+   else
+      return -1;
+}
+
+template <class charT>
+std::string cpp_regex_traits<charT>::catalog_name(const std::string& name)
+{
+#ifdef BOOST_HAS_THREADS
+   static_mutex::scoped_lock lk(get_mutex_inst());
+#endif
+   std::string result(get_catalog_name_inst());
+   get_catalog_name_inst() = name;
+   return result;
+}
+
+template <class charT>
+std::string& cpp_regex_traits<charT>::get_catalog_name_inst()
+{
+   static std::string s_name;
+   return s_name;
+}
+
+template <class charT>
+std::string cpp_regex_traits<charT>::get_catalog_name()
+{
+#ifdef BOOST_HAS_THREADS
+   static_mutex::scoped_lock lk(get_mutex_inst());
+#endif
+   std::string result(get_catalog_name_inst());
+   return result;
+}
+
+#ifdef BOOST_HAS_THREADS
+template <class charT>
+static_mutex& cpp_regex_traits<charT>::get_mutex_inst()
+{
+   static static_mutex s_mutex = BOOST_STATIC_MUTEX_INIT;
+   return s_mutex;
+}
+#endif
+
+
+} // boost
+
+#ifdef BOOST_MSVC
+#pragma warning(pop)
+#endif
+
+#ifdef BOOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
+#endif
+
+#endif
+
+#endif
diff --git a/include/boost/regex/v4/cregex.hpp b/include/boost/regex/v4/cregex.hpp
index 368f1d85..0697d5df 100644
--- a/include/boost/regex/v4/cregex.hpp
+++ b/include/boost/regex/v4/cregex.hpp
@@ -24,6 +24,13 @@
 #include <boost/regex/config.hpp>
 #endif
 #include <boost/regex/v4/match_flags.hpp>
+#include <boost/regex/v4/error_type.hpp>
+
+#ifdef __cplusplus
+#include <cstddef>
+#else
+#include <stddef.h>
+#endif
 
 #ifdef BOOST_HAS_ABI_HEADERS
 #  include BOOST_ABI_PREFIX
@@ -46,8 +53,12 @@ typedef size_t regsize_t;
 typedef struct
 {
    unsigned int re_magic;
-   unsigned int re_nsub;      /* number of parenthesized subexpressions */
-   const char* re_endp;       /* end pointer for REG_PEND */
+#ifdef __cplusplus
+   std::size_t  re_nsub;      /* number of parenthesized subexpressions */
+#else
+   size_t re_nsub; 
+#endif
+   const char*  re_endp;       /* end pointer for REG_PEND */
    void* guts;                /* none of your business :-) */
    match_flag_type eflags;        /* none of your business :-) */
 } regex_tA;
@@ -56,7 +67,11 @@ typedef struct
 typedef struct
 {
    unsigned int re_magic;
-   unsigned int re_nsub;         /* number of parenthesized subexpressions */
+#ifdef __cplusplus
+   std::size_t  re_nsub;         /* number of parenthesized subexpressions */
+#else
+   size_t re_nsub;
+#endif
    const wchar_t* re_endp;       /* end pointer for REG_PEND */
    void* guts;                   /* none of your business :-) */
    match_flag_type eflags;           /* none of your business :-) */
@@ -102,6 +117,39 @@ typedef enum{
    REG_STARTEND =  00004
 } reg_exec_flags;
 
+//
+// POSIX error codes:
+//
+typedef unsigned reg_error_t;
+typedef reg_error_t reg_errcode_t;  // backwards compatibility
+
+static const reg_error_t REG_NOERROR = 0;   /* Success.  */
+static const reg_error_t REG_NOMATCH = 1;   /* Didn't find a match (for regexec).  */
+
+  /* POSIX regcomp return error codes.  (In the order listed in the
+     standard.)  */
+static const reg_error_t REG_BADPAT = 2;    /* Invalid pattern.  */
+static const reg_error_t REG_ECOLLATE = 3;  /* Undefined collating element.  */
+static const reg_error_t REG_ECTYPE = 4;    /* Invalid character class name.  */
+static const reg_error_t REG_EESCAPE = 5;   /* Trailing backslash.  */
+static const reg_error_t REG_ESUBREG = 6;   /* Invalid back reference.  */
+static const reg_error_t REG_EBRACK = 7;    /* Unmatched left bracket.  */
+static const reg_error_t REG_EPAREN = 8;    /* Parenthesis imbalance.  */
+static const reg_error_t REG_EBRACE = 9;    /* Unmatched \{.  */
+static const reg_error_t REG_BADBR = 10;    /* Invalid contents of \{\}.  */
+static const reg_error_t REG_ERANGE = 11;   /* Invalid range end.  */
+static const reg_error_t REG_ESPACE = 12;   /* Ran out of memory.  */
+static const reg_error_t REG_BADRPT = 13;   /* No preceding re for repetition op.  */
+static const reg_error_t REG_EEND = 14;     /* unexpected end of expression */
+static const reg_error_t REG_ESIZE = 15;    /* expression too big */
+static const reg_error_t REG_ERPAREN = 8;   /* = REG_EPAREN : unmatched right parenthesis */
+static const reg_error_t REG_EMPTY = 17;    /* empty expression */
+static const reg_error_t REG_E_MEMORY = 15; /* = REG_ESIZE : out of memory */
+static const reg_error_t REG_ECOMPLEXITY = 18; /* complexity too high */
+static const reg_error_t REG_ESTACK = 19;   /* out of stack space */
+static const reg_error_t REG_E_UNKNOWN = 20; /* unknown error */
+static const reg_error_t REG_ENOSYS = 20;   /* = REG_E_UNKNOWN : Reserved. */
+
 BOOST_REGEX_DECL int BOOST_REGEX_CCALL regcompA(regex_tA*, const char*, int);
 BOOST_REGEX_DECL regsize_t BOOST_REGEX_CCALL regerrorA(int, const regex_tA*, char*, regsize_t);
 BOOST_REGEX_DECL int BOOST_REGEX_CCALL regexecA(const regex_tA*, const char*, regsize_t, regmatch_t*, int);
@@ -128,34 +176,6 @@ BOOST_REGEX_DECL void BOOST_REGEX_CCALL regfreeW(regex_tW*);
 #define regex_t regex_tA
 #endif
 
-/* regerror() flags */
-typedef enum
-{
-  REG_NOERROR = 0,   /* Success.  */
-  REG_NOMATCH = 1,      /* Didn't find a match (for regexec).  */
-
-  /* POSIX regcomp return error codes.  (In the order listed in the
-     standard.)  */
-  REG_BADPAT = 2,    /* Invalid pattern.  */
-  REG_ECOLLATE = 3,  /* Undefined collating element.  */
-  REG_ECTYPE = 4,    /* Invalid character class name.  */
-  REG_EESCAPE = 5,   /* Trailing backslash.  */
-  REG_ESUBREG = 6,   /* Invalid back reference.  */
-  REG_EBRACK = 7,    /* Unmatched left bracket.  */
-  REG_EPAREN = 8,    /* Parenthesis imbalance.  */
-  REG_EBRACE = 9,    /* Unmatched \{.  */
-  REG_BADBR = 10,    /* Invalid contents of \{\}.  */
-  REG_ERANGE = 11,   /* Invalid range end.  */
-  REG_ESPACE = 12,   /* Ran out of memory.  */
-  REG_BADRPT = 13,   /* No preceding re for repetition op.  */
-  REG_EEND = 14,     /* unexpected end of expression */
-  REG_ESIZE = 15,    /* expression too big */
-  REG_ERPAREN = 16,   /* unmatched right parenthesis */
-  REG_EMPTY = 17,    /* empty expression */
-  REG_E_MEMORY = REG_ESIZE, /* out of memory */
-  REG_E_UNKNOWN = 18 /* unknown error */
-} reg_errcode_t;
-
 #ifdef BOOST_HAS_ABI_HEADERS
 #  include BOOST_ABI_SUFFIX
 #endif
@@ -165,10 +185,10 @@ typedef enum
 } // namespace
 #endif
 
-#if defined(__cplusplus)
 //
 // C++ high level wrapper goes here:
 //
+#if defined(__cplusplus)
 #include <string>
 #include <vector>
 namespace boost{
@@ -248,15 +268,12 @@ public:
    std::size_t Position(int i = 0)const;
    std::size_t Length(int i = 0)const;
    bool Matched(int i = 0)const;
-   unsigned int Marks()const;
+   std::size_t Marks()const;
    std::string What(int i = 0)const;
    std::string operator[](int i)const { return What(i); }
 
-#ifdef __MINGW32__
-   static const std::size_t npos = ~0u;
-#else
    static const std::size_t npos;
-#endif
+
    friend struct re_detail::pred1;
    friend struct re_detail::pred2;
    friend struct re_detail::pred3;
@@ -271,7 +288,7 @@ public:
 
 #endif
 
-#endif /* include guard */
+#endif // include guard
 
 
 
diff --git a/include/boost/regex/v4/error_type.hpp b/include/boost/regex/v4/error_type.hpp
new file mode 100644
index 00000000..e3ac1121
--- /dev/null
+++ b/include/boost/regex/v4/error_type.hpp
@@ -0,0 +1,62 @@
+/*
+ *
+ * Copyright (c) 2003
+ * Dr John Maddock
+ *
+ * Permission to use, copy, modify, distribute and sell this software
+ * and its documentation for any purpose is hereby granted without fee,
+ * provided that the above copyright notice appear in all copies and
+ * that both that copyright notice and this permission notice appear
+ * in supporting documentation.  Dr John Maddock makes no representations
+ * about the suitability of this software for any purpose.  
+ * It is provided "as is" without express or implied warranty.
+ *
+ */
+ 
+ /*
+  *   LOCATION:    see http://www.boost.org for most recent version.
+  *   FILE         escape_syntax_type.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Declares regular expression escape synatx type enumerator.
+  */
+
+#ifndef BOOST_REGEX_ERROR_TYPE_HPP
+#define BOOST_REGEX_ERROR_TYPE_HPP
+
+#ifdef __cplusplus
+namespace boost{
+#endif
+
+#ifdef __cplusplus
+namespace regex_constants{
+
+enum error_type{
+
+   error_ok = 0,         // not used
+   error_no_match = 1,   // not used
+   error_bad_pattern = 2,
+   error_collate = 3,
+   error_ctype = 4,
+   error_escape = 5,
+   error_backref = 6,
+   error_brack = 7,
+   error_paren = 8,
+   error_brace = 9,
+   error_badbrace = 10,
+   error_range = 11,
+   error_space = 12,
+   error_badrepeat = 13,
+   error_end = 14,    // not used
+   error_size = 15,
+   error_right_paren = 16,  // not used
+   error_empty = 17,
+   error_complexity = 18,
+   error_stack = 19,
+   error_unknown = 20
+};
+
+}
+}
+#endif // __cplusplus
+
+#endif
diff --git a/include/boost/regex/v4/instances.hpp b/include/boost/regex/v4/instances.hpp
index 9e9060ca..862b69c4 100644
--- a/include/boost/regex/v4/instances.hpp
+++ b/include/boost/regex/v4/instances.hpp
@@ -47,7 +47,7 @@ namespace boost{
 #     pragma option push -Jgx
 #  endif
 
-template class BOOST_REGEX_DECL reg_expression< BOOST_REGEX_CHAR_T >;
+template class BOOST_REGEX_DECL basic_regex< BOOST_REGEX_CHAR_T >;
 
 #  ifndef BOOST_REGEX_INSTANTIATE
 #     pragma option pop
@@ -57,7 +57,7 @@ template class BOOST_REGEX_DECL reg_expression< BOOST_REGEX_CHAR_T >;
 #  include BOOST_ABI_SUFFIX
 #endif
 
-#elif (defined(BOOST_MSVC) && defined(_MSC_EXTENSIONS)) || defined(__GNUC__)
+#elif defined(BOOST_MSVC) || defined(BOOST_INTEL) || (defined(__GNUC__) && (__GNUC__ >= 3))
 
 #  ifndef BOOST_REGEX_INSTANTIATE
 #     ifdef __GNUC__
@@ -72,7 +72,22 @@ template class BOOST_REGEX_DECL reg_expression< BOOST_REGEX_CHAR_T >;
 #     pragma warning(disable : 4251 4231 4660)
 #  endif
 
-template class BOOST_REGEX_DECL reg_expression< BOOST_REGEX_CHAR_T >;
+template class BOOST_REGEX_DECL basic_regex< BOOST_REGEX_CHAR_T >;
+#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1200)
+template class BOOST_REGEX_DECL match_results< const BOOST_REGEX_CHAR_T* >;
+#endif
+#ifndef BOOST_NO_STD_ALLOCATOR
+template class BOOST_REGEX_DECL ::boost::re_detail::perl_matcher<BOOST_REGEX_CHAR_T const *, match_results< const BOOST_REGEX_CHAR_T* >::allocator_type, boost::regex_traits<BOOST_REGEX_CHAR_T > >;
+#endif
+#if !(defined(BOOST_DINKUMWARE_STDLIB) && (BOOST_DINKUMWARE_STDLIB <= 1))
+#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1200)
+template class BOOST_REGEX_DECL match_results< std::basic_string<BOOST_REGEX_CHAR_T>::const_iterator >;
+#endif
+#ifndef BOOST_NO_STD_ALLOCATOR
+template class BOOST_REGEX_DECL ::boost::re_detail::perl_matcher< std::basic_string<BOOST_REGEX_CHAR_T>::const_iterator, match_results< std::basic_string<BOOST_REGEX_CHAR_T>::const_iterator >::allocator_type, boost::regex_traits<BOOST_REGEX_CHAR_T > >;
+#endif
+#endif
+
 
 #  ifdef BOOST_MSVC
 #     pragma warning(pop)
diff --git a/include/boost/regex/v4/iterator_traits.hpp b/include/boost/regex/v4/iterator_traits.hpp
index 58fbd51c..2898b3ff 100644
--- a/include/boost/regex/v4/iterator_traits.hpp
+++ b/include/boost/regex/v4/iterator_traits.hpp
@@ -72,6 +72,13 @@ struct regex_iterator_traits<wchar_t*> : pointer_iterator_traits<wchar_t>{};
 template<>
 struct regex_iterator_traits<const wchar_t*> : const_pointer_iterator_traits<wchar_t>{};
 
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+template<>
+struct regex_iterator_traits<unsigned short*> : pointer_iterator_traits<unsigned short>{};
+template<>
+struct regex_iterator_traits<const unsigned short*> : const_pointer_iterator_traits<unsigned short>{};
+#endif
+
 #if defined(__SGI_STL_PORT) && defined(__STL_DEBUG)
 template<>
 struct regex_iterator_traits<std::string::iterator> : pointer_iterator_traits<char>{};
diff --git a/include/boost/regex/v4/match_flags.hpp b/include/boost/regex/v4/match_flags.hpp
index cb797b0e..4afd65b2 100644
--- a/include/boost/regex/v4/match_flags.hpp
+++ b/include/boost/regex/v4/match_flags.hpp
@@ -23,58 +23,57 @@
 #  include <boost/cstdint.hpp>
 #endif
 
+#include <boost/detail/workaround.hpp>
 
 #ifdef __cplusplus
-#include <boost/detail/workaround.hpp>
 namespace boost{
    namespace regex_constants{
-#else
-#define BOOST_WORKAROUND(x, y) 1
 #endif
 
 typedef enum _match_flags
 {
    match_default = 0,
-   match_not_bol = 1,                                /* first is not start of line*/
-   match_not_eol = match_not_bol << 1,               /* last is not end of line*/
-   match_not_bob = match_not_eol << 1,               /* first is not start of buffer*/
-   match_not_eob = match_not_bob << 1,               /* last is not end of buffer*/
-   match_not_bow = match_not_eob << 1,               /* first is not start of word*/
-   match_not_eow = match_not_bow << 1,               /* last is not end of word*/
-   match_not_dot_newline = match_not_eow << 1,       /* \n is not matched by '.'*/
-   match_not_dot_null = match_not_dot_newline << 1,  /* '\0' is not matched by '.'*/
-   match_prev_avail = match_not_dot_null << 1,       /* *--first is a valid expression*/
-   match_init = match_prev_avail << 1,               /* internal use*/
-   match_any = match_init << 1,                      /* don't care what we match*/
-   match_not_null = match_any << 1,                  /* string can't be null*/
-   match_continuous = match_not_null << 1,           /* each grep match must continue from*/
-                                                     /* uninterupted from the previous one*/
-   match_partial = match_continuous << 1,            /* find partial matches*/
-
-   match_stop = match_partial << 1,                  /* stop after first match (grep) V3 only*/
-   match_not_initial_null = match_stop,              /* don't match initial null, V4 only*/
-   match_all = match_stop << 1,                      /* must find the whole of input even if match_any is set*/
-   match_perl = match_all << 1,                      /* Use perl matching rules*/
-   match_posix = match_perl << 1,                    /* Use POSIX matching rules*/
-   match_nosubs = match_posix << 1,                  /* don't trap marked subs*/
-   match_extra = match_nosubs << 1,                  /* include full capture information for repeated captures*/
-   match_single_line = match_extra << 1,             /* treat text as single line and ignor any \n's when matching ^ and $.*/
-   match_unused1 = match_single_line << 1,           /* unused*/
-   match_unused2 = match_unused1 << 1,               /* unused*/
-   match_unused3 = match_unused2 << 1,               /* unused*/
+   match_not_bol = 1,                                // first is not start of line
+   match_not_eol = match_not_bol << 1,               // last is not end of line
+   match_not_bob = match_not_eol << 1,               // first is not start of buffer
+   match_not_eob = match_not_bob << 1,               // last is not end of buffer
+   match_not_bow = match_not_eob << 1,               // first is not start of word
+   match_not_eow = match_not_bow << 1,               // last is not end of word
+   match_not_dot_newline = match_not_eow << 1,       // \n is not matched by '.'
+   match_not_dot_null = match_not_dot_newline << 1,  // '\0' is not matched by '.'
+   match_prev_avail = match_not_dot_null << 1,       // *--first is a valid expression
+   match_init = match_prev_avail << 1,               // internal use
+   match_any = match_init << 1,                      // don't care what we match
+   match_not_null = match_any << 1,                  // string can't be null
+   match_continuous = match_not_null << 1,           // each grep match must continue from
+                                                     // uninterupted from the previous one
+   match_partial = match_continuous << 1,            // find partial matches
+   
+   match_stop = match_partial << 1,                  // stop after first match (grep) V3 only
+   match_not_initial_null = match_stop,              // don't match initial null, V4 only
+   match_all = match_stop << 1,                      // must find the whole of input even if match_any is set
+   match_perl = match_all << 1,                      // Use perl matching rules
+   match_posix = match_perl << 1,                    // Use POSIX matching rules
+   match_nosubs = match_posix << 1,                  // don't trap marked subs
+   match_extra = match_nosubs << 1,                  // include full capture information for repeated captures
+   match_single_line = match_extra << 1,             // treat text as single line and ignor any \n's when matching ^ and $.
+   match_unused1 = match_single_line << 1,           // unused
+   match_unused2 = match_unused1 << 1,               // unused
+   match_unused3 = match_unused2 << 1,               // unused
    match_max = match_unused3,
 
-   format_perl = 0,                                  /* perl style replacement*/
-   format_default = 0,                               /* ditto.*/
-   format_sed = match_max << 1,                      /* sed style replacement.*/
-   format_all = format_sed << 1,                     /* enable all extentions to sytax.*/
-   format_no_copy = format_all << 1,                /* don't copy non-matching segments.*/
-   format_first_only = format_no_copy << 1,          /* Only replace first occurance.*/
-   format_is_if = format_first_only << 1             /* internal use only.*/
+   format_perl = 0,                                  // perl style replacement
+   format_default = 0,                               // ditto.
+   format_sed = match_max << 1,                      // sed style replacement.
+   format_all = format_sed << 1,                     // enable all extentions to sytax.
+   format_no_copy = format_all << 1,                 // don't copy non-matching segments.
+   format_first_only = format_no_copy << 1,          // Only replace first occurance.
+   format_is_if = format_first_only << 1,            // internal use only.
+   format_literal = format_is_if << 1                // treat string as a literal
 
 } match_flags;
 
-#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) || defined(__SUNPRO_CC)
+#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200) || BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
 typedef unsigned long match_flag_type;
 #else
 typedef match_flags match_flag_type;
@@ -90,11 +89,11 @@ inline match_flags operator^(match_flags m1, match_flags m2)
 inline match_flags operator~(match_flags m1)
 { return static_cast<match_flags>(~static_cast<boost::int32_t>(m1)); }
 inline match_flags& operator&=(match_flags& m1, match_flags m2)
-{ m1 = static_cast<match_flags>(m1&m2); return m1; }
+{ m1 = m1&m2; return m1; }
 inline match_flags& operator|=(match_flags& m1, match_flags m2)
-{ m1 = static_cast<match_flags>(m1|m2); return m1; }
+{ m1 = m1|m2; return m1; }
 inline match_flags& operator^=(match_flags& m1, match_flags m2)
-{ m1 = static_cast<match_flags>(m1^m2); return m1; }
+{ m1 = m1^m2; return m1; }
 #endif
 #endif
 
@@ -136,6 +135,6 @@ using regex_constants::format_first_only;
 //using regex_constants::format_is_if;
 
 } // namespace boost
-#endif /* __cplusplus */
-#endif /* include guard */
+#endif // __cplusplus
+#endif // include guard
 
diff --git a/include/boost/regex/v4/match_results.hpp b/include/boost/regex/v4/match_results.hpp
index fdbc3337..94202a01 100644
--- a/include/boost/regex/v4/match_results.hpp
+++ b/include/boost/regex/v4/match_results.hpp
@@ -24,10 +24,12 @@
 #endif
 
 namespace boost{
+#ifdef BOOST_MSVC
+#pragma warning(push)
+#pragma warning(disable : 4251 4231 4660)
+#endif
 
-template <class BidiIterator
-         , class Allocator = BOOST_DEFAULT_ALLOCATOR(sub_match<BidiIterator> )
-         >
+template <class BidiIterator, class Allocator>
 class match_results
 { 
 private:
@@ -73,7 +75,7 @@ public:
 
    // size:
    size_type size() const
-   { return (m_subs.size() >= 2) ? m_subs.size() - 2 : 0; }
+   { return empty() ? 0 : m_subs.size() - 2; }
    size_type max_size() const
    { return m_subs.max_size(); }
    bool empty() const
@@ -94,7 +96,7 @@ public:
          const sub_match<BidiIterator>& s = m_subs[sub];
          if(s.matched)
          {
-            return boost::re_detail::distance((BidiIterator)(m_base), (BidiIterator)(s.first));
+            return ::boost::re_detail::distance((BidiIterator)(m_base), (BidiIterator)(s.first));
          }
       }
       return ~static_cast<difference_type>(0);
@@ -108,7 +110,7 @@ public:
          const sub_match<BidiIterator>& s = m_subs[sub];
          if(s.matched)
          {
-            result = s;
+            result = s.str();
          }
       }
       return result;
@@ -134,7 +136,7 @@ public:
    }
    const_iterator begin() const
    {
-      return (m_subs.size() >= 2) ? (m_subs.begin() + 2) : m_subs.end();
+      return (m_subs.size() > 2) ? (m_subs.begin() + 2) : m_subs.end();
    }
    const_iterator end() const
    {
@@ -151,7 +153,26 @@ public:
    string_type format(const string_type& fmt,
                       match_flag_type flags = format_default) const
    {
-      return regex_format(*this, fmt, flags);
+      return regex_format<BidiIterator, char_type>(*this, fmt, flags);
+   }
+   // format with locale:
+   template <class OutputIterator, class RegexT>
+   OutputIterator format(OutputIterator out,
+                         const string_type& fmt,
+                         match_flag_type flags,
+                         const RegexT& re) const
+   {
+      return ::boost::re_detail::regex_format_imp(out, *this, fmt.data(), fmt.data() + fmt.size(), flags, re.get_traits());
+   }
+   template <class RegexT>
+   string_type format(const string_type& fmt,
+                      match_flag_type flags,
+                      const RegexT& re) const
+   {
+      string_type result;
+      re_detail::string_out_iterator<string_type> i(result);
+      ::boost::re_detail::regex_format_imp(i, *this, fmt.data(), fmt.data() + fmt.size(), flags, re.get_traits());
+      return result;
    }
 
    allocator_type get_allocator() const
@@ -233,6 +254,10 @@ public:
    {
       m_base = pos;
    }
+   BidiIterator base()const
+   {
+      return m_base;
+   }
    void BOOST_REGEX_CALL set_first(BidiIterator i)
    {
       // set up prefix:
@@ -280,13 +305,13 @@ void BOOST_REGEX_CALL match_results<BidiIterator, Allocator>::maybe_assign(const
    {
       //
       // leftmost takes priority over longest:
-      base1 = boost::re_detail::distance(base, p1->first);
-      base2 = boost::re_detail::distance(base, p2->first);
+      base1 = ::boost::re_detail::distance(base, p1->first);
+      base2 = ::boost::re_detail::distance(base, p2->first);
       if(base1 < base2) return;
       if(base2 < base1) break;
 
-      len1 = boost::re_detail::distance((BidiIterator)p1->first, (BidiIterator)p1->second);
-      len2 = boost::re_detail::distance((BidiIterator)p2->first, (BidiIterator)p2->second);
+      len1 = ::boost::re_detail::distance((BidiIterator)p1->first, (BidiIterator)p1->second);
+      len2 = ::boost::re_detail::distance((BidiIterator)p2->first, (BidiIterator)p2->second);
       if((len1 != len2) || ((p1->matched == false) && (p2->matched == true)))
          break;
       if((p1->matched == true) && (p2->matched == false))
@@ -325,6 +350,9 @@ std::ostream& operator << (std::ostream& os,
 }
 #endif
 
+#ifdef BOOST_MSVC
+#pragma warning(pop)
+#endif
 } // namespace boost
 
 #ifdef BOOST_HAS_ABI_HEADERS
diff --git a/include/boost/regex/v4/mem_block_cache.hpp b/include/boost/regex/v4/mem_block_cache.hpp
index abe8bb87..d9cba994 100644
--- a/include/boost/regex/v4/mem_block_cache.hpp
+++ b/include/boost/regex/v4/mem_block_cache.hpp
@@ -19,7 +19,9 @@
 #define BOOST_REGEX_V4_MEM_BLOCK_CACHE_HPP
 
 #include <new>
-#include <boost/regex/v4/regex_synch.hpp>
+#ifdef BOOST_HAS_THREADS
+#include <boost/regex/pending/static_mutex.hpp>
+#endif
 
 #ifdef BOOST_HAS_ABI_HEADERS
 #  include BOOST_ABI_PREFIX
@@ -38,6 +40,9 @@ struct mem_block_cache
    // this member has to be statically initialsed:
    mem_block_node* next;
    unsigned cached_blocks;
+#ifdef BOOST_HAS_THREADS
+   boost::static_mutex mut;
+#endif
 
    ~mem_block_cache()
    {
@@ -51,7 +56,7 @@ struct mem_block_cache
    void* get()
    {
 #ifdef BOOST_HAS_THREADS
-      re_detail::cs_guard g(*re_detail::p_re_lock);
+      boost::static_mutex::scoped_lock g(mut);
 #endif
      if(next)
       {
@@ -65,7 +70,7 @@ struct mem_block_cache
    void put(void* p)
    {
 #ifdef BOOST_HAS_THREADS
-      re_detail::cs_guard g(*re_detail::p_re_lock);
+      boost::static_mutex::scoped_lock g(mut);
 #endif
       if(cached_blocks >= BOOST_REGEX_MAX_CACHE_BLOCKS)
       {
diff --git a/include/boost/regex/v4/perl_matcher.hpp b/include/boost/regex/v4/perl_matcher.hpp
index e3308d56..9fff3ddb 100644
--- a/include/boost/regex/v4/perl_matcher.hpp
+++ b/include/boost/regex/v4/perl_matcher.hpp
@@ -24,7 +24,37 @@ namespace re_detail{
 //
 // error checking API:
 //
-BOOST_REGEX_DECL void BOOST_REGEX_CALL verify_options(boost::regex::flag_type ef, match_flag_type mf);
+BOOST_REGEX_DECL void BOOST_REGEX_CALL verify_options(boost::regex_constants::syntax_option_type ef, match_flag_type mf);
+//
+// function can_start:
+//
+template <class charT>
+bool can_start(charT c, const unsigned char* map, unsigned char mask)
+{
+   return ((c < static_cast<charT>(0)) ? true : ((c >= static_cast<charT>(1 << CHAR_BIT)) ? true : map[c] & mask));
+}
+inline bool can_start(char c, const unsigned char* map, unsigned char mask)
+{
+   return map[(unsigned char)c] & mask;
+}
+inline bool can_start(signed char c, const unsigned char* map, unsigned char mask)
+{
+   return map[(unsigned char)c] & mask;
+}
+inline bool can_start(unsigned char c, const unsigned char* map, unsigned char mask)
+{
+   return map[c] & mask;
+}
+inline bool can_start(unsigned short c, const unsigned char* map, unsigned char mask)
+{
+   return ((c >= (1 << CHAR_BIT)) ? true : map[c] & mask);
+}
+#if defined(WCHAR_MIN) && (WCHAR_MIN == 0) && !defined(BOOST_NO_INTRINSIC_WCHAR_T)
+inline bool can_start(wchar_t c, const unsigned char* map, unsigned char mask)
+{
+   return ((c >= (1 << CHAR_BIT)) ? true : map[c] & mask);
+}
+#endif
 
 
 //
@@ -36,7 +66,9 @@ BOOST_REGEX_DECL void BOOST_REGEX_CALL verify_options(boost::regex::flag_type ef
 // which succeeds when it should not.
 //
 #ifndef _RWSTD_VER
-# define STR_COMP(s,p) s.compare(p)
+template <class C, class T, class A>
+inline int string_compare(const std::basic_string<C,T,A>& s, const C* p)
+{ return s.compare(p); }
 #else
 template <class C, class T, class A>
 inline int string_compare(const std::basic_string<C,T,A>& s, const C* p)
@@ -47,31 +79,43 @@ inline int string_compare(const std::string& s, const char* p)
 inline int string_compare(const std::wstring& s, const wchar_t* p)
 { return std::wcscmp(s.c_str(), p); }
 #endif
-# define STR_COMP(s,p) string_compare(s,p)
 #endif
+#if !BOOST_WORKAROUND(BOOST_MSVC, < 1310)
+template <class Seq, class C>
+inline int string_compare(const Seq& s, const C* p)
+{
+   std::size_t i = 0;
+   while((i < s.size()) && (p[i] == s[i]))
+   {
+      ++i;
+   }
+   return (i == s.size()) ? -p[i] : s[i] - p[i];
+}
+#endif
+# define STR_COMP(s,p) string_compare(s,p)
 
 template<class charT>
 inline const charT* re_skip_past_null(const charT* p)
 {
-  while (*p != 0) ++p;
+  while (*p != static_cast<charT>(0)) ++p;
   return ++p;
 }
 
-template <class iterator, class charT, class traits_type, class Allocator>
+template <class iterator, class charT, class traits_type, class char_classT>
 iterator BOOST_REGEX_CALL re_is_set_member(iterator next, 
                           iterator last, 
-                          const re_set_long* set_, 
-                          const reg_expression<charT, traits_type, Allocator>& e)
+                          const re_set_long<char_classT>* set_, 
+                          const regex_data<charT, traits_type>& e, bool icase)
 {   
    const charT* p = reinterpret_cast<const charT*>(set_+1);
    iterator ptr;
    unsigned int i;
-   bool icase = e.flags() & regex_constants::icase;
+   //bool icase = e.m_flags & regex_constants::icase;
 
    if(next == last) return next;
 
    typedef typename traits_type::string_type traits_string_type;
-   const traits_type& traits_inst = e.get_traits();
+   const ::boost::regex_traits_wrapper<traits_type>& traits_inst = *(e.m_ptraits);
    
    // dwa 9/13/00 suppress incorrect MSVC warning - it claims this is never
    // referenced
@@ -82,12 +126,12 @@ iterator BOOST_REGEX_CALL re_is_set_member(iterator next,
    for(i = 0; i < set_->csingles; ++i)
    {
       ptr = next;
-      if(*p == 0)
+      if(*p == static_cast<charT>(0))
       {
          // treat null string as special case:
          if(traits_inst.translate(*ptr, icase) != *p)
          {
-            while(*p == 0)++p;
+            while(*p == static_cast<charT>(0))++p;
             continue;
          }
          return set_->isnot ? next : (ptr == next) ? ++next : ptr;
@@ -102,7 +146,7 @@ iterator BOOST_REGEX_CALL re_is_set_member(iterator next,
             ++ptr;
          }
 
-         if(*p == 0) // if null we've matched
+         if(*p == static_cast<charT>(0)) // if null we've matched
             return set_->isnot ? next : (ptr == next) ? ++next : ptr;
 
          p = re_skip_past_null(p);     // skip null
@@ -114,23 +158,25 @@ iterator BOOST_REGEX_CALL re_is_set_member(iterator next,
 
    if(set_->cranges || set_->cequivalents)
    {
-      traits_string_type s2(1, col);
       traits_string_type s1;
       //
       // try and match a range, NB only a single character can match
       if(set_->cranges)
       {
-         if((e.flags() & regex_constants::collate) == 0)
-            s1 = s2;
+         if((e.m_flags & regex_constants::collate) == 0)
+            s1.assign(1, col);
          else
-            traits_inst.transform(s1, s2);
+         {
+            charT a[2] = { col, charT(0), };
+            s1 = traits_inst.transform(a, a + 1);
+         }
          for(i = 0; i < set_->cranges; ++i)
          {
-            if(STR_COMP(s1, p) <= 0)
+            if(STR_COMP(s1, p) >= 0)
             {
                do{ ++p; }while(*p);
                ++p;
-               if(STR_COMP(s1, p) >= 0)
+               if(STR_COMP(s1, p) <= 0)
                   return set_->isnot ? next : ++next;
             }
             else
@@ -148,7 +194,8 @@ iterator BOOST_REGEX_CALL re_is_set_member(iterator next,
       // try and match an equivalence class, NB only a single character can match
       if(set_->cequivalents)
       {
-         traits_inst.transform_primary(s1, s2);
+         charT a[2] = { col, charT(0), };
+         s1 = traits_inst.transform_primary(a, a +1);
          for(i = 0; i < set_->cequivalents; ++i)
          {
             if(STR_COMP(s1, p) == 0)
@@ -159,47 +206,19 @@ iterator BOOST_REGEX_CALL re_is_set_member(iterator next,
          }
       }
    }
-   if(traits_inst.is_class(col, set_->cclasses) == true)
+   if(traits_inst.isctype(col, set_->cclasses) == true)
       return set_->isnot ? next : ++next;
    return set_->isnot ? ++next : next;
 }
 
-template <class charT, class traits, class Allocator>
-struct access_t : public reg_expression<charT, traits, Allocator>
-{
-   typedef typename is_byte<charT>::width_type width_type;
-   typedef reg_expression<charT, traits, Allocator> base_type;
-   typedef charT char_type;
-   typedef traits traits_type;
-   typedef Allocator alloc_type;
-
-   static int repeat_count(const base_type& b) 
-   { return base_type::repeat_count(b); }
-   static unsigned int restart_type(const base_type& b) 
-   { return base_type::restart_type(b); }
-   static const re_syntax_base* first(const base_type& b)
-   { return base_type::first(b); }
-   static const unsigned char* get_map(const base_type& b)
-   { return base_type::get_map(b); }
-   static std::size_t leading_length(const base_type& b)
-   { return base_type::leading_length(b); }
-   static const kmp_info<charT>* get_kmp(const base_type& b)
-   { return base_type::get_kmp(b); }
-   static bool can_start(char_type c, const unsigned char* _map, unsigned char mask)
-   {
-      return reg_expression<char_type, traits_type, alloc_type>::can_start(c, _map, mask, width_type());
-   }
-};
-
-
 template <class BidiIterator>
 class repeater_count
 {
    repeater_count** stack;
    repeater_count* next;
    int id;
-   unsigned count;              // the number of iterations so far
-   BidiIterator start_pos; // where the last repeat started
+   std::size_t count;        // the number of iterations so far
+   BidiIterator start_pos;   // where the last repeat started
 public:
    repeater_count(repeater_count** s)
    {
@@ -230,10 +249,10 @@ public:
    {
       *stack = next;
    }
-   unsigned get_count() { return count; }
+   std::size_t get_count() { return count; }
    int get_id() { return id; }
-   int operator++() { return ++count; }
-   bool check_null_repeat(const BidiIterator& pos, unsigned max)
+   std::size_t operator++() { return ++count; }
+   bool check_null_repeat(const BidiIterator& pos, std::size_t max)
    {
       // this is called when we are about to start a new repeat,
       // if the last one was NULL move our count to max,
@@ -268,22 +287,25 @@ enum saved_state_type
    saved_state_count = 14
 };
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
+#ifdef BOOST_MSVC
+#pragma warning(push)
+#pragma warning(disable : 4251 4231 4660)
+#endif
+
+template <class BidiIterator, class Allocator, class traits>
 class perl_matcher
 {
 public:
    typedef typename traits::char_type char_type;
-   typedef perl_matcher<BidiIterator, Allocator, traits, Allocator2> self_type;
+   typedef perl_matcher<BidiIterator, Allocator, traits> self_type;
    typedef bool (self_type::*matcher_proc_type)(void);
-   typedef access_t<char_type, traits, Allocator2> access;
    typedef typename traits::size_type traits_size_type;
-   typedef typename traits::uchar_type traits_uchar_type;
    typedef typename is_byte<char_type>::width_type width_type;
    typedef typename regex_iterator_traits<BidiIterator>::difference_type difference_type;
 
    perl_matcher(BidiIterator first, BidiIterator end, 
       match_results<BidiIterator, Allocator>& what, 
-      const reg_expression<char_type, traits, Allocator2>& e,
+      const basic_regex<char_type, traits>& e,
       match_flag_type f);
 
    bool match();
@@ -334,7 +356,12 @@ private:
    bool match_char_repeat();
    bool match_dot_repeat_fast();
    bool match_dot_repeat_slow();
-   bool backtrack_till_match(unsigned count);
+   bool match_backstep();
+   bool match_assert_backref();
+   bool match_toggle_case();
+#ifdef BOOST_REGEX_RECURSIVE
+   bool backtrack_till_match(std::size_t count);
+#endif
 
    // find procs stored in s_find_vtable:
    bool find_restart_any();
@@ -361,9 +388,9 @@ private:
    // where the current search started from, acts as base for $` during grep:
    BidiIterator search_base;
    // the expression being examined:
-   const reg_expression<char_type, traits, Allocator2>& re;
+   const basic_regex<char_type, traits>& re;
    // the expression's traits class:
-   const traits& traits_inst;
+   const ::boost::regex_traits_wrapper<traits>& traits_inst;
    // the next state in the machine being matched:
    const re_syntax_base* pstate;
    // matching flags in use:
@@ -378,10 +405,16 @@ private:
    bool m_has_partial_match;
    // set to true whenever we get a match:
    bool m_has_found_match;
+   // set to true whenever we're inside an independent sub-expression:
+   bool m_independent;
    // the current repeat being examined:
    repeater_count<BidiIterator>* next_count;
    // the first repeat being examined (top of linked list):
    repeater_count<BidiIterator> rep_obj;
+   // the mask to pass when matching word boundaries:
+   typename traits::char_class_type m_word_mask;
+   // the bitmask to use when determining whether a match_any matches a newline or not:
+   unsigned char match_any_mask;
 
 #ifdef BOOST_REGEX_NON_RECURSIVE
    //
@@ -411,7 +444,7 @@ private:
    void push_assertion(const re_syntax_base* ps, bool positive);
    void push_alt(const re_syntax_base* ps);
    void push_repeater_count(int i, repeater_count<BidiIterator>** s);
-   void push_single_repeat(unsigned c, const re_repeat* r, BidiIterator last_position, int id);
+   void push_single_repeat(std::size_t c, const re_repeat* r, BidiIterator last_position, int id);
    void push_non_greedy_repeat(const re_syntax_base* ps);
 
 
@@ -426,11 +459,20 @@ private:
    unsigned used_block_count;
 #endif
 
-   // these operations aren't allowed, so are declared private:
-   perl_matcher& operator=(const perl_matcher&);
-   perl_matcher(const perl_matcher&);
+   // these operations aren't allowed, so are declared private,
+   // bodies are provided to keep explicit-instantiation requests happy:
+   perl_matcher& operator=(const perl_matcher&)
+   {
+      return *this;
+   }
+   perl_matcher(const perl_matcher& that)
+      : m_result(that.m_result), re(that.re), traits_inst(that.traits_inst), rep_obj(0) {}
 };
 
+#ifdef BOOST_MSVC
+#pragma warning(pop)
+#endif
+
 } // namespace re_detail
 
 #ifdef BOOST_HAS_ABI_HEADERS
diff --git a/include/boost/regex/v4/perl_matcher_common.hpp b/include/boost/regex/v4/perl_matcher_common.hpp
index ad661d22..bb31468b 100644
--- a/include/boost/regex/v4/perl_matcher_common.hpp
+++ b/include/boost/regex/v4/perl_matcher_common.hpp
@@ -31,14 +31,14 @@
 namespace boost{
 namespace re_detail{
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-perl_matcher<BidiIterator, Allocator, traits, Allocator2>::perl_matcher(BidiIterator first, BidiIterator end, 
+template <class BidiIterator, class Allocator, class traits>
+perl_matcher<BidiIterator, Allocator, traits>::perl_matcher(BidiIterator first, BidiIterator end, 
    match_results<BidiIterator, Allocator>& what, 
-   const reg_expression<char_type, traits, Allocator2>& e,
+   const basic_regex<char_type, traits>& e,
    match_flag_type f)
    :  m_result(what), base(first), last(end), 
       position(first), re(e), traits_inst(e.get_traits()), 
-      next_count(&rep_obj), rep_obj(&next_count)
+      m_independent(false), next_count(&rep_obj), rep_obj(&next_count)
 { 
    typedef typename regex_iterator_traits<BidiIterator>::iterator_category category;
    
@@ -54,7 +54,9 @@ perl_matcher<BidiIterator, Allocator, traits, Allocator2>::perl_matcher(BidiIter
    estimate_max_state_count(static_cast<category*>(0));
    if(!(m_match_flags & (match_perl|match_posix)))
    {
-      if((re.flags() & regex_constants::perlex) || (re.flags() & regex_constants::literal))
+      if((re.flags() & (regbase::main_option_type|regbase::no_perl_ex)) == 0)
+         m_match_flags |= match_perl;
+      else if((re.flags() & (regbase::main_option_type|regbase::emacs_ex)) == (regbase::basic_syntax_group|regbase::emacs_ex))
          m_match_flags |= match_perl;
       else
          m_match_flags |= match_posix;
@@ -70,32 +72,40 @@ perl_matcher<BidiIterator, Allocator, traits, Allocator2>::perl_matcher(BidiIter
    m_stack_base = 0;
    m_backup_state = 0;
 #endif
+   // find the value to use for matching word boundaries:
+   const char_type w = static_cast<char_type>('w');
+   m_word_mask = traits_inst.lookup_classname(&w, &w+1);
+   // find bitmask to use for matching '.':
+   match_any_mask = static_cast<unsigned char>((f & match_not_dot_newline) ? re_detail::test_not_newline : re_detail::test_newline);
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-void perl_matcher<BidiIterator, Allocator, traits, Allocator2>::estimate_max_state_count(std::random_access_iterator_tag*)
+template <class BidiIterator, class Allocator, class traits>
+void perl_matcher<BidiIterator, Allocator, traits>::estimate_max_state_count(std::random_access_iterator_tag*)
 {
+   static const difference_type k = 100000;
    difference_type dist = boost::re_detail::distance(base, last);
    traits_size_type states = static_cast<traits_size_type>(re.size());
    states *= states;
-   difference_type lim = (std::numeric_limits<difference_type>::max)() - 100000 - states;
-   if(dist > (difference_type)(lim / states))
-      max_state_count = lim;
+   difference_type lim = ((std::numeric_limits<difference_type>::max)() - k) / states;
+   if(dist >= lim)
+      max_state_count = (std::numeric_limits<difference_type>::max)();
    else
-      max_state_count = 100000 + states * dist;
+      max_state_count = k + states * dist;
 }
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-void perl_matcher<BidiIterator, Allocator, traits, Allocator2>::estimate_max_state_count(void*)
+
+template <class BidiIterator, class Allocator, class traits>
+void perl_matcher<BidiIterator, Allocator, traits>::estimate_max_state_count(void*)
 {
    // we don't know how long the sequence is:
    max_state_count = BOOST_REGEX_MAX_STATE_COUNT;
 }
 
 #ifdef BOOST_REGEX_HAS_MS_STACK_GUARD
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::protected_call(
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::protected_call(
    protected_proc_type proc)
 {
+   /*
    __try{
       return (this->*proc)();
    }__except(EXCEPTION_STACK_OVERFLOW == GetExceptionCode())
@@ -103,24 +113,30 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::protected_call(
       reset_stack_guard_page();
    }
    // we only get here after a stack overflow:
-   raise_error<traits>(traits_inst, REG_E_MEMORY);
+   raise_error<traits>(traits_inst, regex_constants::error_size);
    // and we never really get here at all:
    return false;
+   */
+   ::boost::re_detail::concrete_protected_call
+      <perl_matcher<BidiIterator, Allocator, traits> >
+      obj(this, proc);
+   return obj.execute();
+
 }
 #endif
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match()
 {
 #ifdef BOOST_REGEX_HAS_MS_STACK_GUARD
-   return protected_call(&perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_imp);
+   return protected_call(&perl_matcher<BidiIterator, Allocator, traits>::match_imp);
 #else
    return match_imp();
 #endif
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_imp()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_imp()
 {
    // initialise our stack if we are non-recursive:
 #ifdef BOOST_REGEX_NON_RECURSIVE
@@ -158,28 +174,28 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_imp()
 #endif
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::find()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::find()
 {
 #ifdef BOOST_REGEX_HAS_MS_STACK_GUARD
-   return protected_call(&perl_matcher<BidiIterator, Allocator, traits, Allocator2>::find_imp);
+   return protected_call(&perl_matcher<BidiIterator, Allocator, traits>::find_imp);
 #else
    return find_imp();
 #endif
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::find_imp()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::find_imp()
 {
    static matcher_proc_type const s_find_vtable[7] = 
    {
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::find_restart_any,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::find_restart_word,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::find_restart_line,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::find_restart_buf,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_prefix,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::find_restart_lit,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::find_restart_lit,
+      &perl_matcher<BidiIterator, Allocator, traits>::find_restart_any,
+      &perl_matcher<BidiIterator, Allocator, traits>::find_restart_word,
+      &perl_matcher<BidiIterator, Allocator, traits>::find_restart_line,
+      &perl_matcher<BidiIterator, Allocator, traits>::find_restart_buf,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_prefix,
+      &perl_matcher<BidiIterator, Allocator, traits>::find_restart_lit,
+      &perl_matcher<BidiIterator, Allocator, traits>::find_restart_lit,
    };
 
    // initialise our stack if we are non-recursive:
@@ -197,7 +213,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::find_imp()
       // reset our state machine:
       position = base;
       search_base = base;
-      pstate = access::first(re);
+      pstate = re.get_first_state();
       m_presult->set_size((m_match_flags & match_nosubs) ? 1 : re.mark_count(), base, last);
       m_presult->set_base(base);
       m_match_flags |= regex_constants::match_init;
@@ -230,7 +246,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::find_imp()
    // find out what kind of expression we have:
    unsigned type = (m_match_flags & match_continuous) ? 
       static_cast<unsigned int>(regbase::restart_continue) 
-         : static_cast<unsigned int>(access::restart_type(re));
+         : static_cast<unsigned int>(re.get_restart_type());
 
    // call the appropriate search routine:
    matcher_proc_type proc = s_find_vtable[type];
@@ -249,12 +265,12 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::find_imp()
 #endif
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_prefix()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_prefix()
 {
    m_has_partial_match = false;
    m_has_found_match = false;
-   pstate = access::first(re);
+   pstate = re.get_first_state();
    m_presult->set_first(position);
    restart = position;
    match_all_states();
@@ -282,8 +298,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_prefix()
    return m_has_found_match;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_endmark()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_endmark()
 {
    int index = static_cast<const re_brace*>(pstate)->index;
    if(index > 0)
@@ -291,7 +307,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_endmark()
       if((m_match_flags & match_nosubs) == 0)
          m_presult->set_second(position, index);
    }
-   else if(index < 0)
+   else if((index < 0) && (index != -4))
    {
       // matched forward lookahead:
       pstate = 0;
@@ -301,8 +317,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_endmark()
    return true;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_literal()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_literal()
 {
    unsigned int len = static_cast<const re_literal*>(pstate)->length;
    const char_type* what = reinterpret_cast<const char_type*>(static_cast<const re_literal*>(pstate) + 1);
@@ -318,8 +334,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_literal()
    return true;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_start_line()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_start_line()
 {
    if(position == base)
    {
@@ -341,13 +357,13 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_start_line
    --t;
    if(position != last)
    {
-      if(traits_inst.is_separator(*t) && !((*t == '\r') && (*position == '\n')) )
+      if(is_separator(*t) && !((*t == static_cast<char_type>('\r')) && (*position == static_cast<char_type>('\n'))) )
       {
          pstate = pstate->next.p;
          return true;
       }
    }
-   else if(traits_inst.is_separator(*t))
+   else if(is_separator(*t))
    {
       pstate = pstate->next.p;
       return true;
@@ -355,22 +371,22 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_start_line
    return false;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_end_line()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_end_line()
 {
    if(position != last)
    {
       if(m_match_flags & match_single_line)
          return false;
       // we're not yet at the end so *first is always valid:
-      if(traits_inst.is_separator(*position))
+      if(is_separator(*position))
       {
          if((position != base) || (m_match_flags & match_prev_avail))
          {
             // check that we're not in the middle of \r\n sequence
             BidiIterator t(position);
             --t;
-            if((*t == '\r') && (*position == '\n'))
+            if((*t == static_cast<char_type>('\r')) && (*position == static_cast<char_type>('\n')))
             {
                return false;
             }
@@ -387,12 +403,12 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_end_line()
    return false;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_wild()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_wild()
 {
    if(position == last) 
       return false;
-   if(traits_inst.is_separator(*position) && (m_match_flags & match_not_dot_newline))
+   if(is_separator(*position) && ((match_any_mask & static_cast<const re_dot*>(pstate)->mask) == 0))
       return false;
    if((*position == char_type(0)) && (m_match_flags & match_not_dot_null))
       return false;
@@ -401,8 +417,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_wild()
    return true;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_match()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_match()
 {
    if((m_match_flags & match_not_null) && (position == (*m_presult)[0].first))
       return false;
@@ -430,17 +446,17 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_match()
    return true;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_word_boundary()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_word_boundary()
 {
    bool b; // indcates whether next character is a word character
    if(position != last)
    {
       // prev and this character must be opposites:
    #if defined(BOOST_REGEX_USE_C_LOCALE) && defined(__GNUC__) && (__GNUC__ == 2) && (__GNUC_MINOR__ < 95)
-      b = traits::is_class(*position, traits::char_class_word);
+      b = traits::isctype(*position, m_word_mask);
    #else
-      b = traits_inst.is_class(*position, traits::char_class_word);
+      b = traits_inst.isctype(*position, m_word_mask);
    #endif
    }
    else
@@ -457,7 +473,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_word_bound
    else
    {
       --position;
-      b ^= traits_inst.is_class(*position, traits::char_class_word);
+      b ^= traits_inst.isctype(*position, m_word_mask);
       ++position;
    }
    if(b)
@@ -468,13 +484,13 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_word_bound
    return false; // no match if we get to here...
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_within_word()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_within_word()
 {
    if(position == last)
       return false;
-   // both prev and this character must be traits::char_class_word:
-   if(traits_inst.is_class(*position, traits::char_class_word))
+   // both prev and this character must be m_word_mask:
+   if(traits_inst.isctype(*position, m_word_mask))
    {
       bool b;
       if((position == base) && ((m_match_flags & match_prev_avail) == 0))
@@ -482,7 +498,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_within_wor
       else
       {
          --position;
-         b = traits_inst.is_class(*position, traits::char_class_word);
+         b = traits_inst.isctype(*position, m_word_mask);
          ++position;
       }
       if(b)
@@ -494,12 +510,12 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_within_wor
    return false;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_word_start()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_word_start()
 {
    if(position == last)
       return false; // can't be starting a word if we're already at the end of input
-   if(!traits_inst.is_class(*position, traits::char_class_word))
+   if(!traits_inst.isctype(*position, m_word_mask))
       return false; // next character isn't a word character
    if((position == base) && ((m_match_flags & match_prev_avail) == 0))
    {
@@ -511,7 +527,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_word_start
       // otherwise inside buffer:
       BidiIterator t(position);
       --t;
-      if(traits_inst.is_class(*t, traits::char_class_word))
+      if(traits_inst.isctype(*t, m_word_mask))
          return false; // previous character not non-word
    }
    // OK we have a match:
@@ -519,14 +535,14 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_word_start
    return true;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_word_end()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_word_end()
 {
    if((position == base) && ((m_match_flags & match_prev_avail) == 0))
       return false;  // start of buffer can't be end of word
    BidiIterator t(position);
    --t;
-   if(traits_inst.is_class(*t, traits::char_class_word) == false)
+   if(traits_inst.isctype(*t, m_word_mask) == false)
       return false;  // previous character wasn't a word character
 
    if(position == last)
@@ -537,15 +553,15 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_word_end()
    else
    {
       // otherwise inside buffer:
-      if(traits_inst.is_class(*position, traits::char_class_word))
+      if(traits_inst.isctype(*position, m_word_mask))
          return false; // next character is a word character
    }
    pstate = pstate->next.p;
    return true;      // if we fall through to here then we've succeeded
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_buffer_start()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_buffer_start()
 {
    if((position != base) || (m_match_flags & match_not_bob))
       return false;
@@ -554,8 +570,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_buffer_sta
    return true;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_buffer_end()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_buffer_end()
 {
    if((position != last) || (m_match_flags & match_not_eob))
       return false;
@@ -564,8 +580,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_buffer_end
    return true;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_backref()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_backref()
 {
    // compare with what we previously matched:
    BidiIterator i = (*m_presult)[static_cast<const re_brace*>(pstate)->index].first;
@@ -581,13 +597,14 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_backref()
    return true;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_long_set()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_long_set()
 {
+   typedef typename traits::char_class_type char_class_type;
    // let the traits class do the work:
    if(position == last)
       return false;
-   BidiIterator t = re_is_set_member(position, last, static_cast<const re_set_long*>(pstate), re);
+   BidiIterator t = re_is_set_member(position, last, static_cast<const re_set_long<char_class_type>*>(pstate), re.get_data(), icase);
    if(t != position)
    {
       pstate = pstate->next.p;
@@ -597,12 +614,12 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_long_set()
    return false;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_set()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_set()
 {
    if(position == last)
       return false;
-   if(static_cast<const re_set*>(pstate)->_map[(traits_uchar_type)traits_inst.translate(*position, icase)])
+   if(static_cast<const re_set*>(pstate)->_map[static_cast<unsigned char>(traits_inst.translate(*position, icase))])
    {
       pstate = pstate->next.p;
       ++position;
@@ -611,42 +628,42 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_set()
    return false;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_jump()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_jump()
 {
    pstate = static_cast<const re_jump*>(pstate)->alt.p;
    return true;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_combining()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_combining()
 {
    if(position == last)
       return false;
-   if(traits_inst.is_combining(traits_inst.translate(*position, icase)))
+   if(is_combining(traits_inst.translate(*position, icase)))
       return false;
    ++position;
-   while((position != last) && traits_inst.is_combining(traits_inst.translate(*position, icase)))
+   while((position != last) && is_combining(traits_inst.translate(*position, icase)))
       ++position;
    pstate = pstate->next.p;
    return true;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_soft_buffer_end()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_soft_buffer_end()
 {
    if(m_match_flags & match_not_eob)
       return false;
    BidiIterator p(position);
-   while((p != last) && traits_inst.is_separator(traits_inst.translate(*p, icase)))++p;
+   while((p != last) && is_separator(traits_inst.translate(*p, icase)))++p;
    if(p != last)
       return false;
    pstate = pstate->next.p;
    return true;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_restart_continue()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_restart_continue()
 {
    if(position == search_base)
    {
@@ -656,23 +673,53 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_restart_co
    return false;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::find_restart_any()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_backstep()
+{
+   std::ptrdiff_t maxlen = ::boost::re_detail::distance(search_base, position);
+   if(maxlen < static_cast<const re_brace*>(pstate)->index)
+      return false;
+   std::advance(position, -static_cast<const re_brace*>(pstate)->index);
+   pstate = pstate->next.p;
+   return true;
+}
+
+template <class BidiIterator, class Allocator, class traits>
+inline bool perl_matcher<BidiIterator, Allocator, traits>::match_assert_backref()
+{
+   // return true if marked sub-expression N has been matched:
+   bool result = (*m_presult)[static_cast<const re_brace*>(pstate)->index].matched;
+   pstate = pstate->next.p;
+   return result;
+}
+
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_toggle_case()
+{
+   // change our case sensitivity:
+   this->icase = static_cast<const re_case*>(pstate)->icase;
+   pstate = pstate->next.p;
+   return true;
+}
+
+
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::find_restart_any()
 {
 #ifdef BOOST_MSVC
 #pragma warning(push)
 #pragma warning(disable:4127)
 #endif
-   const unsigned char* _map = access::get_map(re);
+   const unsigned char* _map = re.get_map();
    while(true)
    {
       // skip everything we can't match:
-      while((position != last) && !access::can_start(*position, _map, (unsigned char)mask_any) )
+      while((position != last) && !can_start(*position, _map, (unsigned char)mask_any) )
          ++position;
       if(position == last)
       {
          // run out of characters, try a null match if possible:
-         if(access::first(re)->can_be_null)
+         if(re.can_be_null())
             return match_prefix();
          break;
       }
@@ -689,29 +736,29 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::find_restart_any
 #endif
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::find_restart_word()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::find_restart_word()
 {
 #ifdef BOOST_MSVC
 #pragma warning(push)
 #pragma warning(disable:4127)
 #endif
    // do search optimised for word starts:
-   const unsigned char* _map = access::get_map(re);
+   const unsigned char* _map = re.get_map();
    if((m_match_flags & match_prev_avail) || (position != base))
       --position;
    else if(match_prefix())
       return true;
    do
    {
-      while((position != last) && traits_inst.is_class(*position, traits::char_class_word))
+      while((position != last) && traits_inst.isctype(*position, m_word_mask))
          ++position;
-      while((position != last) && !traits_inst.is_class(*position, traits::char_class_word))
+      while((position != last) && !traits_inst.isctype(*position, m_word_mask))
          ++position;
       if(position == last)
          break;
 
-      if(access::can_start(*position, _map, (unsigned char)mask_any) )
+      if(can_start(*position, _map, (unsigned char)mask_any) )
       {
          if(match_prefix())
             return true;
@@ -725,28 +772,28 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::find_restart_wor
 #endif
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::find_restart_line()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::find_restart_line()
 {
    // do search optimised for line starts:
-   const unsigned char* _map = access::get_map(re);
+   const unsigned char* _map = re.get_map();
    if(match_prefix())
       return true;
    while(position != last)
    {
-      while((position != last) && (*position != '\n'))
+      while((position != last) && !is_separator(*position))
          ++position;
       if(position == last)
          return false;
       ++position;
       if(position == last)
       {
-         if((access::first(re)->can_be_null) && match_prefix())
+         if(re.can_be_null() && match_prefix())
             return true;
          return false;
       }
 
-      if( access::can_start(*position, _map, (unsigned char)mask_any) )
+      if( can_start(*position, _map, (unsigned char)mask_any) )
       {
          if(match_prefix())
             return true;
@@ -758,23 +805,24 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::find_restart_lin
    return false;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::find_restart_buf()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::find_restart_buf()
 {
    if((position == base) && ((m_match_flags & match_not_bob) == 0))
       return match_prefix();
    return false;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::find_restart_lit()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::find_restart_lit()
 {
+#if 0
    if(position == last)
       return false; // can't possibly match if we're at the end already
 
    unsigned type = (m_match_flags & match_continuous) ? 
       static_cast<unsigned int>(regbase::restart_continue) 
-         : static_cast<unsigned int>(access::restart_type(re));
+         : static_cast<unsigned int>(re.get_restart_type());
 
    const kmp_info<char_type>* info = access::get_kmp(re);
    int len = info->len;
@@ -823,6 +871,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::find_restart_lit
       std::advance(position, -j);
       return match_prefix();
    }
+#endif
    return false;
 }
 
diff --git a/include/boost/regex/v4/perl_matcher_non_recursive.hpp b/include/boost/regex/v4/perl_matcher_non_recursive.hpp
index 79e0e9bb..663ba6c9 100644
--- a/include/boost/regex/v4/perl_matcher_non_recursive.hpp
+++ b/include/boost/regex/v4/perl_matcher_non_recursive.hpp
@@ -40,10 +40,10 @@ struct saved_state
 {
    union{
       unsigned int id;
-      // these ensure that this struct gets the same alignment as derived structs:
-      void* padding1;
-      std::size_t padding2;
-      std::ptrdiff_t padding3;
+      // this padding ensures correct alignment on 64-bit platforms:
+      std::size_t padding1;
+      std::ptrdiff_t padding2;
+      void* padding3;
    };
    saved_state(unsigned i) : id(i) {}
 };
@@ -109,44 +109,47 @@ struct save_state_init
 template <class BidiIterator>
 struct saved_single_repeat : public saved_state
 {
-   unsigned count;
+   std::size_t count;
    const re_repeat* rep;
    BidiIterator last_position;
-   saved_single_repeat(unsigned c, const re_repeat* r, BidiIterator lp, int arg_id) 
+   saved_single_repeat(std::size_t c, const re_repeat* r, BidiIterator lp, int arg_id) 
       : saved_state(arg_id), count(c), rep(r), last_position(lp){}
 };
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_all_states()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_all_states()
 {
-   static matcher_proc_type const s_match_vtable[26] = 
+   static matcher_proc_type const s_match_vtable[29] = 
    {
-      (&perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_startmark),
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_endmark,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_literal,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_start_line,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_end_line,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_wild,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_match,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_word_boundary,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_within_word,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_word_start,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_word_end,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_buffer_start,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_buffer_end,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_backref,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_long_set,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_set,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_jump,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_alt,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_rep,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_combining,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_soft_buffer_end,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_restart_continue,
-      (::boost::is_random_access_iterator<BidiIterator>::value ? &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_dot_repeat_fast : &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_dot_repeat_slow),
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_char_repeat,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_set_repeat,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_long_set_repeat,
+      (&perl_matcher<BidiIterator, Allocator, traits>::match_startmark),
+      &perl_matcher<BidiIterator, Allocator, traits>::match_endmark,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_literal,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_start_line,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_end_line,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_wild,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_match,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_word_boundary,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_within_word,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_word_start,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_word_end,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_buffer_start,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_buffer_end,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_backref,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_long_set,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_set,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_jump,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_alt,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_rep,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_combining,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_soft_buffer_end,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_restart_continue,
+      (::boost::is_random_access_iterator<BidiIterator>::value ? &perl_matcher<BidiIterator, Allocator, traits>::match_dot_repeat_fast : &perl_matcher<BidiIterator, Allocator, traits>::match_dot_repeat_slow),
+      &perl_matcher<BidiIterator, Allocator, traits>::match_char_repeat,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_set_repeat,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_long_set_repeat,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_backstep,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_assert_backref,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_toggle_case,
    };
 
    push_recursion_stopper();
@@ -158,8 +161,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_all_states
          if(!(this->*proc)())
          {
             if(state_count > max_state_count)
-               raise_error(traits_inst, REG_ESPACE);
-            if((m_match_flags & match_partial) && (position == last))
+               raise_error(traits_inst, regex_constants::error_space);
+            if((m_match_flags & match_partial) && (position == last) && (position != search_base))
                m_has_partial_match = true;
             if(false == unwind(false))
                return m_recursive_result;
@@ -169,8 +172,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_all_states
    return m_recursive_result;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-void perl_matcher<BidiIterator, Allocator, traits, Allocator2>::extend_stack()
+template <class BidiIterator, class Allocator, class traits>
+void perl_matcher<BidiIterator, Allocator, traits>::extend_stack()
 {
    if(used_block_count)
    {
@@ -186,11 +189,11 @@ void perl_matcher<BidiIterator, Allocator, traits, Allocator2>::extend_stack()
       m_backup_state = block;
    }
    else
-      raise_error(traits_inst, REG_E_MEMORY);
+      raise_error(traits_inst, regex_constants::error_size);
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-inline void perl_matcher<BidiIterator, Allocator, traits, Allocator2>::push_matched_paren(int index, const sub_match<BidiIterator>& sub)
+template <class BidiIterator, class Allocator, class traits>
+inline void perl_matcher<BidiIterator, Allocator, traits>::push_matched_paren(int index, const sub_match<BidiIterator>& sub)
 {
    assert(index);
    saved_matched_paren<BidiIterator>* pmp = static_cast<saved_matched_paren<BidiIterator>*>(m_backup_state);
@@ -205,8 +208,8 @@ inline void perl_matcher<BidiIterator, Allocator, traits, Allocator2>::push_matc
    m_backup_state = pmp;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-inline void perl_matcher<BidiIterator, Allocator, traits, Allocator2>::push_recursion_stopper()
+template <class BidiIterator, class Allocator, class traits>
+inline void perl_matcher<BidiIterator, Allocator, traits>::push_recursion_stopper()
 {
    saved_state* pmp = m_backup_state;
    --pmp;
@@ -220,8 +223,8 @@ inline void perl_matcher<BidiIterator, Allocator, traits, Allocator2>::push_recu
    m_backup_state = pmp;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-inline void perl_matcher<BidiIterator, Allocator, traits, Allocator2>::push_assertion(const re_syntax_base* ps, bool positive)
+template <class BidiIterator, class Allocator, class traits>
+inline void perl_matcher<BidiIterator, Allocator, traits>::push_assertion(const re_syntax_base* ps, bool positive)
 {
    saved_assertion<BidiIterator>* pmp = static_cast<saved_assertion<BidiIterator>*>(m_backup_state);
    --pmp;
@@ -235,8 +238,8 @@ inline void perl_matcher<BidiIterator, Allocator, traits, Allocator2>::push_asse
    m_backup_state = pmp;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-inline void perl_matcher<BidiIterator, Allocator, traits, Allocator2>::push_alt(const re_syntax_base* ps)
+template <class BidiIterator, class Allocator, class traits>
+inline void perl_matcher<BidiIterator, Allocator, traits>::push_alt(const re_syntax_base* ps)
 {
    saved_position<BidiIterator>* pmp = static_cast<saved_position<BidiIterator>*>(m_backup_state);
    --pmp;
@@ -250,8 +253,8 @@ inline void perl_matcher<BidiIterator, Allocator, traits, Allocator2>::push_alt(
    m_backup_state = pmp;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-inline void perl_matcher<BidiIterator, Allocator, traits, Allocator2>::push_non_greedy_repeat(const re_syntax_base* ps)
+template <class BidiIterator, class Allocator, class traits>
+inline void perl_matcher<BidiIterator, Allocator, traits>::push_non_greedy_repeat(const re_syntax_base* ps)
 {
    saved_position<BidiIterator>* pmp = static_cast<saved_position<BidiIterator>*>(m_backup_state);
    --pmp;
@@ -265,8 +268,8 @@ inline void perl_matcher<BidiIterator, Allocator, traits, Allocator2>::push_non_
    m_backup_state = pmp;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-inline void perl_matcher<BidiIterator, Allocator, traits, Allocator2>::push_repeater_count(int i, repeater_count<BidiIterator>** s)
+template <class BidiIterator, class Allocator, class traits>
+inline void perl_matcher<BidiIterator, Allocator, traits>::push_repeater_count(int i, repeater_count<BidiIterator>** s)
 {
    saved_repeater<BidiIterator>* pmp = static_cast<saved_repeater<BidiIterator>*>(m_backup_state);
    --pmp;
@@ -280,8 +283,8 @@ inline void perl_matcher<BidiIterator, Allocator, traits, Allocator2>::push_repe
    m_backup_state = pmp;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-inline void perl_matcher<BidiIterator, Allocator, traits, Allocator2>::push_single_repeat(unsigned c, const re_repeat* r, BidiIterator last_position, int id)
+template <class BidiIterator, class Allocator, class traits>
+inline void perl_matcher<BidiIterator, Allocator, traits>::push_single_repeat(std::size_t c, const re_repeat* r, BidiIterator last_position, int id)
 {
    saved_single_repeat<BidiIterator>* pmp = static_cast<saved_single_repeat<BidiIterator>*>(m_backup_state);
    --pmp;
@@ -295,8 +298,8 @@ inline void perl_matcher<BidiIterator, Allocator, traits, Allocator2>::push_sing
    m_backup_state = pmp;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_startmark()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_startmark()
 {
    int index = static_cast<const re_brace*>(pstate)->index;
    switch(index)
@@ -316,10 +319,13 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_startmark(
    case -3:
       {
          // independent sub-expression, currently this is always recursive:
+         bool old_independent = m_independent;
+		   m_independent = true;
          const re_syntax_base* next_pstate = static_cast<const re_jump*>(pstate->next.p)->alt.p->next.p;
          pstate = pstate->next.p->next.p;
          bool r = match_all_states();
          pstate = next_pstate;
+		   m_independent = old_independent;
 #ifdef BOOST_REGEX_MATCH_EXTRA
          if(r && (m_match_flags & match_extra))
          {
@@ -349,6 +355,37 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_startmark(
 #endif
          return r;
       }
+   case -4:
+      {
+      // conditional expression:
+      const re_alt* alt = static_cast<const re_alt*>(pstate->next.p);
+      BOOST_ASSERT(alt->type == syntax_element_alt);
+      pstate = alt->next.p;
+      if(pstate->type == syntax_element_assert_backref)
+      {
+         if(!match_assert_backref())
+            pstate = alt->alt.p;
+         break;
+      }
+      else
+      {
+         // zero width assertion, have to match this recursively:
+         BOOST_ASSERT(pstate->type == syntax_element_startmark);
+         bool negated = static_cast<const re_brace*>(pstate)->index == -2;
+         BidiIterator saved_position = position;
+         const re_syntax_base* next_pstate = static_cast<const re_jump*>(pstate->next.p)->alt.p->next.p;
+         pstate = pstate->next.p->next.p;
+         bool r = match_all_states();
+         position = saved_position;
+         if(negated)
+            r = !r;
+         if(r)
+            pstate = next_pstate;
+         else
+            pstate = alt->alt.p;
+         break;
+      }
+      }
    default:
    {
       assert(index > 0);
@@ -364,11 +401,11 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_startmark(
    return true;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_alt()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_alt()
 {
    bool take_first, take_second;
-   const re_jump* jmp = static_cast<const re_jump*>(pstate);
+   const re_alt* jmp = static_cast<const re_alt*>(pstate);
 
    // find out which of these two alternatives we need to take:
    if(position == last)
@@ -378,8 +415,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_alt()
    }
    else
    {
-      take_first = access::can_start(*position, jmp->_map, (unsigned char)mask_take);
-      take_second = access::can_start(*position, jmp->_map, (unsigned char)mask_skip);
+      take_first = can_start(*position, jmp->_map, (unsigned char)mask_take);
+      take_second = can_start(*position, jmp->_map, (unsigned char)mask_skip);
   }
 
    if(take_first)
@@ -401,8 +438,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_alt()
    return false;  // neither option is possible
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_rep()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_rep()
 {
 #ifdef BOOST_MSVC
 #pragma warning(push)
@@ -422,8 +459,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_rep()
    }
    else
    {
-      take_first = access::can_start(*position, rep->_map, (unsigned char)mask_take);
-      take_second = access::can_start(*position, rep->_map, (unsigned char)mask_skip);
+      take_first = can_start(*position, rep->_map, (unsigned char)mask_take);
+      take_second = can_start(*position, rep->_map, (unsigned char)mask_skip);
    }
 
    if(take_first || (next_count->get_id() != rep->id))
@@ -452,7 +489,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_rep()
       return false;
    }
 
-   if(rep->greedy)
+   bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);	
+   if(greedy)
    {
       // try and take the repeat if we can:
       if((next_count->get_count() < rep->max) && take_first)
@@ -501,8 +539,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_rep()
 #endif
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_dot_repeat_slow()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_dot_repeat_slow()
 {
    unsigned count = 0;
    const re_repeat* rep = static_cast<const re_repeat*>(pstate);
@@ -515,7 +553,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_dot_repeat
          return false;
       ++count;
    }
-   if(rep->greedy)
+   bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);	
+   if(greedy)
    {
       // repeat for as long as we can:
       while(count < rep->max)
@@ -541,18 +580,21 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_dot_repeat
       if(count < rep->max)
          push_single_repeat(count, rep, position, saved_state_rep_slow_dot);
       pstate = rep->alt.p;
-      return (position == last) ? (rep->can_be_null & mask_skip) : access::can_start(*position, rep->_map, mask_skip);
+      return (position == last) ? (rep->can_be_null & mask_skip) : can_start(*position, rep->_map, mask_skip);
    }
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_dot_repeat_fast()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_dot_repeat_fast()
 {
-   if(m_match_flags & (match_not_dot_newline | match_not_dot_null))
+   if(m_match_flags & match_not_dot_null)
+      return match_dot_repeat_slow();
+   if((static_cast<const re_dot*>(pstate->next.p)->mask & match_any_mask) == 0)
       return match_dot_repeat_slow();
 
    const re_repeat* rep = static_cast<const re_repeat*>(pstate);
-   unsigned count = (std::min)(static_cast<unsigned>(re_detail::distance(position, last)), static_cast<unsigned>(rep->greedy ? rep->max : rep->min));
+   bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);	
+   unsigned count = static_cast<unsigned>((std::min)(static_cast<unsigned>(::boost::re_detail::distance(position, last)), static_cast<unsigned>(greedy ? rep->max : rep->min)));
    if(rep->min > count)
    {
       position = last;
@@ -560,7 +602,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_dot_repeat
    }
    std::advance(position, count);
 
-   if(rep->greedy)
+   if(greedy)
    {
       if((rep->leading) && (count < rep->max))
          restart = position;
@@ -577,12 +619,12 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_dot_repeat
       if(count < rep->max)
          push_single_repeat(count, rep, position, saved_state_rep_fast_dot);
       pstate = rep->alt.p;
-      return (position == last) ? (rep->can_be_null & mask_skip) : access::can_start(*position, rep->_map, mask_skip);
+      return (position == last) ? (rep->can_be_null & mask_skip) : can_start(*position, rep->_map, mask_skip);
    }
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_char_repeat()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_char_repeat()
 {
 #ifdef BOOST_MSVC
 #pragma warning(push)
@@ -594,21 +636,22 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_char_repea
    const re_repeat* rep = static_cast<const re_repeat*>(pstate);
    assert(1 == static_cast<const re_literal*>(rep->next.p)->length);
    const char_type what = *reinterpret_cast<const char_type*>(static_cast<const re_literal*>(rep->next.p) + 1);
-   unsigned count = 0;
+   std::size_t count = 0;
    //
    // start by working out how much we can skip:
    //
-   unsigned desired = rep->greedy ? rep->max : rep->min;
+   bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);	
+   std::size_t desired = greedy ? rep->max : rep->min;
    if(::boost::is_random_access_iterator<BidiIterator>::value)
    {
       BidiIterator end = position;
-      std::advance(end, (std::min)((unsigned)re_detail::distance(position, last), desired));
+      std::advance(end, (std::min)((std::size_t)::boost::re_detail::distance(position, last), desired));
       BidiIterator origin(position);
       while((position != end) && (traits_inst.translate(*position, icase) == what))
       {
          ++position;
       }
-      count = (unsigned)re_detail::distance(origin, position);
+      count = (unsigned)::boost::re_detail::distance(origin, position);
    }
    else
    {
@@ -622,7 +665,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_char_repea
    if(count < rep->min)
       return false;
 
-   if(rep->greedy)
+   if(greedy)
    {
       if((rep->leading) && (count < rep->max))
          restart = position;
@@ -639,7 +682,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_char_repea
       if(count < rep->max)
          push_single_repeat(count, rep, position, saved_state_rep_char);
       pstate = rep->alt.p;
-      return (position == last) ? (rep->can_be_null & mask_skip) : access::can_start(*position, rep->_map, mask_skip);
+      return (position == last) ? (rep->can_be_null & mask_skip) : can_start(*position, rep->_map, mask_skip);
    }
 #ifdef __BORLANDC__
 #pragma option pop
@@ -649,8 +692,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_char_repea
 #endif
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_set_repeat()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_set_repeat()
 {
 #ifdef BOOST_MSVC
 #pragma warning(push)
@@ -661,25 +704,26 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_set_repeat
 #endif
    const re_repeat* rep = static_cast<const re_repeat*>(pstate);
    const unsigned char* map = static_cast<const re_set*>(rep->next.p)->_map;
-   unsigned count = 0;
+   std::size_t count = 0;
    //
    // start by working out how much we can skip:
    //
-   unsigned desired = rep->greedy ? rep->max : rep->min;
+   bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);	
+   std::size_t desired = greedy ? rep->max : rep->min;
    if(::boost::is_random_access_iterator<BidiIterator>::value)
    {
       BidiIterator end = position;
-      std::advance(end, (std::min)((unsigned)re_detail::distance(position, last), desired));
+      std::advance(end, (std::min)((std::size_t)::boost::re_detail::distance(position, last), desired));
       BidiIterator origin(position);
-      while((position != end) && map[(traits_uchar_type)traits_inst.translate(*position, icase)])
+      while((position != end) && map[static_cast<unsigned char>(traits_inst.translate(*position, icase))])
       {
          ++position;
       }
-      count = (unsigned)re_detail::distance(origin, position);
+      count = (unsigned)::boost::re_detail::distance(origin, position);
    }
    else
    {
-      while((count < desired) && (position != last) && map[(traits_uchar_type)traits_inst.translate(*position, icase)])
+      while((count < desired) && (position != last) && map[static_cast<unsigned char>(traits_inst.translate(*position, icase))])
       {
          ++position;
          ++count;
@@ -689,7 +733,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_set_repeat
    if(count < rep->min)
       return false;
 
-   if(rep->greedy)
+   if(greedy)
    {
       if((rep->leading) && (count < rep->max))
          restart = position;
@@ -706,7 +750,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_set_repeat
       if(count < rep->max)
          push_single_repeat(count, rep, position, saved_state_rep_short_set);
       pstate = rep->alt.p;
-      return (position == last) ? (rep->can_be_null & mask_skip) : access::can_start(*position, rep->_map, mask_skip);
+      return (position == last) ? (rep->can_be_null & mask_skip) : can_start(*position, rep->_map, mask_skip);
    }
 #ifdef __BORLANDC__
 #pragma option pop
@@ -716,8 +760,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_set_repeat
 #endif
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_long_set_repeat()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_long_set_repeat()
 {
 #ifdef BOOST_MSVC
 #pragma warning(push)
@@ -726,27 +770,29 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_long_set_r
 #ifdef __BORLANDC__
 #pragma option push -w-8008 -w-8066 -w-8004
 #endif
+	typedef typename traits::char_class_type mask_type;
    const re_repeat* rep = static_cast<const re_repeat*>(pstate);
-   const re_set_long* set = static_cast<const re_set_long*>(pstate->next.p);
-   unsigned count = 0;
+   const re_set_long<mask_type>* set = static_cast<const re_set_long<mask_type>*>(pstate->next.p);
+   std::size_t count = 0;
    //
    // start by working out how much we can skip:
    //
-   unsigned desired = rep->greedy ? rep->max : rep->min;
+   bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);	
+   std::size_t desired = greedy ? rep->max : rep->min;
    if(::boost::is_random_access_iterator<BidiIterator>::value)
    {
       BidiIterator end = position;
-      std::advance(end, (std::min)((unsigned)re_detail::distance(position, last), desired));
+      std::advance(end, (std::min)((std::size_t)::boost::re_detail::distance(position, last), desired));
       BidiIterator origin(position);
-      while((position != end) && (position != re_is_set_member(position, last, set, re)))
+      while((position != end) && (position != re_is_set_member(position, last, set, re.get_data(), icase)))
       {
          ++position;
       }
-      count = (unsigned)re_detail::distance(origin, position);
+      count = (unsigned)::boost::re_detail::distance(origin, position);
    }
    else
    {
-      while((count < desired) && (position != last) && (position != re_is_set_member(position, last, set, re)))
+      while((count < desired) && (position != last) && (position != re_is_set_member(position, last, set, re.get_data(), icase)))
       {
          ++position;
          ++count;
@@ -756,7 +802,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_long_set_r
    if(count < rep->min)
       return false;
 
-   if(rep->greedy)
+   if(greedy)
    {
       if((rep->leading) && (count < rep->max))
          restart = position;
@@ -773,7 +819,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_long_set_r
       if(count < rep->max)
          push_single_repeat(count, rep, position, saved_state_rep_long_set);
       pstate = rep->alt.p;
-      return (position == last) ? (rep->can_be_null & mask_skip) : access::can_start(*position, rep->_map, mask_skip);
+      return (position == last) ? (rep->can_be_null & mask_skip) : can_start(*position, rep->_map, mask_skip);
    }
 #ifdef __BORLANDC__
 #pragma option pop
@@ -790,25 +836,25 @@ unwinding does in the recursive implementation.
 
 ****************************************************************************/
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind(bool have_match)
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::unwind(bool have_match)
 {
    static unwind_proc_type const s_unwind_table[14] = 
    {
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_end,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_paren,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_recursion_stopper,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_assertion,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_alt,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_repeater_counter,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_extra_block,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_greedy_single_repeat,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_slow_dot_repeat,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_fast_dot_repeat,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_char_repeat,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_short_set_repeat,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_long_set_repeat,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_non_greedy_repeat,
+      &perl_matcher<BidiIterator, Allocator, traits>::unwind_end,
+      &perl_matcher<BidiIterator, Allocator, traits>::unwind_paren,
+      &perl_matcher<BidiIterator, Allocator, traits>::unwind_recursion_stopper,
+      &perl_matcher<BidiIterator, Allocator, traits>::unwind_assertion,
+      &perl_matcher<BidiIterator, Allocator, traits>::unwind_alt,
+      &perl_matcher<BidiIterator, Allocator, traits>::unwind_repeater_counter,
+      &perl_matcher<BidiIterator, Allocator, traits>::unwind_extra_block,
+      &perl_matcher<BidiIterator, Allocator, traits>::unwind_greedy_single_repeat,
+      &perl_matcher<BidiIterator, Allocator, traits>::unwind_slow_dot_repeat,
+      &perl_matcher<BidiIterator, Allocator, traits>::unwind_fast_dot_repeat,
+      &perl_matcher<BidiIterator, Allocator, traits>::unwind_char_repeat,
+      &perl_matcher<BidiIterator, Allocator, traits>::unwind_short_set_repeat,
+      &perl_matcher<BidiIterator, Allocator, traits>::unwind_long_set_repeat,
+      &perl_matcher<BidiIterator, Allocator, traits>::unwind_non_greedy_repeat,
    };
 
    m_recursive_result = have_match;
@@ -828,15 +874,15 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind(bool have
    return pstate ? true : false;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_end(bool)
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::unwind_end(bool)
 {
    pstate = 0;   // nothing left to search
    return false; // end of stack nothing more to search
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_paren(bool have_match)
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::unwind_paren(bool have_match)
 {
    saved_matched_paren<BidiIterator>* pmp = static_cast<saved_matched_paren<BidiIterator>*>(m_backup_state);
    // restore previous values if no match was found:
@@ -858,16 +904,16 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_paren(boo
    return true; // keep looking
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_recursion_stopper(bool)
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::unwind_recursion_stopper(bool)
 {
    boost::re_detail::inplace_destroy(m_backup_state++);
    pstate = 0;   // nothing left to search
    return false; // end of stack nothing more to search
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_assertion(bool r)
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::unwind_assertion(bool r)
 {
    saved_assertion<BidiIterator>* pmp = static_cast<saved_assertion<BidiIterator>*>(m_backup_state);
    pstate = pmp->pstate;
@@ -879,8 +925,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_assertion
    return !result; // return false if the assertion was matched to stop search.
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_alt(bool r)
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::unwind_alt(bool r)
 {
    saved_position<BidiIterator>* pmp = static_cast<saved_position<BidiIterator>*>(m_backup_state);
    if(!r)
@@ -893,8 +939,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_alt(bool
    return r; 
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_repeater_counter(bool)
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::unwind_repeater_counter(bool)
 {
    saved_repeater<BidiIterator>* pmp = static_cast<saved_repeater<BidiIterator>*>(m_backup_state);
    boost::re_detail::inplace_destroy(pmp++);
@@ -902,8 +948,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_repeater_
    return true; // keep looking
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_extra_block(bool)
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::unwind_extra_block(bool)
 {
    saved_extra_block* pmp = static_cast<saved_extra_block*>(m_backup_state);
    void* condemmed = m_stack_base;
@@ -914,16 +960,16 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_extra_blo
    return true; // keep looking
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-inline void perl_matcher<BidiIterator, Allocator, traits, Allocator2>::destroy_single_repeat()
+template <class BidiIterator, class Allocator, class traits>
+inline void perl_matcher<BidiIterator, Allocator, traits>::destroy_single_repeat()
 {
    saved_single_repeat<BidiIterator>* p = static_cast<saved_single_repeat<BidiIterator>*>(m_backup_state);
    boost::re_detail::inplace_destroy(p++);
    m_backup_state = p;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_greedy_single_repeat(bool r)
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::unwind_greedy_single_repeat(bool r)
 {
    saved_single_repeat<BidiIterator>* pmp = static_cast<saved_single_repeat<BidiIterator>*>(m_backup_state);
 
@@ -935,7 +981,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_greedy_si
    }
 
    const re_repeat* rep = pmp->rep;
-   unsigned count = pmp->count;
+   std::size_t count = pmp->count;
    assert(rep->next.p != 0);
    assert(rep->alt.p != 0);
 
@@ -953,13 +999,13 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_greedy_si
       --position;
       --count;
       ++state_count;
-   }while(count && !access::can_start(*position, rep->_map, mask_skip));
+   }while(count && !can_start(*position, rep->_map, mask_skip));
 
    // if we've hit base, destroy this state:
    if(count == 0)
    {
          destroy_single_repeat();
-         if(!access::can_start(*position, rep->_map, mask_skip))
+         if(!can_start(*position, rep->_map, mask_skip))
             return true;
    }
    else
@@ -971,8 +1017,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_greedy_si
    return false;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_slow_dot_repeat(bool r)
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::unwind_slow_dot_repeat(bool r)
 {
    saved_single_repeat<BidiIterator>* pmp = static_cast<saved_single_repeat<BidiIterator>*>(m_backup_state);
 
@@ -984,7 +1030,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_slow_dot_
    }
 
    const re_repeat* rep = pmp->rep;
-   unsigned count = pmp->count;
+   std::size_t count = pmp->count;
    assert(rep->type == syntax_element_dot_rep);
    assert(rep->next.p != 0);
    assert(rep->alt.p != 0);
@@ -1008,7 +1054,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_slow_dot_
          ++count;
          ++state_count;
          pstate = rep->next.p;
-      }while((count < rep->max) && (position != last) && !access::can_start(*position, rep->_map, mask_skip));
+      }while((count < rep->max) && (position != last) && !can_start(*position, rep->_map, mask_skip));
    }   
    if(position == last)
    {
@@ -1021,7 +1067,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_slow_dot_
    {
       // can't repeat any more, remove the pushed state: 
       destroy_single_repeat();
-      if(!access::can_start(*position, rep->_map, mask_skip))
+      if(!can_start(*position, rep->_map, mask_skip))
          return true;
    }
    else
@@ -1033,8 +1079,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_slow_dot_
    return false;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_fast_dot_repeat(bool r)
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::unwind_fast_dot_repeat(bool r)
 {
    saved_single_repeat<BidiIterator>* pmp = static_cast<saved_single_repeat<BidiIterator>*>(m_backup_state);
 
@@ -1046,7 +1092,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_fast_dot_
    }
 
    const re_repeat* rep = pmp->rep;
-   unsigned count = pmp->count;
+   std::size_t count = pmp->count;
 
    assert(count < rep->max);
    position = pmp->last_position;
@@ -1059,7 +1105,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_fast_dot_
          ++position;
          ++count;
          ++state_count;
-      }while((count < rep->max) && (position != last) && !access::can_start(*position, rep->_map, mask_skip));
+      }while((count < rep->max) && (position != last) && !can_start(*position, rep->_map, mask_skip));
    }
 
    if(position == last)
@@ -1073,7 +1119,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_fast_dot_
    {
       // can't repeat any more, remove the pushed state: 
       destroy_single_repeat();
-      if(!access::can_start(*position, rep->_map, mask_skip))
+      if(!can_start(*position, rep->_map, mask_skip))
          return true;
    }
    else
@@ -1085,8 +1131,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_fast_dot_
    return false;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_char_repeat(bool r)
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::unwind_char_repeat(bool r)
 {
    saved_single_repeat<BidiIterator>* pmp = static_cast<saved_single_repeat<BidiIterator>*>(m_backup_state);
 
@@ -1098,7 +1144,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_char_repe
    }
 
    const re_repeat* rep = pmp->rep;
-   unsigned count = pmp->count;
+   std::size_t count = pmp->count;
    pstate = rep->next.p;
    const char_type what = *reinterpret_cast<const char_type*>(static_cast<const re_literal*>(pstate) + 1);
    position = pmp->last_position;
@@ -1124,7 +1170,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_char_repe
          ++ position;
          ++state_count;
          pstate = rep->next.p;
-      }while((count < rep->max) && (position != last) && !access::can_start(*position, rep->_map, mask_skip));
+      }while((count < rep->max) && (position != last) && !can_start(*position, rep->_map, mask_skip));
    }   
    if(position == last)
    {
@@ -1137,7 +1183,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_char_repe
    {
       // can't repeat any more, remove the pushed state: 
       destroy_single_repeat();
-      if(!access::can_start(*position, rep->_map, mask_skip))
+      if(!can_start(*position, rep->_map, mask_skip))
          return true;
    }
    else
@@ -1149,8 +1195,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_char_repe
    return false;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_short_set_repeat(bool r)
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::unwind_short_set_repeat(bool r)
 {
    saved_single_repeat<BidiIterator>* pmp = static_cast<saved_single_repeat<BidiIterator>*>(m_backup_state);
 
@@ -1162,7 +1208,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_short_set
    }
 
    const re_repeat* rep = pmp->rep;
-   unsigned count = pmp->count;
+   std::size_t count = pmp->count;
    pstate = rep->next.p;
    const unsigned char* map = static_cast<const re_set*>(rep->next.p)->_map;
    position = pmp->last_position;
@@ -1178,7 +1224,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_short_set
       // wind forward until we can skip out of the repeat:
       do
       {
-         if(!map[(traits_uchar_type)traits_inst.translate(*position, icase)])
+         if(!map[static_cast<unsigned char>(traits_inst.translate(*position, icase))])
          {
             // failed repeat match, discard this state and look for another:
             destroy_single_repeat();
@@ -1188,7 +1234,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_short_set
          ++ position;
          ++state_count;
          pstate = rep->next.p;
-      }while((count < rep->max) && (position != last) && !access::can_start(*position, rep->_map, mask_skip));
+      }while((count < rep->max) && (position != last) && !can_start(*position, rep->_map, mask_skip));
    }   
    if(position == last)
    {
@@ -1201,7 +1247,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_short_set
    {
       // can't repeat any more, remove the pushed state: 
       destroy_single_repeat();
-      if(!access::can_start(*position, rep->_map, mask_skip))
+      if(!can_start(*position, rep->_map, mask_skip))
          return true;
    }
    else
@@ -1213,9 +1259,10 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_short_set
    return false;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_long_set_repeat(bool r)
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::unwind_long_set_repeat(bool r)
 {
+   typedef typename traits::char_class_type mask_type;
    saved_single_repeat<BidiIterator>* pmp = static_cast<saved_single_repeat<BidiIterator>*>(m_backup_state);
 
    // if we have a match, just discard this state:
@@ -1226,16 +1273,15 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_long_set_
    }
 
    const re_repeat* rep = pmp->rep;
-   unsigned count = pmp->count;
+   std::size_t count = pmp->count;
    pstate = rep->next.p;
-   const re_set_long* set = static_cast<const re_set_long*>(pstate);
+   const re_set_long<mask_type>* set = static_cast<const re_set_long<mask_type>*>(pstate);
    position = pmp->last_position;
 
    assert(rep->type == syntax_element_long_set_rep);
    assert(rep->next.p != 0);
    assert(rep->alt.p != 0);
    assert(rep->next.p->type == syntax_element_long_set);
-   assert(position != last);
    assert(count < rep->max);
 
    if(position != last)
@@ -1243,7 +1289,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_long_set_
       // wind forward until we can skip out of the repeat:
       do
       {
-         if(position == re_is_set_member(position, last, set, re))
+         if(position == re_is_set_member(position, last, set, re.get_data(), icase))
          {
             // failed repeat match, discard this state and look for another:
             destroy_single_repeat();
@@ -1253,7 +1299,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_long_set_
          ++count;
          ++state_count;
          pstate = rep->next.p;
-      }while((count < rep->max) && (position != last) && !access::can_start(*position, rep->_map, mask_skip));
+      }while((count < rep->max) && (position != last) && !can_start(*position, rep->_map, mask_skip));
    }   
    if(position == last)
    {
@@ -1266,7 +1312,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_long_set_
    {
       // can't repeat any more, remove the pushed state: 
       destroy_single_repeat();
-      if(!access::can_start(*position, rep->_map, mask_skip))
+      if(!can_start(*position, rep->_map, mask_skip))
          return true;
    }
    else
@@ -1278,8 +1324,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_long_set_
    return false;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::unwind_non_greedy_repeat(bool r)
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::unwind_non_greedy_repeat(bool r)
 {
    saved_position<BidiIterator>* pmp = static_cast<saved_position<BidiIterator>*>(m_backup_state);
    if(!r)
diff --git a/include/boost/regex/v4/perl_matcher_recursive.hpp b/include/boost/regex/v4/perl_matcher_recursive.hpp
index 10571f21..d78e9af1 100644
--- a/include/boost/regex/v4/perl_matcher_recursive.hpp
+++ b/include/boost/regex/v4/perl_matcher_recursive.hpp
@@ -45,48 +45,51 @@ public:
    const sub_match<BidiIterator>& get() { return sub; }
 };
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_all_states()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_all_states()
 {
-   static matcher_proc_type const s_match_vtable[26] = 
+   static matcher_proc_type const s_match_vtable[29] = 
    {
-      (&perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_startmark),
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_endmark,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_literal,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_start_line,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_end_line,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_wild,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_match,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_word_boundary,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_within_word,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_word_start,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_word_end,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_buffer_start,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_buffer_end,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_backref,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_long_set,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_set,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_jump,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_alt,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_rep,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_combining,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_soft_buffer_end,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_restart_continue,
-      (::boost::is_random_access_iterator<BidiIterator>::value ? &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_dot_repeat_fast : &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_dot_repeat_slow),
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_char_repeat,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_set_repeat,
-      &perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_long_set_repeat,
+      (&perl_matcher<BidiIterator, Allocator, traits>::match_startmark),
+      &perl_matcher<BidiIterator, Allocator, traits>::match_endmark,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_literal,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_start_line,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_end_line,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_wild,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_match,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_word_boundary,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_within_word,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_word_start,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_word_end,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_buffer_start,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_buffer_end,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_backref,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_long_set,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_set,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_jump,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_alt,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_rep,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_combining,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_soft_buffer_end,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_restart_continue,
+      (::boost::is_random_access_iterator<BidiIterator>::value ? &perl_matcher<BidiIterator, Allocator, traits>::match_dot_repeat_fast : &perl_matcher<BidiIterator, Allocator, traits>::match_dot_repeat_slow),
+      &perl_matcher<BidiIterator, Allocator, traits>::match_char_repeat,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_set_repeat,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_long_set_repeat,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_backstep,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_assert_backref,
+      &perl_matcher<BidiIterator, Allocator, traits>::match_toggle_case,
    };
 
    if(state_count > max_state_count)
-      raise_error(traits_inst, REG_ESPACE);
+      raise_error(traits_inst, regex_constants::error_space);
    while(pstate)
    {
       matcher_proc_type proc = s_match_vtable[pstate->type];
       ++state_count;
       if(!(this->*proc)())
       {
-         if((m_match_flags & match_partial) && (position == last))
+         if((m_match_flags & match_partial) && (position == last) && (position != search_base))
             m_has_partial_match = true;
          return 0;
       }
@@ -94,8 +97,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_all_states
    return true;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_startmark()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_startmark()
 {
    int index = static_cast<const re_brace*>(pstate)->index;
    bool r = true;
@@ -123,10 +126,13 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_startmark(
    case -3:
       {
          // independent sub-expression:
+         bool old_independent = m_independent;
+		   m_independent = true;
          const re_syntax_base* next_pstate = static_cast<const re_jump*>(pstate->next.p)->alt.p->next.p;
          pstate = pstate->next.p->next.p;
          r = match_all_states();
          pstate = next_pstate;
+		   m_independent = old_independent;
 #ifdef BOOST_REGEX_MATCH_EXTRA
          if(r && (m_match_flags & match_extra))
          {
@@ -156,6 +162,37 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_startmark(
 #endif
          break;
       }
+   case -4:
+      {
+      // conditional expression:
+      const re_alt* alt = static_cast<const re_alt*>(pstate->next.p);
+      BOOST_ASSERT(alt->type == syntax_element_alt);
+      pstate = alt->next.p;
+      if(pstate->type == syntax_element_assert_backref)
+      {
+         if(!match_assert_backref())
+            pstate = alt->alt.p;
+         break;
+      }
+      else
+      {
+         // zero width assertion, have to match this recursively:
+         BOOST_ASSERT(pstate->type == syntax_element_startmark);
+         bool negated = static_cast<const re_brace*>(pstate)->index == -2;
+         BidiIterator saved_position = position;
+         const re_syntax_base* next_pstate = static_cast<const re_jump*>(pstate->next.p)->alt.p->next.p;
+         pstate = pstate->next.p->next.p;
+         bool r = match_all_states();
+         position = saved_position;
+         if(negated)
+            r = !r;
+         if(r)
+            pstate = next_pstate;
+         else
+            pstate = alt->alt.p;
+         break;
+      }
+      }
    default:
    {
       assert(index > 0);
@@ -185,11 +222,11 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_startmark(
    return r;
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_alt()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_alt()
 {
    bool take_first, take_second;
-   const re_jump* jmp = static_cast<const re_jump*>(pstate);
+   const re_alt* jmp = static_cast<const re_alt*>(pstate);
 
    // find out which of these two alternatives we need to take:
    if(position == last)
@@ -199,8 +236,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_alt()
    }
    else
    {
-      take_first = access::can_start(*position, jmp->_map, (unsigned char)mask_take);
-      take_second = access::can_start(*position, jmp->_map, (unsigned char)mask_skip);
+      take_first = can_start(*position, jmp->_map, (unsigned char)mask_take);
+      take_second = can_start(*position, jmp->_map, (unsigned char)mask_skip);
   }
 
    if(take_first)
@@ -230,8 +267,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_alt()
    return false;  // neither option is possible
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_rep()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_rep()
 {
 #ifdef BOOST_MSVC
 #pragma warning(push)
@@ -261,8 +298,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_rep()
    }
    else
    {
-      take_first = access::can_start(*position, rep->_map, (unsigned char)mask_take);
-      take_second = access::can_start(*position, rep->_map, (unsigned char)mask_skip);
+      take_first = can_start(*position, rep->_map, (unsigned char)mask_take);
+      take_second = can_start(*position, rep->_map, (unsigned char)mask_skip);
    }
 
    if(next_count->get_count() < rep->min)
@@ -277,8 +314,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_rep()
       }
       return false;
    }
-
-   if(rep->greedy)
+   bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);	
+   if(greedy)
    {
       // try and take the repeat if we can:
       if((next_count->get_count() < rep->max) && take_first)
@@ -327,8 +364,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_rep()
 #endif
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_dot_repeat_slow()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_dot_repeat_slow()
 {
 #ifdef BOOST_MSVC
 #pragma warning(push)
@@ -345,7 +382,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_dot_repeat
          return false;
       ++count;
    }
-   if(rep->greedy)
+   bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);	
+   if(greedy)
    {
       // normal repeat:
       while(count < rep->max)
@@ -387,41 +425,51 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_dot_repeat
 #endif
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_dot_repeat_fast()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_dot_repeat_fast()
 {
 #ifdef BOOST_MSVC
 #pragma warning(push)
 #pragma warning(disable:4127)
 #endif
-   if(m_match_flags & (match_not_dot_newline | match_not_dot_null))
+   if(m_match_flags & match_not_dot_null)
+      return match_dot_repeat_slow();
+   if((static_cast<const re_dot*>(pstate->next.p)->mask & match_any_mask) == 0)
       return match_dot_repeat_slow();
    //
    // start by working out how much we can skip:
    //
    const re_repeat* rep = static_cast<const re_repeat*>(pstate);
-   unsigned count = (std::min)(static_cast<unsigned>(re_detail::distance(position, last)), (rep->greedy ? rep->max : rep->min));
+#ifdef BOOST_MSVC
+#pragma warning(push)
+#pragma warning(disable:4267)
+#endif
+   bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);	
+   std::size_t count = (std::min)(static_cast<std::size_t>(::boost::re_detail::distance(position, last)), static_cast<std::size_t>(greedy ? rep->max : rep->min));
    if(rep->min > count)
    {
       position = last;
       return false;  // not enough text left to match
    }
    std::advance(position, count);
-   if((rep->leading) && (count < rep->max) && (rep->greedy))
+#ifdef BOOST_MSVC
+#pragma warning(pop)
+#endif
+   if((rep->leading) && (count < rep->max) && greedy)
       restart = position;
-   if(rep->greedy)
+   if(greedy)
       return backtrack_till_match(count - rep->min);
 
    // non-greedy, keep trying till we get a match:
    BidiIterator save_pos;
    do
    {
-      while((position != last) && (count < rep->max) && !access::can_start(*position, rep->_map, mask_skip))
+      while((position != last) && (count < rep->max) && !can_start(*position, rep->_map, mask_skip))
       {
          ++position;
          ++count;
       }
-      if((rep->leading) && (count == UINT_MAX))
+      if((rep->leading) && (rep->max == UINT_MAX))
          restart = position;
       pstate = rep->alt.p;
       save_pos = position;
@@ -440,8 +488,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_dot_repeat
 #endif
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_char_repeat()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_char_repeat()
 {
 #ifdef BOOST_MSVC
 #pragma warning(push)
@@ -457,17 +505,18 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_char_repea
    //
    // start by working out how much we can skip:
    //
-   unsigned desired = rep->greedy ? rep->max : rep->min;
+   bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);	
+   std::size_t desired = greedy ? rep->max : rep->min;
    if(::boost::is_random_access_iterator<BidiIterator>::value)
    {
       BidiIterator end = position;
-      std::advance(end, (std::min)((unsigned)re_detail::distance(position, last), desired));
+      std::advance(end, (std::min)((unsigned)::boost::re_detail::distance(position, last), desired));
       BidiIterator origin(position);
       while((position != end) && (traits_inst.translate(*position, icase) == what))
       {
          ++position;
       }
-      count = (unsigned)re_detail::distance(origin, position);
+      count = (unsigned)::boost::re_detail::distance(origin, position);
    }
    else
    {
@@ -477,19 +526,19 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_char_repea
          ++count;
       }
    }
-   if((rep->leading) && (count < rep->max) && (rep->greedy))
+   if((rep->leading) && (count < rep->max) && greedy)
       restart = position;
    if(count < rep->min)
       return false;
 
-   if(rep->greedy)
+   if(greedy)
       return backtrack_till_match(count - rep->min);
 
    // non-greedy, keep trying till we get a match:
    BidiIterator save_pos;
    do
    {
-      while((position != last) && (count < rep->max) && !access::can_start(*position, rep->_map, mask_skip))
+      while((position != last) && (count < rep->max) && !can_start(*position, rep->_map, mask_skip))
       {
          if((traits_inst.translate(*position, icase) == what))
          {
@@ -529,8 +578,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_char_repea
 #endif
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_set_repeat()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_set_repeat()
 {
 #ifdef BOOST_MSVC
 #pragma warning(push)
@@ -545,41 +594,42 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_set_repeat
    //
    // start by working out how much we can skip:
    //
-   unsigned desired = rep->greedy ? rep->max : rep->min;
+   bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);	
+   std::size_t desired = greedy ? rep->max : rep->min;
    if(::boost::is_random_access_iterator<BidiIterator>::value)
    {
       BidiIterator end = position;
-      std::advance(end, (std::min)((unsigned)re_detail::distance(position, last), desired));
+      std::advance(end, (std::min)((unsigned)::boost::re_detail::distance(position, last), desired));
       BidiIterator origin(position);
-      while((position != end) && map[(traits_uchar_type)traits_inst.translate(*position, icase)])
+      while((position != end) && map[static_cast<unsigned char>(traits_inst.translate(*position, icase))])
       {
          ++position;
       }
-      count = (unsigned)re_detail::distance(origin, position);
+      count = (unsigned)::boost::re_detail::distance(origin, position);
    }
    else
    {
-      while((count < desired) && (position != last) && map[(traits_uchar_type)traits_inst.translate(*position, icase)])
+      while((count < desired) && (position != last) && map[static_cast<unsigned char>(traits_inst.translate(*position, icase))])
       {
          ++position;
          ++count;
       }
    }
-   if((rep->leading) && (count < rep->max) && (rep->greedy))
+   if((rep->leading) && (count < rep->max) && greedy)
       restart = position;
    if(count < rep->min)
       return false;
 
-   if(rep->greedy)
+   if(greedy)
       return backtrack_till_match(count - rep->min);
 
    // non-greedy, keep trying till we get a match:
    BidiIterator save_pos;
    do
    {
-      while((position != last) && (count < rep->max) && !access::can_start(*position, rep->_map, mask_skip))
+      while((position != last) && (count < rep->max) && !can_start(*position, rep->_map, mask_skip))
       {
-         if(map[(traits_uchar_type)traits_inst.translate(*position, icase)])
+         if(map[static_cast<unsigned char>(traits_inst.translate(*position, icase))])
          {
             ++position;
             ++count;
@@ -599,7 +649,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_set_repeat
       if(position == last)
          return false;
       position = save_pos;
-      if(map[(traits_uchar_type)traits_inst.translate(*position, icase)])
+      if(map[static_cast<unsigned char>(traits_inst.translate(*position, icase))])
       {
          ++position;
          ++count;
@@ -617,8 +667,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_set_repeat
 #endif
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_long_set_repeat()
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::match_long_set_repeat()
 {
 #ifdef BOOST_MSVC
 #pragma warning(push)
@@ -627,47 +677,49 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_long_set_r
 #ifdef __BORLANDC__
 #pragma option push -w-8008 -w-8066 -w-8004
 #endif
+   typedef typename traits::char_class_type char_class_type;
    const re_repeat* rep = static_cast<const re_repeat*>(pstate);
-   const re_set_long* set = static_cast<const re_set_long*>(pstate->next.p);
+   const re_set_long<char_class_type>* set = static_cast<const re_set_long<char_class_type>*>(pstate->next.p);
    unsigned count = 0;
    //
    // start by working out how much we can skip:
    //
-   unsigned desired = rep->greedy ? rep->max : rep->min;
+   bool greedy = (rep->greedy) && (!(m_match_flags & regex_constants::match_any) || m_independent);	
+   std::size_t desired = greedy ? rep->max : rep->min;
    if(::boost::is_random_access_iterator<BidiIterator>::value)
    {
       BidiIterator end = position;
-      std::advance(end, (std::min)((unsigned)re_detail::distance(position, last), desired));
+      std::advance(end, (std::min)((unsigned)::boost::re_detail::distance(position, last), desired));
       BidiIterator origin(position);
-      while((position != end) && (position != re_is_set_member(position, last, set, re)))
+      while((position != end) && (position != re_is_set_member(position, last, set, re.get_data(), icase)))
       {
          ++position;
       }
-      count = (unsigned)re_detail::distance(origin, position);
+      count = (unsigned)::boost::re_detail::distance(origin, position);
    }
    else
    {
-      while((count < desired) && (position != last) && (position != re_is_set_member(position, last, set, re)))
+      while((count < desired) && (position != last) && (position != re_is_set_member(position, last, set, re.get_data(), icase)))
       {
          ++position;
          ++count;
       }
    }
-   if((rep->leading) && (count < rep->max) && (rep->greedy))
+   if((rep->leading) && (count < rep->max) && greedy)
       restart = position;
    if(count < rep->min)
       return false;
 
-   if(rep->greedy)
+   if(greedy)
       return backtrack_till_match(count - rep->min);
 
    // non-greedy, keep trying till we get a match:
    BidiIterator save_pos;
    do
    {
-      while((position != last) && (count < rep->max) && !access::can_start(*position, rep->_map, mask_skip))
+      while((position != last) && (count < rep->max) && !can_start(*position, rep->_map, mask_skip))
       {
-         if(position != re_is_set_member(position, last, set, re))
+         if(position != re_is_set_member(position, last, set, re.get_data(), icase))
          {
             ++position;
             ++count;
@@ -687,7 +739,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_long_set_r
       if(position == last)
          return false;
       position = save_pos;
-      if(position != re_is_set_member(position, last, set, re))
+      if(position != re_is_set_member(position, last, set, re.get_data(), icase))
       {
          ++position;
          ++count;
@@ -705,8 +757,8 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::match_long_set_r
 #endif
 }
 
-template <class BidiIterator, class Allocator, class traits, class Allocator2>
-bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::backtrack_till_match(unsigned count)
+template <class BidiIterator, class Allocator, class traits>
+bool perl_matcher<BidiIterator, Allocator, traits>::backtrack_till_match(std::size_t count)
 {
 #ifdef BOOST_MSVC
 #pragma warning(push)
@@ -735,7 +787,7 @@ bool perl_matcher<BidiIterator, Allocator, traits, Allocator2>::backtrack_till_m
    }
    do
    {
-      while(count && !access::can_start(*position, rep->_map, mask_skip))
+      while(count && !can_start(*position, rep->_map, mask_skip))
       {
          --position;
          --count;
diff --git a/src/primary_transform.hpp b/include/boost/regex/v4/primary_transform.hpp
similarity index 74%
rename from src/primary_transform.hpp
rename to include/boost/regex/v4/primary_transform.hpp
index a7381b8b..f9a0bcb1 100644
--- a/src/primary_transform.hpp
+++ b/include/boost/regex/v4/primary_transform.hpp
@@ -17,6 +17,13 @@
   *                by the current locale.
   */
 
+#ifndef BOOST_REGEX_PRIMARY_TRANSFORM
+#define BOOST_REGEX_PRIMARY_TRANSFORM
+
+#ifdef BOOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
+#endif
+
 namespace boost{
    namespace re_detail{
 
@@ -31,6 +38,12 @@ enum{
 template <class S, class charT>
 unsigned count_chars(const S& s, charT c)
 {
+   //
+   // Count how many occurances of character c occur
+   // in string s: if c is a delimeter between collation
+   // fields, then this should be the same value for all
+   // sort keys:
+   //
    unsigned int count = 0;
    for(unsigned pos = 0; pos < s.size(); ++pos)
    {
@@ -53,20 +66,17 @@ unsigned find_sort_syntax(const traits* pt, charT* delim)
    // Suppress incorrect warning for MSVC
    (void)pt;
 
-   string_type a(1, (char_type)'a');
-   string_type sa;
-   pt->transform(sa, a);
+   char_type a[2] = {'a', '\0', };
+   string_type sa(pt->transform(a, a+1));
    if(sa == a)
    {
       *delim = 0;
       return sort_C;
    }
-   string_type A(1, (char_type)'A');
-   string_type sA;
-   pt->transform(sA, A);
-   string_type c(1, (char_type)';');
-   string_type sc;
-   pt->transform(sc, c);
+   char_type A[2] = { 'A', '\0', };
+   string_type sA(pt->transform(A, A+1));
+   char_type c[2] = { ';', '\0', };
+   string_type sc(pt->transform(c, c+1));
 
    int pos = 0;
    while((pos <= static_cast<int>(sa.size())) && (pos <= static_cast<int>(sA.size())) && (sa[pos] == sA[pos])) ++pos;
@@ -77,11 +87,11 @@ unsigned find_sort_syntax(const traits* pt, charT* delim)
       return sort_unknown;
    }
    //
-   // at this point sa[pos] is either the end of a fixed with field
+   // at this point sa[pos] is either the end of a fixed width field
    // or the character that acts as a delimiter:
    //
    charT maybe_delim = sa[pos];
-   if((pos != 0) && (count_chars(sa, maybe_delim) == count_chars(sA, maybe_delim)) && (count_chars(sa, maybe_delim) == count_chars(c, maybe_delim)))
+   if((pos != 0) && (count_chars(sa, maybe_delim) == count_chars(sA, maybe_delim)) && (count_chars(sa, maybe_delim) == count_chars(sc, maybe_delim)))
    {
       *delim = maybe_delim;
       return sort_delim;
@@ -89,7 +99,7 @@ unsigned find_sort_syntax(const traits* pt, charT* delim)
    //
    // OK doen't look like a delimiter, try for fixed width field:
    //
-   if((sa.size() == sA.size()) && (sa.size() == c.size()))
+   if((sa.size() == sA.size()) && (sa.size() == sc.size()))
    {
       // note assumes that the fixed width field is less than
       // numeric_limits<charT>::max(), should be true for all types
@@ -108,6 +118,11 @@ unsigned find_sort_syntax(const traits* pt, charT* delim)
    } // namespace re_detail
 } // namespace boost
 
+#ifdef BOOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
+#endif
+
+#endif
 
 
 
diff --git a/include/boost/regex/v4/protected_call.hpp b/include/boost/regex/v4/protected_call.hpp
new file mode 100644
index 00000000..baa4ee9b
--- /dev/null
+++ b/include/boost/regex/v4/protected_call.hpp
@@ -0,0 +1,65 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         basic_regex_creator.cpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Declares template class basic_regex_creator which fills in
+  *                the data members of a regex_data object.
+  */
+
+#ifndef BOOST_REGEX_V4_PROTECTED_CALL_HPP
+#define BOOST_REGEX_V4_PROTECTED_CALL_HPP
+
+#ifdef BOOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
+#endif
+
+namespace boost{
+namespace re_detail{
+
+class BOOST_REGEX_DECL abstract_protected_call
+{
+public:
+   bool BOOST_REGEX_CALL execute()const;
+private:
+   virtual bool call()const = 0;
+};
+
+template <class T>
+class concrete_protected_call
+   : public abstract_protected_call
+{
+public:
+   typedef bool (T::*proc_type)();
+   concrete_protected_call(T* o, proc_type p)
+      : obj(o), proc(p) {}
+private:
+   virtual bool call()const;
+   T* obj;
+   proc_type proc;
+};
+
+template <class T>
+bool concrete_protected_call<T>::call()const
+{
+   return (obj->*proc)();
+}
+
+}
+} // namespace boost
+
+#ifdef BOOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
+#endif
+
+#endif
diff --git a/include/boost/regex/v4/regbase.hpp b/include/boost/regex/v4/regbase.hpp
index e198326f..7e62eab7 100644
--- a/include/boost/regex/v4/regbase.hpp
+++ b/include/boost/regex/v4/regbase.hpp
@@ -33,32 +33,59 @@ class BOOST_REGEX_DECL regbase
 public:
    enum flag_type_
    {
-      escape_in_lists = 1,                     // '\' special inside [...]
-      char_classes = escape_in_lists << 1,     // [[:CLASS:]] allowed
-      intervals = char_classes << 1,           // {x,y} allowed
-      limited_ops = intervals << 1,            // all of + ? and | are normal characters
-      newline_alt = limited_ops << 1,          // \n is the same as |
-      bk_plus_qm = newline_alt << 1,           // uses \+ and \?
-      bk_braces = bk_plus_qm << 1,             // uses \{ and \}
-      bk_parens = bk_braces << 1,              // uses \( and \)
-      bk_refs = bk_parens << 1,                // \d allowed
-      bk_vbar = bk_refs << 1,                  // uses \|
+      //
+      // Divide the flags up into logical groups:
+      // bits 0-7 indicate main synatx type.
+      // bits 8-15 indicate syntax subtype.
+      // bits 16-31 indicate options that are common to all
+      // regex syntaxes.
+      // In all cases the default is 0.
+      //
+      // Main synatx group:
+      //
+      perl_syntax_group = 0,                      // default
+      basic_syntax_group = 1,                     // POSIX basic
+      literal = 2,                                // all characters are literals
+      main_option_type = literal | basic_syntax_group | perl_syntax_group, // everything!
+      //
+      // options specific to perl group:
+      //
+      no_bk_refs = 1 << 8,                        // \d not allowed
+      no_perl_ex = 1 << 9,                        // disable perl extensions
+      no_mod_m = 1 << 10,                         // disable Perl m modifier
+      mod_x = 1 << 11,                            // Perl x modifier
+      mod_s = 1 << 12,                            // force s modifier on (overrides match_not_dot_newline)
+      no_mod_s = 1 << 13,                         // force s modifier off (overrides match_not_dot_newline)
 
-      use_except = bk_vbar << 1,               // exception on error
-      failbit = use_except << 1,               // error flag
-      literal = failbit << 1,                  // all characters are literals
-      icase = literal << 1,                    // characters are matched regardless of case
-      nocollate = 0,                           // don't use locale specific collation (deprecated)
-      collate = icase << 1,                    // use locale specific collation
-      perlex = collate << 1,                 // perl extensions
-      nosubs = perlex << 1,                    // don't mark sub-expressions
-      optimize = 0,                            // not really supported
+      //
+      // options specific to basic group:
+      //
+      no_char_classes = 1 << 8,                   // [[:CLASS:]] not allowed
+      no_intervals = 1 << 9,                      // {x,y} not allowed
+      bk_plus_qm = 1 << 10,                       // uses \+ and \?
+      bk_vbar = 1 << 11,                          // use \| for alternatives
+      emacs_ex = 1 << 12,                         // enables emacs extensions
 
-      basic = char_classes | intervals | limited_ops | bk_braces | bk_parens | bk_refs | collate,
-      extended = char_classes | intervals | bk_refs | collate,
-      normal = perlex | escape_in_lists | char_classes | intervals | bk_refs | nocollate,
-      emacs = bk_braces | bk_parens | bk_refs | bk_vbar,
-      awk = extended | escape_in_lists,
+      //
+      // options common to all groups:
+      //
+      no_escape_in_lists = 1 << 16,                     // '\' not special inside [...]
+      newline_alt = 1 << 17,                            // \n is the same as |
+      no_except = 1 << 18,                              // no exception on error
+      failbit = 1 << 19,                                // error flag
+      icase = 1 << 20,                                  // characters are matched regardless of case
+      nocollate = 0,                                    // don't use locale specific collation (deprecated)
+      collate = 1 << 21,                                // use locale specific collation
+      nosubs = 1 << 22,                                 // don't mark sub-expressions
+      optimize = 0,                                     // not really supported
+      
+
+
+      basic = basic_syntax_group | collate | no_escape_in_lists,
+      extended = no_bk_refs | collate | no_perl_ex | no_escape_in_lists,
+      normal = 0,
+      emacs = basic_syntax_group | collate | emacs_ex | bk_vbar,
+      awk = no_bk_refs | collate | no_perl_ex,
       grep = basic | newline_alt,
       egrep = extended | newline_alt,
       sed = basic,
@@ -80,18 +107,6 @@ public:
       restart_fixed_lit = 6, 
       restart_count = 7
    };
-
-   flag_type BOOST_REGEX_CALL flags()const
-   {
-      return _flags;
-   }
-
-   regbase();
-   regbase(const regbase& b);
-   void swap(regbase& that)
-   { std::swap(_flags, that._flags); }
-protected:
-   flag_type _flags;
 };
 
 //
@@ -101,26 +116,24 @@ namespace regex_constants{
 
    enum flag_type_
    {
-      escape_in_lists = ::boost::regbase::escape_in_lists,
-      char_classes = ::boost::regbase::char_classes,
-      intervals = ::boost::regbase::intervals,
-      limited_ops = ::boost::regbase::limited_ops,
-      newline_alt = ::boost::regbase::newline_alt,
-      bk_plus_qm = ::boost::regbase::bk_plus_qm,
-      bk_braces = ::boost::regbase::bk_braces,
-      bk_parens = ::boost::regbase::bk_parens,
-      bk_refs = ::boost::regbase::bk_refs,
-      bk_vbar = ::boost::regbase::bk_vbar,
 
-      use_except = ::boost::regbase::use_except,
+      no_except = ::boost::regbase::no_except,
       failbit = ::boost::regbase::failbit,
       literal = ::boost::regbase::literal,
       icase = ::boost::regbase::icase,
       nocollate = ::boost::regbase::nocollate,
       collate = ::boost::regbase::collate,
-      perlex = ::boost::regbase::perlex,
       nosubs = ::boost::regbase::nosubs,
       optimize = ::boost::regbase::optimize,
+      bk_plus_qm = ::boost::regbase::bk_plus_qm,
+      bk_vbar = ::boost::regbase::bk_vbar,
+      no_intervals = ::boost::regbase::no_intervals,
+      no_char_classes = ::boost::regbase::no_char_classes,
+      no_escape_in_lists = ::boost::regbase::no_escape_in_lists,
+      no_mod_m = ::boost::regbase::no_mod_m,
+      mod_x = ::boost::regbase::mod_x,
+      mod_s = ::boost::regbase::mod_s,
+      no_mod_s = ::boost::regbase::no_mod_s,
 
       basic = ::boost::regbase::basic,
       extended = ::boost::regbase::extended,
diff --git a/include/boost/regex/v4/regex.hpp b/include/boost/regex/v4/regex.hpp
index 081df670..bf072a16 100644
--- a/include/boost/regex/v4/regex.hpp
+++ b/include/boost/regex/v4/regex.hpp
@@ -13,7 +13,7 @@
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex.cpp
   *   VERSION      see <boost/version.hpp>
-  *   DESCRIPTION: Declares boost::reg_expression<> and associated
+  *   DESCRIPTION: Declares boost::basic_regex<> and associated
   *                functions and classes. This header is the main
   *                entry point for the template regex code.
   */
@@ -21,42 +21,35 @@
 #ifndef BOOST_RE_REGEX_HPP_INCLUDED
 #define BOOST_RE_REGEX_HPP_INCLUDED
 
-#ifndef BOOST_RE_CREGEX_HPP
-#include <boost/cregex.hpp>
-#endif
-
 #ifdef __cplusplus
 
 // what follows is all C++ don't include in C builds!!
 
-#ifdef BOOST_REGEX_DEBUG
-# include <iosfwd>
-#endif
-
-#include <new>
-#include <cstring>
 #ifndef BOOST_REGEX_CONFIG_HPP
 #include <boost/regex/config.hpp>
 #endif
+#ifndef BOOST_REGEX_WORKAROUND_HPP
+#include <boost/regex/v4/regex_workaround.hpp>
+#endif
+
 #ifndef BOOST_REGEX_FWD_HPP
 #include <boost/regex_fwd.hpp>
 #endif
-#ifndef BOOST_REGEX_STACK_HPP
-#include <boost/regex/v4/regex_stack.hpp>
-#endif
-#ifndef BOOST_REGEX_RAW_BUFFER_HPP
-#include <boost/regex/v4/regex_raw_buffer.hpp>
-#endif
-#ifndef BOOST_REGEX_KMP_HPP
-#include <boost/regex/v4/regex_kmp.hpp>
-#endif
-#ifndef BOOST_RE_PAT_EXCEPT_HPP
-#include <boost/regex/pattern_except.hpp>
-#endif
 #ifndef BOOST_REGEX_TRAITS_HPP
 #include <boost/regex/regex_traits.hpp>
 #endif
-#include <boost/scoped_array.hpp>
+#ifndef BOOST_REGEX_RAW_BUFFER_HPP
+#include <boost/regex/v4/error_type.hpp>
+#endif
+#ifndef BOOST_REGEX_V4_MATCH_FLAGS
+#include <boost/regex/v4/match_flags.hpp>
+#endif
+#ifndef BOOST_REGEX_RAW_BUFFER_HPP
+#include <boost/regex/v4/regex_raw_buffer.hpp>
+#endif
+#ifndef BOOST_RE_PAT_EXCEPT_HPP
+#include <boost/regex/pattern_except.hpp>
+#endif
 
 #ifndef BOOST_REGEX_V4_CHAR_REGEX_TRAITS_HPP
 #include <boost/regex/v4/char_regex_traits.hpp>
@@ -70,12 +63,15 @@
 #ifndef BOOST_REGEX_V4_ITERATOR_TRAITS_HPP
 #include <boost/regex/v4/iterator_traits.hpp>
 #endif
-#ifndef BOOST_REGEX_V4_ITERATOR_TRAITS_HPP
-#include <boost/regex/v4/iterator_traits.hpp>
-#endif
 #ifndef BOOST_REGEX_V4_BASIC_REGEX_HPP
 #include <boost/regex/v4/basic_regex.hpp>
 #endif
+#ifndef BOOST_REGEX_V4_BASIC_REGEX_CREATOR_HPP
+#include <boost/regex/v4/basic_regex_creator.hpp>
+#endif
+#ifndef BOOST_REGEX_V4_BASIC_REGEX_PARSER_HPP
+#include <boost/regex/v4/basic_regex_parser.hpp>
+#endif
 #ifndef BOOST_REGEX_V4_SUB_MATCH_HPP
 #include <boost/regex/v4/sub_match.hpp>
 #endif
@@ -85,10 +81,12 @@
 #ifndef BOOST_REGEX_V4_MATCH_RESULTS_HPP
 #include <boost/regex/v4/match_results.hpp>
 #endif
-#ifndef BOOST_REGEX_COMPILE_HPP
-#include <boost/regex/v4/regex_compile.hpp>
+#ifndef BOOST_REGEX_V4_PROTECTED_CALL_HPP
+#include <boost/regex/v4/protected_call.hpp>
+#endif
+#ifndef BOOST_REGEX_MATCHER_HPP
+#include <boost/regex/v4/perl_matcher.hpp>
 #endif
-
 //
 // template instances:
 //
@@ -103,7 +101,7 @@
 #endif
 
 #ifndef BOOST_NO_WREGEX
-#define BOOST_REGEX_CHAR_T boost::regex_wchar_type
+#define BOOST_REGEX_CHAR_T wchar_t
 #ifdef BOOST_REGEX_WIDE_INSTANTIATE
 #  define BOOST_REGEX_INSTANTIATE
 #endif
@@ -114,12 +112,24 @@
 #endif
 #endif
 
+#if !defined(BOOST_NO_WREGEX) && defined(BOOST_REGEX_HAS_OTHER_WCHAR_T)
+#define BOOST_REGEX_CHAR_T unsigned short
+#ifdef BOOST_REGEX_US_INSTANTIATE
+#  define BOOST_REGEX_INSTANTIATE
+#endif
+#include <boost/regex/v4/instances.hpp>
+#undef BOOST_REGEX_CHAR_T
+#ifdef BOOST_REGEX_INSTANTIATE
+#  undef BOOST_REGEX_INSTANTIATE
+#endif
+#endif
+
 
 namespace boost{
 #ifdef BOOST_REGEX_NO_FWD
-typedef reg_expression<char, regex_traits<char>, BOOST_DEFAULT_ALLOCATOR(char)> regex;
+typedef basic_regex<char, regex_traits<char> > regex;
 #ifndef BOOST_NO_WREGEX
-typedef reg_expression<wchar_t, regex_traits<wchar_t>, BOOST_DEFAULT_ALLOCATOR(wchar_t)> wregex;
+typedef basic_regex<wchar_t, regex_traits<wchar_t> > wregex;
 #endif
 #endif
 
@@ -137,6 +147,12 @@ typedef match_results<std::wstring::const_iterator> wsmatch;
 #ifndef BOOST_REGEX_V4_REGEX_SEARCH_HPP
 #include <boost/regex/v4/regex_search.hpp>
 #endif
+#ifndef BOOST_REGEX_ITERATOR_HPP
+#include <boost/regex/v4/regex_iterator.hpp>
+#endif
+#ifndef BOOST_REGEX_TOKEN_ITERATOR_HPP
+#include <boost/regex/v4/regex_token_iterator.hpp>
+#endif
 #ifndef BOOST_REGEX_V4_REGEX_GREP_HPP
 #include <boost/regex/v4/regex_grep.hpp>
 #endif
@@ -149,12 +165,6 @@ typedef match_results<std::wstring::const_iterator> wsmatch;
 #ifndef BOOST_REGEX_SPLIT_HPP
 #include <boost/regex/v4/regex_split.hpp>
 #endif
-#ifndef BOOST_REGEX_ITERATOR_HPP
-#include <boost/regex/v4/regex_iterator.hpp>
-#endif
-#ifndef BOOST_REGEX_TOKEN_ITERATOR_HPP
-#include <boost/regex/v4/regex_token_iterator.hpp>
-#endif
 
 #endif  // __cplusplus
 
diff --git a/include/boost/regex/v4/regex_format.hpp b/include/boost/regex/v4/regex_format.hpp
index a2ae9250..0f4d4a5c 100644
--- a/include/boost/regex/v4/regex_format.hpp
+++ b/include/boost/regex/v4/regex_format.hpp
@@ -3,8 +3,8 @@
  * Copyright (c) 1998-2002
  * Dr John Maddock
  *
- * Use, modification and distribution are subject to the
- * Boost Software License, Version 1.0. (See accompanying file
+ * 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)
  *
  */
@@ -31,638 +31,579 @@ namespace boost{
 //
 // Forward declaration:
 //
-template <class RandomAccessIterator, class Allocator>
+   template <class BidiIterator, class Allocator = BOOST_DEDUCED_TYPENAME std::vector<sub_match<BidiIterator> >::allocator_type >
 class match_results;
 
 namespace re_detail{
 
-// make_upper and make_lower should ideally be implemented in regex_traits
-#if defined(_WIN32) && !defined(BOOST_REGEX_NO_W32)
-
 //
-// VC6 needs to link to user32.lib, as do all compilers that
-// claim to be VC6/7 compatible:
+// struct trivial_format_traits:
+// defines minimum localisation support for formatting
+// in the case that the actual regex traits is unavailable.
 //
-#if defined(_MSC_VER) && !defined(__BORLANDC__)
-#pragma comment(lib, "user32.lib")
-#endif
-
-inline wchar_t make_upper(wchar_t c)
+template <class charT>
+struct trivial_format_traits
 {
-   return LOWORD(::CharUpperW(reinterpret_cast<wchar_t*>(static_cast<unsigned short>(c))));
-}
+   typedef charT char_type;
 
-inline char make_upper(char c)
-{
-   return static_cast<char>(LOWORD(::CharUpperA(reinterpret_cast<char*>(static_cast<unsigned short>(c)))));
-}
-
-inline wchar_t make_lower(wchar_t c)
-{
-   return LOWORD(::CharLowerW(reinterpret_cast<wchar_t*>(static_cast<unsigned short>(c))));
-}
-
-inline char make_lower(char c)
-{
-   return static_cast<char>(LOWORD(::CharLowerA(reinterpret_cast<char*>(static_cast<unsigned short>(c)))));
-}
-
-#else
-
-// TODO: make this traits class sensitive:
-#ifndef BOOST_NO_WREGEX
-inline wchar_t make_upper(wchar_t c)
-{
-   return (std::towupper)(c); 
-}
-
-inline wchar_t make_lower(wchar_t c)
-{
-   return (std::towlower)(c);
-}
-#endif
-inline char make_upper(char c)
-{
-   return static_cast<char>((std::toupper)(c)); 
-}
-
-inline char make_lower(char c)
-{
-   return static_cast<char>((std::tolower)(c)); 
-}
-
-#endif //defined(_WIN32) && !defined(BOOST_REGEX_NO_W32)
-
-typedef enum {
-   case_nochange,
-   case_oneupper,
-   case_onelower,
-   case_allupper,
-   case_alllower
-} case_flags_type;
-
-// traits_type is unused, but provided to make it possible to use it for case conversion
-template <class O, class charT, class traits_type>
-void BOOST_REGEX_CALL output_char(O& out, charT c, traits_type& /*t*/, case_flags_type& f)
-{
-   switch (f) {
-      case case_oneupper:
-         f = case_nochange;
-         // drop through
-      case case_allupper:
-         *out = make_upper(c);
-         break;
-      case case_onelower:
-         f = case_nochange;
-         // drop through
-      case case_alllower:
-         *out = make_lower(c);
-         break;
-      default:
-         *out = c;
-         break;
-   }
-}
-
-template <class O, class I, class traits_type>
-O BOOST_REGEX_CALL re_copy_out(O out, I first, I last, traits_type& t, case_flags_type& f)
-{
-   while(first != last)
+   static std::ptrdiff_t length(const charT* p)
    {
-      if (f != case_nochange)
-         output_char(out, *first, t, f);
-      else
-         *out = *first;
-
-      ++out;
-      ++first;
+      return global_length(p);
    }
-   return out;
+   static charT tolower(charT c)
+   {
+      return ::boost::re_detail::global_lower(c);
+   }
+   static charT toupper(charT c)
+   {
+      return ::boost::re_detail::global_upper(c);
+   }
+   static int value(const charT c, int radix)
+   {
+      int result = global_value(c);
+      return result >= radix ? -1 : result;
+   }
+   int toi(const charT*& p1, const charT* p2, int radix)const
+   {
+      return global_toi(p1, p2, radix, *this);
+   }
+};
+
+template <class OutputIterator, class Results, class traits>
+class basic_regex_formatter
+{
+public:
+   typedef typename traits::char_type char_type;
+   basic_regex_formatter(OutputIterator o, const Results& r, const traits& t)
+      : m_traits(t), m_results(r), m_out(o), m_state(output_copy), m_have_conditional(false) {}
+   OutputIterator format(const char_type* p1, const char_type* p2, match_flag_type f);
+   OutputIterator format(const char_type* p1, match_flag_type f)
+   {
+      return format(p1, p1 + m_traits.length(p1), f);
+   }
+private:
+   typedef typename Results::value_type sub_match_type;
+   enum output_state
+   {
+      output_copy,
+      output_next_lower,
+      output_next_upper,
+      output_lower,
+      output_upper,
+      output_none
+   };
+
+   void put(char_type c);
+   void put(const sub_match_type& sub);
+   void format_all();
+   void format_perl();
+   void format_escape();
+   void format_conditional();
+   void format_until_scope_end();
+
+   const traits& m_traits;       // the traits class for localised formatting operations
+   const Results& m_results;     // the match_results being used.
+   OutputIterator m_out;         // where to send output.
+   const char_type* m_position;  // format string, current position
+   const char_type* m_end;       // format string end
+   match_flag_type m_flags;      // format flags to use
+   output_state    m_state;      // what to do with the next character
+   bool            m_have_conditional; // we are parsing a conditional
+private:
+   basic_regex_formatter(const basic_regex_formatter&);
+   basic_regex_formatter& operator=(const basic_regex_formatter&);
+};
+
+template <class OutputIterator, class Results, class traits>
+OutputIterator basic_regex_formatter<OutputIterator, Results, traits>::format(const char_type* p1, const char_type* p2, match_flag_type f)
+{
+   m_position = p1;
+   m_end = p2;
+   m_flags = f;
+   format_all();
+   return m_out;
 }
 
-
-template <class charT, class traits_type>
-void BOOST_REGEX_CALL re_skip_format(const charT*& fmt, const traits_type& traits_inst)
+template <class OutputIterator, class Results, class traits>
+void basic_regex_formatter<OutputIterator, Results, traits>::format_all()
 {
-   // dwa 9/13/00 - suppress incorrect unused parameter warning for MSVC
-   (void)traits_inst;
-
-   typedef typename traits_type::size_type traits_size_type;
-   typedef typename traits_type::uchar_type traits_uchar_type;
-   typedef typename traits_type::string_type traits_string_type;
-
-   unsigned int parens = 0;
-   unsigned int c;
-   while(*fmt)
+   // over and over:
+   while(m_position != m_end)
    {
-      c = traits_inst.syntax_type((traits_size_type)(traits_uchar_type)(*fmt));
-      if((c == traits_type::syntax_colon) && (parens == 0))
+      switch(*m_position)
       {
-         ++fmt;
-         return;
-      }
-      else if(c == traits_type::syntax_close_bracket)
-      {
-         if(parens == 0)
+      case '&':
+         if(m_flags & ::boost::regex_constants::format_sed)
+         {
+            ++m_position;
+            put(m_results[0]);
+            break;
+         }
+         put(*m_position++);
+         break;
+      case '\\':
+         format_escape();
+         break;
+      case '(':
+         if(m_flags & boost::regex_constants::format_all)
+         {
+            ++m_position;
+            bool have_conditional = m_have_conditional;
+            m_have_conditional = false;
+            format_until_scope_end();
+            m_have_conditional = have_conditional;
+            if(m_position == m_end)
+               return;
+            BOOST_ASSERT(*m_position == static_cast<char_type>(')'));
+            ++m_position;  // skip the closing ')'
+            break;
+         }
+         put(*m_position);
+         ++m_position;
+         break;
+      case ')':
+         if(m_flags & boost::regex_constants::format_all)
          {
-            ++fmt;
             return;
          }
-         --parens;
-      }
-      else if(c == traits_type::syntax_open_bracket)
-         ++parens;
-      else if(c == traits_type::syntax_slash)
-      {
-         ++fmt;
-         if(*fmt == 0)
+         put(*m_position);
+         ++m_position;
+         break;
+      case ':':
+         if((m_flags & boost::regex_constants::format_all) && m_have_conditional)
+         {
             return;
+         }
+         put(*m_position);
+         ++m_position;
+         break;
+      case '?':
+         if(m_flags & boost::regex_constants::format_all)
+         {
+            ++m_position;
+            format_conditional();
+            break;
+         }
+         put(*m_position);
+         ++m_position;
+         break;
+      case '$':
+         if((m_flags & format_sed) == 0)
+         {
+            format_perl();
+            break;
+         }
+         // fall through, not a special character:
+      default:
+         put(*m_position);
+         ++m_position;
+         break;
       }
-      ++fmt;
    }
 }
 
-#ifdef BOOST_NO_STD_OUTPUT_ITERATOR_ASSIGN
-
-//
-// ugly hack for buggy output iterators
-
-template <class T>
-inline void oi_assign(T* p, T v)
-{
-   ::boost::re_detail::pointer_destroy(p);
-   pointer_construct(p, v);
-}
-
-#else
-
-template <class T>
-inline void oi_assign(T* p, T v)
+template <class OutputIterator, class Results, class traits>
+void basic_regex_formatter<OutputIterator, Results, traits>::format_perl()
 {
    //
-   // if you get a compile time error in here then you either
-   // need to rewrite your output iterator to make it assignable
-   // (as is required by the standard), or define
-   // BOOST_NO_STD_OUTPUT_ITERATOR_ASSIGN to use the ugly hack above
-   *p = v;
-}
-
-#endif
-
-
-#if defined(BOOST_REGEX_NO_TEMPLATE_SWITCH_MERGE)
-//
-// Ugly ugly hack,
-// template don't merge if they contain switch statements so declare these
-// templates in unnamed namespace (ie with internal linkage), each translation
-// unit then gets its own local copy, it works seemlessly but bloats the app.
-namespace{
-#endif
-
-//
-// algorithm reg_format:
-// takes the result of a match and a format string
-// and merges them to produce a new string which
-// is sent to an OutputIterator,
-// _reg_format_aux does the actual work:
-//
-template <class OutputIterator, class Iterator, class Allocator, class charT, class traits_type>
-OutputIterator BOOST_REGEX_CALL _reg_format_aux(OutputIterator out,
-                          const match_results<Iterator, Allocator>& m,
-                          const charT*& fmt,
-                          match_flag_type flags, const traits_type& traits_inst,
-                          case_flags_type& case_flags)
-{
-#ifdef __BORLANDC__
-#pragma option push -w-8037
-#endif
-   const charT* fmt_end = fmt;
-   while(*fmt_end) ++ fmt_end;
-
-   typedef typename traits_type::size_type traits_size_type;
-   typedef typename traits_type::uchar_type traits_uchar_type;
-   typedef typename traits_type::string_type traits_string_type;
-
-   while(*fmt)
+   // On entry *m_position points to a '$' character
+   // output the information that goes with it:
+   //
+   BOOST_ASSERT(*m_position == '$');
+   //
+   // see if this is a trailing '$':
+   //
+   if(++m_position == m_end)
    {
-      switch(traits_inst.syntax_type((traits_size_type)(traits_uchar_type)(*fmt)))
+      --m_position;
+      put(*m_position);
+      ++m_position;
+      return;
+   }
+   //
+   // OK find out what kind it is:
+   //
+   switch(*m_position)
+   {
+   case '&':
+      ++m_position;
+      put(this->m_results[0]);
+      break;
+   case '`':
+      ++m_position;
+      put(this->m_results.prefix());
+      break;
+   case '\'':
+      ++m_position;
+      put(this->m_results.suffix());
+      break;
+   case '$':
+      put(*m_position++);
+      break;
+   default:
+      // see if we have a number:
       {
-      case traits_type::syntax_dollar:
-         if(flags & format_sed)
+         std::ptrdiff_t len = (std::min)(static_cast<std::ptrdiff_t>(2), std::distance(m_position, m_end));
+         int v = m_traits.toi(m_position, m_position + len, 10);
+         if(v < 0)
          {
-            // no perl style replacement,
-            // $ is an ordinary character:
-            goto default_opt;
-         }
-         ++fmt;
-         if(*fmt == 0) // oops trailing $
-         {
-            --fmt;
-            *out = *fmt;
-            ++out;
-            return out;
-         }
-         switch(traits_inst.syntax_type((traits_size_type)(traits_uchar_type)(*fmt)))
-         {
-         case traits_type::syntax_start_buffer:
-            oi_assign(&out, re_copy_out(out, Iterator(m[-1].first), Iterator(m[-1].second),
-                        traits_inst, case_flags));
-            ++fmt;
-            continue;
-         case traits_type::syntax_end_buffer:
-            oi_assign(&out, re_copy_out(out, Iterator(m[-2].first), Iterator(m[-2].second),
-                        traits_inst, case_flags));
-            ++fmt;
-            continue;
-         case traits_type::syntax_digit:
-         {
-expand_sub:
-            unsigned int index = traits_inst.toi(fmt, fmt_end, 10);
-            if(index < m.size())
-               oi_assign(&out, re_copy_out(out, Iterator(m[index].first), Iterator(m[index].second),
-                        traits_inst, case_flags));
-            continue;
-         }
-         }
-         // anything else:
-         if(*fmt == '&')
-         {
-            oi_assign(&out, re_copy_out(out, Iterator(m[0].first), Iterator(m[0].second),
-                        traits_inst, case_flags));
-            ++fmt;
-         }
-         else
-         {
-            // probably an error, treat as a literal '$'
-            --fmt;
-            *out = *fmt;
-            ++out;
-            ++fmt;
-         }
-         continue;
-      case traits_type::syntax_slash:
-      {
-         // escape sequence:
-         ++fmt;
-         charT c(*fmt);
-         if(*fmt == 0)
-         {
-            --fmt;
-            *out = *fmt;
-            ++out;
-            ++fmt;
-            return out;
-         }
-         switch(traits_inst.syntax_type((traits_size_type)(traits_uchar_type)(*fmt)))
-         {
-         case traits_type::syntax_a:
-            c = '\a';
-            ++fmt;
+            // leave the $ as is, and carry on:
+            --m_position;
+            put(*m_position);
+            ++m_position;
             break;
-         case traits_type::syntax_f:
-            c = '\f';
-            ++fmt;
-            break;
-         case traits_type::syntax_n:
-            c = '\n';
-            ++fmt;
-            break;
-         case traits_type::syntax_r:
-            c = '\r';
-            ++fmt;
-            break;
-         case traits_type::syntax_t:
-            c = '\t';
-            ++fmt;
-            break;
-         case traits_type::syntax_v:
-            c = '\v';
-            ++fmt;
-            break;
-         case traits_type::syntax_x:
-            ++fmt;
-            if(fmt == fmt_end)
-            {
-               *out = *--fmt;
-               ++out;
-               return out;
-            }
-            // maybe have \x{ddd}
-            if(traits_inst.syntax_type((traits_size_type)(traits_uchar_type)(*fmt)) == traits_type::syntax_open_brace)
-            {
-               ++fmt;
-               if(fmt == fmt_end)
-               {
-                  fmt -= 2;
-                  *out = *fmt;
-                  ++out;
-                  ++fmt;
-                  continue;
-               }
-               if(traits_inst.is_class(*fmt, traits_type::char_class_xdigit) == false)
-               {
-                  fmt -= 2;
-                  *out = *fmt;
-                  ++out;
-                  ++fmt;
-                  continue;
-               }
-               c = (charT)traits_inst.toi(fmt, fmt_end, -16);
-               if(traits_inst.syntax_type((traits_size_type)(traits_uchar_type)(*fmt)) != traits_type::syntax_close_brace)
-               {
-                  while(traits_inst.syntax_type((traits_size_type)(traits_uchar_type)(*fmt)) != traits_type::syntax_slash)
-                     --fmt;
-                  ++fmt;
-                  *out = *fmt;
-                  ++out;
-                  ++fmt;
-                  continue;
-               }
-               ++fmt;
-               break;
-            }
-            else
-            {
-               if(traits_inst.is_class(*fmt, traits_type::char_class_xdigit) == false)
-               {
-                  --fmt;
-                  *out = *fmt;
-                  ++out;
-                  ++fmt;
-                  continue;
-               }
-               c = (charT)traits_inst.toi(fmt, fmt_end, -16);
-            }
-            break;
-         case traits_type::syntax_c:
-            ++fmt;
-            if(fmt == fmt_end)
-            {
-               --fmt;
-               *out = *fmt;
-               ++out;
-               return out;
-            }
-            if(((typename traits_type::uchar_type)(*fmt) < (typename traits_type::uchar_type)'@')
-                  || ((typename traits_type::uchar_type)(*fmt) > (typename traits_type::uchar_type)127) )
-            {
-               --fmt;
-               *out = *fmt;
-               ++out;
-               ++fmt;
-               break;
-            }
-            c = (charT)((typename traits_type::uchar_type)(*fmt) - (typename traits_type::uchar_type)'@');
-            ++fmt;
-            break;
-         case traits_type::syntax_e:
-            c = (charT)27;
-            ++fmt;
-            break;
-         case traits_type::syntax_digit:
-            if(flags & format_sed)
-               goto expand_sub;
-            else
-               c = (charT)traits_inst.toi(fmt, fmt_end, -8);
-            break;
-
-         case traits_type::syntax_u:
-            ++fmt;
-            if(flags & format_sed) break;
-            case_flags = case_oneupper;
-            continue;
-         case traits_type::syntax_l:
-            ++fmt;
-            if(flags & format_sed) break;
-            case_flags = case_onelower;
-            continue;
-         case traits_type::syntax_U:
-            ++fmt;
-            if(flags & format_sed) break;
-            case_flags = case_allupper;
-            continue;
-         case traits_type::syntax_L:
-            ++fmt;
-            if(flags & format_sed) break;
-            case_flags = case_alllower;
-            continue;
-         case traits_type::syntax_E:
-            ++fmt;
-            if(flags & format_sed) break;
-            case_flags = case_nochange;
-            continue;
-         default:
-            //c = *fmt;
-            ++fmt;
          }
-         *out = c;
-         ++out;
-         continue;
-      }
-      case traits_type::syntax_open_bracket:
-         if(0 == (flags & format_all))
-         {
-            *out = *fmt;
-            ++out;
-            ++fmt;
-            continue;
-         }
-         else
-         {
-            ++fmt;  // recurse
-            oi_assign(&out, _reg_format_aux(out, m, fmt, flags, traits_inst, case_flags));
-            continue;
-         }
-      case traits_type::syntax_close_bracket:
-         if(0 == (flags & format_all))
-         {
-            *out = *fmt;
-            ++out;
-            ++fmt;
-            continue;
-         }
-         else
-         {
-            ++fmt;  // return from recursion
-            return out;
-         }
-      case traits_type::syntax_colon:
-         if(flags & regex_constants::format_is_if)
-         {
-            ++fmt;
-            return out;
-         }
-         *out = *fmt;
-         ++out;
-         ++fmt;
-         continue;
-      case traits_type::syntax_question:
-      {
-         if(0 == (flags & format_all))
-         {
-            *out = *fmt;
-            ++out;
-            ++fmt;
-            continue;
-         }
-         else
-         {
-            ++fmt;
-            if(*fmt == 0)
-            {
-               --fmt;
-               *out = *fmt;
-               ++out;
-               ++fmt;
-               return out;
-            }
-            unsigned int id = traits_inst.toi(fmt, fmt_end, 10);
-            if(m[id].matched)
-            {
-               oi_assign(&out, _reg_format_aux(out, m, fmt, flags | regex_constants::format_is_if, traits_inst, case_flags));
-               if(traits_inst.syntax_type((traits_size_type)(traits_uchar_type)(*(fmt-1))) == traits_type::syntax_colon)
-                  re_skip_format(fmt, traits_inst);
-            }
-            else
-            {
-               re_skip_format(fmt, traits_inst);
-               if(traits_inst.syntax_type((traits_size_type)(traits_uchar_type)(*(fmt-1))) == traits_type::syntax_colon)
-                  oi_assign(&out, _reg_format_aux(out, m, fmt, flags | regex_constants::format_is_if, traits_inst, case_flags));
-            }
-            return out;
-         }
-      }
-      default:
-default_opt:
-         if((flags & format_sed) && (*fmt == '&'))
-         {
-            oi_assign(&out, re_copy_out(out, Iterator(m[0].first), Iterator(m[0].second),
-                     traits_inst, case_flags));
-            ++fmt;
-            continue;
-         }
-
-         output_char(out, *fmt, traits_inst, case_flags);
-         ++out;
-         ++fmt;
+         // otherwise output sub v:
+         put(this->m_results[v]);
       }
    }
-
-   return out;
-#ifdef __BORLANDC__
-#pragma option pop
-#endif
 }
 
-#if defined(BOOST_REGEX_NO_TEMPLATE_SWITCH_MERGE)
-} // namespace
-#endif
+template <class OutputIterator, class Results, class traits>
+void basic_regex_formatter<OutputIterator, Results, traits>::format_escape()
+{
+   // skip the escape and check for trailing escape:
+   if(++m_position == m_end)
+   {
+      put(static_cast<char_type>('\\'));
+      return;
+   }
+   // now switch on the escape type:
+   switch(*m_position)
+   {
+   case 'a':
+      put(static_cast<char_type>('\a'));
+      ++m_position;
+      break;
+   case 'f':
+      put(static_cast<char_type>('\f'));
+      ++m_position;
+      break;
+   case 'n':
+      put(static_cast<char_type>('\n'));
+      ++m_position;
+      break;
+   case 'r':
+      put(static_cast<char_type>('\r'));
+      ++m_position;
+      break;
+   case 't':
+      put(static_cast<char_type>('\t'));
+      ++m_position;
+      break;
+   case 'v':
+      put(static_cast<char_type>('\v'));
+      ++m_position;
+      break;
+   case 'x':
+      if(++m_position == m_end)
+      {
+         put(static_cast<char_type>('x'));
+         return;
+      }
+      // maybe have \x{ddd}
+      if(*m_position == static_cast<char_type>('{'))
+      {
+         ++m_position;
+         int val = m_traits.toi(m_position, m_end, 16);
+         if(val < 0)
+         {
+            // invalid value treat everything as literals:
+            put(static_cast<char_type>('x'));
+            put(static_cast<char_type>('{'));
+            return;
+         }
+         if(*m_position != static_cast<char_type>('}'))
+         {
+            while(*m_position != static_cast<char_type>('\\'))
+               --m_position;
+            ++m_position;
+            put(*m_position++);
+            return;
+         }
+         ++m_position;
+         put(static_cast<char_type>(val));
+         return;
+      }
+      else
+      {
+         std::ptrdiff_t len = (std::min)(static_cast<std::ptrdiff_t>(2), std::distance(m_position, m_end));
+         int val = m_traits.toi(m_position, m_position + len, 16);
+         if(val < 0)
+         {
+            --m_position;
+            put(*m_position++);
+            return;
+         }
+         put(static_cast<char_type>(val));
+      }
+      break;
+   case 'c':
+      if(++m_position == m_end)
+      {
+         --m_position;
+         put(*m_position++);
+         return;
+      }
+      put(static_cast<char_type>(*m_position++ % 32));
+      break;
+   case 'e':
+      put(static_cast<char_type>(27));
+      ++m_position;
+      break;
+   default:
+      // see if we have a perl specific escape:
+      if((m_flags & boost::regex_constants::format_sed) == 0)
+      {
+         bool breakout = false;
+         switch(*m_position)
+         {
+         case 'l':
+            ++m_position;
+            m_state = output_next_lower;
+            breakout = true;
+            break;
+         case 'L':
+            ++m_position;
+            m_state = output_lower;
+            breakout = true;
+            break;
+         case 'u':
+            ++m_position;
+            m_state = output_next_upper;
+            breakout = true;
+            break;
+         case 'U':
+            ++m_position;
+            m_state = output_upper;
+            breakout = true;
+            break;
+         case 'E':
+            ++m_position;
+            m_state = output_copy;
+            breakout = true;
+            break;
+         }
+         if(breakout)
+            break;
+      }
+      // see if we have a \n sed style backreference:
+      int v = m_traits.toi(m_position, m_position+1, 10);
+      if((v > 0) || ((v == 0) && (m_flags & ::boost::regex_constants::format_sed)))
+      {
+         put(m_results[v]);
+         break;
+      }
+      else if(v == 0)
+      {
+         // octal ecape sequence:
+         --m_position;
+         std::ptrdiff_t len = (std::min)(static_cast<std::ptrdiff_t>(4), std::distance(m_position, m_end));
+         v = m_traits.toi(m_position, m_position + len, 8);
+         BOOST_ASSERT(v >= 0);
+         put(static_cast<char_type>(v));
+         break;
+      }
+      // Otherwise output the character "as is":
+      put(*m_position++);
+      break;
+   }
+}
+
+template <class OutputIterator, class Results, class traits>
+void basic_regex_formatter<OutputIterator, Results, traits>::format_conditional()
+{
+   if(m_position == m_end)
+   {
+      // oops trailing '?':
+      put(static_cast<char_type>('?'));
+      return;
+   }
+   std::ptrdiff_t len = (std::min)(static_cast<std::ptrdiff_t>(2), std::distance(m_position, m_end));
+   int v = m_traits.toi(m_position, m_position + len, 10);
+   if(v < 0)
+   {
+      // oops not a number:
+      put(static_cast<char_type>('?'));
+      return;
+   }
+
+   // output varies depending upon whether sub-expression v matched or not:
+   if(m_results[v].matched)
+   {
+      m_have_conditional = true;
+      format_all();
+      m_have_conditional = false;
+      if((m_position != m_end) && (*m_position == static_cast<char_type>(':')))
+      {
+         // skip the ':':
+         ++m_position;
+         // save output state, then turn it off:
+         output_state saved_state = m_state;
+         m_state = output_none;
+         // format the rest of this scope:
+         format_until_scope_end();
+         // restore output state:
+         m_state = saved_state;
+      }
+   }
+   else
+   {
+      // save output state, then turn it off:
+      output_state saved_state = m_state;
+      m_state = output_none;
+      // format until ':' or ')':
+      m_have_conditional = true;
+      format_all();
+      m_have_conditional = false;
+      // restore state:
+      m_state = saved_state;
+      if((m_position != m_end) && (*m_position == static_cast<char_type>(':')))
+      {
+         // skip the ':':
+         ++m_position;
+         // format the rest of this scope:
+         format_until_scope_end();
+      }
+   }
+}
+
+template <class OutputIterator, class Results, class traits>
+void basic_regex_formatter<OutputIterator, Results, traits>::format_until_scope_end()
+{
+   do
+   {
+      format_all();
+      if((m_position == m_end) || (*m_position == static_cast<char_type>(')')))
+         return;
+      put(*m_position++);
+   }while(m_position != m_end);
+}
+
+template <class OutputIterator, class Results, class traits>
+void basic_regex_formatter<OutputIterator, Results, traits>::put(char_type c)
+{
+   // write a single character to output
+   // according to which case translation mode we are in:
+   switch(this->m_state)
+   {
+   case output_none:
+      return;
+   case output_next_lower:
+      c = m_traits.tolower(c);
+      this->m_state = output_copy;
+      break;
+   case output_next_upper:
+      c = m_traits.toupper(c);
+      this->m_state = output_copy;
+      break;
+   case output_lower:
+      c = m_traits.tolower(c);
+      break;
+   case output_upper:
+      c = m_traits.toupper(c);
+      break;
+   default:
+      break;
+   }
+   *m_out = c;
+   ++m_out;
+}
+
+template <class OutputIterator, class Results, class traits>
+void basic_regex_formatter<OutputIterator, Results, traits>::put(const sub_match_type& sub)
+{
+   typedef typename sub_match_type::iterator iterator_type;
+   iterator_type i = sub.first;
+   while(i != sub.second)
+   {
+      put(*i);
+      ++i;
+   }
+}
 
 template <class S>
 class string_out_iterator
 {
    S* out;
 public:
-   typedef typename S::difference_type difference_type;
-   typedef typename S::value_type value_type;
-   typedef typename S::pointer pointer;
-   typedef typename S::reference reference;
-   typedef          std::output_iterator_tag iterator_category;
-
    string_out_iterator(S& s) : out(&s) {}
    string_out_iterator& operator++() { return *this; }
    string_out_iterator& operator++(int) { return *this; }
    string_out_iterator& operator*() { return *this; }
-   string_out_iterator& operator=(typename S::value_type v)
-   {
-      out->append(1, v);
-      return *this;
+   string_out_iterator& operator=(typename S::value_type v) 
+   { 
+      out->append(1, v); 
+      return *this; 
    }
 };
 
-template <class OutputIterator, class Iterator, class charT, class Allocator, class traits_type>
-class merge_out_predicate
+template <class OutputIterator, class Iterator, class Alloc, class charT, class traits>
+OutputIterator regex_format_imp(OutputIterator out,
+                          const match_results<Iterator, Alloc>& m,
+                          const charT* p1, const charT* p2,
+                          match_flag_type flags,
+                          const traits& t
+                         )
 {
-   OutputIterator* out;
-   Iterator* last;
-   const charT* fmt;
-   match_flag_type flags;
-   const traits_type* pt;
-   // rebind allocator to correct type:
-   typedef typename detail::rebind_allocator<sub_match<Iterator>, Allocator>::type alloc_type;
-
-public:
-   merge_out_predicate(OutputIterator& o, Iterator& pi, const charT* f, match_flag_type format_flags, const traits_type& p)
-      : out(&o), last(&pi), fmt(f), flags(format_flags), pt(&p){}
-
-   ~merge_out_predicate() {}
-   bool BOOST_REGEX_CALL operator()(const boost::match_results<Iterator, alloc_type>& m)
+   if(flags & regex_constants::format_literal)
    {
-      const charT* f = fmt;
-      case_flags_type cf = case_nochange;
-      if(0 == (flags & format_no_copy))
-      {
-         oi_assign(out, re_copy_out(
-                     *out, 
-                     Iterator(m[-1].first), 
-                     Iterator(m[-1].second),
-                     *pt, 
-                     cf));
-      }
-      oi_assign(out, _reg_format_aux(*out, m, f, flags, *pt, cf));
-      *last = m[-2].first;
-      return flags & format_first_only ? false : true;
+      return std::copy(p1, p2, out);
    }
-};
+
+   re_detail::basic_regex_formatter<
+      OutputIterator, 
+      match_results<Iterator, Alloc>, 
+      traits > f(out, m, t);
+   return f.format(p1, p2, flags);
+}
+
 
 } // namespace re_detail
 
-template <class OutputIterator, class Iterator, class Allocator, class charT>
+template <class OutputIterator, class Iterator, class charT>
 OutputIterator regex_format(OutputIterator out,
-                          const match_results<Iterator, Allocator>& m,
+                          const match_results<Iterator>& m,
                           const charT* fmt,
                           match_flag_type flags = format_all
                          )
 {
-   regex_traits<charT> t;
-
-   re_detail::case_flags_type cf = re_detail::case_nochange;
-   return re_detail::_reg_format_aux(out, m, fmt, flags, t, cf);
+   re_detail::trivial_format_traits<charT> traits;
+   return re_detail::regex_format_imp(out, m, fmt, fmt + traits.length(fmt), flags, traits);
 }
 
-template <class OutputIterator, class Iterator, class Allocator, class charT>
+template <class OutputIterator, class Iterator, class charT>
 OutputIterator regex_format(OutputIterator out,
-                          const match_results<Iterator, Allocator>& m,
+                          const match_results<Iterator>& m,
                           const std::basic_string<charT>& fmt,
                           match_flag_type flags = format_all
                          )
 {
-   regex_traits<charT> t;
-   const charT* start = fmt.c_str();
+   re_detail::trivial_format_traits<charT> traits;
+   return re_detail::regex_format_imp(out, m, fmt.data(), fmt.data() + fmt.size(), flags, traits);
+}  
 
-   re_detail::case_flags_type cf = re_detail::case_nochange;
-   return re_detail::_reg_format_aux(out, m, start, flags, t, cf);
-}
-
-template <class Iterator, class Allocator, class charT>
-std::basic_string<charT> regex_format(const match_results<Iterator, Allocator>& m,
-                                      const charT* fmt,
+template <class Iterator, class charT>
+std::basic_string<charT> regex_format(const match_results<Iterator>& m, 
+                                      const charT* fmt, 
                                       match_flag_type flags = format_all)
 {
    std::basic_string<charT> result;
    re_detail::string_out_iterator<std::basic_string<charT> > i(result);
-   regex_format(i, m, fmt, flags);
+   re_detail::trivial_format_traits<charT> traits;
+   re_detail::regex_format_imp(i, m, fmt, fmt + traits.length(fmt), flags, traits);
    return result;
 }
 
-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,
+template <class Iterator, class charT>
+std::basic_string<charT> regex_format(const match_results<Iterator>& m, 
+                                      const std::basic_string<charT>& fmt, 
                                       match_flag_type flags = format_all)
 {
    std::basic_string<charT> result;
    re_detail::string_out_iterator<std::basic_string<charT> > i(result);
-   regex_format(i, m, fmt.c_str(), flags);
+   re_detail::trivial_format_traits<charT> traits;
+   re_detail::regex_format_imp(i, m, fmt.data(), fmt.data() + fmt.size(), flags, traits);
    return result;
 }
 
diff --git a/include/boost/regex/v4/regex_fwd.hpp b/include/boost/regex/v4/regex_fwd.hpp
index e5b437cc..704104ed 100644
--- a/include/boost/regex/v4/regex_fwd.hpp
+++ b/include/boost/regex/v4/regex_fwd.hpp
@@ -13,7 +13,7 @@
   *   LOCATION:    see http://www.boost.org for most recent version.
   *   FILE         regex_fwd.cpp
   *   VERSION      see <boost/version.hpp>
-  *   DESCRIPTION: Forward declares boost::reg_expression<> and
+  *   DESCRIPTION: Forward declares boost::basic_regex<> and
   *                associated typedefs.
   */
 
@@ -21,9 +21,8 @@
 #define BOOST_REGEX_FWD_HPP_INCLUDED
 
 #ifndef BOOST_REGEX_CONFIG_HPP
-#include <boost/config.hpp>
+#include <boost/regex/config.hpp>
 #endif
-#include <boost/regex/config/allocator.hpp>
 
 //
 // define BOOST_REGEX_NO_FWD if this
@@ -35,27 +34,32 @@
 #  endif
 #else
 
-//
-// If there isn't good enough wide character support then there will
-// be no wide character regular expressions:
-//
-#if (defined(BOOST_NO_CWCHAR) || defined(BOOST_NO_CWCTYPE) || defined(BOOST_NO_STD_WSTRING)) && !defined(BOOST_NO_WREGEX)
-#  define BOOST_NO_WREGEX
-#endif
-
 namespace boost{
 
 template <class charT>
-class regex_traits;
+class cpp_regex_traits;
+template <class charT>
+struct c_regex_traits;
+template <class charT>
+class w32_regex_traits;
 
-template <class charT, class traits = regex_traits<charT>, class Allocator = BOOST_DEFAULT_ALLOCATOR(charT) >
-class reg_expression;
-template <class charT, class traits = regex_traits<charT>, class Allocator = BOOST_DEFAULT_ALLOCATOR(charT) >
+#ifdef BOOST_REGEX_USE_WIN32_LOCALE
+template <class charT, class implementationT = w32_regex_traits<charT> >
+struct regex_traits;
+#elif defined(BOOST_REGEX_USE_CPP_LOCALE)
+template <class charT, class implementationT = cpp_regex_traits<charT> >
+struct regex_traits;
+#else
+template <class charT, class implementationT = c_regex_traits<charT> >
+struct regex_traits;
+#endif
+
+template <class charT, class traits = regex_traits<charT> >
 class basic_regex;
 
-typedef basic_regex<char, regex_traits<char>, BOOST_DEFAULT_ALLOCATOR(char) > regex;
+typedef basic_regex<char, regex_traits<char> > regex;
 #ifndef BOOST_NO_WREGEX
-typedef basic_regex<wchar_t, regex_traits<wchar_t>, BOOST_DEFAULT_ALLOCATOR(wchar_t) > wregex;
+typedef basic_regex<wchar_t, regex_traits<wchar_t> > wregex;
 #endif
 
 } // namespace boost
diff --git a/include/boost/regex/v4/regex_grep.hpp b/include/boost/regex/v4/regex_grep.hpp
index f59fceb8..51fab118 100644
--- a/include/boost/regex/v4/regex_grep.hpp
+++ b/include/boost/regex/v4/regex_grep.hpp
@@ -30,21 +30,20 @@ namespace boost{
 // regex_grep:
 // find all non-overlapping matches within the sequence first last:
 //
-template <class Predicate, class BidiIterator, class charT, class traits, class Allocator>
+template <class Predicate, class BidiIterator, class charT, class traits>
 inline unsigned int regex_grep(Predicate foo, 
                                BidiIterator first, 
                                BidiIterator last, 
-                               const reg_expression<charT, traits, Allocator>& e, 
+                               const basic_regex<charT, traits>& e, 
                                match_flag_type flags = match_default)
 {
    if(e.flags() & regex_constants::failbit)
       return false;
-   typedef          detail::rebind_allocator<sub_match<BidiIterator>, Allocator>  binder;
-   typedef typename binder::type                                                  match_allocator_type;
-   //typedef Allocator match_allocator_type;
 
-   match_results<BidiIterator, match_allocator_type> m;
-   re_detail::perl_matcher<BidiIterator, match_allocator_type, traits, Allocator> matcher(first, last, m, e, flags);
+   typedef typename match_results<BidiIterator>::allocator_type match_allocator_type;
+
+   match_results<BidiIterator> m;
+   re_detail::perl_matcher<BidiIterator, match_allocator_type, traits> matcher(first, last, m, e, flags);
    unsigned int count = 0;
    while(matcher.find())
    {
@@ -85,17 +84,17 @@ inline unsigned int regex_grep(Predicate foo,
 // this isn't really a partial specialisation, but template function
 // overloading - if the compiler doesn't support partial specialisation
 // then it really won't support this either:
-template <class Predicate, class charT, class Allocator, class traits>
+template <class Predicate, class charT, class traits>
 inline unsigned int regex_grep(Predicate foo, const charT* str, 
-                        const reg_expression<charT, traits, Allocator>& e, 
+                        const basic_regex<charT, traits>& e, 
                         match_flag_type flags = match_default)
 {
    return regex_grep(foo, str, str + traits::length(str), e, flags);
 }
 
-template <class Predicate, class ST, class SA, class Allocator, class charT, class traits>
+template <class Predicate, class ST, class SA, class charT, class traits>
 inline unsigned int regex_grep(Predicate foo, const std::basic_string<charT, ST, SA>& s, 
-                 const reg_expression<charT, traits, Allocator>& e, 
+                 const basic_regex<charT, traits>& e, 
                  match_flag_type flags = match_default)
 {
    return regex_grep(foo, s.begin(), s.end(), e, flags);
diff --git a/include/boost/regex/v4/regex_iterator.hpp b/include/boost/regex/v4/regex_iterator.hpp
index 0229246c..68db8317 100644
--- a/include/boost/regex/v4/regex_iterator.hpp
+++ b/include/boost/regex/v4/regex_iterator.hpp
@@ -29,30 +29,29 @@ namespace boost{
 
 template <class BidirectionalIterator, 
           class charT,
-          class traits,
-          class Allocator>
+          class traits>
 class regex_iterator_implementation 
 {
-   typedef basic_regex<charT, traits, Allocator> regex_type;
+   typedef basic_regex<charT, traits> regex_type;
 
    match_results<BidirectionalIterator> what;  // current match
    BidirectionalIterator                base;  // start of sequence
    BidirectionalIterator                end;   // end of sequence
-   const regex_type*                    pre;   // the expression
+   const regex_type                     re;   // the expression
    match_flag_type                      flags; // flags for matching
 
 public:
    regex_iterator_implementation(const regex_type* p, BidirectionalIterator last, match_flag_type f)
-      : base(), end(last), pre(p), flags(f){}
+      : base(), end(last), re(*p), flags(f){}
    bool init(BidirectionalIterator first)
    {
       base = first;
-      return regex_search(first, end, what, *pre, flags);
+      return regex_search(first, end, what, re, flags);
    }
    bool compare(const regex_iterator_implementation& that)
    {
       if(this == &that) return true;
-      return (pre == that.pre) && (end == that.end) && (flags == that.flags) && (what[0].first == that.what[0].first) && (what[0].second == that.what[0].second);
+      return (&re.get_data() == &that.re.get_data()) && (end == that.end) && (flags == that.flags) && (what[0].first == that.what[0].first) && (what[0].second == that.what[0].second);
    }
    const match_results<BidirectionalIterator>& get()
    { return what; }
@@ -64,17 +63,18 @@ public:
       match_flag_type f(flags);
       if(!what.length())
          f |= regex_constants::match_not_initial_null;
-      bool result = regex_search(next_start, end, what, *pre, f);
+      bool result = regex_search(next_start, end, what, re, f);
       if(result)
          what.set_base(base);
       return result;
    }
+private:
+   regex_iterator_implementation& operator=(const regex_iterator_implementation&);
 };
 
 template <class BidirectionalIterator, 
           class charT = BOOST_DEDUCED_TYPENAME re_detail::regex_iterator_traits<BidirectionalIterator>::value_type,
-          class traits = regex_traits<charT>,
-          class Allocator = BOOST_DEFAULT_ALLOCATOR(charT) >
+          class traits = regex_traits<charT> >
 class regex_iterator 
 #ifndef BOOST_NO_STD_ITERATOR
    : public std::iterator<
@@ -86,10 +86,10 @@ class regex_iterator
 #endif
 {
 private:
-   typedef regex_iterator_implementation<BidirectionalIterator, charT, traits, Allocator> impl;
+   typedef regex_iterator_implementation<BidirectionalIterator, charT, traits> impl;
    typedef shared_ptr<impl> pimpl;
 public:
-   typedef          basic_regex<charT, traits, Allocator>                   regex_type;
+   typedef          basic_regex<charT, traits>                   regex_type;
    typedef          match_results<BidirectionalIterator>                    value_type;
    typedef typename re_detail::regex_iterator_traits<BidirectionalIterator>::difference_type 
                                                                             difference_type;
@@ -163,6 +163,18 @@ typedef regex_iterator<const wchar_t*> wcregex_iterator;
 typedef regex_iterator<std::wstring::const_iterator> wsregex_iterator;
 #endif
 
+// make_regex_iterator:
+template <class charT, class traits>
+inline 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)
+{
+   return regex_iterator<const charT*, charT, traits>(p, p+traits::length(p), e, m);
+}
+template <class charT, class traits, class ST, class SA>
+inline 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)
+{
+   return regex_iterator<typename std::basic_string<charT, ST, SA>::const_iterator, charT, traits>(p.begin(), p.end(), e, m);
+}
+
 #ifdef BOOST_HAS_ABI_HEADERS
 #  include BOOST_ABI_SUFFIX
 #endif
diff --git a/include/boost/regex/v4/regex_kmp.hpp b/include/boost/regex/v4/regex_kmp.hpp
index eaea55e0..073a0e2e 100644
--- a/include/boost/regex/v4/regex_kmp.hpp
+++ b/include/boost/regex/v4/regex_kmp.hpp
@@ -55,7 +55,7 @@ kmp_info<charT>* kmp_compile(iterator first, iterator last, charT, Trans transla
    typedef typename boost::detail::rebind_allocator<char, Allocator>::type atype;
    int i, j, m;
    i = 0;
-   m = static_cast<int>(boost::re_detail::distance(first, last));
+   m = static_cast<int>(::boost::re_detail::distance(first, last));
    ++m;
    unsigned int size = sizeof(kmp_info<charT>) + sizeof(int)*m + sizeof(charT)*m;
    --m;
diff --git a/include/boost/regex/v4/regex_match.hpp b/include/boost/regex/v4/regex_match.hpp
index a34a07ad..9117c7c0 100644
--- a/include/boost/regex/v4/regex_match.hpp
+++ b/include/boost/regex/v4/regex_match.hpp
@@ -22,14 +22,6 @@
 #ifndef BOOST_REGEX_MATCH_HPP
 #define BOOST_REGEX_MATCH_HPP
 
-#ifndef BOOST_REGEX_MAX_STATE_COUNT
-#  define BOOST_REGEX_MAX_STATE_COUNT 100000000
-#endif
-
-#include <boost/limits.hpp>
-#include <boost/regex/v4/perl_matcher.hpp>
-
-
 namespace boost{
 
 #ifdef BOOST_HAS_ABI_HEADERS
@@ -41,22 +33,22 @@ namespace boost{
 // returns true if the specified regular expression matches
 // the whole of the input.  Fills in what matched in m.
 //
-template <class BidiIterator, class Allocator, class charT, class traits, class Allocator2>
+template <class BidiIterator, class Allocator, class charT, class traits>
 bool regex_match(BidiIterator first, BidiIterator last, 
                  match_results<BidiIterator, Allocator>& m, 
-                 const reg_expression<charT, traits, Allocator2>& e, 
+                 const basic_regex<charT, traits>& e, 
                  match_flag_type flags = match_default)
 {
-   re_detail::perl_matcher<BidiIterator, Allocator, traits, Allocator2> matcher(first, last, m, e, flags);
+   re_detail::perl_matcher<BidiIterator, Allocator, traits> matcher(first, last, m, e, flags);
    return matcher.match();
 }
-template <class iterator, class charT, class traits, class Allocator2>
+template <class iterator, class charT, class traits>
 bool regex_match(iterator first, iterator last, 
-                 const reg_expression<charT, traits, Allocator2>& e, 
+                 const basic_regex<charT, traits>& e, 
                  match_flag_type flags = match_default)
 {
    match_results<iterator> m;
-   return regex_match(first, last, m, e, flags);
+   return regex_match(first, last, m, e, flags | regex_constants::match_any);
 }
 //
 // query_match convenience interfaces:
@@ -65,40 +57,40 @@ bool regex_match(iterator first, iterator last,
 // this isn't really a partial specialisation, but template function
 // overloading - if the compiler doesn't support partial specialisation
 // then it really won't support this either:
-template <class charT, class Allocator, class traits, class Allocator2>
+template <class charT, class Allocator, class traits>
 inline bool regex_match(const charT* str, 
                         match_results<const charT*, Allocator>& m, 
-                        const reg_expression<charT, traits, Allocator2>& e, 
+                        const basic_regex<charT, traits>& e, 
                         match_flag_type flags = match_default)
 {
    return regex_match(str, str + traits::length(str), m, e, flags);
 }
 
-template <class ST, class SA, class Allocator, class charT, class traits, class Allocator2>
+template <class ST, class SA, class Allocator, class charT, class traits>
 inline bool regex_match(const std::basic_string<charT, ST, SA>& s, 
                  match_results<typename std::basic_string<charT, ST, SA>::const_iterator, Allocator>& m, 
-                 const reg_expression<charT, traits, Allocator2>& e, 
+                 const basic_regex<charT, traits>& e, 
                  match_flag_type flags = match_default)
 {
    return regex_match(s.begin(), s.end(), m, e, flags);
 }
-template <class charT, class traits, class Allocator2>
+template <class charT, class traits>
 inline bool regex_match(const charT* str, 
-                        const reg_expression<charT, traits, Allocator2>& e, 
+                        const basic_regex<charT, traits>& e, 
                         match_flag_type flags = match_default)
 {
    match_results<const charT*> m;
-   return regex_match(str, str + traits::length(str), m, e, flags);
+   return regex_match(str, str + traits::length(str), m, e, flags | regex_constants::match_any);
 }
 
-template <class ST, class SA, class charT, class traits, class Allocator2>
+template <class ST, class SA, class charT, class traits>
 inline bool regex_match(const std::basic_string<charT, ST, SA>& s, 
-                 const reg_expression<charT, traits, Allocator2>& e, 
+                 const basic_regex<charT, traits>& e, 
                  match_flag_type flags = match_default)
 {
    typedef typename std::basic_string<charT, ST, SA>::const_iterator iterator;
    match_results<iterator> m;
-   return regex_match(s.begin(), s.end(), m, e, flags);
+   return regex_match(s.begin(), s.end(), m, e, flags | regex_constants::match_any);
 }
 #else  // partial ordering
 inline bool regex_match(const char* str, 
@@ -113,8 +105,52 @@ inline bool regex_match(const char* str,
                         match_flag_type flags = match_default)
 {
    match_results<const char*> m;
+   return regex_match(str, str + regex::traits_type::length(str), m, e, flags | regex_constants::match_any);
+}
+inline bool regex_match(const char* str, 
+                        cmatch& m, 
+                        const basic_regex<char, cpp_regex_traits<char> >& e, 
+                        match_flag_type flags = match_default)
+{
    return regex_match(str, str + regex::traits_type::length(str), m, e, flags);
 }
+inline bool regex_match(const char* str, 
+                        const basic_regex<char, cpp_regex_traits<char> >& e, 
+                        match_flag_type flags = match_default)
+{
+   match_results<const char*> m;
+   return regex_match(str, str + regex::traits_type::length(str), m, e, flags | regex_constants::match_any);
+}
+inline bool regex_match(const char* str, 
+                        cmatch& m, 
+                        const basic_regex<char, c_regex_traits<char> >& e, 
+                        match_flag_type flags = match_default)
+{
+   return regex_match(str, str + regex::traits_type::length(str), m, e, flags);
+}
+inline bool regex_match(const char* str, 
+                        const basic_regex<char, c_regex_traits<char> >& e, 
+                        match_flag_type flags = match_default)
+{
+   match_results<const char*> m;
+   return regex_match(str, str + regex::traits_type::length(str), m, e, flags | regex_constants::match_any);
+}
+#if defined(_WIN32) && !defined(BOOST_REGEX_NO_W32)
+inline bool regex_match(const char* str, 
+                        cmatch& m, 
+                        const basic_regex<char, w32_regex_traits<char> >& e, 
+                        match_flag_type flags = match_default)
+{
+   return regex_match(str, str + regex::traits_type::length(str), m, e, flags);
+}
+inline bool regex_match(const char* str, 
+                        const basic_regex<char, w32_regex_traits<char> >& e, 
+                        match_flag_type flags = match_default)
+{
+   match_results<const char*> m;
+   return regex_match(str, str + regex::traits_type::length(str), m, e, flags | regex_constants::match_any);
+}
+#endif
 #ifndef BOOST_NO_WREGEX
 inline bool regex_match(const wchar_t* str, 
                         wcmatch& m, 
@@ -128,8 +164,52 @@ inline bool regex_match(const wchar_t* str,
                         match_flag_type flags = match_default)
 {
    match_results<const wchar_t*> m;
+   return regex_match(str, str + wregex::traits_type::length(str), m, e, flags | regex_constants::match_any);
+}
+inline bool regex_match(const wchar_t* str, 
+                        wcmatch& m, 
+                        const basic_regex<wchar_t, cpp_regex_traits<wchar_t> >& e, 
+                        match_flag_type flags = match_default)
+{
    return regex_match(str, str + wregex::traits_type::length(str), m, e, flags);
 }
+inline bool regex_match(const wchar_t* str, 
+                        const basic_regex<wchar_t, cpp_regex_traits<wchar_t> >& e, 
+                        match_flag_type flags = match_default)
+{
+   match_results<const wchar_t*> m;
+   return regex_match(str, str + wregex::traits_type::length(str), m, e, flags | regex_constants::match_any);
+}
+inline bool regex_match(const wchar_t* str, 
+                        wcmatch& m, 
+                        const basic_regex<wchar_t, c_regex_traits<wchar_t> >& e, 
+                        match_flag_type flags = match_default)
+{
+   return regex_match(str, str + wregex::traits_type::length(str), m, e, flags);
+}
+inline bool regex_match(const wchar_t* str, 
+                        const basic_regex<wchar_t, c_regex_traits<wchar_t> >& e, 
+                        match_flag_type flags = match_default)
+{
+   match_results<const wchar_t*> m;
+   return regex_match(str, str + wregex::traits_type::length(str), m, e, flags | regex_constants::match_any);
+}
+#if defined(_WIN32) && !defined(BOOST_REGEX_NO_W32)
+inline bool regex_match(const wchar_t* str, 
+                        wcmatch& m, 
+                        const basic_regex<wchar_t, w32_regex_traits<wchar_t> >& e, 
+                        match_flag_type flags = match_default)
+{
+   return regex_match(str, str + wregex::traits_type::length(str), m, e, flags);
+}
+inline bool regex_match(const wchar_t* str, 
+                        const basic_regex<wchar_t, w32_regex_traits<wchar_t> >& e, 
+                        match_flag_type flags = match_default)
+{
+   match_results<const wchar_t*> m;
+   return regex_match(str, str + wregex::traits_type::length(str), m, e, flags | regex_constants::match_any);
+}
+#endif
 #endif
 inline bool regex_match(const std::string& s, 
                         smatch& m,
@@ -143,11 +223,55 @@ inline bool regex_match(const std::string& s,
                         match_flag_type flags = match_default)
 {
    match_results<std::string::const_iterator> m;
+   return regex_match(s.begin(), s.end(), m, e, flags | regex_constants::match_any);
+}
+inline bool regex_match(const std::string& s, 
+                        smatch& m,
+                        const basic_regex<char, cpp_regex_traits<char> >& e, 
+                        match_flag_type flags = match_default)
+{
    return regex_match(s.begin(), s.end(), m, e, flags);
 }
+inline bool regex_match(const std::string& s, 
+                        const basic_regex<char, cpp_regex_traits<char> >& e, 
+                        match_flag_type flags = match_default)
+{
+   match_results<std::string::const_iterator> m;
+   return regex_match(s.begin(), s.end(), m, e, flags | regex_constants::match_any);
+}
+inline bool regex_match(const std::string& s, 
+                        smatch& m,
+                        const basic_regex<char, c_regex_traits<char> >& e, 
+                        match_flag_type flags = match_default)
+{
+   return regex_match(s.begin(), s.end(), m, e, flags);
+}
+inline bool regex_match(const std::string& s, 
+                        const basic_regex<char, c_regex_traits<char> >& e, 
+                        match_flag_type flags = match_default)
+{
+   match_results<std::string::const_iterator> m;
+   return regex_match(s.begin(), s.end(), m, e, flags | regex_constants::match_any);
+}
+#if defined(_WIN32) && !defined(BOOST_REGEX_NO_W32)
+inline bool regex_match(const std::string& s, 
+                        smatch& m,
+                        const basic_regex<char, w32_regex_traits<char> >& e, 
+                        match_flag_type flags = match_default)
+{
+   return regex_match(s.begin(), s.end(), m, e, flags);
+}
+inline bool regex_match(const std::string& s, 
+                        const basic_regex<char, w32_regex_traits<char> >& e, 
+                        match_flag_type flags = match_default)
+{
+   match_results<std::string::const_iterator> m;
+   return regex_match(s.begin(), s.end(), m, e, flags | regex_constants::match_any);
+}
+#endif
 #if !defined(BOOST_NO_WREGEX)
 inline bool regex_match(const std::basic_string<wchar_t>& s, 
-                        wsmatch& m,
+                        match_results<std::basic_string<wchar_t>::const_iterator>& m,
                         const wregex& e, 
                         match_flag_type flags = match_default)
 {
@@ -158,8 +282,52 @@ inline bool regex_match(const std::basic_string<wchar_t>& s,
                         match_flag_type flags = match_default)
 {
    match_results<std::basic_string<wchar_t>::const_iterator> m;
+   return regex_match(s.begin(), s.end(), m, e, flags | regex_constants::match_any);
+}
+inline bool regex_match(const std::basic_string<wchar_t>& s, 
+                        match_results<std::basic_string<wchar_t>::const_iterator>& m,
+                        const basic_regex<wchar_t, cpp_regex_traits<wchar_t> >& e, 
+                        match_flag_type flags = match_default)
+{
    return regex_match(s.begin(), s.end(), m, e, flags);
 }
+inline bool regex_match(const std::basic_string<wchar_t>& s, 
+                        const basic_regex<wchar_t, cpp_regex_traits<wchar_t> >& e, 
+                        match_flag_type flags = match_default)
+{
+   match_results<std::basic_string<wchar_t>::const_iterator> m;
+   return regex_match(s.begin(), s.end(), m, e, flags | regex_constants::match_any);
+}
+inline bool regex_match(const std::basic_string<wchar_t>& s, 
+                        match_results<std::basic_string<wchar_t>::const_iterator>& m,
+                        const basic_regex<wchar_t, c_regex_traits<wchar_t> >& e, 
+                        match_flag_type flags = match_default)
+{
+   return regex_match(s.begin(), s.end(), m, e, flags);
+}
+inline bool regex_match(const std::basic_string<wchar_t>& s, 
+                        const basic_regex<wchar_t, c_regex_traits<wchar_t> >& e, 
+                        match_flag_type flags = match_default)
+{
+   match_results<std::basic_string<wchar_t>::const_iterator> m;
+   return regex_match(s.begin(), s.end(), m, e, flags | regex_constants::match_any);
+}
+#if defined(_WIN32) && !defined(BOOST_REGEX_NO_W32)
+inline bool regex_match(const std::basic_string<wchar_t>& s, 
+                        match_results<std::basic_string<wchar_t>::const_iterator>& m,
+                        const basic_regex<wchar_t, w32_regex_traits<wchar_t> >& e, 
+                        match_flag_type flags = match_default)
+{
+   return regex_match(s.begin(), s.end(), m, e, flags);
+}
+inline bool regex_match(const std::basic_string<wchar_t>& s, 
+                        const basic_regex<wchar_t, w32_regex_traits<wchar_t> >& e, 
+                        match_flag_type flags = match_default)
+{
+   match_results<std::basic_string<wchar_t>::const_iterator> m;
+   return regex_match(s.begin(), s.end(), m, e, flags | regex_constants::match_any);
+}
+#endif
 #endif
 
 #endif
diff --git a/include/boost/regex/v4/regex_merge.hpp b/include/boost/regex/v4/regex_merge.hpp
index ff6e1aa3..e77a329a 100644
--- a/include/boost/regex/v4/regex_merge.hpp
+++ b/include/boost/regex/v4/regex_merge.hpp
@@ -28,40 +28,40 @@ namespace boost{
 #  include BOOST_ABI_PREFIX
 #endif
 
-template <class OutputIterator, class Iterator, class traits, class Allocator, class charT>
+template <class OutputIterator, class Iterator, class traits, class charT>
 inline OutputIterator regex_merge(OutputIterator out,
                          Iterator first,
                          Iterator last,
-                         const reg_expression<charT, traits, Allocator>& e, 
+                         const basic_regex<charT, traits>& e, 
                          const charT* fmt, 
                          match_flag_type flags = match_default)
 {
    return regex_replace(out, first, last, e, fmt, flags);
 }
 
-template <class OutputIterator, class Iterator, class traits, class Allocator, class charT>
+template <class OutputIterator, class Iterator, class traits, class charT>
 inline OutputIterator regex_merge(OutputIterator out,
                          Iterator first,
                          Iterator last,
-                         const reg_expression<charT, traits, Allocator>& e, 
+                         const basic_regex<charT, traits>& e, 
                          const std::basic_string<charT>& fmt,
                          match_flag_type flags = match_default)
 {
    return regex_merge(out, first, last, e, fmt.c_str(), flags);
 }
 
-template <class traits, class Allocator, class charT>
+template <class traits, class charT>
 inline std::basic_string<charT> regex_merge(const std::basic_string<charT>& s,
-                         const reg_expression<charT, traits, Allocator>& e, 
+                         const basic_regex<charT, traits>& e, 
                          const charT* fmt,
                          match_flag_type flags = match_default)
 {
    return regex_replace(s, e, fmt, flags);
 }
 
-template <class traits, class Allocator, class charT>
+template <class traits, class charT>
 inline std::basic_string<charT> regex_merge(const std::basic_string<charT>& s,
-                         const reg_expression<charT, traits, Allocator>& e, 
+                         const basic_regex<charT, traits>& e, 
                          const std::basic_string<charT>& fmt,
                          match_flag_type flags = match_default)
 {
diff --git a/include/boost/regex/v4/regex_raw_buffer.hpp b/include/boost/regex/v4/regex_raw_buffer.hpp
index e44fa647..aea1b2e9 100644
--- a/include/boost/regex/v4/regex_raw_buffer.hpp
+++ b/include/boost/regex/v4/regex_raw_buffer.hpp
@@ -25,6 +25,8 @@
 #include <boost/regex/config.hpp>
 #endif
 
+#include <algorithm>
+
 namespace boost{
    namespace re_detail{
 
@@ -93,43 +95,33 @@ enum{
 //
 // class raw_storage
 // basically this is a simplified vector<unsigned char>
-// this is used by reg_expression for expression storage
+// this is used by basic_regex for expression storage
 //
 
-template <class Allocator>
-class raw_storage
+class BOOST_REGEX_DECL raw_storage
 {
 public:
-   typedef Allocator allocator_type;
-   typedef typename boost::detail::rebind_allocator<unsigned char, allocator_type>::type alloc_inst_type;
-   typedef typename alloc_inst_type::size_type                                size_type;
-   typedef typename alloc_inst_type::pointer                                  pointer;
+   typedef std::size_t           size_type;
+   typedef unsigned char*        pointer;
 private:
-   //
-   // empty member optimisation:
-   struct alloc_data : public alloc_inst_type
-   {
-      typename alloc_inst_type::pointer last;
-      alloc_data(const Allocator& a) : alloc_inst_type(a){}
-   } alloc_inst;
-   pointer start, end;
+   pointer last, start, end;
 public:
 
-   raw_storage(const Allocator& a = Allocator());
-   raw_storage(size_type n, const Allocator& a = Allocator());
+   raw_storage();
+   raw_storage(size_type n);
 
    ~raw_storage()
    {
-      alloc_inst.deallocate(start, (alloc_inst.last - start));
+      ::operator delete(start);
    }
 
    void BOOST_REGEX_CALL resize(size_type n);
    
    void* BOOST_REGEX_CALL extend(size_type n)
    {
-      if(size_type(alloc_inst.last - end) < n)
+      if(size_type(last - end) < n)
          resize(n + (end - start));
-      register void* result = end;
+      register pointer result = end;
       end += n;
       return result;
    }
@@ -143,7 +135,7 @@ public:
 
    size_type BOOST_REGEX_CALL capacity()
    {
-      return alloc_inst.last - start;
+      return last - start;
    }
 
    void* BOOST_REGEX_CALL data()const
@@ -153,7 +145,7 @@ public:
 
    size_type BOOST_REGEX_CALL index(void* ptr)
    {
-      return reinterpret_cast<unsigned char*>(ptr) - reinterpret_cast<unsigned char*>(data());
+      return static_cast<pointer>(ptr) - static_cast<pointer>(data());
    }
 
    void BOOST_REGEX_CALL clear()
@@ -164,78 +156,28 @@ public:
    void BOOST_REGEX_CALL align()
    {
       // move end up to a boundary:
-      end = reinterpret_cast<unsigned char*>(start) + (((reinterpret_cast<unsigned char*>(end) - reinterpret_cast<unsigned char*>(start)) + padding_mask) & ~padding_mask);
+      end = start + (((end - start) + padding_mask) & ~padding_mask);
    }
-
-   Allocator BOOST_REGEX_CALL allocator()const;
    void swap(raw_storage& that)
    {
       std::swap(start, that.start);
       std::swap(end, that.end);
-      std::swap(alloc_inst.last, that.alloc_inst.last);
-      std::swap(static_cast<alloc_inst_type&>(alloc_inst), static_cast<alloc_inst_type&>(that.alloc_inst));
+      std::swap(last, that.last);
   }
 };
 
-template <class Allocator>
-raw_storage<Allocator>::raw_storage(const Allocator& a)
-  : alloc_inst(a)
+inline raw_storage::raw_storage()
 {
-  start = end = alloc_inst.allocate(1024);
-  BOOST_REGEX_NOEH_ASSERT(start)
-  alloc_inst.last = start + 1024;
+   last = start = end = 0;
 }
 
-template <class Allocator>
-raw_storage<Allocator>::raw_storage(size_type n, const Allocator& a)
-  : alloc_inst(a)
+inline raw_storage::raw_storage(size_type n)
 {
-  start = end = alloc_inst.allocate(n);
-  BOOST_REGEX_NOEH_ASSERT(start)
-  alloc_inst.last = start + n;
+   start = end = static_cast<pointer>(::operator new(n));
+   BOOST_REGEX_NOEH_ASSERT(start)
+   last = start + n;
 }
 
-template <class Allocator>
-Allocator BOOST_REGEX_CALL raw_storage<Allocator>::allocator()const
-{
-  return alloc_inst;
-}
-
-template <class Allocator>
-void BOOST_REGEX_CALL raw_storage<Allocator>::resize(size_type n)
-{
-   register size_type newsize = (alloc_inst.last - start) * 2;
-   register size_type datasize = end - start;
-   if(newsize < n)
-      newsize = n;
-   // extend newsize to WORD/DWORD boundary:
-   newsize = (newsize + padding_mask) & ~(padding_mask);
-
-   // allocate and copy data:
-   register unsigned char* ptr = alloc_inst.allocate(newsize);
-   BOOST_REGEX_NOEH_ASSERT(ptr)
-   std::memcpy(ptr, start, datasize);
-
-   // get rid of old buffer:
-   alloc_inst.deallocate(start, (alloc_inst.last - start));
-
-   // and set up pointers:
-   start = ptr;
-   end = ptr + datasize;
-   alloc_inst.last = ptr + newsize;
-}
-
-template <class Allocator>
-void* BOOST_REGEX_CALL raw_storage<Allocator>::insert(size_type pos, size_type n)
-{
-   jm_assert(pos <= size_type(end - start));
-   if(size_type(alloc_inst.last - end) < n)
-      resize(n + (end - start));
-   register void* result = start + pos;
-   std::memmove(start + pos + n, start + pos, (end - start) - pos);
-   end += n;
-   return result;
-}
 
 #ifdef BOOST_HAS_ABI_HEADERS
 #  include BOOST_ABI_SUFFIX
diff --git a/include/boost/regex/v4/regex_replace.hpp b/include/boost/regex/v4/regex_replace.hpp
index d1a9500e..a6f9a550 100644
--- a/include/boost/regex/v4/regex_replace.hpp
+++ b/include/boost/regex/v4/regex_replace.hpp
@@ -28,34 +28,54 @@ namespace boost{
 #  include BOOST_ABI_PREFIX
 #endif
 
-template <class OutputIterator, class Iterator, class traits, class Allocator, class charT>
+template <class OutputIterator, class BidirectionalIterator, class traits, class charT>
 OutputIterator regex_replace(OutputIterator out,
-                         Iterator first,
-                         Iterator last,
-                         const reg_expression<charT, traits, Allocator>& e, 
+                         BidirectionalIterator first,
+                         BidirectionalIterator last,
+                         const basic_regex<charT, traits>& e, 
                          const charT* fmt, 
                          match_flag_type flags = match_default)
 {
-   Iterator l = first;
-   re_detail::merge_out_predicate<OutputIterator, Iterator, charT, Allocator, traits> oi(out, l, fmt, flags, e.get_traits());
-   regex_grep(oi, first, last, e, flags);
-   return (flags & format_no_copy) ? out : std::copy(l, last, out);
+   regex_iterator<BidirectionalIterator, charT, traits> i(first, last, e, flags);
+   regex_iterator<BidirectionalIterator, charT, traits> j;
+   if(i == j)
+   {
+      if(!(flags & regex_constants::format_no_copy))
+         out = std::copy(first, last, out);
+   }
+   else
+   {
+      BidirectionalIterator last_m = first;
+      while(i != j)
+      {
+         if(!(flags & regex_constants::format_no_copy))
+            out = std::copy(i->prefix().first, i->prefix().second, out); 
+         out = i->format(out, fmt, flags, e);
+         last_m = (*i)[0].second;
+         if(flags & regex_constants::format_first_only)
+            break;
+         ++i;
+      }
+      if(!(flags & regex_constants::format_no_copy))
+         out = std::copy(last_m, last, out);
+   }
+   return out;
 }
 
-template <class OutputIterator, class Iterator, class traits, class Allocator, class charT>
+template <class OutputIterator, class Iterator, class traits, class charT>
 inline OutputIterator regex_replace(OutputIterator out,
                          Iterator first,
                          Iterator last,
-                         const reg_expression<charT, traits, Allocator>& e, 
+                         const basic_regex<charT, traits>& e, 
                          const std::basic_string<charT>& fmt,
                          match_flag_type flags = match_default)
 {
    return regex_replace(out, first, last, e, fmt.c_str(), flags);
 }
 
-template <class traits, class Allocator, class charT>
+template <class traits, class charT>
 std::basic_string<charT> regex_replace(const std::basic_string<charT>& s,
-                         const reg_expression<charT, traits, Allocator>& e, 
+                         const basic_regex<charT, traits>& e, 
                          const charT* fmt,
                          match_flag_type flags = match_default)
 {
@@ -65,9 +85,9 @@ std::basic_string<charT> regex_replace(const std::basic_string<charT>& s,
    return result;
 }
 
-template <class traits, class Allocator, class charT>
+template <class traits, class charT>
 std::basic_string<charT> regex_replace(const std::basic_string<charT>& s,
-                         const reg_expression<charT, traits, Allocator>& e, 
+                         const basic_regex<charT, traits>& e, 
                          const std::basic_string<charT>& fmt,
                          match_flag_type flags = match_default)
 {
diff --git a/include/boost/regex/v4/regex_search.hpp b/include/boost/regex/v4/regex_search.hpp
index 91aef712..08b9324d 100644
--- a/include/boost/regex/v4/regex_search.hpp
+++ b/include/boost/regex/v4/regex_search.hpp
@@ -26,16 +26,16 @@ namespace boost{
 #  include BOOST_ABI_PREFIX
 #endif
 
-template <class BidiIterator, class Allocator, class charT, class traits, class Allocator2>
+template <class BidiIterator, class Allocator, class charT, class traits>
 bool regex_search(BidiIterator first, BidiIterator last, 
                   match_results<BidiIterator, Allocator>& m, 
-                  const reg_expression<charT, traits, Allocator2>& e, 
+                  const basic_regex<charT, traits>& e, 
                   match_flag_type flags = match_default)
 {
    if(e.flags() & regex_constants::failbit)
       return false;
 
-   re_detail::perl_matcher<BidiIterator, Allocator, traits, Allocator2> matcher(first, last, m, e, flags);
+   re_detail::perl_matcher<BidiIterator, Allocator, traits> matcher(first, last, m, e, flags);
    return matcher.find();
 }
 
@@ -46,24 +46,24 @@ bool regex_search(BidiIterator first, BidiIterator last,
 // this isn't really a partial specialisation, but template function
 // overloading - if the compiler doesn't support partial specialisation
 // then it really won't support this either:
-template <class charT, class Allocator, class traits, class Allocator2>
+template <class charT, class Allocator, class traits>
 inline bool regex_search(const charT* str, 
                         match_results<const charT*, Allocator>& m, 
-                        const reg_expression<charT, traits, Allocator2>& e, 
+                        const basic_regex<charT, traits>& e, 
                         match_flag_type flags = match_default)
 {
    return regex_search(str, str + traits::length(str), m, e, flags);
 }
 
-template <class ST, class SA, class Allocator, class charT, class traits, class Allocator2>
+template <class ST, class SA, class Allocator, class charT, class traits>
 inline bool regex_search(const std::basic_string<charT, ST, SA>& s, 
                  match_results<typename std::basic_string<charT, ST, SA>::const_iterator, Allocator>& m, 
-                 const reg_expression<charT, traits, Allocator2>& e, 
+                 const basic_regex<charT, traits>& e, 
                  match_flag_type flags = match_default)
 {
    return regex_search(s.begin(), s.end(), m, e, flags);
 }
-#else  // partial specialisation
+#else  // partial overloads:
 inline bool regex_search(const char* str, 
                         cmatch& m, 
                         const regex& e, 
@@ -71,6 +71,14 @@ inline bool regex_search(const char* str,
 {
    return regex_search(str, str + regex::traits_type::length(str), m, e, flags);
 }
+inline bool regex_search(const char* first, const char* last, 
+                  const regex& e, 
+                  match_flag_type flags = match_default)
+{
+   cmatch m;
+   return regex_search(first, last, m, e, flags | regex_constants::match_any);
+}
+
 #ifndef BOOST_NO_WREGEX
 inline bool regex_search(const wchar_t* str, 
                         wcmatch& m, 
@@ -79,6 +87,13 @@ inline bool regex_search(const wchar_t* str,
 {
    return regex_search(str, str + wregex::traits_type::length(str), m, e, flags);
 }
+inline bool regex_search(const wchar_t* first, const wchar_t* last, 
+                  const wregex& e, 
+                  match_flag_type flags = match_default)
+{
+   wcmatch m;
+   return regex_search(first, last, m, e, flags | regex_constants::match_any);
+}
 #endif
 inline bool regex_search(const std::string& s, 
                         smatch& m,
@@ -99,9 +114,9 @@ inline bool regex_search(const std::basic_string<wchar_t>& s,
 
 #endif
 
-template <class BidiIterator, class charT, class traits, class Allocator2>
+template <class BidiIterator, class charT, class traits>
 bool regex_search(BidiIterator first, BidiIterator last, 
-                  const reg_expression<charT, traits, Allocator2>& e, 
+                  const basic_regex<charT, traits>& e, 
                   match_flag_type flags = match_default)
 {
    if(e.flags() & regex_constants::failbit)
@@ -109,51 +124,34 @@ bool regex_search(BidiIterator first, BidiIterator last,
 
    match_results<BidiIterator> m;
    typedef typename match_results<BidiIterator>::allocator_type match_alloc_type;
-   re_detail::perl_matcher<BidiIterator, match_alloc_type, traits, Allocator2> matcher(first, last, m, e, flags);
+   re_detail::perl_matcher<BidiIterator, match_alloc_type, traits> matcher(first, last, m, e, flags | regex_constants::match_any);
    return matcher.find();
 }
 
 #ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
 
-template <class charT, class traits, class Allocator2>
+template <class charT, class traits>
 inline bool regex_search(const charT* str, 
-                        const reg_expression<charT, traits, Allocator2>& e, 
+                        const basic_regex<charT, traits>& e, 
                         match_flag_type flags = match_default)
 {
    return regex_search(str, str + traits::length(str), e, flags);
 }
 
-template <class ST, class SA, class charT, class traits, class Allocator2>
+template <class ST, class SA, class charT, class traits>
 inline bool regex_search(const std::basic_string<charT, ST, SA>& s, 
-                 const reg_expression<charT, traits, Allocator2>& e, 
+                 const basic_regex<charT, traits>& e, 
                  match_flag_type flags = match_default)
 {
    return regex_search(s.begin(), s.end(), e, flags);
 }
 #else  // non-template function overloads
-inline bool regex_search(const char* first, const char* last, 
-                  const regex& e, 
-                  match_flag_type flags = match_default)
-{
-   cmatch m;
-   return regex_search(first, last, m, e, flags);
-}
-
-#ifndef BOOST_NO_WREGEX
-inline bool regex_search(const wchar_t* first, const wchar_t* last, 
-                  const wregex& e, 
-                  match_flag_type flags = match_default)
-{
-   wcmatch m;
-   return regex_search(first, last, m, e, flags);
-}
-#endif
 inline bool regex_search(const char* str, 
                         const regex& e, 
                         match_flag_type flags = match_default)
 {
    cmatch m;
-   return regex_search(str, str + regex::traits_type::length(str), m, e, flags);
+   return regex_search(str, str + regex::traits_type::length(str), m, e, flags | regex_constants::match_any);
 }
 #ifndef BOOST_NO_WREGEX
 inline bool regex_search(const wchar_t* str, 
@@ -161,7 +159,7 @@ inline bool regex_search(const wchar_t* str,
                         match_flag_type flags = match_default)
 {
    wcmatch m;
-   return regex_search(str, str + wregex::traits_type::length(str), m, e, flags);
+   return regex_search(str, str + wregex::traits_type::length(str), m, e, flags | regex_constants::match_any);
 }
 #endif
 inline bool regex_search(const std::string& s, 
@@ -169,7 +167,7 @@ inline bool regex_search(const std::string& s,
                         match_flag_type flags = match_default)
 {
    smatch m;
-   return regex_search(s.begin(), s.end(), m, e, flags);
+   return regex_search(s.begin(), s.end(), m, e, flags | regex_constants::match_any);
 }
 #if !defined(BOOST_NO_WREGEX)
 inline bool regex_search(const std::basic_string<wchar_t>& s, 
@@ -177,11 +175,12 @@ inline bool regex_search(const std::basic_string<wchar_t>& s,
                         match_flag_type flags = match_default)
 {
    wsmatch m;
-   return regex_search(s.begin(), s.end(), m, e, flags);
+   return regex_search(s.begin(), s.end(), m, e, flags | regex_constants::match_any);
 }
-#endif
 
-#endif
+#endif // BOOST_NO_WREGEX
+
+#endif // partial overload
 
 #ifdef BOOST_HAS_ABI_HEADERS
 #  include BOOST_ABI_SUFFIX
diff --git a/include/boost/regex/v4/regex_split.hpp b/include/boost/regex/v4/regex_split.hpp
index ab614214..b02e01e7 100644
--- a/include/boost/regex/v4/regex_split.hpp
+++ b/include/boost/regex/v4/regex_split.hpp
@@ -30,14 +30,14 @@ namespace boost{
 namespace re_detail{
 
 template <class charT>
-const reg_expression<charT>& get_default_expression(charT)
+const basic_regex<charT>& get_default_expression(charT)
 {
    static const charT expression_text[4] = { '\\', 's', '+', '\00', };
-   static const reg_expression<charT> e(expression_text);
+   static const basic_regex<charT> e(expression_text);
    return e;
 }
 
-template <class OutputIterator, class charT, class Traits1, class Alloc1, class Alloc2>
+template <class OutputIterator, class charT, class Traits1, class Alloc1>
 class split_pred
 {
    typedef std::basic_string<charT, Traits1, Alloc1> string_type;
@@ -50,12 +50,12 @@ public:
    split_pred(iterator_type* a, OutputIterator* b, std::size_t* c)
       : p_last(a), p_out(b), p_max(c), initial_max(*c) {}
 
-   bool operator()(const match_results<iterator_type, Alloc2>& what);
+   bool operator()(const match_results<iterator_type>& what);
 };
 
-template <class OutputIterator, class charT, class Traits1, class Alloc1, class Alloc2>
-bool split_pred<OutputIterator, charT, Traits1, Alloc1, Alloc2>::operator()
-   (const match_results<iterator_type, Alloc2>& what)
+template <class OutputIterator, class charT, class Traits1, class Alloc1>
+bool split_pred<OutputIterator, charT, Traits1, Alloc1>::operator()
+   (const match_results<iterator_type>& what)
 {
    *p_last = what[0].second;
    if(what.size() > 1)
@@ -63,7 +63,7 @@ bool split_pred<OutputIterator, charT, Traits1, Alloc1, Alloc2>::operator()
       // output sub-expressions only:
       for(unsigned i = 1; i < what.size(); ++i)
       {
-         *(*p_out) = static_cast<string_type>(what[i]);
+         *(*p_out) = what.str(i);
          ++(*p_out);
          if(0 == --*p_max) return false;
       }
@@ -75,7 +75,7 @@ bool split_pred<OutputIterator, charT, Traits1, Alloc1, Alloc2>::operator()
       const sub_match<iterator_type>& sub = what[-1];
       if((sub.first != sub.second) || (*p_max != initial_max))
       {
-         *(*p_out) = static_cast<string_type>(sub);
+         *(*p_out) = sub.str();
          ++(*p_out);
          return --*p_max;
       }
@@ -87,18 +87,18 @@ bool split_pred<OutputIterator, charT, Traits1, Alloc1, Alloc2>::operator()
 
 } // namespace re_detail
 
-template <class OutputIterator, class charT, class Traits1, class Alloc1, class Traits2, class Alloc2>
+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 reg_expression<charT, Traits2, Alloc2>& e,
+                   const basic_regex<charT, Traits2>& e,
                    match_flag_type flags,
                    std::size_t max_split)
 {
-   typedef typename std::basic_string<charT, Traits1, Alloc1>::const_iterator ci_t;
-   typedef typename detail::rebind_allocator<sub_match<ci_t>, Alloc2>::type match_allocator;
+   typedef typename std::basic_string<charT, Traits1, Alloc1>::const_iterator  ci_t;
+   typedef typename match_results<ci_t>::allocator_type                        match_allocator;
    ci_t last = s.begin();
    std::size_t init_size = max_split;
-   re_detail::split_pred<OutputIterator, charT, Traits1, Alloc1, match_allocator> pred(&last, &out, &max_split);
+   re_detail::split_pred<OutputIterator, charT, Traits1, Alloc1> pred(&last, &out, &max_split);
    ci_t i, j;
    i = s.begin();
    j = s.end();
@@ -122,10 +122,10 @@ std::size_t regex_split(OutputIterator out,
    return init_size - max_split;
 }
 
-template <class OutputIterator, class charT, class Traits1, class Alloc1, class Traits2, class Alloc2>
+template <class OutputIterator, class charT, class Traits1, class Alloc1, class Traits2>
 inline std::size_t regex_split(OutputIterator out,
                    std::basic_string<charT, Traits1, Alloc1>& s, 
-                   const reg_expression<charT, Traits2, Alloc2>& e,
+                   const basic_regex<charT, Traits2>& e,
                    match_flag_type flags = match_default)
 {
    return regex_split(out, s, e, flags, UINT_MAX);
diff --git a/include/boost/regex/v4/regex_stack.hpp b/include/boost/regex/v4/regex_stack.hpp
index a22b531f..2d519a86 100644
--- a/include/boost/regex/v4/regex_stack.hpp
+++ b/include/boost/regex/v4/regex_stack.hpp
@@ -177,7 +177,7 @@ void BOOST_REGEX_CALL jstack<T, Allocator>::pop_aux()const
 {
    // make sure that we have a valid item
    // on TOS:
-   jm_assert(m_stack->next);
+   BOOST_ASSERT(m_stack->next);
    register node* p = m_stack;
    m_stack = p->next;
    p->next = unused;
diff --git a/include/boost/regex/v4/regex_synch.hpp b/include/boost/regex/v4/regex_synch.hpp
deleted file mode 100644
index dc1f0743..00000000
--- a/include/boost/regex/v4/regex_synch.hpp
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- *
- * Copyright (c) 1998-2002
- * Dr 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         regex_synch.hpp
-  *   VERSION      see <boost/version.hpp>
-  *   DESCRIPTION: Thread synchronisation for regex code.
-  *                Note this is an internal header file included
-  *                by regex.hpp, do not include on its own.
-  */
-
-#ifndef BOOST_REGEX_SYNCH_HPP
-#define BOOST_REGEX_SYNCH_HPP
-
-#ifndef BOOST_REGEX_CONFIG_HPP
-#include <boost/regex/config.hpp>
-#endif
-
-#if defined(BOOST_HAS_THREADS)
-#  if defined(BOOST_HAS_WINTHREADS)
-#     include <windows.h>
-#  elif defined(BOOST_HAS_BETHREADS)
-#     include <OS.h>
-#     include <cassert>
-#  elif defined(BOOST_HAS_PTHREADS)
-#     include <pthread.h>
-#  else
-#     error "Unknown threading API"
-#  endif
-#endif
-
-
-namespace boost{
-   namespace re_detail{
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-void BOOST_REGEX_CALL re_init_threads();
-void BOOST_REGEX_CALL re_free_threads();
-
-#ifdef BOOST_HAS_THREADS
-
-#  ifdef BOOST_HAS_BETHREADS
-
-typedef sem_id CRITICAL_SECTION;
-
-inline void BOOST_REGEX_CALL InitializeCriticalSection(CRITICAL_SECTION* ps)
-{
-    *ps = create_sem(1, "regex++");
-    assert(*ps > 0);
-}
-
-inline void BOOST_REGEX_CALL DeleteCriticalSection(CRITICAL_SECTION* ps)
-{
-    int t = delete_sem(*ps);
-    assert(t == B_NO_ERROR);
-}
-
-inline void BOOST_REGEX_CALL EnterCriticalSection(CRITICAL_SECTION* ps)
-{
-   status_t t = acquire_sem(*ps);
-   assert(t == B_NO_ERROR);
-}
-
-inline void BOOST_REGEX_CALL LeaveCriticalSection(CRITICAL_SECTION* ps)
-{
-    status_t t = release_sem(*ps);
-    assert(t == B_NO_ERROR);
-}
-
-#  elif defined(BOOST_HAS_PTHREADS)
-
-typedef pthread_mutex_t CRITICAL_SECTION;
-
-inline void BOOST_REGEX_CALL InitializeCriticalSection(CRITICAL_SECTION* ps)
-{
-   pthread_mutex_init(ps, 0);
-}
-
-inline void BOOST_REGEX_CALL DeleteCriticalSection(CRITICAL_SECTION* ps)
-{
-   pthread_mutex_destroy(ps);
-}
-
-inline void BOOST_REGEX_CALL EnterCriticalSection(CRITICAL_SECTION* ps)
-{
-   pthread_mutex_lock(ps);
-}
-
-inline void BOOST_REGEX_CALL LeaveCriticalSection(CRITICAL_SECTION* ps)
-{
-   pthread_mutex_unlock(ps);
-}
-
-#  elif !defined(BOOST_HAS_WINTHREADS)
-#    error "Unknown threading API"
-#  endif
-
-template <class Lock>
-class lock_guard
-{
-   typedef Lock lock_type;
-public:
-   lock_guard(lock_type& m, bool aq = true)
-      : mut(m), owned(false){ acquire(aq); }
-
-   ~lock_guard()
-   { acquire(false); }
-
-   void BOOST_REGEX_CALL acquire(bool aq = true)
-   {
-      if(aq && !owned)
-      {
-         mut.acquire(true);
-         owned = true;
-      }
-      else if(!aq && owned)
-      {
-         mut.acquire(false);
-         owned = false;
-      }
-   }
-private:
-   lock_type& mut;
-   bool owned;
-   // VC6 warning suppression:
-   lock_guard& operator=(const lock_guard&);
-};
-
-
-class critical_section
-{
-public:
-   critical_section()
-   { InitializeCriticalSection(&hmutex);}
-
-   critical_section(const critical_section&)
-   { InitializeCriticalSection(&hmutex);}
-
-   const critical_section& BOOST_REGEX_CALL operator=(const critical_section&)
-   {return *this;}
-
-   ~critical_section()
-   {DeleteCriticalSection(&hmutex);}
-
-private:
-
-   void BOOST_REGEX_CALL acquire(bool aq)
-   { if(aq) EnterCriticalSection(&hmutex);
-      else LeaveCriticalSection(&hmutex);
-   }
-
-   CRITICAL_SECTION hmutex;
-
-public:
-   typedef lock_guard<critical_section> ro_guard;
-   typedef lock_guard<critical_section> rw_guard;
-
-   friend class lock_guard<critical_section>;
-};
-
-inline bool BOOST_REGEX_CALL operator==(const critical_section&, const critical_section&)
-{
-   return false;
-}
-
-inline bool BOOST_REGEX_CALL operator<(const critical_section&, const critical_section&)
-{
-   return true;
-}
-
-typedef lock_guard<critical_section> cs_guard;
-
-BOOST_REGEX_DECL extern critical_section* p_re_lock;
-BOOST_REGEX_DECL extern unsigned int re_lock_count;
-
-#define BOOST_REGEX_GUARD(inst) boost::re_detail::critical_section::rw_guard g(inst);
-
-#else  // BOOST_HAS_THREADS
-
-#define BOOST_REGEX_GUARD(inst)
-
-#endif // BOOST_HAS_THREADS
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
-
-} // namespace re_detail
-} // namespace boost
-
-#endif // sentry
-
-
-
-
-
-
-
diff --git a/include/boost/regex/v4/regex_token_iterator.hpp b/include/boost/regex/v4/regex_token_iterator.hpp
index e25230b9..ff6958c5 100644
--- a/include/boost/regex/v4/regex_token_iterator.hpp
+++ b/include/boost/regex/v4/regex_token_iterator.hpp
@@ -23,8 +23,7 @@
 #include <boost/detail/workaround.hpp>
 #if (BOOST_WORKAROUND(__BORLANDC__, >= 0x560) && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x570)))\
       || BOOST_WORKAROUND(BOOST_MSVC, < 1300) \
-      || BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003)) \
-      || BOOST_WORKAROUND(__HP_aCC, BOOST_TESTED_AT(55500))
+      || BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003))
 //
 // Borland C++ Builder 6, and Visual C++ 6,
 // can't cope with the array template constructor
@@ -47,16 +46,15 @@ namespace boost{
 
 template <class BidirectionalIterator,
           class charT,
-          class traits,
-          class Allocator>
+          class traits>
 class regex_token_iterator_implementation 
 {
-   typedef basic_regex<charT, traits, Allocator> regex_type;
+   typedef basic_regex<charT, traits> regex_type;
    typedef sub_match<BidirectionalIterator>      value_type;
 
    match_results<BidirectionalIterator> what;   // current match
    BidirectionalIterator                end;    // end of search area
-   const regex_type*                    pre;    // the expression
+   const regex_type                     re;    // the expression
    match_flag_type                      flags;  // match flags
    value_type                           result; // the current string result
    int                                  N;      // the current sub-expression being enumerated
@@ -64,16 +62,16 @@ class regex_token_iterator_implementation
 
 public:
    regex_token_iterator_implementation(const regex_type* p, BidirectionalIterator last, int sub, match_flag_type f)
-      : end(last), pre(p), flags(f){ subs.push_back(sub); }
+      : end(last), re(*p), flags(f){ subs.push_back(sub); }
    regex_token_iterator_implementation(const regex_type* p, BidirectionalIterator last, const std::vector<int>& v, match_flag_type f)
-      : end(last), pre(p), flags(f), subs(v){}
+      : end(last), re(*p), flags(f), subs(v){}
 #if (BOOST_WORKAROUND(__BORLANDC__, >= 0x560) && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x570)))\
       || BOOST_WORKAROUND(BOOST_MSVC, < 1300) \
       || BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003)) \
       || BOOST_WORKAROUND(__HP_aCC, BOOST_TESTED_AT(55500))
    template <class T>
    regex_token_iterator_implementation(const regex_type* p, BidirectionalIterator last, const T& submatches, match_flag_type f)
-      : end(last), pre(p), flags(f)
+      : end(last), re(*p), flags(f)
    {
       // assert that T really is an array:
       BOOST_STATIC_ASSERT(::boost::is_array<T>::value);
@@ -86,7 +84,7 @@ public:
 #else
    template <std::size_t CN>
    regex_token_iterator_implementation(const regex_type* p, BidirectionalIterator last, const int (&submatches)[CN], match_flag_type f)
-      : end(last), pre(p), flags(f)
+      : end(last), re(*p), flags(f)
    {
       for(std::size_t i = 0; i < CN; ++i)
       {
@@ -98,7 +96,7 @@ public:
    bool init(BidirectionalIterator first)
    {
       N = 0;
-      if(regex_search(first, end, what, *pre, flags) == true)
+      if(regex_search(first, end, what, re, flags) == true)
       {
          N = 0;
          result = ((subs[N] == -1) ? what.prefix() : what[(int)subs[N]]);
@@ -116,7 +114,7 @@ public:
    bool compare(const regex_token_iterator_implementation& that)
    {
       if(this == &that) return true;
-      return (pre == that.pre) 
+      return (&re.get_data() == &that.re.get_data()) 
          && (end == that.end) 
          && (flags == that.flags) 
          && (N == that.N) 
@@ -138,7 +136,7 @@ public:
       if(what.prefix().first != what[0].second)
          flags |= match_prev_avail;
       BidirectionalIterator last_end(what[0].second);
-      if(regex_search(last_end, end, what, *pre, ((what[0].first == what[0].second) ? flags | regex_constants::match_not_initial_null : flags)))
+      if(regex_search(last_end, end, what, re, ((what[0].first == what[0].second) ? flags | regex_constants::match_not_initial_null : flags)))
       {
          N =0;
          result =((subs[N] == -1) ? what.prefix() : what[subs[N]]);
@@ -154,12 +152,13 @@ public:
       }
       return false;
    }
+private:
+   regex_token_iterator_implementation& operator=(const regex_token_iterator_implementation&);
 };
 
 template <class BidirectionalIterator, 
           class charT = BOOST_DEDUCED_TYPENAME re_detail::regex_iterator_traits<BidirectionalIterator>::value_type,
-          class traits = regex_traits<charT>,
-          class Allocator = BOOST_DEFAULT_ALLOCATOR(charT) >
+          class traits = regex_traits<charT> >
 class regex_token_iterator 
 #ifndef BOOST_NO_STD_ITERATOR
    : public std::iterator<
@@ -171,10 +170,10 @@ class regex_token_iterator
 #endif
 {
 private:
-   typedef regex_token_iterator_implementation<BidirectionalIterator, charT, traits, Allocator> impl;
+   typedef regex_token_iterator_implementation<BidirectionalIterator, charT, traits> impl;
    typedef shared_ptr<impl> pimpl;
 public:
-   typedef          basic_regex<charT, traits, Allocator>                   regex_type;
+   typedef          basic_regex<charT, traits>                   regex_type;
    typedef          sub_match<BidirectionalIterator>                        value_type;
    typedef typename re_detail::regex_iterator_traits<BidirectionalIterator>::difference_type 
                                                                             difference_type;
@@ -274,6 +273,39 @@ 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>
+inline 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)
+{
+   return regex_token_iterator<const charT*, charT, traits>(p, p+traits::length(p), e, submatch, m);
+}
+template <class charT, class traits, class ST, class SA>
+inline 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)
+{
+   return regex_token_iterator<typename std::basic_string<charT, ST, SA>::const_iterator, charT, traits>(p.begin(), p.end(), e, submatch, m);
+}
+#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1200)
+template <class charT, class traits, std::size_t N>
+inline 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)
+{
+   return regex_token_iterator<const charT*, charT, traits>(p, p+traits::length(p), e, submatch, m);
+}
+template <class charT, class traits, class ST, class SA, std::size_t N>
+inline 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)
+{
+   return regex_token_iterator<typename std::basic_string<charT, ST, SA>::const_iterator, charT, traits>(p.begin(), p.end(), e, submatch, m);
+}
+#endif
+template <class charT, class traits>
+inline 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)
+{
+   return regex_token_iterator<const charT*, charT, traits>(p, p+traits::length(p), e, submatch, m);
+}
+template <class charT, class traits, class ST, class SA>
+inline 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)
+{
+   return regex_token_iterator<typename std::basic_string<charT, ST, SA>::const_iterator, charT, traits>(p.begin(), p.end(), e, submatch, m);
+}
+
 #if BOOST_WORKAROUND(BOOST_MSVC, == 1310)
 #  pragma warning(pop)
 #endif
diff --git a/include/boost/regex/v4/regex_traits.hpp b/include/boost/regex/v4/regex_traits.hpp
index 27bd75ba..044192d5 100644
--- a/include/boost/regex/v4/regex_traits.hpp
+++ b/include/boost/regex/v4/regex_traits.hpp
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 1998-2002
+ * Copyright (c) 2003
  * Dr John Maddock
  *
  * Use, modification and distribution are subject to the 
@@ -19,1180 +19,157 @@
 #ifndef BOOST_REGEX_TRAITS_HPP_INCLUDED
 #define BOOST_REGEX_TRAITS_HPP_INCLUDED
 
-#ifndef BOOST_RE_CREGEX_HPP
-#include <boost/cregex.hpp>
+#ifndef BOOST_REGEX_CONFIG_HPP
+#include <boost/regex/config.hpp>
 #endif
-#ifndef BOOST_REGEX_CSTRING_HPP
-#include <boost/regex/v4/regex_cstring.hpp>
+#ifndef BOOST_REGEX_WORKAROUND_HPP
+#include <boost/regex/v4/regex_workaround.hpp>
+#endif
+#ifndef BOOST_REGEX_SYNTAX_TYPE_HPP
+#include <boost/regex/v4/syntax_type.hpp>
+#endif
+#ifndef BOOST_REGEX_ERROR_TYPE_HPP
+#include <boost/regex/v4/error_type.hpp>
+#endif
+#ifndef BOOST_REGEX_TRAITS_DEFAULTS_HPP_INCLUDED
+#include <boost/regex/v4/regex_traits_defaults.hpp>
+#endif
+#ifndef BOOST_NO_STD_LOCALE
+#  ifndef BOOST_CPP_REGEX_TRAITS_HPP_INCLUDED
+#     include <boost/regex/v4/cpp_regex_traits.hpp>
+#  endif
+#endif
+#if !BOOST_WORKAROUND(__BORLANDC__, < 0x560)
+#  ifndef BOOST_C_REGEX_TRAITS_HPP_INCLUDED
+#     include <boost/regex/v4/c_regex_traits.hpp>
+#  endif
+#endif
+#if defined(_WIN32) && !defined(BOOST_REGEX_NO_W32)
+#  ifndef BOOST_W32_REGEX_TRAITS_HPP_INCLUDED
+#     include <boost/regex/v4/w32_regex_traits.hpp>
+#  endif
+#endif
+#ifndef BOOST_REGEX_FWD_HPP_INCLUDED
+#include <boost/regex_fwd.hpp>
 #endif
 
-namespace boost{
+#include "boost/mpl/has_xxx.hpp"
+#include <boost/static_assert.hpp>
 
 #ifdef BOOST_HAS_ABI_HEADERS
 #  include BOOST_ABI_PREFIX
 #endif
 
-template <class charT>
-class c_regex_traits;
+namespace boost{
 
+template <class charT, class implementationT >
+struct regex_traits : public implementationT
+{
+   regex_traits() : implementationT() {}
+};
+
+//
+// class regex_traits_wrapper.
+// this is what our implementation will actually store;
+// it provides default implementations of the "optional"
+// interfaces that we support, in addition to the
+// required "standard" ones:
+//
 namespace re_detail{
-
-struct mss
-{
-   unsigned int id;
-   const char* what;
-};
-
-BOOST_REGEX_DECL bool BOOST_REGEX_CALL re_lookup_def_collate_name(std::string& buf, const char* name);
-BOOST_REGEX_DECL std::size_t BOOST_REGEX_CALL re_get_default_message(char* buf, std::size_t len, std::size_t id);
-extern BOOST_REGEX_DECL const char *re_default_error_messages[];
-
-#ifndef BOOST_NO_WREGEX
-extern BOOST_REGEX_DECL regex_wchar_type wide_lower_case_map[];
-extern BOOST_REGEX_DECL unsigned short wide_unicode_classes[];
-BOOST_REGEX_DECL bool BOOST_REGEX_CALL is_combining(regex_wchar_type c);
-#endif
-
-
-struct BOOST_REGEX_DECL regex_traits_base
-{
-   enum char_syntax_type
-   {
-      syntax_char = 0,
-      syntax_open_bracket = 1,                  // (
-      syntax_close_bracket = 2,                 // )
-      syntax_dollar = 3,                        // $
-      syntax_caret = 4,                         // ^
-      syntax_dot = 5,                           // .
-      syntax_star = 6,                          // *
-      syntax_plus = 7,                          // +
-      syntax_question = 8,                      // ?
-      syntax_open_set = 9,                      // [
-      syntax_close_set = 10,                    // ]
-      syntax_or = 11,                           // |
-      syntax_slash = 12,                        //
-      syntax_hash = 13,                         // #
-      syntax_dash = 14,                         // -
-      syntax_open_brace = 15,                   // {
-      syntax_close_brace = 16,                  // }
-      syntax_digit = 17,                        // 0-9
-      syntax_b = 18,                            // for \b
-      syntax_B = 19,                            // for \B
-      syntax_left_word = 20,                    // for \<
-      syntax_right_word = 21,                   // for \>
-      syntax_w = 22,                            // for \w
-      syntax_W = 23,                            // for \W
-      syntax_start_buffer = 24,                 // for \`
-      syntax_end_buffer = 25,                   // for \'
-      syntax_newline = 26,                      // for newline alt
-      syntax_comma = 27,                        // for {x,y}
-
-      syntax_a = 28,                            // for \a
-      syntax_f = 29,                            // for \f
-      syntax_n = 30,                            // for \n
-      syntax_r = 31,                            // for \r
-      syntax_t = 32,                            // for \t
-      syntax_v = 33,                            // for \v
-      syntax_x = 34,                            // for \xdd
-      syntax_c = 35,                            // for \cx
-      syntax_colon = 36,                        // for [:...:]
-      syntax_equal = 37,                        // for [=...=]
-   
-      // perl ops:
-      syntax_e = 38,                            // for \e
-      syntax_l = 39,                            // for \l
-      syntax_L = 40,                            // for \L
-      syntax_u = 41,                            // for \u
-      syntax_U = 42,                            // for \U
-      syntax_s = 43,                            // for \s
-      syntax_S = 44,                            // for \S
-      syntax_d = 45,                            // for \d
-      syntax_D = 46,                            // for \D
-      syntax_E = 47,                            // for \Q\E
-      syntax_Q = 48,                            // for \Q\E
-      syntax_X = 49,                            // for \X
-      syntax_C = 50,                            // for \C
-      syntax_Z = 51,                            // for \Z
-      syntax_G = 52,                            // for \G
-
-      // new extentions:
-      syntax_not = 53,                          // for (?!...)
-
-      syntax_max = 54
-   };
-#ifdef __BORLANDC__
-private:
-   char dummy_member;
-#endif
-};
-
-struct BOOST_REGEX_DECL c_traits_base : public regex_traits_base
-{
-public:
-   enum{
-      char_class_none = 0,
-      char_class_alpha = 0x0001,
-      char_class_cntrl = 0x0002,
-      char_class_digit = 0x0004,
-      char_class_lower = 0x0008,
-      char_class_punct = 0x0010,
-      char_class_space = 0x0020,
-      char_class_upper = 0x0040,
-      char_class_xdigit = 0x0080,
-      char_class_blank = 0x0100,
-      char_class_underscore = 0x4000,
-      char_class_unicode = 0x8000,
-
-      char_class_alnum = char_class_alpha | char_class_digit,
-      char_class_graph = char_class_alpha | char_class_digit | char_class_punct | char_class_underscore,
-      char_class_print = char_class_alpha | char_class_digit | char_class_punct | char_class_underscore | char_class_blank,
-      char_class_word = char_class_alpha | char_class_digit | char_class_underscore
-   };
-   static std::string BOOST_REGEX_CALL set_message_catalogue(const std::string& s);
-protected:
-#if defined(__MWERKS__) && __MWERKS__ <= 0x6000
-   friend class c_regex_traits<char>;
-   friend class c_regex_traits<regex_wchar_type>;
-#endif 
-
-   static char regex_message_catalogue[BOOST_REGEX_MAX_PATH];
-   enum syntax_map_size
-   {
-      map_size = UCHAR_MAX + 1
-   };
-
-   static unsigned char syntax_map[map_size];
-   static unsigned short class_map[map_size];
-   static char lower_case_map[map_size];
-
-   static boost::uint_fast32_t BOOST_REGEX_CALL do_lookup_class(const char* p);
-   static bool BOOST_REGEX_CALL do_lookup_collate(std::string& buf, const char* p);
-   static void BOOST_REGEX_CALL do_update_ctype();
-   static void BOOST_REGEX_CALL do_update_collate();
-public:
-   static std::string BOOST_REGEX_CALL error_string(unsigned id);
-   static char* BOOST_REGEX_CALL get_catalogue() { return regex_message_catalogue; }
-};
-
-} // namespace re_detail
-
-
-template<>
-class BOOST_REGEX_DECL c_regex_traits<char> : public re_detail::c_traits_base
-{
-   typedef re_detail::c_traits_base base_type;
-public:
-   typedef char char_type;
-   typedef unsigned char uchar_type;
-   typedef unsigned int size_type;
-   typedef std::string string_type;
-   typedef int locale_type;
-
-   static std::size_t BOOST_REGEX_CALL length(const char_type* p)
-   {
-      return std::strlen(p);
-   }
-   static unsigned int BOOST_REGEX_CALL syntax_type(size_type c)
-   {
-      return syntax_map[c];
-   }
-   static char BOOST_REGEX_CALL translate(char c, bool icase)
-   {
-      return icase ? lower_case_map[(size_type)(uchar_type)c] : c;
-   }
-   static void BOOST_REGEX_CALL transform(std::string& out, const std::string& in);
-
-   static void BOOST_REGEX_CALL transform_primary(std::string& out, const std::string& in);
-
-   static bool BOOST_REGEX_CALL is_separator(char c)
-   {
-      return BOOST_REGEX_MAKE_BOOL((c == '\n') || (c == '\r'));
-   }
-
-   static bool BOOST_REGEX_CALL is_combining(char)
-   {
-      return false;
-   }
-   
-   static bool BOOST_REGEX_CALL is_class(char c, boost::uint_fast32_t f)
-   {
-      return BOOST_REGEX_MAKE_BOOL(class_map[(size_type)(uchar_type)c] & f);
-   }
-
-   static int BOOST_REGEX_CALL toi(char c);
-   static int BOOST_REGEX_CALL toi(const char*& first, const char* last, int radix);
-
-   static boost::uint_fast32_t BOOST_REGEX_CALL lookup_classname(const char* first, const char* last)
-   {
-      std::string s(first, last);
-      return do_lookup_class(s.c_str());
-   }
-
-   static bool BOOST_REGEX_CALL lookup_collatename(std::string& buf, const char* first, const char* last)
-   {
-      std::string s(first, last);
-      return do_lookup_collate(buf, s.c_str());
-   }
-
-   static locale_type BOOST_REGEX_CALL imbue(locale_type l){ return l; }
-   locale_type BOOST_REGEX_CALL getloc()const{ return locale_type(); }
-   void swap(c_regex_traits&){}
-
-   c_regex_traits()
-   {
-      init();
-   }
-   ~c_regex_traits()
-   {
-      m_free();
-   }
-   struct sentry
-   {
-      sentry(const c_regex_traits<char>&)
-      { c_regex_traits<char>::update(); }
-      operator void*() { return this; }
-   };
-   static void BOOST_REGEX_CALL update();
-private:
-   static void BOOST_REGEX_CALL init();
-   static void BOOST_REGEX_CALL m_free();
-   static c_regex_traits<char> i;
-
-   static unsigned sort_type;
-   static char sort_delim;
-};
-
-#ifndef BOOST_NO_WREGEX
-template<>
-class BOOST_REGEX_DECL c_regex_traits<regex_wchar_type> : public re_detail::c_traits_base
-{
-   typedef re_detail::c_traits_base base_type;
-public:
-   typedef regex_wchar_type char_type;
-   typedef unsigned short uchar_type;
-   typedef unsigned int size_type;
-   typedef std::basic_string<regex_wchar_type> string_type;
-   typedef int locale_type; 
-#ifndef BOOST_REGEX_HAS_SHORT_WCHAR_T
-   static std::size_t BOOST_REGEX_CALL length(const char_type* p)
-   {
-      return std::wcslen(p);
-   }
+#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !BOOST_WORKAROUND(__HP_aCC, BOOST_TESTED_AT(55500))
+BOOST_MPL_HAS_XXX_TRAIT_DEF(boost_extensions_tag)
 #else
-   static std::size_t BOOST_REGEX_CALL length(const char_type* p)
-   {
-      return std::wcslen(reinterpret_cast<const wchar_t*>(p));
-   }
+template<class T>
+struct has_boost_extensions_tag
+{
+   BOOST_STATIC_CONSTANT(bool, value = false);
+};
 #endif
-   static unsigned int BOOST_REGEX_CALL syntax_type(size_type c);
-   static regex_wchar_type BOOST_REGEX_CALL translate(regex_wchar_type c, bool icase)
+
+template <class BaseT>
+struct default_wrapper : public BaseT
+{
+   typedef typename BaseT::char_type char_type;
+   std::string error_string(::boost::regex_constants::error_type e)const
    {
-      return icase ? ((c < 256) ? re_detail::wide_lower_case_map[(uchar_type)c] : std::towlower(c)) : c;
+      return ::boost::re_detail::get_default_error_string(e);
    }
-
-   static void BOOST_REGEX_CALL transform(std::basic_string<regex_wchar_type>& out, const std::basic_string<regex_wchar_type>& in);
-
-   static void BOOST_REGEX_CALL transform_primary(std::basic_string<regex_wchar_type>& out, const std::basic_string<regex_wchar_type>& in);
-
-   static bool BOOST_REGEX_CALL is_separator(regex_wchar_type c)
+   ::boost::regex_constants::syntax_type syntax_type(char_type c)const
    {
-      return BOOST_REGEX_MAKE_BOOL((c == L'\n') || (c == L'\r') || (c == (regex_wchar_type)0x2028) || (c == (regex_wchar_type)0x2029));
+      return ((c & 0x7f) == c) ? get_default_syntax_type(static_cast<char>(c)) : ::boost::regex_constants::syntax_char;
    }
-
-   static bool BOOST_REGEX_CALL is_combining(regex_wchar_type c)
-   { return re_detail::is_combining(c); }
-   
-   static bool BOOST_REGEX_CALL is_class(regex_wchar_type c, boost::uint_fast32_t f)
+   ::boost::regex_constants::escape_syntax_type escape_syntax_type(char_type c)const
    {
-      return BOOST_REGEX_MAKE_BOOL(((uchar_type)c < 256) ? (re_detail::wide_unicode_classes[(size_type)(uchar_type)c] & f) : do_iswclass(c, f));
+      return ((c & 0x7f) == c) ? get_default_escape_syntax_type(static_cast<char>(c)) : ::boost::regex_constants::escape_type_identity;
    }
-
-   static int BOOST_REGEX_CALL toi(regex_wchar_type c);
-   static int BOOST_REGEX_CALL toi(const regex_wchar_type*& first, const regex_wchar_type* last, int radix);
-
-   static boost::uint_fast32_t BOOST_REGEX_CALL lookup_classname(const regex_wchar_type* first, const regex_wchar_type* last);
-
-   static bool BOOST_REGEX_CALL lookup_collatename(std::basic_string<regex_wchar_type>& s, const regex_wchar_type* first, const regex_wchar_type* last);
-
-   static locale_type BOOST_REGEX_CALL imbue(locale_type l){ return l; }
-   locale_type BOOST_REGEX_CALL getloc()const{ return locale_type(); }
-   void swap(c_regex_traits&){}
-   c_regex_traits<regex_wchar_type>()
-   { init(); }
-   ~c_regex_traits<regex_wchar_type>()
-   { m_free(); }
-   struct sentry
+   int toi(const char_type*& p1, const char_type* p2, int radix)const
    {
-      sentry(const c_regex_traits<regex_wchar_type>&)
-      { c_regex_traits<regex_wchar_type>::update(); }
-      operator void*() { return this; }
-   };
-   static void BOOST_REGEX_CALL update();
-   static std::size_t BOOST_REGEX_CALL strnarrow(char *s1, std::size_t len, const regex_wchar_type *s2);
-   static std::size_t BOOST_REGEX_CALL strwiden(regex_wchar_type *s1, std::size_t len, const char *s2);
-private:
-   static bool BOOST_REGEX_CALL do_iswclass(regex_wchar_type c, boost::uint_fast32_t f);
-   static void BOOST_REGEX_CALL m_free();
-   static void BOOST_REGEX_CALL init();
-   static bool BOOST_REGEX_CALL do_lookup_collate(std::basic_string<regex_wchar_type>& out, const regex_wchar_type* first, const regex_wchar_type* last);
-   static c_regex_traits<regex_wchar_type> init_;
-
-   static unsigned sort_type;
-   static regex_wchar_type sort_delim;
+      return ::boost::re_detail::global_toi(p1, p2, radix, *this);
+   }
+   char_type translate(char_type c, bool icase)const
+   {
+      return (icase ? this->translate_nocase(c) : this->translate(c));
+   }
+   char_type translate(char_type c)const
+   {
+      return BaseT::translate(c);
+   }
+   char_type tolower(char_type c)const
+   {
+      return ::boost::re_detail::global_lower(c);
+   }
+   char_type toupper(char_type c)const
+   {
+      return ::boost::re_detail::global_upper(c);
+   }
 };
 
-#ifdef BOOST_REGEX_HAS_SHORT_WCHAR_T
-//
-// What follows here is Visual Studio specific - it is a thin wrapper
-// that redirects calls to c_regex_traits<unsigned short> to
-// c_regex_traits<__wchar_t>.  This allows the library to be built
-// so that it supports programs built both with and without /Zc:wchar_t.
-//
-template<>
-class c_regex_traits<unsigned short> : public re_detail::c_traits_base
+template <class BaseT, bool has_extensions>
+struct compute_wrapper_base
 {
-   typedef re_detail::c_traits_base base_type;
-public:
-   typedef unsigned short char_type;
-   typedef unsigned short uchar_type;
-   typedef unsigned int size_type;
-   typedef std::basic_string<unsigned short> string_type;
-   typedef int locale_type; 
-   static std::size_t BOOST_REGEX_CALL length(const char_type* p)
-   {
-      return c_regex_traits<regex_wchar_type>::length(
-         reinterpret_cast<const regex_wchar_type*>(p));
-   }
-   static unsigned int BOOST_REGEX_CALL syntax_type(size_type c)
-   { 
-      return c_regex_traits<regex_wchar_type>::syntax_type(c); 
-   }
-   static unsigned short BOOST_REGEX_CALL translate(unsigned short c, bool icase)
-   {
-      return c_regex_traits<regex_wchar_type>::translate(c, icase);
-   }
-
-   static void BOOST_REGEX_CALL transform(std::basic_string<unsigned short>& out, const std::basic_string<unsigned short>& in)
-   { 
-      c_regex_traits<regex_wchar_type>::transform(
-         reinterpret_cast<std::basic_string<regex_wchar_type>&>(out), 
-         reinterpret_cast<const std::basic_string<regex_wchar_type>&>(in)); 
-   }
-
-   static void BOOST_REGEX_CALL transform_primary(std::basic_string<unsigned short>& out, const std::basic_string<unsigned short>& in)
-   { 
-      c_regex_traits<regex_wchar_type>::transform_primary(
-         reinterpret_cast<std::basic_string<regex_wchar_type>&>(out), 
-         reinterpret_cast<const std::basic_string<regex_wchar_type>&>(in)); }
-
-   static bool BOOST_REGEX_CALL is_separator(unsigned short c)
-   {
-      return c_regex_traits<regex_wchar_type>::is_separator(c);
-   }
-
-   static bool BOOST_REGEX_CALL is_combining(unsigned short c)
-   { 
-      return c_regex_traits<regex_wchar_type>::is_combining(c); 
-   }
-   
-   static bool BOOST_REGEX_CALL is_class(unsigned short c, boost::uint_fast32_t f)
-   {
-      return c_regex_traits<regex_wchar_type>::is_class(c, f);
-   }
-
-   static int BOOST_REGEX_CALL toi(unsigned short c)
-   { 
-      return c_regex_traits<regex_wchar_type>::toi(c); 
-   }
-   static int BOOST_REGEX_CALL toi(const unsigned short*& first, const unsigned short* last, int radix)
-   { 
-      return c_regex_traits<regex_wchar_type>::toi(
-         reinterpret_cast<const regex_wchar_type*&>(first), 
-         reinterpret_cast<const regex_wchar_type*>(last), 
-         radix); 
-   }
-
-   static boost::uint_fast32_t BOOST_REGEX_CALL lookup_classname(const unsigned short* first, const unsigned short* last)
-   {
-      return c_regex_traits<regex_wchar_type>::lookup_classname(
-         reinterpret_cast<const regex_wchar_type*>(first), 
-         reinterpret_cast<const regex_wchar_type*>(last));
-   }
-
-   static bool BOOST_REGEX_CALL lookup_collatename(std::basic_string<unsigned short>& s, const unsigned short* first, const unsigned short* last)
-   {
-      return c_regex_traits<regex_wchar_type>::lookup_collatename(
-         reinterpret_cast<std::basic_string<regex_wchar_type>&>(s), 
-         reinterpret_cast<const regex_wchar_type*>(first), 
-         reinterpret_cast<const regex_wchar_type*>(last));
-   }
-
-   static locale_type BOOST_REGEX_CALL imbue(locale_type l){ return l; }
-   locale_type BOOST_REGEX_CALL getloc()const{ return locale_type(); }
-
-   struct sentry
-   {
-      sentry(const c_regex_traits<unsigned short>&)
-      { c_regex_traits<unsigned short>::update(); }
-      ~sentry(){}
-      operator void*() { return this; }
-   };
-   static void BOOST_REGEX_CALL update()
-   { 
-      c_regex_traits<regex_wchar_type>::update(); 
-   }
-   void swap(c_regex_traits&){}
-   c_regex_traits(){};
-   ~c_regex_traits(){};
-   static std::size_t BOOST_REGEX_CALL strnarrow(char *s1, std::size_t len, const unsigned short *s2)
-   { 
-      return c_regex_traits<regex_wchar_type>::strnarrow(
-         s1, 
-         len, 
-         reinterpret_cast<const regex_wchar_type *>(s2)); 
-   }
-   static std::size_t BOOST_REGEX_CALL strwiden(unsigned short *s1, std::size_t len, const char *s2)
-   { 
-      return c_regex_traits<regex_wchar_type>::strwiden(
-         reinterpret_cast<regex_wchar_type *>(s1), len, s2); 
-   }
-
-private:
-   c_regex_traits<regex_wchar_type> m_init;
-
+   typedef BaseT type;
 };
-
-#endif // BOOST_REGEX_HAS_SHORT_WCHAR_T
-
-#endif // wide characters
-
-#if defined(_WIN32) && !defined(BOOST_REGEX_NO_W32)
-
-namespace re_detail{
-
-struct BOOST_REGEX_DECL w32_traits_base : public regex_traits_base
+#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !BOOST_WORKAROUND(__HP_aCC, BOOST_TESTED_AT(55500))
+template <class BaseT>
+struct compute_wrapper_base<BaseT, false>
 {
-   enum{
-   char_class_none = 0,
-   char_class_alnum = C1_ALPHA | C1_DIGIT,
-   char_class_alpha = C1_ALPHA,
-   char_class_cntrl = C1_CNTRL,
-   char_class_digit = C1_DIGIT,
-   char_class_graph = C1_UPPER | C1_LOWER | C1_DIGIT | C1_PUNCT | C1_ALPHA,
-   char_class_lower = C1_LOWER,
-   char_class_print = C1_UPPER | C1_LOWER | C1_DIGIT | C1_PUNCT | C1_BLANK | C1_ALPHA,
-   char_class_punct = C1_PUNCT,
-   char_class_space = C1_SPACE,
-   char_class_upper = C1_UPPER,
-   char_class_xdigit = C1_XDIGIT,
-   char_class_blank = C1_BLANK,
-   char_class_underscore = 0x4000,
-   char_class_word = C1_ALPHA | C1_DIGIT | char_class_underscore,
-   char_class_unicode = 0x8000,
-   char_class_win = 0x01FF
-   };
-
-
-public:
-   static std::string BOOST_REGEX_CALL set_message_catalogue(const std::string& s);
-protected:
-   static char regex_message_catalogue[BOOST_REGEX_MAX_PATH];
-   enum syntax_map_size
-   {
-      map_size = UCHAR_MAX + 1
-   };
-
-   static unsigned char syntax_map[map_size];
-   static unsigned short class_map[map_size];
-   static char lower_case_map[map_size];
-
-   static boost::uint_fast32_t BOOST_REGEX_CALL do_lookup_class(const char* p);
-   static bool BOOST_REGEX_CALL do_lookup_collate(std::string& buf, const char* p);
-   static void BOOST_REGEX_CALL do_free();
-   static void BOOST_REGEX_CALL do_init();
-public:
-   static std::string BOOST_REGEX_CALL error_string(unsigned id);
-   static char* BOOST_REGEX_CALL get_catalogue() { return regex_message_catalogue; }
+   typedef default_wrapper<BaseT> type;
 };
-
-
-} // namespace re_detail
-
-template<class charT>
-class w32_regex_traits;
-
-template<>
-class BOOST_REGEX_DECL w32_regex_traits<char> : public re_detail::w32_traits_base
-{
-   typedef re_detail::w32_traits_base base_type;
-public:
-   typedef char char_type;
-   typedef unsigned char uchar_type;
-   typedef unsigned int size_type;
-   typedef std::string string_type;
-   typedef int locale_type;
-
-   static std::size_t BOOST_REGEX_CALL length(const char_type* p)
-   {
-      return std::strlen(p);
-   }
-   static unsigned int BOOST_REGEX_CALL syntax_type(size_type c)
-   {
-      return syntax_map[c];
-   }
-   static char BOOST_REGEX_CALL translate(char c, bool icase)
-   {
-      return icase ? lower_case_map[(size_type)(uchar_type)c] : c;
-   }
-   static void BOOST_REGEX_CALL transform(std::string& out, const std::string& in);
-
-   static void BOOST_REGEX_CALL transform_primary(std::string& out, const std::string& in);
-
-   static bool BOOST_REGEX_CALL is_separator(char c)
-   {
-      return BOOST_REGEX_MAKE_BOOL((c == '\n') || (c == '\r'));
-   }
-
-   static bool BOOST_REGEX_CALL is_combining(char)
-   {
-      return false;
-   }
-   
-   static bool BOOST_REGEX_CALL is_class(char c, boost::uint_fast32_t f)
-   {
-      return BOOST_REGEX_MAKE_BOOL(class_map[(size_type)(uchar_type)c] & f);
-   }
-
-   static int BOOST_REGEX_CALL toi(char c);
-   static int BOOST_REGEX_CALL toi(const char*& first, const char* last, int radix);
-
-   static boost::uint_fast32_t BOOST_REGEX_CALL lookup_classname(const char* first, const char* last)
-   {
-      std::string s(first, last);
-      return do_lookup_class(s.c_str());
-   }
-
-   static bool BOOST_REGEX_CALL lookup_collatename(std::string& buf, const char* first, const char* last)
-   {
-      std::string s(first, last);
-      return do_lookup_collate(buf, s.c_str());
-   }
-
-   static locale_type BOOST_REGEX_CALL imbue(locale_type l){ return l; }
-   locale_type BOOST_REGEX_CALL getloc()const{ return locale_type(); }
-
-   struct sentry
-   {
-      sentry(const w32_regex_traits<char>&)
-      { w32_regex_traits<char>::update(); }
-      ~sentry(){}
-      operator void*() { return this; }
-   };
-   static void BOOST_REGEX_CALL update();
-   void swap(w32_regex_traits&){}
-   w32_regex_traits();
-   ~w32_regex_traits();
-private:
-   static w32_regex_traits<char> i;
-};
-
-#ifndef BOOST_NO_WREGEX
-template<>
-class BOOST_REGEX_DECL w32_regex_traits<regex_wchar_type> : public re_detail::w32_traits_base
-{
-   typedef re_detail::w32_traits_base base_type;
-public:
-   typedef regex_wchar_type char_type;
-   typedef unsigned short uchar_type;
-   typedef unsigned int size_type;
-   typedef std::basic_string<regex_wchar_type> string_type;
-   typedef int locale_type; 
-#ifndef BOOST_REGEX_HAS_SHORT_WCHAR_T
-   static std::size_t BOOST_REGEX_CALL length(const char_type* p)
-   {
-      return std::wcslen(p);
-   }
 #else
-   static std::size_t BOOST_REGEX_CALL length(const char_type* p)
-   {
-      return std::wcslen(reinterpret_cast<const wchar_t*>(p));
-   }
-#endif
-   static unsigned int BOOST_REGEX_CALL syntax_type(size_type c);
-   static regex_wchar_type BOOST_REGEX_CALL translate(regex_wchar_type c, bool icase)
-   {
-      return icase ? ((c < 256) ? re_detail::wide_lower_case_map[(uchar_type)c] : wtolower(c)) : c;
-   }
-
-   static void BOOST_REGEX_CALL transform(std::basic_string<regex_wchar_type>& out, const std::basic_string<regex_wchar_type>& in);
-
-   static void BOOST_REGEX_CALL transform_primary(std::basic_string<regex_wchar_type>& out, const std::basic_string<regex_wchar_type>& in);
-
-   static bool BOOST_REGEX_CALL is_separator(regex_wchar_type c)
-   {
-      return BOOST_REGEX_MAKE_BOOL((c == L'\n') || (c == L'\r') || (c == (regex_wchar_type)0x2028) || (c == (regex_wchar_type)0x2029));
-   }
-
-   static bool BOOST_REGEX_CALL is_combining(regex_wchar_type c)
-   { return re_detail::is_combining(c); }
-   
-   static bool BOOST_REGEX_CALL is_class(regex_wchar_type c, boost::uint_fast32_t f)
-   {
-      return BOOST_REGEX_MAKE_BOOL(((uchar_type)c < 256) ? (wide_unicode_classes[(size_type)(uchar_type)c] & f) : do_iswclass(c, f));
-   }
-
-   static int BOOST_REGEX_CALL toi(regex_wchar_type c);
-   static int BOOST_REGEX_CALL toi(const regex_wchar_type*& first, const regex_wchar_type* last, int radix);
-
-   static boost::uint_fast32_t BOOST_REGEX_CALL lookup_classname(const regex_wchar_type* first, const regex_wchar_type* last);
-
-   static bool BOOST_REGEX_CALL lookup_collatename(std::basic_string<regex_wchar_type>& s, const regex_wchar_type* first, const regex_wchar_type* last);
-
-   static locale_type BOOST_REGEX_CALL imbue(locale_type l){ return l; }
-   locale_type BOOST_REGEX_CALL getloc()const{ return locale_type(); }
-
-   struct sentry
-   {
-      sentry(const w32_regex_traits<regex_wchar_type>&)
-      { w32_regex_traits<regex_wchar_type>::update(); }
-      ~sentry(){}
-      operator void*() { return this; }
-   };
-   static void BOOST_REGEX_CALL update();
-   void swap(w32_regex_traits&){}
-   w32_regex_traits();
-   ~w32_regex_traits();
-   static std::size_t BOOST_REGEX_CALL strnarrow(char *s1, std::size_t len, const regex_wchar_type *s2);
-   static std::size_t BOOST_REGEX_CALL strwiden(regex_wchar_type *s1, std::size_t len, const char *s2);
-
-private:
-   static bool BOOST_REGEX_CALL do_iswclass(regex_wchar_type c, boost::uint_fast32_t f);
-   static bool BOOST_REGEX_CALL do_lookup_collate(std::basic_string<regex_wchar_type>& out, const regex_wchar_type* first, const regex_wchar_type* last);
-   static w32_regex_traits<regex_wchar_type> init_;
-   static regex_wchar_type BOOST_REGEX_CALL wtolower(regex_wchar_type c);
-   static unsigned short wide_unicode_classes[];
-};
-
-#ifdef BOOST_REGEX_HAS_SHORT_WCHAR_T
-//
-// What follows here is Visual Studio specific - it is a thin wrapper
-// that redirects calls to w32_regex_traits<unsigned short> to
-// w32_regex_traits<__wchar_t>.  This allows the library to be built
-// so that it supports programs built both with and without /Zc:wchar_t.
-//
-template<>
-class w32_regex_traits<unsigned short> : public re_detail::w32_traits_base
-{
-   typedef re_detail::w32_traits_base base_type;
-public:
-   typedef unsigned short char_type;
-   typedef unsigned short uchar_type;
-   typedef unsigned int size_type;
-   typedef std::basic_string<unsigned short> string_type;
-   typedef int locale_type; 
-   static std::size_t BOOST_REGEX_CALL length(const char_type* p)
-   {
-      return w32_regex_traits<regex_wchar_type>::length(
-         reinterpret_cast<const regex_wchar_type*>(p));
-   }
-   static unsigned int BOOST_REGEX_CALL syntax_type(size_type c)
-   { 
-      return w32_regex_traits<regex_wchar_type>::syntax_type(c); 
-   }
-   static unsigned short BOOST_REGEX_CALL translate(unsigned short c, bool icase)
-   {
-      return w32_regex_traits<regex_wchar_type>::translate(c, icase);
-   }
-
-   static void BOOST_REGEX_CALL transform(std::basic_string<unsigned short>& out, const std::basic_string<unsigned short>& in)
-   { 
-      w32_regex_traits<regex_wchar_type>::transform(
-         reinterpret_cast<std::basic_string<regex_wchar_type>&>(out), 
-         reinterpret_cast<const std::basic_string<regex_wchar_type>&>(in)); 
-   }
-
-   static void BOOST_REGEX_CALL transform_primary(std::basic_string<unsigned short>& out, const std::basic_string<unsigned short>& in)
-   { 
-      w32_regex_traits<regex_wchar_type>::transform_primary(
-         reinterpret_cast<std::basic_string<regex_wchar_type>&>(out), 
-         reinterpret_cast<const std::basic_string<regex_wchar_type>&>(in)); }
-
-   static bool BOOST_REGEX_CALL is_separator(unsigned short c)
-   {
-      return w32_regex_traits<regex_wchar_type>::is_separator(c);
-   }
-
-   static bool BOOST_REGEX_CALL is_combining(unsigned short c)
-   { 
-      return w32_regex_traits<regex_wchar_type>::is_combining(c); 
-   }
-   
-   static bool BOOST_REGEX_CALL is_class(unsigned short c, boost::uint_fast32_t f)
-   {
-      return w32_regex_traits<regex_wchar_type>::is_class(c, f);
-   }
-
-   static int BOOST_REGEX_CALL toi(unsigned short c)
-   { 
-      return w32_regex_traits<regex_wchar_type>::toi(c); 
-   }
-   static int BOOST_REGEX_CALL toi(const unsigned short*& first, const unsigned short* last, int radix)
-   { 
-      return w32_regex_traits<regex_wchar_type>::toi(
-         reinterpret_cast<const regex_wchar_type*&>(first), 
-         reinterpret_cast<const regex_wchar_type*>(last), 
-         radix); 
-   }
-
-   static boost::uint_fast32_t BOOST_REGEX_CALL lookup_classname(const unsigned short* first, const unsigned short* last)
-   {
-      return w32_regex_traits<regex_wchar_type>::lookup_classname(
-         reinterpret_cast<const regex_wchar_type*>(first), 
-         reinterpret_cast<const regex_wchar_type*>(last));
-   }
-
-   static bool BOOST_REGEX_CALL lookup_collatename(std::basic_string<unsigned short>& s, const unsigned short* first, const unsigned short* last)
-   {
-      return w32_regex_traits<regex_wchar_type>::lookup_collatename(
-         reinterpret_cast<std::basic_string<regex_wchar_type>&>(s), 
-         reinterpret_cast<const regex_wchar_type*>(first), 
-         reinterpret_cast<const regex_wchar_type*>(last));
-   }
-
-   static locale_type BOOST_REGEX_CALL imbue(locale_type l){ return l; }
-   locale_type BOOST_REGEX_CALL getloc()const{ return locale_type(); }
-
-   struct sentry
-   {
-      sentry(const w32_regex_traits<unsigned short>&)
-      { w32_regex_traits<unsigned short>::update(); }
-      ~sentry(){}
-      operator void*() { return this; }
-   };
-   static void BOOST_REGEX_CALL update()
-   { 
-      w32_regex_traits<regex_wchar_type>::update(); 
-   }
-   void swap(w32_regex_traits&){}
-   w32_regex_traits(){};
-   ~w32_regex_traits(){};
-   static std::size_t BOOST_REGEX_CALL strnarrow(char *s1, std::size_t len, const unsigned short *s2)
-   { 
-      return w32_regex_traits<regex_wchar_type>::strnarrow(
-         s1, 
-         len, 
-         reinterpret_cast<const regex_wchar_type *>(s2)); 
-   }
-   static std::size_t BOOST_REGEX_CALL strwiden(unsigned short *s1, std::size_t len, const char *s2)
-   { 
-      return w32_regex_traits<regex_wchar_type>::strwiden(
-         reinterpret_cast<regex_wchar_type *>(s1), len, s2); 
-   }
-
-private:
-   w32_regex_traits<regex_wchar_type> m_init;
-
-};
-
-#endif // BOOST_REGEX_HAS_SHORT_WCHAR_T
-
-#endif // Wide strings
-#endif // Win32
-
-#if !defined(BOOST_NO_STD_LOCALE)
-
-namespace re_detail
-{
-
-template <class charT>
-struct message_data;
-
 template <>
-struct message_data<char>;
-
-template <>
-struct message_data<regex_wchar_type>;
-
-struct BOOST_REGEX_DECL cpp_regex_traits_base : public regex_traits_base
+struct compute_wrapper_base<c_regex_traits<char>, false>
 {
-   enum char_class_type
-   {
-      char_class_none = 0,
-      char_class_alnum = std::ctype_base::alnum,
-      char_class_alpha = std::ctype_base::alpha,
-      char_class_cntrl = std::ctype_base::cntrl,
-      char_class_digit = std::ctype_base::digit,
-      char_class_graph = std::ctype_base::graph,
-      char_class_lower = std::ctype_base::lower,
-      char_class_print = std::ctype_base::print,
-      char_class_punct = std::ctype_base::punct,
-      char_class_space = std::ctype_base::space,
-      char_class_upper = std::ctype_base::upper,
-      char_class_xdigit = std::ctype_base::xdigit,
-      char_class_blank = 1<<12,
-      char_class_underscore = 1<<13,
-      char_class_word = std::ctype_base::alnum | char_class_underscore,
-      char_class_unicode = 1<<14,
-      char_class_all_base = char_class_alnum | char_class_alpha | char_class_cntrl
-                         | char_class_digit | char_class_graph | char_class_lower
-                         | char_class_print | char_class_punct | char_class_space
-                         | char_class_upper | char_class_xdigit
-   };
-
-   static std::string BOOST_REGEX_CALL set_message_catalogue(const std::string& s);
-protected:
-   static char regex_message_cat[BOOST_REGEX_MAX_PATH];
+   typedef default_wrapper<c_regex_traits<char> > type;
 };
+#ifndef BOOST_NO_WREGEX
+template <>
+struct compute_wrapper_base<c_regex_traits<wchar_t>, false>
+{
+   typedef default_wrapper<c_regex_traits<wchar_t> > type;
+};
+#endif
+#endif
 
 } // namespace re_detail
 
-template <class charT>
-class cpp_regex_traits;
-
-template<>
-class BOOST_REGEX_DECL cpp_regex_traits<char> : public re_detail::cpp_regex_traits_base
+template <class BaseT>
+struct regex_traits_wrapper 
+   : public ::boost::re_detail::compute_wrapper_base<
+               BaseT, 
+               ::boost::re_detail::has_boost_extensions_tag<BaseT>::value
+            >::type
 {
-   typedef re_detail::cpp_regex_traits_base base_type;
+   regex_traits_wrapper(){}
 private:
-   re_detail::message_data<char>* pmd;
-   const unsigned char* psyntax;
-   char* lower_map;
-   const std::ctype<char>* pctype;
-   const std::collate<char>* pcollate;
-   std::locale locale_inst;
-   unsigned sort_type;
-   char sort_delim;
-
-   cpp_regex_traits(const cpp_regex_traits&);
-   cpp_regex_traits& operator=(const cpp_regex_traits&);
-
-public:
-   typedef char char_type;
-   typedef unsigned char uchar_type;
-   typedef unsigned int size_type;
-   typedef std::string string_type;
-   typedef std::locale locale_type;
-
-   cpp_regex_traits();
-   ~cpp_regex_traits();
-
-   static std::size_t BOOST_REGEX_CALL length(const char_type* p)
-   {
-      return std::strlen(p);
-   }
-   unsigned int BOOST_REGEX_CALL syntax_type(size_type c)const
-   {
-      return psyntax[c];
-   }
-   char BOOST_REGEX_CALL translate(char c, bool icase)const
-   {
-      return icase ? lower_map[(size_type)(uchar_type)c] : c;
-   }
-   void BOOST_REGEX_CALL transform(std::string& out, const std::string& in)const
-   {
-      out = pcollate->transform(in.c_str(), in.c_str() + in.size()).c_str();
-   }
-
-   void BOOST_REGEX_CALL transform_primary(std::string& out, const std::string& in)const;
-
-   static bool BOOST_REGEX_CALL is_separator(char c)
-   {
-      return BOOST_REGEX_MAKE_BOOL((c == '\n') || (c == '\r'));
-   }
-
-   static bool BOOST_REGEX_CALL is_combining(char)
-   {
-      return false;
-   }
-   
-   bool BOOST_REGEX_CALL is_class(char c, boost::uint_fast32_t f)const
-   {
-      if(pctype->is((std::ctype<char>::mask)(f & char_class_all_base), c))
-         return true;
-      if((f & char_class_underscore) && (c == '_'))
-         return true;
-      if((f & char_class_blank) && ((c == ' ') || (c == '\t')))
-         return true;
-      return false;
-   }
-
-   int BOOST_REGEX_CALL toi(char c)const;
-   int BOOST_REGEX_CALL toi(const char*& first, const char* last, int radix)const;
-
-   boost::uint_fast32_t BOOST_REGEX_CALL lookup_classname(const char* first, const char* last)const;
-   bool BOOST_REGEX_CALL lookup_collatename(std::string& s, const char* first, const char* last)const;
-
-   std::string BOOST_REGEX_CALL error_string(unsigned id)const;
-   locale_type BOOST_REGEX_CALL imbue(locale_type l);
-   locale_type BOOST_REGEX_CALL getloc()const{ return locale_inst; }
-   void swap(cpp_regex_traits&);
-
-   struct sentry
-   {
-      sentry(const cpp_regex_traits<char>&){}
-      operator void*() { return this; }
-   };
+   regex_traits_wrapper(const regex_traits_wrapper&);
+   regex_traits_wrapper& operator=(const regex_traits_wrapper&);
 };
 
-#if !defined(BOOST_NO_WREGEX) && !defined(BOOST_NO_STD_WSTREAMBUF)
-template<>
-class BOOST_REGEX_DECL cpp_regex_traits<regex_wchar_type> : public re_detail::cpp_regex_traits_base
-{
-   typedef re_detail::cpp_regex_traits_base base_type;
-public:
-   typedef regex_wchar_type char_type;
-   typedef unsigned short uchar_type;
-   typedef unsigned int size_type;
-   typedef std::basic_string<regex_wchar_type> string_type;
-   typedef std::locale locale_type;
-
-private:
-   re_detail::message_data<regex_wchar_type>* pmd;
-   const unsigned char* psyntax;
-   regex_wchar_type* lower_map;
-   const std::ctype<regex_wchar_type>* pctype;
-   const std::collate<regex_wchar_type>* pcollate;
-   const std::codecvt<regex_wchar_type, char, std::mbstate_t>* pcdv;
-   std::locale locale_inst;
-   unsigned int BOOST_REGEX_CALL do_syntax_type(size_type c)const;
-   unsigned sort_type;
-   regex_wchar_type sort_delim;
-
-   cpp_regex_traits(const cpp_regex_traits&);
-   cpp_regex_traits& operator=(const cpp_regex_traits&);
-
-public:
-#ifndef BOOST_REGEX_HAS_SHORT_WCHAR_T
-   static std::size_t BOOST_REGEX_CALL length(const char_type* p)
-   {
-      return std::wcslen(p);
-   }
-#else
-   static std::size_t BOOST_REGEX_CALL length(const char_type* p)
-   {
-      return std::wcslen(reinterpret_cast<const wchar_t*>(p));
-   }
-#endif
-   unsigned int BOOST_REGEX_CALL syntax_type(size_type c)const
-   {
-      return (c < UCHAR_MAX) ? psyntax[c] : do_syntax_type(c);
-   }
-   regex_wchar_type BOOST_REGEX_CALL translate(regex_wchar_type c, bool icase)const
-   {
-      return icase ? (((uchar_type)c) <= UCHAR_MAX) ? lower_map[c] : pctype->tolower(c) : c;
-   }
-   void BOOST_REGEX_CALL transform(std::basic_string<regex_wchar_type>& out, const std::basic_string<regex_wchar_type>& in)const
-   {
-      out = pcollate->transform(in.c_str(), in.c_str() + in.size());
-   }
-
-   void BOOST_REGEX_CALL transform_primary(std::basic_string<regex_wchar_type>& out, const std::basic_string<regex_wchar_type>& in)const;
-
-   static bool BOOST_REGEX_CALL is_separator(regex_wchar_type c)
-   {
-      return BOOST_REGEX_MAKE_BOOL((c == L'\n') || (c == L'\r') || (c == (regex_wchar_type)0x2028) || (c == (regex_wchar_type)0x2029));
-   }
-
-   static bool BOOST_REGEX_CALL is_combining(regex_wchar_type c)
-   { return re_detail::is_combining(c); }
-   
-   bool BOOST_REGEX_CALL is_class(regex_wchar_type c, boost::uint_fast32_t f)const
-   {
-      if(pctype->is((std::ctype<regex_wchar_type>::mask)(f & char_class_all_base), c))
-         return true;
-      if((f & char_class_underscore) && (c == '_'))
-         return true;
-      if((f & char_class_blank) && ((c == ' ') || (c == '\t')))
-         return true;
-      if((f & char_class_unicode) && ((uchar_type)c > (uchar_type)255))
-         return true;
-      return false;
-   }
-
-   int BOOST_REGEX_CALL toi(regex_wchar_type c)const;
-   int BOOST_REGEX_CALL toi(const regex_wchar_type*& first, const regex_wchar_type* last, int radix)const;
-
-   boost::uint_fast32_t BOOST_REGEX_CALL lookup_classname(const regex_wchar_type* first, const regex_wchar_type* last)const;
-   bool BOOST_REGEX_CALL lookup_collatename(std::basic_string<regex_wchar_type>& s, const regex_wchar_type* first, const regex_wchar_type* last)const;
-
-   std::string BOOST_REGEX_CALL error_string(unsigned id)const;
-   void swap(cpp_regex_traits&);
-   cpp_regex_traits();
-   ~cpp_regex_traits();
-   locale_type BOOST_REGEX_CALL imbue(locale_type l);
-   locale_type BOOST_REGEX_CALL getloc()const{ return locale_inst; }
-   std::size_t BOOST_REGEX_CALL strwiden(regex_wchar_type *s1, std::size_t len, const char *s2)const;
-
-   struct sentry
-   {
-      sentry(const cpp_regex_traits<regex_wchar_type>&){}
-      operator void*() { return this; }
-   };
-};
-
-#ifdef BOOST_REGEX_HAS_SHORT_WCHAR_T
-//
-// What follows here is Visual Studio specific - it is a thin wrapper
-// that redirects calls to cpp_regex_traits<unsigned short> to
-// cpp_regex_traits<__wchar_t>.  This allows the library to be built
-// so that it supports programs built both with and without /Zc:wchar_t.
-//
-template<>
-class cpp_regex_traits<unsigned short> : public re_detail::cpp_regex_traits_base
-{
-   typedef re_detail::cpp_regex_traits_base base_type;
-public:
-   typedef unsigned short char_type;
-   typedef unsigned short uchar_type;
-   typedef unsigned int size_type;
-   typedef std::basic_string<unsigned short> string_type;
-   typedef std::locale locale_type; 
-   static std::size_t BOOST_REGEX_CALL length(const char_type* p)
-   {
-      return cpp_regex_traits<regex_wchar_type>::length(
-         reinterpret_cast<const regex_wchar_type*>(p));
-   }
-   unsigned int BOOST_REGEX_CALL syntax_type(size_type c)const
-   { 
-      return m_imp.syntax_type(c); 
-   }
-   unsigned short BOOST_REGEX_CALL translate(unsigned short c, bool icase)const
-   {
-      return m_imp.translate(c, icase);
-   }
-
-   void BOOST_REGEX_CALL transform(std::basic_string<unsigned short>& out, const std::basic_string<unsigned short>& in)const
-   { 
-      m_imp.transform(
-         reinterpret_cast<std::basic_string<regex_wchar_type>&>(out), 
-         reinterpret_cast<const std::basic_string<regex_wchar_type>&>(in)); 
-   }
-
-   void BOOST_REGEX_CALL transform_primary(std::basic_string<unsigned short>& out, const std::basic_string<unsigned short>& in)const
-   { 
-      m_imp.transform_primary(
-         reinterpret_cast<std::basic_string<regex_wchar_type>&>(out), 
-         reinterpret_cast<const std::basic_string<regex_wchar_type>&>(in)); }
-
-   static bool BOOST_REGEX_CALL is_separator(unsigned short c)
-   {
-      return cpp_regex_traits<regex_wchar_type>::is_separator(c);
-   }
-
-   static bool BOOST_REGEX_CALL is_combining(unsigned short c)
-   { 
-      return cpp_regex_traits<regex_wchar_type>::is_combining(c); 
-   }
-   
-   bool BOOST_REGEX_CALL is_class(unsigned short c, boost::uint_fast32_t f)const
-   {
-      return m_imp.is_class(c, f);
-   }
-
-   int BOOST_REGEX_CALL toi(unsigned short c)const
-   { 
-      return m_imp.toi(c); 
-   }
-   int BOOST_REGEX_CALL toi(const unsigned short*& first, const unsigned short* last, int radix)const
-   { 
-      return m_imp.toi(
-         reinterpret_cast<const regex_wchar_type*&>(first), 
-         reinterpret_cast<const regex_wchar_type*>(last), 
-         radix); 
-   }
-
-   boost::uint_fast32_t BOOST_REGEX_CALL lookup_classname(const unsigned short* first, const unsigned short* last)const
-   {
-      return m_imp.lookup_classname(
-         reinterpret_cast<const regex_wchar_type*>(first), 
-         reinterpret_cast<const regex_wchar_type*>(last));
-   }
-
-   bool BOOST_REGEX_CALL lookup_collatename(std::basic_string<unsigned short>& s, const unsigned short* first, const unsigned short* last)const
-   {
-      return m_imp.lookup_collatename(
-         reinterpret_cast<std::basic_string<regex_wchar_type>&>(s), 
-         reinterpret_cast<const regex_wchar_type*>(first), 
-         reinterpret_cast<const regex_wchar_type*>(last));
-   }
-
-   locale_type BOOST_REGEX_CALL imbue(locale_type l)
-   { 
-      return m_imp.imbue(l); 
-   }
-   locale_type BOOST_REGEX_CALL getloc()const
-   { 
-      return m_imp.getloc(); 
-   }
-
-   struct sentry
-   {
-      sentry(const cpp_regex_traits<unsigned short>&){}
-      operator void*() { return this; }
-   };
-   void swap(cpp_regex_traits& that)
-   {
-      m_imp.swap(that.m_imp);
-   }
-   cpp_regex_traits(){};
-   ~cpp_regex_traits(){};
-   std::size_t BOOST_REGEX_CALL strwiden(unsigned short *s1, std::size_t len, const char *s2)const
-   { 
-      return m_imp.strwiden(
-         reinterpret_cast<regex_wchar_type *>(s1), len, s2); 
-   }
-   std::string BOOST_REGEX_CALL error_string(unsigned id)const
-   {
-      return m_imp.error_string(id);
-   }
-
-private:
-   cpp_regex_traits<regex_wchar_type> m_imp;
-
-};
-
-#endif // BOOST_REGEX_HAS_SHORT_WCHAR_T
-#endif // BOOST_NO_WREGEX
-
-#endif // BOOST_NO_STD_LOCALE
-
-#ifdef BOOST_REGEX_USE_WIN32_LOCALE
-
-template <class charT>
-class regex_traits : public w32_regex_traits<charT>
-{
-};
-
-#elif defined(BOOST_REGEX_USE_C_LOCALE)
-
-template <class charT>
-class regex_traits : public c_regex_traits<charT>
-{
-};
-
-#elif defined(BOOST_REGEX_USE_CPP_LOCALE)
-
-template <class charT>
-class regex_traits : public cpp_regex_traits<charT>
-{
-};
-
-#else
-#error No default localisation model defined
-#endif
+} // namespace boost
 
 #ifdef BOOST_HAS_ABI_HEADERS
 #  include BOOST_ABI_SUFFIX
 #endif
 
-} // namespace boost
-
 #endif // include
 
-
-
-
-
-
-
-
diff --git a/include/boost/regex/v4/regex_traits_defaults.hpp b/include/boost/regex/v4/regex_traits_defaults.hpp
new file mode 100644
index 00000000..38f4ab4a
--- /dev/null
+++ b/include/boost/regex/v4/regex_traits_defaults.hpp
@@ -0,0 +1,288 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         regex_traits_defaults.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Declares API's for access to regex_traits default properties.
+  */
+
+#ifndef BOOST_REGEX_TRAITS_DEFAULTS_HPP_INCLUDED
+#define BOOST_REGEX_TRAITS_DEFAULTS_HPP_INCLUDED
+
+#ifdef BOOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
+#endif
+
+#ifndef BOOST_REGEX_SYNTAX_TYPE_HPP
+#include <boost/regex/v4/syntax_type.hpp>
+#endif
+#ifndef BOOST_REGEX_ERROR_TYPE_HPP
+#include <boost/regex/v4/error_type.hpp>
+#endif
+
+#ifdef BOOST_NO_STDC_NAMESPACE
+namespace std{
+   using ::strlen;
+}
+#endif
+
+namespace boost{ namespace re_detail{
+
+
+//
+// helpers to suppress warnings:
+//
+template <class charT>
+inline bool is_extended(charT c)
+{ return c > 256; }
+inline bool is_extended(char)
+{ return false; }
+
+
+BOOST_REGEX_DECL const char* BOOST_REGEX_CALL get_default_syntax(regex_constants::syntax_type n);
+BOOST_REGEX_DECL const char* BOOST_REGEX_CALL get_default_error_string(regex_constants::error_type n);
+BOOST_REGEX_DECL regex_constants::syntax_type BOOST_REGEX_CALL get_default_syntax_type(char c);
+BOOST_REGEX_DECL regex_constants::escape_syntax_type BOOST_REGEX_CALL get_default_escape_syntax_type(char c);
+
+// is charT c a combining character?
+BOOST_REGEX_DECL bool BOOST_REGEX_CALL is_combining_implementation(uint_least16_t s);
+
+template <class charT>
+inline bool is_combining(charT c)
+{
+   return (c < static_cast<charT>(0)) ? false : ((c > static_cast<charT>((std::numeric_limits<uint_least16_t>::max)())) ? false : is_combining_implementation(static_cast<unsigned short>(c)));
+}
+template <>
+inline bool is_combining<char>(char)
+{
+   return false;
+}
+template <>
+inline bool is_combining<signed char>(signed char)
+{
+   return false;
+}
+template <>
+inline bool is_combining<unsigned char>(unsigned char)
+{
+   return false;
+}
+#ifdef _MSC_VER
+template<>
+inline bool is_combining<wchar_t>(wchar_t c)
+{
+   return is_combining_implementation(static_cast<unsigned short>(c));
+}
+#elif !defined(__DECCXX) && defined(WCHAR_MIN) && (WCHAR_MIN == 0) && !defined(BOOST_NO_INTRINSIC_WCHAR_T)
+#if defined(WCHAR_MAX) && (WCHAR_MAX <= USHRT_MAX)
+template<>
+inline bool is_combining<wchar_t>(wchar_t c)
+{
+   return is_combining_implementation(static_cast<unsigned short>(c));
+}
+#else
+template<>
+inline bool is_combining<wchar_t>(wchar_t c)
+{
+   return (c > (std::numeric_limits<uint_least16_t>::max)()) ? false : is_combining_implementation(static_cast<unsigned short>(c));
+}
+#endif
+#endif
+
+//
+// is a charT c a line separator?
+//
+template <class charT>
+inline bool is_separator(charT c)
+{
+   return BOOST_REGEX_MAKE_BOOL(
+      (c == static_cast<charT>('\n')) 
+      || (c == static_cast<charT>('\r')) 
+      || (c == static_cast<charT>('\f')) 
+      || (static_cast<boost::uint16_t>(c) == 0x2028u) 
+      || (static_cast<boost::uint16_t>(c) == 0x2029u) 
+      || (static_cast<boost::uint16_t>(c) == 0x85u));
+}
+template <>
+inline bool is_separator<char>(char c)
+{
+   return BOOST_REGEX_MAKE_BOOL((c == '\n') || (c == '\r') || (c == '\f'));
+}
+
+//
+// get a default collating element:
+//
+BOOST_REGEX_DECL std::string BOOST_REGEX_CALL lookup_default_collate_name(const std::string& name);
+
+//
+// get the id of a character clasification, the individual
+// traits classes then transform that id into a bitmask:
+//
+template <class charT>
+struct character_pointer_range
+{
+   const charT* p1;
+   const charT* p2;
+
+   bool operator < (const character_pointer_range& r)const
+   {
+      return std::lexicographical_compare(p1, p2, r.p1, r.p2);
+   }
+   bool operator == (const character_pointer_range& r)const
+   {
+      return ((p2 - p1) == (r.p2 - r.p1)) && std::equal(p1, p2, r.p1);
+   }
+};
+template <class charT>
+int get_default_class_id(const charT* p1, const charT* p2)
+{
+   static const charT data[] = {
+      'a', 'l', 'n', 'u', 'm',
+      'a', 'l', 'p', 'h', 'a',
+      'b', 'l', 'a', 'n', 'k',
+      'c', 'n', 't', 'r', 'l',
+      'd', 'i', 'g', 'i', 't',
+      'g', 'r', 'a', 'p', 'h',
+      'l', 'o', 'w', 'e', 'r',
+      'p', 'r', 'i', 'n', 't',
+      'p', 'u', 'n', 'c', 't',
+      's', 'p', 'a', 'c', 'e',
+      'u', 'n', 'i', 'c', 'o', 'd', 'e',
+      'u', 'p', 'p', 'e', 'r',
+      'w', 'o', 'r', 'd',
+      'x', 'd', 'i', 'g', 'i', 't',
+   };
+
+   static const character_pointer_range<charT> ranges[] = 
+   {
+      {data+0, data+5,}, // alnum
+      {data+5, data+10,}, // alpha
+      {data+10, data+15,}, // blank
+      {data+15, data+20,}, // cntrl
+      {data+20, data+21,}, // d
+      {data+20, data+25,}, // digit
+      {data+25, data+30,}, // graph
+      {data+30, data+31,}, // l
+      {data+30, data+35,}, // lower
+      {data+35, data+40,}, // print
+      {data+40, data+45,}, // punct
+      {data+45, data+46,}, // s
+      {data+45, data+50,}, // space
+      {data+57, data+58,}, // u
+      {data+50, data+57,}, // unicode
+      {data+57, data+62,}, // upper
+      {data+62, data+63,}, // w
+      {data+62, data+66,}, // word
+      {data+66, data+72,}, // xdigit
+   };
+   static const character_pointer_range<charT>* ranges_begin = ranges;
+   static const character_pointer_range<charT>* ranges_end = ranges + (sizeof(ranges)/sizeof(ranges[0]));
+   
+   character_pointer_range<charT> t = { p1, p2, };
+   const character_pointer_range<charT>* p = std::lower_bound(ranges_begin, ranges_end, t);
+   if((p != ranges_end) && (t == *p))
+      return static_cast<int>(p - ranges);
+   return -1;
+}
+
+//
+// helper functions:
+//
+template <class charT>
+std::ptrdiff_t global_length(const charT* p)
+{
+   std::ptrdiff_t n = 0;
+   while(*p)
+   {
+      ++p;
+      ++n;
+   }
+   return n;
+}
+inline std::ptrdiff_t global_length(const char* p)
+{
+   return (std::strlen)(p);
+}
+#ifndef BOOST_NO_WREGEX
+inline std::ptrdiff_t global_length(const wchar_t* p)
+{
+   return (std::wcslen)(p);
+}
+#endif
+template <class charT>
+inline charT BOOST_REGEX_CALL global_lower(charT c)
+{
+   return c;
+}
+template <class charT>
+inline charT BOOST_REGEX_CALL global_upper(charT c)
+{
+   return c;
+}
+BOOST_REGEX_DECL char BOOST_REGEX_CALL global_lower(char c);
+BOOST_REGEX_DECL char BOOST_REGEX_CALL global_upper(char c);
+#ifndef BOOST_NO_WREGEX
+BOOST_REGEX_DECL wchar_t BOOST_REGEX_CALL global_lower(wchar_t c);
+BOOST_REGEX_DECL wchar_t BOOST_REGEX_CALL global_upper(wchar_t c);
+#endif
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+BOOST_REGEX_DECL unsigned short BOOST_REGEX_CALL global_lower(unsigned short c);
+BOOST_REGEX_DECL unsigned short BOOST_REGEX_CALL global_upper(unsigned short c);
+#endif
+
+template <class charT>
+int global_value(charT c)
+{
+   static const charT zero = '0';
+   static const charT nine = '9';
+   static const charT a = 'a';
+   static const charT f = 'f';
+   static const charT A = 'A';
+   static const charT F = 'F';
+
+   if(c > f) return -1;
+   if(c >= a) return 10 + (c - a);
+   if(c > F) return -1;
+   if(c >= A) return 10 + (c - A);
+   if(c > nine) return -1;
+   if(c >= zero) return c - zero;
+   return -1;
+}
+template <class charT, class traits>
+int global_toi(const charT*& p1, const charT* p2, int radix, const traits& t)
+{
+   (void)t; // warning suppression
+   int next_value = t.value(*p1, radix);
+   if((p1 == p2) || (next_value < 0) || (next_value >= radix))
+      return -1;
+   int result = 0;
+   while(p1 != p2)
+   {
+      next_value = t.value(*p1, radix);
+      if((next_value < 0) || (next_value >= radix))
+         break;
+      result *= radix;
+      result += next_value;
+      ++p1;
+   }
+   return result;
+}
+
+} // re_detail
+} // boost
+
+#ifdef BOOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
+#endif
+
+#endif
diff --git a/include/boost/regex/v4/regex_workaround.hpp b/include/boost/regex/v4/regex_workaround.hpp
new file mode 100644
index 00000000..9c9d7465
--- /dev/null
+++ b/include/boost/regex/v4/regex_workaround.hpp
@@ -0,0 +1,115 @@
+/*
+ *
+ * Copyright (c) 1998-2004
+ * Dr 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         regex_workarounds.cpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Declares Misc workarounds.
+  */
+
+#ifndef BOOST_REGEX_WORKAROUND_HPP
+#define BOOST_REGEX_WORKAROUND_HPP
+
+
+#include <new>
+#include <cstring>
+#include <cstdlib>
+#include <cstddef>
+#include <cassert>
+#include <string>
+#include <stdexcept>
+#include <iterator>
+#include <iosfwd>
+#include <vector>
+#include <map>
+#include <boost/limits.hpp>
+#include <boost/assert.hpp>
+#include <boost/cstdint.hpp>
+#include <boost/throw_exception.hpp>
+#include <boost/scoped_ptr.hpp>
+#include <boost/scoped_array.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/mpl/bool_fwd.hpp>
+#ifndef BOOST_NO_STD_LOCALE
+#   include <locale>
+#endif
+
+namespace boost{ namespace re_detail{
+#ifdef BOOST_NO_STD_DISTANCE
+template <class T>
+std::ptrdiff_t distance(const T& x, const T& y)
+{ return y - x; }
+#else
+using std::distance;
+#endif
+}}
+
+
+#ifdef BOOST_REGEX_NO_BOOL
+#  define BOOST_REGEX_MAKE_BOOL(x) static_cast<bool>((x) ? true : false)
+#else
+#  ifdef BOOST_MSVC
+      // warning suppression with VC6:
+#     pragma warning(disable: 4800)
+#     pragma warning(disable: 4786)
+#  endif
+#  define BOOST_REGEX_MAKE_BOOL(x) static_cast<bool>(x)
+#endif
+
+/*****************************************************************************
+ *
+ *  Fix broken broken namespace support:
+ *
+ ****************************************************************************/
+
+#if defined(BOOST_NO_STDC_NAMESPACE) && defined(__cplusplus)
+
+namespace std{
+   using ::ptrdiff_t;
+   using ::size_t;
+   using ::abs;
+   using ::memset;
+   using ::memcpy;
+}
+
+#endif
+
+/*****************************************************************************
+ *
+ *  helper functions pointer_construct/pointer_destroy:
+ *
+ ****************************************************************************/
+
+#ifdef __cplusplus
+namespace boost{ namespace re_detail{
+
+#ifdef BOOST_MSVC
+#pragma warning (push)
+#pragma warning (disable : 4100)
+#endif
+
+template <class T>
+inline void pointer_destroy(T* p)
+{ p->~T(); (void)p; }
+
+#ifdef BOOST_MSVC
+#pragma warning (pop)
+#endif
+
+template <class T>
+inline void pointer_construct(T* p, const T& t)
+{ new (p) T(t); }
+
+}} // namespaces
+#endif
+
+#endif // include guard
diff --git a/include/boost/regex/v4/states.hpp b/include/boost/regex/v4/states.hpp
index 1e4e11d6..42ff7e5e 100644
--- a/include/boost/regex/v4/states.hpp
+++ b/include/boost/regex/v4/states.hpp
@@ -36,6 +36,7 @@ enum mask_type
 {
    mask_take = 1,
    mask_skip = 2,
+   mask_init = 4,
    mask_any = mask_skip | mask_take,
    mask_all = mask_any
 };
@@ -105,7 +106,12 @@ enum syntax_element_type
    syntax_element_dot_rep = syntax_element_restart_continue + 1,
    syntax_element_char_rep = syntax_element_dot_rep + 1,
    syntax_element_short_set_rep = syntax_element_char_rep + 1,
-   syntax_element_long_set_rep = syntax_element_short_set_rep + 1
+   syntax_element_long_set_rep = syntax_element_short_set_rep + 1,
+   // a backstep for lookbehind repeats:
+   syntax_element_backstep = syntax_element_long_set_rep + 1,
+   // an assertion that a mark was matched:
+   syntax_element_assert_backref = syntax_element_backstep + 1,
+   syntax_element_toggle_case = syntax_element_assert_backref + 1
 };
 
 #ifdef BOOST_REGEX_DEBUG
@@ -123,7 +129,7 @@ execution of the machine.
 union offset_type
 {
    re_syntax_base*   p;
-   std::size_t       i;
+   std::ptrdiff_t    i;
 };
 
 /*** struct re_syntax_base ********************************************
@@ -133,11 +139,10 @@ struct re_syntax_base
 {
    syntax_element_type   type;         // what kind of state this is
    offset_type           next;         // next state in the machine
-   unsigned int          can_be_null;  // true if we match a NULL string
 };
 
 /*** struct re_brace **************************************************
-Base class for all states in the machine.
+A marked parenthesis.
 ***********************************************************************/
 struct re_brace : public re_syntax_base
 {
@@ -146,6 +151,23 @@ struct re_brace : public re_syntax_base
    int index;
 };
 
+/*** struct re_dot **************************************************
+Match anything.
+***********************************************************************/
+enum
+{
+   dont_care = 1,
+   force_not_newline = 0,
+   force_newline = 2,
+
+   test_not_newline = 2,
+   test_newline = 3
+};
+struct re_dot : public re_syntax_base
+{
+   unsigned char mask;
+};
+
 /*** struct re_literal ************************************************
 A string of literals, following this structure will be an 
 array of characters: charT[length]
@@ -155,6 +177,14 @@ struct re_literal : public re_syntax_base
    unsigned int length;
 };
 
+/*** struct re_case ************************************************
+Indicates whether we are moving to a case insensive block or not
+***********************************************************************/
+struct re_case : public re_syntax_base
+{
+   bool icase;
+};
+
 /*** struct re_set_long ***********************************************
 A wide character set of characters, following this structure will be
 an array of type charT:
@@ -162,10 +192,11 @@ First csingles null-terminated strings
 Then 2 * cranges NULL terminated strings
 Then cequivalents NULL terminated strings
 ***********************************************************************/
+template <class mask_type>
 struct re_set_long : public re_syntax_base
 {
    unsigned int            csingles, cranges, cequivalents;
-   boost::uint_fast32_t    cclasses;
+   mask_type               cclasses;
    bool                    isnot;
    bool                    singleton;
 };
@@ -175,7 +206,7 @@ A set of narrow-characters, matches any of _map which is none-zero
 ***********************************************************************/
 struct re_set : public re_syntax_base
 {
-   unsigned char _map[256];
+   unsigned char _map[1 << CHAR_BIT];
 };
 
 /*** struct re_jump ***************************************************
@@ -183,19 +214,27 @@ Jump to a new location in the machine (not next).
 ***********************************************************************/
 struct re_jump : public re_syntax_base
 {
-   offset_type     alt;           // location to jump to
-   unsigned char   _map[256];     // which characters can take the jump
+   offset_type     alt;                 // location to jump to
+};
+
+/*** struct re_alt ***************************************************
+Jump to a new location in the machine (possibly next).
+***********************************************************************/
+struct re_alt : public re_jump
+{
+   unsigned char   _map[1 << CHAR_BIT]; // which characters can take the jump
+   unsigned int    can_be_null;         // true if we match a NULL string
 };
 
 /*** struct re_repeat *************************************************
 Repeat a section of the machine
 ***********************************************************************/
-struct re_repeat : public re_jump
+struct re_repeat : public re_alt
 {
-   unsigned   min, max;  // min and max allowable repeats
-   int        id;        // Unique identifier for this repeat
-   bool       leading;   // True if this repeat is at the start of the machine (lets us optimize some searches)
-   bool       greedy;    // True if this is a greedy repeat
+   std::size_t   min, max;  // min and max allowable repeats
+   int           id;        // Unique identifier for this repeat
+   bool          leading;   // True if this repeat is at the start of the machine (lets us optimize some searches)
+   bool          greedy;    // True if this is a greedy repeat
 };
 
 /*** enum re_jump_size_type *******************************************
@@ -206,17 +245,22 @@ We provide this so we know how manybytes to insert when constructing the machine
 enum re_jump_size_type
 {
    re_jump_size = (sizeof(re_jump) + padding_mask) & ~(padding_mask),
-   re_repeater_size = (sizeof(re_repeat) + padding_mask) & ~(padding_mask)
+   re_repeater_size = (sizeof(re_repeat) + padding_mask) & ~(padding_mask),
+   re_alt_size = (sizeof(re_alt) + padding_mask) & ~(padding_mask)
 };
 
 /*** proc re_is_set_member *********************************************
 Forward declaration: we'll need this one later...
 ***********************************************************************/
-template <class iterator, class charT, class traits_type, class Allocator>
+
+template<class charT, class traits>
+struct regex_data;
+
+template <class iterator, class charT, class traits_type, class char_classT>
 iterator BOOST_REGEX_CALL re_is_set_member(iterator next, 
                           iterator last, 
-                          const re_set_long* set_, 
-                          const reg_expression<charT, traits_type, Allocator>& e);
+                          const re_set_long<char_classT>* set_, 
+                          const regex_data<charT, traits_type>& e, bool icase);
 
 } // namespace re_detail
 
diff --git a/include/boost/regex/v4/sub_match.hpp b/include/boost/regex/v4/sub_match.hpp
index e67a2f84..a81dc41f 100644
--- a/include/boost/regex/v4/sub_match.hpp
+++ b/include/boost/regex/v4/sub_match.hpp
@@ -42,20 +42,29 @@ struct sub_match : public std::pair<BidiIterator, BidiIterator>
 
    sub_match() : std::pair<BidiIterator, BidiIterator>(), matched(false) {}
    sub_match(BidiIterator i) : std::pair<BidiIterator, BidiIterator>(i, i), matched(false) {}
-
+#if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS)\
+               && !BOOST_WORKAROUND(BOOST_MSVC, < 1310)\
+               && !BOOST_WORKAROUND(__BORLANDC__, <= 0x0551)
+   template <class T, class A>
+   operator std::basic_string<value_type, T, A> ()const
+   {
+      return std::basic_string<value_type, T, A>(this->first, this->second);
+   }
+#else
    operator std::basic_string<value_type> ()const
    {
       return str();
    }
+#endif
    difference_type BOOST_REGEX_CALL length()const
    {
-      difference_type n = boost::re_detail::distance((BidiIterator)this->first, (BidiIterator)this->second);
+      difference_type n = ::boost::re_detail::distance((BidiIterator)this->first, (BidiIterator)this->second);
       return n;
    }
    std::basic_string<value_type> str()const
    {
       std::basic_string<value_type> result;
-      std::size_t len = boost::re_detail::distance((BidiIterator)this->first, (BidiIterator)this->second);
+      std::size_t len = ::boost::re_detail::distance((BidiIterator)this->first, (BidiIterator)this->second);
       result.reserve(len);
       BidiIterator i = this->first;
       while(i != this->second)
@@ -71,6 +80,14 @@ struct sub_match : public std::pair<BidiIterator, BidiIterator>
          return static_cast<int>(matched) - static_cast<int>(s.matched);
       return str().compare(s.str());
    }
+   int compare(const std::basic_string<value_type>& s)const
+   {
+      return str().compare(s);
+   }
+   int compare(const value_type* p)const
+   {
+      return str().compare(p);
+   }
 
    bool operator==(const sub_match& that)const
    { return compare(that) == 0; }
@@ -154,6 +171,13 @@ public:
 #endif
 };
 
+typedef sub_match<const char*> csub_match;
+typedef sub_match<std::string::const_iterator> ssub_match;
+#ifndef BOOST_NO_WREGEX
+typedef sub_match<const wchar_t*> wcsub_match;
+typedef sub_match<std::wstring::const_iterator> wssub_match;
+#endif
+
 // comparison to std::basic_string<> part 1:
 template <class RandomAccessIterator, class traits, class Allocator>
 inline bool operator == (const std::basic_string<typename re_detail::regex_iterator_traits<RandomAccessIterator>::value_type, traits, Allocator>& s,
diff --git a/include/boost/regex/v4/syntax_type.hpp b/include/boost/regex/v4/syntax_type.hpp
new file mode 100644
index 00000000..b79d1664
--- /dev/null
+++ b/include/boost/regex/v4/syntax_type.hpp
@@ -0,0 +1,102 @@
+/*
+ *
+ * Copyright (c) 2003
+ * Dr 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         syntax_type.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Declares regular expression synatx type enumerator.
+  */
+
+#ifndef BOOST_REGEX_SYNTAX_TYPE_HPP
+#define BOOST_REGEX_SYNTAX_TYPE_HPP
+
+namespace boost{
+namespace regex_constants{
+
+typedef unsigned char syntax_type;
+
+//
+// values chosen are binary compatible with previous version:
+//
+static const syntax_type syntax_char = 0;
+static const syntax_type syntax_open_mark = 1;
+static const syntax_type syntax_close_mark = 2;
+static const syntax_type syntax_dollar = 3;
+static const syntax_type syntax_caret = 4;
+static const syntax_type syntax_dot = 5;
+static const syntax_type syntax_star = 6;
+static const syntax_type syntax_plus = 7;
+static const syntax_type syntax_question = 8;
+static const syntax_type syntax_open_set = 9;
+static const syntax_type syntax_close_set = 10;
+static const syntax_type syntax_or = 11;
+static const syntax_type syntax_escape = 12;
+static const syntax_type syntax_dash = 14;
+static const syntax_type syntax_open_brace = 15;
+static const syntax_type syntax_close_brace = 16;
+static const syntax_type syntax_digit = 17;
+static const syntax_type syntax_comma = 27;
+static const syntax_type syntax_equal = 37;
+static const syntax_type syntax_colon = 36;
+static const syntax_type syntax_not = 53;
+
+// extensions:
+
+static const syntax_type syntax_hash = 13;
+static const syntax_type syntax_newline = 26;
+
+// escapes:
+
+typedef syntax_type escape_syntax_type;
+
+static const escape_syntax_type escape_type_word_assert = 18;
+static const escape_syntax_type escape_type_not_word_assert = 19;
+static const escape_syntax_type escape_type_control_f = 29;
+static const escape_syntax_type escape_type_control_n = 30;
+static const escape_syntax_type escape_type_control_r = 31;
+static const escape_syntax_type escape_type_control_t = 32;
+static const escape_syntax_type escape_type_control_v = 33;
+static const escape_syntax_type escape_type_ascii_control = 35;
+static const escape_syntax_type escape_type_hex = 34;
+static const escape_syntax_type escape_type_unicode = 0; // not used
+static const escape_syntax_type escape_type_identity = 0; // not used
+static const escape_syntax_type escape_type_backref = syntax_digit;
+static const escape_syntax_type escape_type_decimal = syntax_digit; // not used
+static const escape_syntax_type escape_type_class = 22; 
+static const escape_syntax_type escape_type_not_class = 23; 
+
+// extensions:
+
+static const escape_syntax_type escape_type_left_word = 20;
+static const escape_syntax_type escape_type_right_word = 21;
+static const escape_syntax_type escape_type_start_buffer = 24;                 // for \`
+static const escape_syntax_type escape_type_end_buffer = 25;                   // for \'
+static const escape_syntax_type escape_type_control_a = 28;                    // for \a
+static const escape_syntax_type escape_type_e = 38;                            // for \e
+static const escape_syntax_type escape_type_E = 47;                            // for \Q\E
+static const escape_syntax_type escape_type_Q = 48;                            // for \Q\E
+static const escape_syntax_type escape_type_X = 49;                            // for \X
+static const escape_syntax_type escape_type_C = 50;                            // for \C
+static const escape_syntax_type escape_type_Z = 51;                            // for \Z
+static const escape_syntax_type escape_type_G = 52;                            // for \G
+
+static const escape_syntax_type escape_type_property = 54;                     // for \p
+static const escape_syntax_type escape_type_not_property = 55;                 // for \P
+static const escape_syntax_type escape_type_named_char = 56;                   // for \N
+
+static const escape_syntax_type syntax_max = 57;
+
+}
+}
+
+
+#endif
diff --git a/include/boost/regex/v4/u32regex_iterator.hpp b/include/boost/regex/v4/u32regex_iterator.hpp
new file mode 100644
index 00000000..7978eb0e
--- /dev/null
+++ b/include/boost/regex/v4/u32regex_iterator.hpp
@@ -0,0 +1,190 @@
+/*
+ *
+ * Copyright (c) 2003
+ * Dr 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         u32regex_iterator.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Provides u32regex_iterator implementation.
+  */
+
+#ifndef BOOST_REGEX_V4_U32REGEX_ITERATOR_HPP
+#define BOOST_REGEX_V4_U32REGEX_ITERATOR_HPP
+
+namespace boost{
+
+#ifdef BOOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
+#endif
+
+template <class BidirectionalIterator>
+class u32regex_iterator_implementation 
+{
+   typedef u32regex regex_type;
+
+   match_results<BidirectionalIterator> what;  // current match
+   BidirectionalIterator                base;  // start of sequence
+   BidirectionalIterator                end;   // end of sequence
+   const regex_type                     re;   // the expression
+   match_flag_type                      flags; // flags for matching
+
+public:
+   u32regex_iterator_implementation(const regex_type* p, BidirectionalIterator last, match_flag_type f)
+      : base(), end(last), re(*p), flags(f){}
+   bool init(BidirectionalIterator first)
+   {
+      base = first;
+      return u32regex_search(first, end, what, re, flags);
+   }
+   bool compare(const u32regex_iterator_implementation& that)
+   {
+      if(this == &that) return true;
+      return (&re.get_data() == &that.re.get_data()) && (end == that.end) && (flags == that.flags) && (what[0].first == that.what[0].first) && (what[0].second == that.what[0].second);
+   }
+   const match_results<BidirectionalIterator>& get()
+   { return what; }
+   bool next()
+   {
+      if(what.prefix().first != what[0].second)
+         flags |= match_prev_avail;
+      BidirectionalIterator next_start = what[0].second;
+      match_flag_type f(flags);
+      if(!what.length())
+         f |= regex_constants::match_not_initial_null;
+      bool result = u32regex_search(next_start, end, what, re, f);
+      if(result)
+         what.set_base(base);
+      return result;
+   }
+private:
+   u32regex_iterator_implementation& operator=(const u32regex_iterator_implementation&);
+};
+
+template <class BidirectionalIterator>
+class u32regex_iterator 
+#ifndef BOOST_NO_STD_ITERATOR
+   : public std::iterator<
+         std::forward_iterator_tag, 
+         match_results<BidirectionalIterator>,
+         typename re_detail::regex_iterator_traits<BidirectionalIterator>::difference_type,
+         const match_results<BidirectionalIterator>*,
+         const match_results<BidirectionalIterator>& >         
+#endif
+{
+private:
+   typedef u32regex_iterator_implementation<BidirectionalIterator> impl;
+   typedef shared_ptr<impl> pimpl;
+public:
+   typedef          u32regex                                                regex_type;
+   typedef          match_results<BidirectionalIterator>                    value_type;
+   typedef typename re_detail::regex_iterator_traits<BidirectionalIterator>::difference_type 
+                                                                            difference_type;
+   typedef          const value_type*                                       pointer;
+   typedef          const value_type&                                       reference; 
+   typedef          std::forward_iterator_tag                               iterator_category;
+   
+   u32regex_iterator(){}
+   u32regex_iterator(BidirectionalIterator a, BidirectionalIterator b, 
+                  const regex_type& re, 
+                  match_flag_type m = match_default)
+                  : pdata(new impl(&re, b, m))
+   {
+      if(!pdata->init(a))
+      {
+         pdata.reset();
+      }
+   }
+   u32regex_iterator(const u32regex_iterator& that)
+      : pdata(that.pdata) {}
+   u32regex_iterator& operator=(const u32regex_iterator& that)
+   {
+      pdata = that.pdata;
+      return *this;
+   }
+   bool operator==(const u32regex_iterator& that)const
+   { 
+      if((pdata.get() == 0) || (that.pdata.get() == 0))
+         return pdata.get() == that.pdata.get();
+      return pdata->compare(*(that.pdata.get())); 
+   }
+   bool operator!=(const u32regex_iterator& that)const
+   { return !(*this == that); }
+   const value_type& operator*()const
+   { return pdata->get(); }
+   const value_type* operator->()const
+   { return &(pdata->get()); }
+   u32regex_iterator& operator++()
+   {
+      cow();
+      if(0 == pdata->next())
+      {
+         pdata.reset();
+      }
+      return *this;
+   }
+   u32regex_iterator operator++(int)
+   {
+      u32regex_iterator result(*this);
+      ++(*this);
+      return result;
+   }
+private:
+
+   pimpl pdata;
+
+   void cow()
+   {
+      // copy-on-write
+      if(pdata.get() && !pdata.unique())
+      {
+         pdata.reset(new impl(*(pdata.get())));
+      }
+   }
+};
+
+typedef u32regex_iterator<const char*> utf8regex_iterator;
+typedef u32regex_iterator<const UChar*> utf16regex_iterator;
+typedef u32regex_iterator<const UChar32*> utf32regex_iterator;
+
+inline u32regex_iterator<const char*> make_u32regex_iterator(const char* p, const u32regex& e, regex_constants::match_flag_type m = regex_constants::match_default)
+{
+   return u32regex_iterator<const char*>(p, p+std::strlen(p), e, m);
+}
+#ifndef BOOST_NO_WREGEX
+inline u32regex_iterator<const wchar_t*> make_u32regex_iterator(const wchar_t* p, const u32regex& e, regex_constants::match_flag_type m = regex_constants::match_default)
+{
+   return u32regex_iterator<const wchar_t*>(p, p+std::wcslen(p), e, m);
+}
+#endif
+#ifndef U_WCHAR_IS_UTF16
+inline u32regex_iterator<const UChar*> make_u32regex_iterator(const UChar* p, const u32regex& e, regex_constants::match_flag_type m = regex_constants::match_default)
+{
+   return u32regex_iterator<const UChar*>(p, p+u_strlen(p), e, m);
+}
+#endif
+template <class charT, class Traits, class Alloc>
+inline u32regex_iterator<typename std::basic_string<charT, Traits, Alloc>::const_iterator> make_u32regex_iterator(const std::basic_string<charT, Traits, Alloc>& p, const u32regex& e, regex_constants::match_flag_type m = regex_constants::match_default)
+{
+   return u32regex_iterator<typename std::basic_string<charT, Traits, Alloc>::const_iterator>(p.begin(), p.end(), e, m);
+}
+inline u32regex_iterator<const UChar*> make_u32regex_iterator(const UnicodeString& s, const u32regex& e, regex_constants::match_flag_type m = regex_constants::match_default)
+{
+   return u32regex_iterator<const UChar*>(s.getBuffer(), s.getBuffer() + s.length(), e, m);
+}
+
+#ifdef BOOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
+#endif
+
+} // namespace boost
+
+#endif // BOOST_REGEX_V4_REGEX_ITERATOR_HPP
+
diff --git a/include/boost/regex/v4/u32regex_token_iterator.hpp b/include/boost/regex/v4/u32regex_token_iterator.hpp
new file mode 100644
index 00000000..9e749102
--- /dev/null
+++ b/include/boost/regex/v4/u32regex_token_iterator.hpp
@@ -0,0 +1,365 @@
+/*
+ *
+ * Copyright (c) 2003
+ * Dr 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         u32regex_token_iterator.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Provides u32regex_token_iterator implementation.
+  */
+
+#ifndef BOOST_REGEX_V4_U32REGEX_TOKEN_ITERATOR_HPP
+#define BOOST_REGEX_V4_U32REGEX_TOKEN_ITERATOR_HPP
+
+#if (BOOST_WORKAROUND(__BORLANDC__, >= 0x560) && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x570)))\
+      || BOOST_WORKAROUND(BOOST_MSVC, < 1300) \
+      || BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003))
+//
+// Borland C++ Builder 6, and Visual C++ 6,
+// can't cope with the array template constructor
+// so we have a template member that will accept any type as 
+// argument, and then assert that is really is an array:
+//
+#include <boost/static_assert.hpp>
+#include <boost/type_traits/is_array.hpp>
+#endif
+
+namespace boost{
+
+#ifdef BOOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
+#endif
+#if BOOST_WORKAROUND(BOOST_MSVC, > 1300)
+#  pragma warning(push)
+#  pragma warning(disable:4700)
+#endif
+
+template <class BidirectionalIterator>
+class u32regex_token_iterator_implementation 
+{
+   typedef u32regex                              regex_type;
+   typedef sub_match<BidirectionalIterator>      value_type;
+
+   match_results<BidirectionalIterator> what;   // current match
+   BidirectionalIterator                end;    // end of search area
+   const regex_type                     re;    // the expression
+   match_flag_type                      flags;  // match flags
+   value_type                           result; // the current string result
+   int                                  N;      // the current sub-expression being enumerated
+   std::vector<int>                     subs;   // the sub-expressions to enumerate
+
+public:
+   u32regex_token_iterator_implementation(const regex_type* p, BidirectionalIterator last, int sub, match_flag_type f)
+      : end(last), re(*p), flags(f){ subs.push_back(sub); }
+   u32regex_token_iterator_implementation(const regex_type* p, BidirectionalIterator last, const std::vector<int>& v, match_flag_type f)
+      : end(last), re(*p), flags(f), subs(v){}
+#if (BOOST_WORKAROUND(__BORLANDC__, >= 0x560) && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x570)))\
+      || BOOST_WORKAROUND(BOOST_MSVC, < 1300) \
+      || BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003)) \
+      || BOOST_WORKAROUND(__HP_aCC, BOOST_TESTED_AT(55500))
+   template <class T>
+   u32regex_token_iterator_implementation(const regex_type* p, BidirectionalIterator last, const T& submatches, match_flag_type f)
+      : end(last), re(*p), flags(f)
+   {
+      // assert that T really is an array:
+      BOOST_STATIC_ASSERT(::boost::is_array<T>::value);
+      const std::size_t array_size = sizeof(T) / sizeof(submatches[0]);
+      for(std::size_t i = 0; i < array_size; ++i)
+      {
+         subs.push_back(submatches[i]);
+      }
+   }
+#else
+   template <std::size_t CN>
+   u32regex_token_iterator_implementation(const regex_type* p, BidirectionalIterator last, const int (&submatches)[CN], match_flag_type f)
+      : end(last), re(*p), flags(f)
+   {
+      for(std::size_t i = 0; i < CN; ++i)
+      {
+         subs.push_back(submatches[i]);
+      }
+   }
+#endif
+
+   bool init(BidirectionalIterator first)
+   {
+      N = 0;
+      if(u32regex_search(first, end, what, re, flags) == true)
+      {
+         N = 0;
+         result = ((subs[N] == -1) ? what.prefix() : what[(int)subs[N]]);
+         return true;
+      }
+      else if((subs[N] == -1) && (first != end))
+      {
+         result.first = first;
+         result.second = end;
+         result.matched = (first != end);
+         return true;
+      }
+      return false;
+   }
+   bool compare(const u32regex_token_iterator_implementation& that)
+   {
+      if(this == &that) return true;
+      return (&re.get_data() == &that.re.get_data()) 
+         && (end == that.end) 
+         && (flags == that.flags) 
+         && (N == that.N) 
+         && (what[0].first == that.what[0].first) 
+         && (what[0].second == that.what[0].second);
+   }
+   const value_type& get()
+   { return result; }
+   bool next()
+   {
+      if(N == -1)
+         return false;
+      if(N+1 < (int)subs.size())
+      {
+         ++N;
+         result =((subs[N] == -1) ? what.prefix() : what[subs[N]]);
+         return true;
+      }
+      if(what.prefix().first != what[0].second)
+         flags |= match_prev_avail;
+      BidirectionalIterator last_end(what[0].second);
+      if(u32regex_search(last_end, end, what, re, ((what[0].first == what[0].second) ? flags | regex_constants::match_not_initial_null : flags)))
+      {
+         N =0;
+         result =((subs[N] == -1) ? what.prefix() : what[subs[N]]);
+         return true;
+      }
+      else if((last_end != end) && (subs[0] == -1))
+      {
+         N =-1;
+         result.first = last_end;
+         result.second = end;
+         result.matched = (last_end != end);
+         return true;
+      }
+      return false;
+   }
+private:
+   u32regex_token_iterator_implementation& operator=(const u32regex_token_iterator_implementation&);
+};
+
+template <class BidirectionalIterator>
+class u32regex_token_iterator 
+#ifndef BOOST_NO_STD_ITERATOR
+   : public std::iterator<
+         std::forward_iterator_tag, 
+         sub_match<BidirectionalIterator>,
+         typename re_detail::regex_iterator_traits<BidirectionalIterator>::difference_type,
+         const sub_match<BidirectionalIterator>*,
+         const sub_match<BidirectionalIterator>& >         
+#endif
+{
+private:
+   typedef u32regex_token_iterator_implementation<BidirectionalIterator> impl;
+   typedef shared_ptr<impl> pimpl;
+public:
+   typedef          u32regex                                                regex_type;
+   typedef          sub_match<BidirectionalIterator>                        value_type;
+   typedef typename re_detail::regex_iterator_traits<BidirectionalIterator>::difference_type 
+                                                                            difference_type;
+   typedef          const value_type*                                       pointer;
+   typedef          const value_type&                                       reference; 
+   typedef          std::forward_iterator_tag                               iterator_category;
+   
+   u32regex_token_iterator(){}
+   u32regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const regex_type& re, 
+                        int submatch = 0, match_flag_type m = match_default)
+                        : pdata(new impl(&re, b, submatch, m))
+   {
+      if(!pdata->init(a))
+         pdata.reset();
+   }
+   u32regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const regex_type& re, 
+                        const std::vector<int>& submatches, match_flag_type m = match_default)
+                        : pdata(new impl(&re, b, submatches, m))
+   {
+      if(!pdata->init(a))
+         pdata.reset();
+   }
+#if (BOOST_WORKAROUND(__BORLANDC__, >= 0x560) && BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x570)))\
+      || BOOST_WORKAROUND(BOOST_MSVC, < 1300) \
+      || BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3003)) \
+      || BOOST_WORKAROUND(__HP_aCC, BOOST_TESTED_AT(55500))
+   template <class T>
+   u32regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const regex_type& re,
+                        const T& submatches, match_flag_type m = match_default)
+                        : pdata(new impl(&re, b, submatches, m))
+   {
+      if(!pdata->init(a))
+         pdata.reset();
+   }
+#else
+   template <std::size_t N>
+   u32regex_token_iterator(BidirectionalIterator a, BidirectionalIterator b, const regex_type& re,
+                        const int (&submatches)[N], match_flag_type m = match_default)
+                        : pdata(new impl(&re, b, submatches, m))
+   {
+      if(!pdata->init(a))
+         pdata.reset();
+   }
+#endif
+   u32regex_token_iterator(const u32regex_token_iterator& that)
+      : pdata(that.pdata) {}
+   u32regex_token_iterator& operator=(const u32regex_token_iterator& that)
+   {
+      pdata = that.pdata;
+      return *this;
+   }
+   bool operator==(const u32regex_token_iterator& that)const
+   { 
+      if((pdata.get() == 0) || (that.pdata.get() == 0))
+         return pdata.get() == that.pdata.get();
+      return pdata->compare(*(that.pdata.get())); 
+   }
+   bool operator!=(const u32regex_token_iterator& that)const
+   { return !(*this == that); }
+   const value_type& operator*()const
+   { return pdata->get(); }
+   const value_type* operator->()const
+   { return &(pdata->get()); }
+   u32regex_token_iterator& operator++()
+   {
+      cow();
+      if(0 == pdata->next())
+      {
+         pdata.reset();
+      }
+      return *this;
+   }
+   u32regex_token_iterator operator++(int)
+   {
+      u32regex_token_iterator result(*this);
+      ++(*this);
+      return result;
+   }
+private:
+
+   pimpl pdata;
+
+   void cow()
+   {
+      // copy-on-write
+      if(pdata.get() && !pdata.unique())
+      {
+         pdata.reset(new impl(*(pdata.get())));
+      }
+   }
+};
+
+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;
+
+// construction from an integral sub_match id:
+inline u32regex_token_iterator<const char*> make_u32regex_token_iterator(const char* p, const u32regex& e, int submatch = 0, regex_constants::match_flag_type m = regex_constants::match_default)
+{
+   return u32regex_token_iterator<const char*>(p, p+std::strlen(p), e, submatch, m);
+}
+#ifndef BOOST_NO_WREGEX
+inline u32regex_token_iterator<const wchar_t*> make_u32regex_token_iterator(const wchar_t* p, const u32regex& e, int submatch = 0, regex_constants::match_flag_type m = regex_constants::match_default)
+{
+   return u32regex_token_iterator<const wchar_t*>(p, p+std::wcslen(p), e, submatch, m);
+}
+#endif
+#ifndef U_WCHAR_IS_UTF16
+inline u32regex_token_iterator<const UChar*> make_u32regex_token_iterator(const UChar* p, const u32regex& e, int submatch = 0, regex_constants::match_flag_type m = regex_constants::match_default)
+{
+   return u32regex_token_iterator<const UChar*>(p, p+u_strlen(p), e, m);
+}
+#endif
+template <class charT, class Traits, class Alloc>
+inline 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, int submatch = 0, regex_constants::match_flag_type m = regex_constants::match_default)
+{
+   return u32regex_token_iterator<typename std::basic_string<charT, Traits, Alloc>::const_iterator>(p.begin(), p.end(), e, m);
+}
+inline u32regex_token_iterator<const UChar*> make_u32regex_token_iterator(const UnicodeString& s, const u32regex& e, int submatch = 0, regex_constants::match_flag_type m = regex_constants::match_default)
+{
+   return u32regex_token_iterator<const UChar*>(s.getBuffer(), s.getBuffer() + s.length(), e, submatch, m);
+}
+
+// construction from a reference to an array:
+template <std::size_t N>
+inline 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)
+{
+   return u32regex_token_iterator<const char*>(p, p+std::strlen(p), e, submatch, m);
+}
+#ifndef BOOST_NO_WREGEX
+template <std::size_t N>
+inline 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)
+{
+   return u32regex_token_iterator<const wchar_t*>(p, p+std::wcslen(p), e, submatch, m);
+}
+#endif
+#ifndef U_WCHAR_IS_UTF16
+template <std::size_t N>
+inline 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)
+{
+   return u32regex_token_iterator<const UChar*>(p, p+u_strlen(p), e, m);
+}
+#endif
+template <class charT, class Traits, class Alloc, std::size_t N>
+inline 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)
+{
+   return u32regex_token_iterator<typename std::basic_string<charT, Traits, Alloc>::const_iterator>(p.begin(), p.end(), e, m);
+}
+template <std::size_t N>
+inline 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)
+{
+   return u32regex_token_iterator<const UChar*>(s.getBuffer(), s.getBuffer() + s.length(), e, submatch, m);
+}
+
+// construction from a vector of sub_match id's:
+inline 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)
+{
+   return u32regex_token_iterator<const char*>(p, p+std::strlen(p), e, submatch, m);
+}
+#ifndef BOOST_NO_WREGEX
+inline 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)
+{
+   return u32regex_token_iterator<const wchar_t*>(p, p+std::wcslen(p), e, submatch, m);
+}
+#endif
+#ifndef U_WCHAR_IS_UTF16
+inline 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)
+{
+   return u32regex_token_iterator<const UChar*>(p, p+u_strlen(p), e, m);
+}
+#endif
+template <class charT, class Traits, class Alloc>
+inline 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)
+{
+   return u32regex_token_iterator<typename std::basic_string<charT, Traits, Alloc>::const_iterator>(p.begin(), p.end(), e, m);
+}
+inline 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)
+{
+   return u32regex_token_iterator<const UChar*>(s.getBuffer(), s.getBuffer() + s.length(), e, submatch, m);
+}
+
+#if BOOST_WORKAROUND(BOOST_MSVC, == 1310)
+#  pragma warning(pop)
+#endif
+#ifdef BOOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
+#endif
+
+} // namespace boost
+
+#endif // BOOST_REGEX_V4_REGEX_TOKEN_ITERATOR_HPP
+
+
+
+
diff --git a/include/boost/regex/v4/w32_regex_traits.hpp b/include/boost/regex/v4/w32_regex_traits.hpp
new file mode 100644
index 00000000..c9c42dea
--- /dev/null
+++ b/include/boost/regex/v4/w32_regex_traits.hpp
@@ -0,0 +1,712 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         w32_regex_traits.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Declares regular expression traits class w32_regex_traits.
+  */
+
+#ifndef BOOST_W32_REGEX_TRAITS_HPP_INCLUDED
+#define BOOST_W32_REGEX_TRAITS_HPP_INCLUDED
+
+#ifndef BOOST_REGEX_TRAITS_DEFAULTS_HPP_INCLUDED
+#include <boost/regex/v4/regex_traits_defaults.hpp>
+#endif
+#ifdef BOOST_HAS_THREADS
+#include <boost/regex/pending/static_mutex.hpp>
+#endif
+#ifndef BOOST_REGEX_PRIMARY_TRANSFORM
+#include <boost/regex/v4/primary_transform.hpp>
+#endif
+#ifndef BOOST_REGEX_OBJECT_CACHE_HPP
+#include <boost/regex/pending/object_cache.hpp>
+#endif
+
+#ifdef BOOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
+#endif
+
+#ifdef BOOST_MSVC
+#pragma warning(push)
+#pragma warning(disable:4786)
+#endif
+
+namespace boost{ 
+
+//
+// forward declaration is needed by some compilers:
+//
+template <class charT>
+class w32_regex_traits;
+   
+namespace re_detail{
+
+//
+// start by typedeffing the types we'll need:
+//
+typedef ::boost::uint32_t lcid_type;   // placeholder for LCID.
+typedef ::boost::shared_ptr<void> cat_type; // placeholder for dll HANDLE.
+
+//
+// then add wrappers around the actual Win32 API's (ie implementation hiding):
+//
+BOOST_REGEX_DECL lcid_type BOOST_REGEX_CALL w32_get_default_locale();
+BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is_lower(char, lcid_type);
+#ifndef BOOST_NO_WREGEX
+BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is_lower(wchar_t, lcid_type);
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is_lower(unsigned short ca, lcid_type id);
+#endif
+#endif
+BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is_upper(char, lcid_type);
+#ifndef BOOST_NO_WREGEX
+BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is_upper(wchar_t, lcid_type);
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is_upper(unsigned short ca, lcid_type id);
+#endif
+#endif
+BOOST_REGEX_DECL cat_type BOOST_REGEX_CALL w32_cat_open(const std::string& name);
+BOOST_REGEX_DECL std::string BOOST_REGEX_CALL w32_cat_get(const cat_type& cat, lcid_type id, int i, const std::string& def);
+#ifndef BOOST_NO_WREGEX
+BOOST_REGEX_DECL std::wstring BOOST_REGEX_CALL w32_cat_get(const cat_type& cat, lcid_type id, int i, const std::wstring& def);
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+BOOST_REGEX_DECL std::basic_string<unsigned short> BOOST_REGEX_CALL w32_cat_get(const cat_type& cat, lcid_type, int i, const std::basic_string<unsigned short>& def);
+#endif
+#endif
+BOOST_REGEX_DECL std::string BOOST_REGEX_CALL w32_transform(lcid_type id, const char* p1, const char* p2);
+#ifndef BOOST_NO_WREGEX
+BOOST_REGEX_DECL std::wstring BOOST_REGEX_CALL w32_transform(lcid_type id, const wchar_t* p1, const wchar_t* p2);
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+BOOST_REGEX_DECL std::basic_string<unsigned short> BOOST_REGEX_CALL w32_transform(lcid_type id, const unsigned short* p1, const unsigned short* p2);
+#endif
+#endif
+BOOST_REGEX_DECL char BOOST_REGEX_CALL w32_tolower(char c, lcid_type);
+#ifndef BOOST_NO_WREGEX
+BOOST_REGEX_DECL wchar_t BOOST_REGEX_CALL w32_tolower(wchar_t c, lcid_type);
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+BOOST_REGEX_DECL unsigned short BOOST_REGEX_CALL w32_tolower(unsigned short c, lcid_type id);
+#endif
+#endif
+BOOST_REGEX_DECL char BOOST_REGEX_CALL w32_toupper(char c, lcid_type);
+#ifndef BOOST_NO_WREGEX
+BOOST_REGEX_DECL wchar_t BOOST_REGEX_CALL w32_toupper(wchar_t c, lcid_type);
+#endif
+BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is(lcid_type, boost::uint32_t mask, char c);
+#ifndef BOOST_NO_WREGEX
+BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is(lcid_type, boost::uint32_t mask, wchar_t c);
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is(lcid_type id, boost::uint32_t m, unsigned short c);
+#endif
+#endif
+//
+// class w32_regex_traits_base:
+// acts as a container for locale and the facets we are using.
+//
+template <class charT>
+struct w32_regex_traits_base
+{
+   w32_regex_traits_base(lcid_type l)
+   { imbue(l); }
+   lcid_type imbue(lcid_type l);
+
+   lcid_type m_locale;
+};
+
+template <class charT>
+inline lcid_type w32_regex_traits_base<charT>::imbue(lcid_type l)
+{
+   lcid_type result(m_locale);
+   m_locale = l;
+   return result;
+}
+
+//
+// class w32_regex_traits_char_layer:
+// implements methods that require specialisation for narrow characters:
+//
+template <class charT>
+class w32_regex_traits_char_layer : public w32_regex_traits_base<charT>
+{
+   typedef std::basic_string<charT> string_type;
+   typedef std::map<charT, regex_constants::syntax_type> map_type;
+   typedef typename map_type::const_iterator map_iterator_type;
+public:
+   w32_regex_traits_char_layer(const lcid_type l);
+
+   regex_constants::syntax_type syntax_type(charT c)const
+   {
+      map_iterator_type i = m_char_map.find(c);
+      return ((i == m_char_map.end()) ? 0 : i->second);
+   }
+   regex_constants::escape_syntax_type escape_syntax_type(charT c) const
+   {
+      map_iterator_type i = m_char_map.find(c);
+      if(i == m_char_map.end())
+      {
+         if(::boost::re_detail::w32_is_lower(c, this->m_locale)) return regex_constants::escape_type_class;
+         if(::boost::re_detail::w32_is_upper(c, this->m_locale)) return regex_constants::escape_type_not_class;
+         return 0;
+      }
+      return i->second;
+   }
+   charT tolower(charT c)const
+   {
+      return ::boost::re_detail::w32_tolower(c, this->m_locale);
+   }
+   bool isctype(boost::uint32_t mask, charT c)
+   {
+      return ::boost::re_detail::w32_is(this->m_locale, mask, c);
+   }
+
+private:
+   string_type get_default_message(regex_constants::syntax_type);
+   // TODO: use a hash table when available!
+   map_type m_char_map;
+};
+
+template <class charT>
+w32_regex_traits_char_layer<charT>::w32_regex_traits_char_layer(::boost::re_detail::lcid_type l) 
+   : w32_regex_traits_base<charT>(l)
+{
+   // we need to start by initialising our syntax map so we know which
+   // character is used for which purpose:
+   cat_type cat;
+   std::string cat_name(w32_regex_traits<charT>::get_catalog_name());
+   if(cat_name.size())
+   {
+      cat = ::boost::re_detail::w32_cat_open(cat_name);
+      if(!cat)
+      {
+         std::string m("Unable to open message catalog: ");
+         std::runtime_error err(m + cat_name);
+         boost::re_detail::raise_runtime_error(err);
+      }
+   }
+   //
+   // if we have a valid catalog then load our messages:
+   //
+   if(cat)
+   {
+      for(regex_constants::syntax_type i = 1; i < regex_constants::syntax_max; ++i)
+      {
+         string_type mss = ::boost::re_detail::w32_cat_get(cat, m_locale, i, get_default_message(i));
+         for(typename string_type::size_type j = 0; j < mss.size(); ++j)
+         {
+            m_char_map[mss[j]] = i;
+         }
+      }
+   }
+   else
+   {
+      for(regex_constants::syntax_type i = 1; i < regex_constants::syntax_max; ++i)
+      {
+         const char* ptr = get_default_syntax(i);
+         while(ptr && *ptr)
+         {
+            m_char_map[static_cast<charT>(*ptr)] = i;
+            ++ptr;
+         }
+      }
+   }
+}
+
+template <class charT>
+typename w32_regex_traits_char_layer<charT>::string_type 
+   w32_regex_traits_char_layer<charT>::get_default_message(regex_constants::syntax_type i)
+{
+   const char* ptr = get_default_syntax(i);
+   string_type result;
+   while(ptr && *ptr)
+   {
+      result.append(1, static_cast<charT>(*ptr));
+      ++ptr;
+   }
+   return result;
+}
+
+//
+// specialised version for narrow characters:
+//
+template <>
+class BOOST_REGEX_DECL w32_regex_traits_char_layer<char> : public w32_regex_traits_base<char>
+{
+   typedef std::string string_type;
+public:
+   w32_regex_traits_char_layer(::boost::re_detail::lcid_type l)
+   : w32_regex_traits_base<char>(l)
+   {
+      init();
+   }
+
+   regex_constants::syntax_type syntax_type(char c)const
+   {
+      return m_char_map[static_cast<unsigned char>(c)];
+   }
+   regex_constants::escape_syntax_type escape_syntax_type(char c) const
+   {
+      return m_char_map[static_cast<unsigned char>(c)];
+   }
+   char tolower(char c)const
+   {
+      return m_lower_map[static_cast<unsigned char>(c)];
+   }
+   bool isctype(boost::uint32_t mask, char c)
+   {
+      return m_type_map[static_cast<unsigned char>(c)] & mask;
+   }
+
+private:
+   regex_constants::syntax_type m_char_map[1u << CHAR_BIT];
+   char m_lower_map[1u << CHAR_BIT];
+   boost::uint16_t m_type_map[1u << CHAR_BIT];
+   void init();
+};
+
+//
+// class w32_regex_traits_implementation:
+// provides pimpl implementation for w32_regex_traits.
+//
+template <class charT>
+class w32_regex_traits_implementation : public w32_regex_traits_char_layer<charT>
+{
+public:
+   typedef typename w32_regex_traits<charT>::char_class_type char_class_type;
+   BOOST_STATIC_CONSTANT(char_class_type, mask_word = 0x0400); // must be C1_DEFINED << 1
+   BOOST_STATIC_CONSTANT(char_class_type, mask_unicode = 0x0800); // must be C1_DEFINED << 2
+   BOOST_STATIC_CONSTANT(char_class_type, mask_base = 0x3ff);  // all the masks used by the CT_CTYPE1 group
+
+   typedef std::basic_string<charT> string_type;
+   typedef charT char_type;
+   w32_regex_traits_implementation(::boost::re_detail::lcid_type l);
+   std::string error_string(regex_constants::error_type n) const
+   {
+      if(!m_error_strings.empty())
+      {
+         std::map<int, std::string>::const_iterator p = m_error_strings.find(n);
+         return (p == m_error_strings.end()) ? std::string(get_default_error_string(n)) : p->second;
+      }
+      return get_default_error_string(n);
+   }
+   char_class_type lookup_classname(const charT* p1, const charT* p2) const
+   {
+      char_class_type result = lookup_classname_imp(p1, p2);
+      if(result == 0)
+      {
+         typedef typename string_type::size_type size_type;
+         string_type temp(p1, p2);
+         for(size_type i = 0; i < temp.size(); ++i)
+            temp[i] = this->tolower(temp[i]);
+         result = lookup_classname_imp(&*temp.begin(), &*temp.begin() + temp.size());
+      }
+      return result;
+   }
+   string_type lookup_collatename(const charT* p1, const charT* p2) const;
+   string_type transform_primary(const charT* p1, const charT* p2) const;
+   string_type transform(const charT* p1, const charT* p2) const
+   {
+      return ::boost::re_detail::w32_transform(this->m_locale, p1, p2);
+   }
+private:
+   std::map<int, std::string>     m_error_strings;   // error messages indexed by numberic ID
+   std::map<string_type, char_class_type>  m_custom_class_names; // character class names
+   std::map<string_type, string_type>      m_custom_collate_names; // collating element names
+   unsigned                       m_collate_type;    // the form of the collation string
+   charT                          m_collate_delim;   // the collation group delimiter
+   //
+   // helpers:
+   //
+   char_class_type lookup_classname_imp(const charT* p1, const charT* p2) const;
+};
+
+template <class charT>
+typename w32_regex_traits_implementation<charT>::string_type 
+   w32_regex_traits_implementation<charT>::transform_primary(const charT* p1, const charT* p2) const
+{
+   string_type result;
+   //
+   // What we do here depends upon the format of the sort key returned by
+   // sort key returned by this->transform:
+   //
+   switch(m_collate_type)
+   {
+   case sort_C:
+   case sort_unknown:
+      // the best we can do is translate to lower case, then get a regular sort key:
+      {
+         result.assign(p1, p2);
+         typedef typename string_type::size_type size_type;
+         for(size_type i = 0; i < result.size(); ++i)
+            result[i] = this->tolower(result[i]);
+         result = this->transform(&*result.begin(), &*result.begin() + result.size());
+         break;
+      }
+   case sort_fixed:
+      {
+         // get a regular sort key, and then truncate it:
+         result.assign(this->transform(p1, p2));
+         result.erase(this->m_collate_delim);
+         break;
+      }
+   case sort_delim:
+         // get a regular sort key, and then truncate everything after the delim:
+         result.assign(this->transform(p1, p2));
+         std::size_t i;
+         for(i = 0; i < result.size(); ++i)
+         {
+            if(result[i] == m_collate_delim)
+               break;
+         }
+         result.erase(i);
+         break;
+   }
+   return result;
+}
+
+template <class charT>
+typename w32_regex_traits_implementation<charT>::string_type 
+   w32_regex_traits_implementation<charT>::lookup_collatename(const charT* p1, const charT* p2) const
+{
+   typedef typename std::map<string_type, string_type>::const_iterator iter_type;
+   if(m_custom_collate_names.size())
+   {
+      iter_type pos = m_custom_collate_names.find(string_type(p1, p2));
+      if(pos != m_custom_collate_names.end())
+         return pos->second;
+   }
+#if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS)\
+               && !BOOST_WORKAROUND(BOOST_MSVC, < 1300)\
+               && !BOOST_WORKAROUND(__BORLANDC__, <= 0x0551)
+   std::string name(p1, p2);
+#else
+   std::string name;
+   const charT* p0 = p1;
+   while(p0 != p2)
+	   name.append(1, char(*p0++));
+#endif
+   name = lookup_default_collate_name(name);
+#if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS)\
+               && !BOOST_WORKAROUND(BOOST_MSVC, < 1300)\
+               && !BOOST_WORKAROUND(__BORLANDC__, <= 0x0551)
+   if(name.size())
+      return string_type(name.begin(), name.end());
+#else
+   if(name.size())
+   {
+	   string_type result;
+	   typedef std::string::const_iterator iter;
+	   iter b = name.begin();
+	   iter e = name.end();
+	   while(b != e)
+		   result.append(1, charT(*b++));
+	   return result;
+   }
+#endif
+   if(p2 - p1 == 1)
+      return string_type(1, *p1);
+   return string_type();
+}
+
+template <class charT>
+w32_regex_traits_implementation<charT>::w32_regex_traits_implementation(::boost::re_detail::lcid_type l)
+: w32_regex_traits_char_layer<charT>(l)
+{
+   cat_type cat;
+   std::string cat_name(w32_regex_traits<charT>::get_catalog_name());
+   if(cat_name.size())
+   {
+      cat = ::boost::re_detail::w32_cat_open(cat_name);
+      if(!cat)
+      {
+         std::string m("Unable to open message catalog: ");
+         std::runtime_error err(m + cat_name);
+         boost::re_detail::raise_runtime_error(err);
+      }
+   }
+   //
+   // if we have a valid catalog then load our messages:
+   //
+   if(cat)
+   {
+      //
+      // Error messages:
+      //
+      for(boost::regex_constants::error_type i = static_cast<boost::regex_constants::error_type>(0); 
+         i <= boost::regex_constants::error_unknown; 
+         i = static_cast<boost::regex_constants::error_type>(i + 1))
+      {
+         const char* p = get_default_error_string(i);
+         string_type default_message;
+         while(*p)
+         {
+            default_message.append(1, static_cast<charT>(*p));
+            ++p;
+         }
+         string_type s = ::boost::re_detail::w32_cat_get(cat, this->m_locale, i+200, default_message);
+         std::string result;
+         for(std::string::size_type j = 0; j < s.size(); ++j)
+         {
+            result.append(1, static_cast<char>(s[j]));
+         }
+         m_error_strings[i] = result;
+      }
+      //
+      // Custom class names:
+      //
+      static const char_class_type masks[] = 
+      {
+         0x0104u, // C1_ALPHA | C1_DIGIT
+         0x0100u, // C1_ALPHA
+         0x0020u, // C1_CNTRL
+         0x0004u, // C1_DIGIT
+         (~(0x0020u|0x0008u) & 0x01ffu) | 0x0400u, // not C1_CNTRL or C1_SPACE
+         0x0002u, // C1_LOWER
+         (~0x0020u & 0x01ffu) | 0x0400, // not C1_CNTRL
+         0x0010u, // C1_PUNCT
+         0x0008u, // C1_SPACE
+         0x0001u, // C1_UPPER
+         0x0080u, // C1_XDIGIT
+         0x0040u, // C1_BLANK
+         w32_regex_traits_implementation<charT>::mask_word,
+         w32_regex_traits_implementation<charT>::mask_unicode,
+      };
+      static const string_type null_string;
+      for(unsigned int j = 0; j <= 13; ++j)
+      {
+         string_type s(::boost::re_detail::w32_cat_get(cat, this->m_locale, j+300, null_string));
+         if(s.size())
+            this->m_custom_class_names[s] = masks[j];
+      }
+   }
+   //
+   // get the collation format used by m_pcollate:
+   //
+   m_collate_type = re_detail::find_sort_syntax(this, &m_collate_delim);
+}
+
+template <class charT>
+typename w32_regex_traits_implementation<charT>::char_class_type 
+   w32_regex_traits_implementation<charT>::lookup_classname_imp(const charT* p1, const charT* p2) const
+{
+   static const char_class_type masks[] = 
+   {
+      0,
+      0x0104u, // C1_ALPHA | C1_DIGIT
+      0x0100u, // C1_ALPHA
+      0x0040u, // C1_BLANK
+      0x0020u, // C1_CNTRL
+      0x0004u, // C1_DIGIT
+      0x0004u, // C1_DIGIT
+      (~(0x0020u|0x0008u|0x0040) & 0x01ffu) | 0x0400u, // not C1_CNTRL or C1_SPACE or C1_BLANK
+      0x0002u, // C1_LOWER
+      0x0002u, // C1_LOWER
+      (~0x0020u & 0x01ffu) | 0x0400, // not C1_CNTRL
+      0x0010u, // C1_PUNCT
+      0x0008u, // C1_SPACE
+      0x0008u, // C1_SPACE
+      0x0001u, // C1_UPPER
+      w32_regex_traits_implementation<charT>::mask_unicode,
+      0x0001u, // C1_UPPER
+      0x0104u | w32_regex_traits_implementation<charT>::mask_word, 
+      0x0104u | w32_regex_traits_implementation<charT>::mask_word, 
+      0x0080u, // C1_XDIGIT
+   };
+   if(m_custom_class_names.size())
+   {
+      typedef typename std::map<std::basic_string<charT>, char_class_type>::const_iterator map_iter;
+      map_iter pos = m_custom_class_names.find(string_type(p1, p2));
+      if(pos != m_custom_class_names.end())
+         return pos->second;
+   }
+   std::size_t id = 1 + re_detail::get_default_class_id(p1, p2);
+   assert(id < sizeof(masks) / sizeof(masks[0]));
+   return masks[id];
+}
+
+
+template <class charT>
+boost::shared_ptr<w32_regex_traits_implementation<charT> > create_w32_regex_traits(::boost::re_detail::lcid_type l BOOST_APPEND_EXPLICIT_TEMPLATE_TYPE(charT))
+{
+   // TODO: create a cache for previously constructed objects.
+   return boost::object_cache< ::boost::re_detail::lcid_type, w32_regex_traits_implementation<charT> >::get(l, 5);
+}
+
+} // re_detail
+
+template <class charT>
+class w32_regex_traits
+{
+private:
+   typedef std::ctype<charT>             ctype_type;
+public:
+   typedef charT                         char_type;
+   typedef std::size_t                   size_type;
+   typedef std::basic_string<char_type>  string_type;
+   typedef ::boost::re_detail::lcid_type locale_type;
+   typedef boost::uint_least32_t         char_class_type;
+
+   struct boost_extensions_tag{};
+
+   w32_regex_traits()
+      : m_pimpl(re_detail::create_w32_regex_traits<charT>(::boost::re_detail::w32_get_default_locale()))
+   { }
+   static size_type length(const char_type* p)
+   {
+      return std::char_traits<charT>::length(p);
+   }
+   regex_constants::syntax_type syntax_type(charT c)const
+   {
+      return m_pimpl->syntax_type(c);
+   }
+   regex_constants::escape_syntax_type escape_syntax_type(charT c) const
+   {
+      return m_pimpl->escape_syntax_type(c);
+   }
+   charT translate(charT c) const
+   {
+      return c;
+   }
+   charT translate_nocase(charT c) const
+   {
+      return this->m_pimpl->tolower(c);
+   }
+   charT translate(charT c, bool icase) const
+   {
+      return icase ? this->m_pimpl->tolower(c) : c;
+   }
+   charT tolower(charT c) const
+   {
+      return this->m_pimpl->tolower(c);
+   }
+   charT toupper(charT c) const
+   {
+      return ::boost::re_detail::w32_toupper(c, this->m_pimpl->m_locale);
+   }
+   string_type transform(const charT* p1, const charT* p2) const
+   {
+      return ::boost::re_detail::w32_transform(this->m_pimpl->m_locale, p1, p2);
+   }
+   string_type transform_primary(const charT* p1, const charT* p2) const
+   {
+      return m_pimpl->transform_primary(p1, p2);
+   }
+   char_class_type lookup_classname(const charT* p1, const charT* p2) const
+   {
+      return m_pimpl->lookup_classname(p1, p2);
+   }
+   string_type lookup_collatename(const charT* p1, const charT* p2) const
+   {
+      return m_pimpl->lookup_collatename(p1, p2);
+   }
+   bool isctype(charT c, char_class_type f) const
+   {
+      if((f & re_detail::w32_regex_traits_implementation<charT>::mask_base) 
+         && (this->m_pimpl->isctype(f & re_detail::w32_regex_traits_implementation<charT>::mask_base, c)))
+         return true;
+      else if((f & re_detail::w32_regex_traits_implementation<charT>::mask_unicode) && re_detail::is_extended(c))
+         return true;
+      else if((f & re_detail::w32_regex_traits_implementation<charT>::mask_word) && (c == '_'))
+         return true;
+      return false;
+   }
+   int toi(const charT*& p1, const charT* p2, int radix)const
+   {
+      return ::boost::re_detail::global_toi(p1, p2, radix, *this);
+   }
+   int value(charT c, int radix)const
+   {
+      int result = ::boost::re_detail::global_value(c);
+      return result < radix ? result : -1;
+   }
+   locale_type imbue(locale_type l)
+   {
+      ::boost::re_detail::lcid_type result(getloc());
+      m_pimpl = re_detail::create_w32_regex_traits<charT>(l);
+      return result;
+   }
+   locale_type getloc()const
+   {
+      return m_pimpl->m_locale;
+   }
+   std::string error_string(regex_constants::error_type n) const
+   {
+      return m_pimpl->error_string(n);
+   }
+
+   //
+   // extension:
+   // set the name of the message catalog in use (defaults to "boost_regex").
+   //
+   static std::string catalog_name(const std::string& name);
+   static std::string get_catalog_name();
+
+private:
+   boost::shared_ptr<re_detail::w32_regex_traits_implementation<charT> > m_pimpl;
+   //
+   // catalog name handler:
+   //
+   static std::string& get_catalog_name_inst();
+
+#ifdef BOOST_HAS_THREADS
+   static static_mutex& get_mutex_inst();
+#endif
+};
+
+template <class charT>
+std::string w32_regex_traits<charT>::catalog_name(const std::string& name)
+{
+#ifdef BOOST_HAS_THREADS
+   static_mutex::scoped_lock lk(get_mutex_inst());
+#endif
+   std::string result(get_catalog_name_inst());
+   get_catalog_name_inst() = name;
+   return result;
+}
+
+template <class charT>
+std::string& w32_regex_traits<charT>::get_catalog_name_inst()
+{
+   static std::string s_name;
+   return s_name;
+}
+
+template <class charT>
+std::string w32_regex_traits<charT>::get_catalog_name()
+{
+#ifdef BOOST_HAS_THREADS
+   static_mutex::scoped_lock lk(get_mutex_inst());
+#endif
+   std::string result(get_catalog_name_inst());
+   return result;
+}
+
+#ifdef BOOST_HAS_THREADS
+template <class charT>
+static_mutex& w32_regex_traits<charT>::get_mutex_inst()
+{
+   static static_mutex s_mutex = BOOST_STATIC_MUTEX_INIT;
+   return s_mutex;
+}
+#endif
+
+
+} // boost
+
+#ifdef BOOST_MSVC
+#pragma warning(pop)
+#endif
+
+#ifdef BOOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
+#endif
+
+#endif
diff --git a/include/boost/regex_fwd.hpp b/include/boost/regex_fwd.hpp
index 21e8ad48..838edb01 100644
--- a/include/boost/regex_fwd.hpp
+++ b/include/boost/regex_fwd.hpp
@@ -24,11 +24,7 @@
 #include <boost/regex/config.hpp>
 #endif
 
-#ifdef BOOST_REGEX_V3
-#include <boost/regex/v3/regex_fwd.hpp>
-#else
 #include <boost/regex/v4/regex_fwd.hpp>
-#endif
 
 #endif
 
diff --git a/performance/Jamfile b/performance/Jamfile
index 6be58f0a..48a395ff 100644
--- a/performance/Jamfile
+++ b/performance/Jamfile
@@ -2,7 +2,7 @@
 
 subproject libs/regex/performance ;
 
-SOURCES = command_line main time_boost time_greta time_localised_boost time_pcre time_posix time_safe_greta ;
+SOURCES = command_line main time_boost time_greta time_localised_boost time_pcre time_dynamic_xpressive time_posix time_safe_greta ;
 
 if $(HS_REGEX_PATH)
 {
@@ -42,3 +42,4 @@ exe regex_comparison :
 
 
 
+
diff --git a/performance/command_line.cpp b/performance/command_line.cpp
index f444d63d..79b90a19 100644
--- a/performance/command_line.cpp
+++ b/performance/command_line.cpp
@@ -33,6 +33,7 @@ bool time_greta = false;
 bool time_safe_greta = false;
 bool time_posix = false;
 bool time_pcre = false;
+bool time_xpressive = false;
 
 bool test_matches = false;
 bool test_code = false;
@@ -79,6 +80,10 @@ int handle_argument(const std::string& what)
 #ifdef BOOST_HAS_PCRE
    else if(what == "-pcre")
       time_pcre = true;
+#endif
+#ifdef BOOST_HAS_XPRESSIVE
+   else if(what == "-xpressive")
+      time_xpressive = true;
 #endif
    else if(what == "-all")
    {
diff --git a/performance/main.cpp b/performance/main.cpp
index 33280a9a..486cb8da 100644
--- a/performance/main.cpp
+++ b/performance/main.cpp
@@ -65,6 +65,14 @@ void test_match(const std::string& re, const std::string& text, const std::strin
       r.pcre_time = time;
       std::cout << "\tPCRE regex: " << time << "s\n";
    }
+#endif
+#ifdef BOOST_HAS_XPRESSIVE
+   if(time_xpressive == true)
+   {
+      time = dxpr::time_match(re, text, icase);
+      r.xpressive_time = time;
+      std::cout << "\txpressive regex: " << time << "s\n";
+   }
 #endif
    r.finalise();
    result_list.push_back(r);
@@ -118,6 +126,14 @@ void test_find_all(const std::string& re, const std::string& text, const std::st
       r.pcre_time = time;
       std::cout << "\tPCRE regex: " << time << "s\n";
    }
+#endif
+#ifdef BOOST_HAS_XPRESSIVE
+   if(time_xpressive == true)
+   {
+      time = dxpr::time_find_all(re, text, icase);
+      r.xpressive_time = time;
+      std::cout << "\txpressive regex: " << time << "s\n";
+   }
 #endif
    r.finalise();
    result_list.push_back(r);
diff --git a/performance/regex_comparison.hpp b/performance/regex_comparison.hpp
index 4117a084..a16dc138 100644
--- a/performance/regex_comparison.hpp
+++ b/performance/regex_comparison.hpp
@@ -26,6 +26,7 @@ extern bool time_greta;
 extern bool time_safe_greta;
 extern bool time_posix;
 extern bool time_pcre;
+extern bool time_xpressive;
 
 extern bool test_matches;
 extern bool test_short_twain;
@@ -53,6 +54,7 @@ struct results
    double safe_greta_time;
    double posix_time;
    double pcre_time;
+   double xpressive_time;
    double factor;
    std::string expression;
    std::string description;
@@ -63,7 +65,8 @@ struct results
         safe_greta_time(-1),
         posix_time(-1),
         pcre_time(-1),
-        factor((std::numeric_limits<double>::max)()),
+        xpressive_time(-1),
+        factor(std::numeric_limits<double>::max()),
         expression(ex), 
         description(desc)
    {}
@@ -81,6 +84,8 @@ struct results
          factor = posix_time;
       if((pcre_time >= 0) && (pcre_time < factor))
          factor = pcre_time;
+      if((xpressive_time >= 0) && (xpressive_time < factor))
+         factor = xpressive_time;
    }
 };
 
@@ -123,6 +128,12 @@ double time_match(const std::string& re, const std::string& text, bool icase);
 double time_find_all(const std::string& re, const std::string& text, bool icase);
 
 }
+namespace dxpr {
+// xpressive tests:
+double time_match(const std::string& re, const std::string& text, bool icase);
+double time_find_all(const std::string& re, const std::string& text, bool icase);
+}
+
 void test_match(const std::string& re, const std::string& text, const std::string& description, bool icase = false);
 void test_find_all(const std::string& re, const std::string& text, const std::string& description, bool icase = false);
 inline void test_match(const std::string& re, const std::string& text, bool icase = false)
diff --git a/performance/time_boost.cpp b/performance/time_boost.cpp
index ea80ded5..52d27bab 100644
--- a/performance/time_boost.cpp
+++ b/performance/time_boost.cpp
@@ -45,7 +45,7 @@ double time_match(const std::string& re, const std::string& text, bool icase)
          boost::regex_match(text, what, e);
       }
       run = tim.elapsed();
-      result = (std::min)(run, result);
+      result = std::min(run, result);
    }
    return result / iter;
 }
@@ -86,7 +86,7 @@ double time_find_all(const std::string& re, const std::string& text, bool icase)
          boost::regex_grep(&dummy_grep_proc, text, e);
       }
       run = tim.elapsed();
-      result = (std::min)(run, result);
+      result = std::min(run, result);
    }
    return result / iter;
 }
diff --git a/performance/time_dynamic_xpressive.cpp b/performance/time_dynamic_xpressive.cpp
new file mode 100644
index 00000000..cf81ec63
--- /dev/null
+++ b/performance/time_dynamic_xpressive.cpp
@@ -0,0 +1,129 @@
+/*
+*
+* Copyright (c) 2002
+* Dr John Maddock
+*
+* All rights reserved.
+* May not be transfered or disclosed to a third party without
+* prior consent of the author.
+*
+*/
+
+#include "regex_comparison.hpp"
+
+#ifdef BOOST_HAS_XPRESSIVE
+#include <cassert>
+#include <boost/timer.hpp>
+#include <boost/xpressive/xpressive.hpp>
+
+namespace dxpr
+{
+
+double time_match(const std::string& re, const std::string& text, bool icase)
+{
+   boost::xpressive::sregex e;
+   e = (icase ? 
+            boost::xpressive::sregex(boost::xpressive::sregex::compile(re))
+            : boost::xpressive::sregex(boost::xpressive::sregex::compile(re, boost::xpressive::regex_constants::icase)));
+    boost::xpressive::smatch what;
+    boost::timer tim;
+    int iter = 1;
+    int counter, repeats;
+    double result = 0;
+    double run;
+    assert(boost::xpressive::regex_match( text, what, e ));
+    do
+    {
+        tim.restart();
+        for(counter = 0; counter < iter; ++counter)
+        {
+            boost::xpressive::regex_match( text, what, e );
+        }
+        result = tim.elapsed();
+        iter *= 2;
+    } while(result < 0.5);
+    iter /= 2;
+
+    // repeat test and report least value for consistency:
+    for(repeats = 0; repeats < REPEAT_COUNT; ++repeats)
+    {
+        tim.restart();
+        for(counter = 0; counter < iter; ++counter)
+        {
+            boost::xpressive::regex_match( text, what, e );
+        }
+        run = tim.elapsed();
+        result = (std::min)(run, result);
+    }
+    return result / iter;
+}
+
+struct noop
+{
+    void operator()( boost::xpressive::smatch const & ) const
+    {
+    }
+};
+
+double time_find_all(const std::string& re, const std::string& text, bool icase)
+{
+   boost::xpressive::sregex e;
+   e = (icase ? 
+            boost::xpressive::sregex(boost::xpressive::sregex::compile(re))
+            : boost::xpressive::sregex(boost::xpressive::sregex::compile(re, boost::xpressive::regex_constants::icase)));
+    boost::xpressive::smatch what;
+    boost::timer tim;
+    int iter = 1;
+    int counter, repeats;
+    double result = 0;
+    double run;
+    do
+    {
+        tim.restart();
+        for(counter = 0; counter < iter; ++counter)
+        {
+            boost::xpressive::sregex_iterator begin( text.begin(), text.end(), e ), end;
+            std::for_each( begin, end, noop() );
+        }
+        result = tim.elapsed();
+        iter *= 2;
+    }while(result < 0.5);
+    iter /= 2;
+
+    if(result >10)
+        return result / iter;
+
+    // repeat test and report least value for consistency:
+    for(repeats = 0; repeats < REPEAT_COUNT; ++repeats)
+    {
+        tim.restart();
+        for(counter = 0; counter < iter; ++counter)
+        {
+            boost::xpressive::sregex_iterator begin( text.begin(), text.end(), e ), end;
+            std::for_each( begin, end, noop() );
+        }
+        run = tim.elapsed();
+        result = (std::min)(run, result);
+    }
+    return result / iter;
+}
+
+}
+
+#else
+
+namespace dxpr{
+
+double time_match(const std::string& re, const std::string& text, bool icase)
+{
+   return -1;
+}
+double time_find_all(const std::string& re, const std::string& text, bool icase)
+{
+   return -1;
+}
+
+}
+#endif
+
+
diff --git a/performance/time_greta.cpp b/performance/time_greta.cpp
index 15c9be40..7653c6ce 100644
--- a/performance/time_greta.cpp
+++ b/performance/time_greta.cpp
@@ -48,7 +48,7 @@ double time_match(const std::string& re, const std::string& text, bool icase)
          e.match(text, what);
       }
       run = tim.elapsed();
-      result = (std::min)(run, result);
+      result = std::min(run, result);
    }
    return result / iter;
 }
@@ -94,7 +94,7 @@ double time_find_all(const std::string& re, const std::string& text, bool icase)
          }
       }
       run = tim.elapsed();
-      result = (std::min)(run, result);
+      result = std::min(run, result);
    }
    return result / iter;
 }
diff --git a/performance/time_localised_boost.cpp b/performance/time_localised_boost.cpp
index e3276c59..fb748deb 100644
--- a/performance/time_localised_boost.cpp
+++ b/performance/time_localised_boost.cpp
@@ -45,7 +45,7 @@ double time_match(const std::string& re, const std::string& text, bool icase)
          boost::regex_match(text, what, e);
       }
       run = tim.elapsed();
-      result = (std::min)(run, result);
+      result = std::min(run, result);
    }
    return result / iter;
 }
@@ -86,7 +86,7 @@ double time_find_all(const std::string& re, const std::string& text, bool icase)
          boost::regex_grep(&dummy_grep_proc, text, e);
       }
       run = tim.elapsed();
-      result = (std::min)(run, result);
+      result = std::min(run, result);
    }
    return result / iter;
 }
diff --git a/performance/time_pcre.cpp b/performance/time_pcre.cpp
index 8aee6d98..94ebbf81 100644
--- a/performance/time_pcre.cpp
+++ b/performance/time_pcre.cpp
@@ -69,7 +69,7 @@ double time_match(const std::string& re, const std::string& text, bool icase)
          erroffset = pcre_exec(ppcre, pe, text.c_str(), text.size(), 0, 0, what, sizeof(what)/sizeof(int));
       }
       run = tim.elapsed();
-      result = (std::min)(run, result);
+      result = std::min(run, result);
    }
    free(ppcre);
    free(pe);
@@ -152,7 +152,7 @@ double time_find_all(const std::string& re, const std::string& text, bool icase)
          }
       }
       run = tim.elapsed();
-      result = (std::min)(run, result);
+      result = std::min(run, result);
    }
    return result / iter;
 }
diff --git a/performance/time_posix.cpp b/performance/time_posix.cpp
index 4bf19b5b..54e5cb98 100644
--- a/performance/time_posix.cpp
+++ b/performance/time_posix.cpp
@@ -27,7 +27,7 @@ double time_match(const std::string& re, const std::string& text, bool icase)
    int counter, repeats;
    double result = 0;
    double run;
-   if(0 != regcomp(&e, re.c_str(), (icase ? REG_ICASE | REG_EXTENDED : REG_EXTENDED)))
+   if(0 != ::regcomp(&e, re.c_str(), (icase ? REG_ICASE | REG_EXTENDED : REG_EXTENDED)))
       return -1;
    do
    {
@@ -50,7 +50,7 @@ double time_match(const std::string& re, const std::string& text, bool icase)
          regexec(&e, text.c_str(), e.re_nsub, what, 0);
       }
       run = tim.elapsed();
-      result = (std::min)(run, result);
+      result = std::min(run, result);
    }
    regfree(&e);
    return result / iter;
@@ -116,7 +116,7 @@ double time_find_all(const std::string& re, const std::string& text, bool icase)
          }
       }
       run = tim.elapsed();
-      result = (std::min)(run, result);
+      result = std::min(run, result);
    }
    return result / iter;
 }
diff --git a/performance/time_safe_greta.cpp b/performance/time_safe_greta.cpp
index 8ef4b4d2..cbf856b8 100644
--- a/performance/time_safe_greta.cpp
+++ b/performance/time_safe_greta.cpp
@@ -49,7 +49,7 @@ double time_match(const std::string& re, const std::string& text, bool icase)
          e.match(text, what);
       }
       run = tim.elapsed();
-      result = (std::min)(run, result);
+      result = std::min(run, result);
    }
    return result / iter;
 }
@@ -96,7 +96,7 @@ double time_find_all(const std::string& re, const std::string& text, bool icase)
          }
       }
       run = tim.elapsed();
-      result = (std::min)(run, result);
+      result = std::min(run, result);
    }
    return result / iter;
 }
diff --git a/src/c_regex_traits.cpp b/src/c_regex_traits.cpp
index f8be3ebb..5cac4a44 100644
--- a/src/c_regex_traits.cpp
+++ b/src/c_regex_traits.cpp
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 1998-2002
+ * Copyright (c) 2004
  * Dr John Maddock
  *
  * Use, modification and distribution are subject to the 
@@ -8,1066 +8,195 @@
  * 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         c_regex_traits.cpp
-  *   VERSION      see <boost/version.hpp>
-  *   DESCRIPTION: Implements the c_regex_traits<charT> traits class
+  *   FILE:        c_regex_traits.cpp
+  *   VERSION:     see <boost/version.hpp>
+  *   DESCRIPTION: Implements out of line c_regex_traits<char> members
   */
 
+
 #define BOOST_REGEX_SOURCE
 
 #include <boost/config.hpp>
+#include <boost/detail/workaround.hpp>
 
-# ifdef BOOST_MSVC
-#  pragma warning(disable: 4702)
-#  endif
+#if !BOOST_WORKAROUND(__BORLANDC__, < 0x560)
 
-#include <clocale>
-#include <cstdio>
-#include <list>
-#include <cctype>
-#include <cstdio>
-#include <boost/cregex.hpp>
-#include <boost/regex/regex_traits.hpp>
-#ifdef BOOST_REGEX_V3
-#include <boost/regex/v3/regex_synch.hpp>
-#include <boost/regex/v3/regex_cstring.hpp>
-#else
-#include <boost/regex/v4/regex_synch.hpp>
-#include <boost/regex/v4/regex_cstring.hpp>
-#endif
-#include <boost/scoped_array.hpp>
+#include <boost/regex/v4/c_regex_traits.hpp>
+#include <boost/regex/v4/primary_transform.hpp>
+#include <boost/regex/v4/regex_traits_defaults.hpp>
 
-#include "primary_transform.hpp"
-
-
-#if defined(BOOST_HAS_NL_TYPES_H)
-#include <nl_types.h>
-#endif
-
-// Fixes a very strange bug in Comeau 4.2.45.2 that would otherwise result in
-// an instantiation loop
-#if defined(__COMO__) && __COMO_VERSION__ <= 4245
-void c_regex_adopted_no_longer_needed_loop_shutter_upper() { }
-#endif
-
-namespace{
-
-//
-// helper function to get the locale name,
-// works around possibly broken setlocale implementations:
-//
-const char* re_get_locale(int id)
-{
-   static const char* def = "Unknown";
-   const char* pl = std::setlocale(id, 0);
-   return pl ? pl : def;
-}
-
-//
-// character classes:
-//
-boost::uint_fast32_t re_char_class_id[] = {
-   boost::re_detail::c_traits_base::char_class_alnum,
-   boost::re_detail::c_traits_base::char_class_alpha,
-   boost::re_detail::c_traits_base::char_class_cntrl,
-   boost::re_detail::c_traits_base::char_class_digit,
-   boost::re_detail::c_traits_base::char_class_graph,
-   boost::re_detail::c_traits_base::char_class_lower,
-   boost::re_detail::c_traits_base::char_class_print,
-   boost::re_detail::c_traits_base::char_class_punct,
-   boost::re_detail::c_traits_base::char_class_space,
-   boost::re_detail::c_traits_base::char_class_upper,
-   boost::re_detail::c_traits_base::char_class_xdigit,
-   boost::re_detail::c_traits_base::char_class_blank,
-   boost::re_detail::c_traits_base::char_class_word,
-   boost::re_detail::c_traits_base::char_class_unicode,
-};
-
-const char* re_char_class_names[] = {
-"alnum",
-"alpha",
-"cntrl",
-"digit",
-"graph",
-"lower",
-"print",
-"punct",
-"space",
-"upper",
-"xdigit",
-"blank",
-"word",
-"unicode",
-};
-
-std::string* re_cls_name;
-std::string* pclasses;
-unsigned int classes_count = 0;
-const unsigned int re_classes_max = 14;
-
-//
-// collate names:
-
-struct collate_name_t
-{
-   std::string name;
-   std::string value;
-   collate_name_t(const char* p1, const char* p2, const char* p3, const char* p4)
-      : name(p1, p2), value(p3, p4) {}
-};
-
-std::string* re_coll_name;
-std::list<collate_name_t>* pcoll_names;
-unsigned int collate_count = 0;
-
-//
-// message handling:
-#ifndef BOOST_RE_MESSAGE_BASE
-#define BOOST_RE_MESSAGE_BASE 0
-#endif
-
-#if defined(BOOST_HAS_NL_TYPES_H)
-nl_catd message_cat = (nl_catd)-1;
-#endif
-
-unsigned int message_count = 0;
-std::string* mess_locale;
-
-char* re_custom_error_messages[] = {
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-};
-
-#if !defined(LC_MESSAGES)
-#define LC_MESSAGES LC_CTYPE
-#endif
-
-char re_zero;
-char re_ten;
-
-unsigned int entry_count = 0;
-
-std::string* ctype_name;
-std::string* collate_name;
-enum syntax_map_size
-{
-   map_size = UCHAR_MAX + 1
-};
-
-std::size_t BOOST_REGEX_CALL _re_get_message(char* buf, std::size_t len, std::size_t id);
-
-#ifndef BOOST_NO_WREGEX
-
-boost::regex_wchar_type re_zero_w;
-boost::regex_wchar_type re_ten_w;
-
-unsigned int nlsw_count = 0;
-std::string* wlocale_name = 0;
-
-struct syntax_map_t
-{
-   boost::regex_wchar_type c;
-   unsigned int type;
-};
-
-std::list<syntax_map_t>* syntax;
-
-std::size_t BOOST_REGEX_CALL re_get_message(boost::regex_wchar_type* buf, std::size_t len, std::size_t id)
-{
-   std::size_t size = _re_get_message(static_cast<char*>(0), 0, id);
-   if(len < size)
-      return size;
-   boost::scoped_array<char> cb(new char[size]);
-   _re_get_message(cb.get(), size, id);
-   size = boost::c_regex_traits<boost::regex_wchar_type>::strwiden(buf, len, cb.get());
-   return size;
+#ifdef BOOST_NO_STDC_NAMESPACE
+namespace std{
+   using ::strxfrm; using ::isspace;
+   using ::ispunct; using ::isalpha;
+   using ::isalnum; using ::iscntrl;
+   using ::isprint; using ::isupper;
+   using ::islower; using ::isdigit;
+   using ::isxdigit; using ::strtol;
 }
 #endif
 
-inline std::size_t BOOST_REGEX_CALL re_get_message(char* buf, std::size_t len, std::size_t id)
-{
-   return _re_get_message(buf, len, id);
-}
-
-void BOOST_REGEX_CALL re_init_classes()
-{
-   BOOST_RE_GUARD_STACK
-   if(classes_count == 0)
-   {
-      re_cls_name = new std::string("xxxxxxxx");
-#ifndef BOOST_NO_EXCEPTIONS
-      try{
+#ifdef BOOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_PREFIX
 #endif
-         pclasses = new std::string[re_classes_max];
-         BOOST_REGEX_NOEH_ASSERT(pclasses)
-#ifndef BOOST_NO_EXCEPTIONS
-      }
-      catch(...)
-      {
-         delete re_cls_name;
-         throw;
-      }
-#endif
-   }
-   ++classes_count;
-}
-
-void BOOST_REGEX_CALL re_free_classes()
-{
-   BOOST_RE_GUARD_STACK
-   if(--classes_count == 0)
-   {
-      delete re_cls_name;
-      delete[] pclasses;
-   }
-}
-
-void BOOST_REGEX_CALL re_update_classes()
-{
-   BOOST_RE_GUARD_STACK
-   if(*re_cls_name != re_get_locale(LC_CTYPE))
-   {
-      *re_cls_name = re_get_locale(LC_CTYPE);
-      char buf[256];
-      unsigned int i;
-      for(i = 0; i < re_classes_max; ++i)
-      {
-         re_get_message(buf, 256, i+300);
-         pclasses[i] = buf;
-      }
-   }
-}
-
-void BOOST_REGEX_CALL re_init_collate()
-{
-   BOOST_RE_GUARD_STACK
-   if(collate_count == 0)
-   {
-      re_coll_name = new std::string("xxxxxxxx");
-#ifndef BOOST_NO_EXCEPTIONS
-      try{
-#endif
-         pcoll_names = new std::list<collate_name_t>();
-         BOOST_REGEX_NOEH_ASSERT(pcoll_names)
-#ifndef BOOST_NO_EXCEPTIONS
-      }
-      catch(...)
-      {
-         delete re_coll_name;
-         throw;
-      }
-#endif
-   }
-   ++collate_count;
-}
-
-void BOOST_REGEX_CALL re_free_collate()
-{
-   BOOST_RE_GUARD_STACK
-   if(--collate_count == 0)
-   {
-      delete re_coll_name;
-      delete pcoll_names;
-   }
-}
-
-void BOOST_REGEX_CALL re_update_collate()
-{
-   BOOST_RE_GUARD_STACK
-   if(*re_coll_name != re_get_locale(LC_COLLATE))
-   {
-      *re_coll_name = re_get_locale(LC_COLLATE);
-      char buf[256];
-      unsigned int i = 400;
-      re_get_message(buf, 256, i);
-      while(*buf)
-      {
-         char* p1, *p2, *p3, *p4;;
-         p1 = buf;
-         while(*p1 && std::isspace((unsigned char)*p1))++p1;
-         p2 = p1;
-         while(*p2 && !std::isspace((unsigned char)*p2))++p2;
-         p3 = p2;
-         while(*p3 && std::isspace((unsigned char)*p3))++p3;
-         p4 = p3;
-         while(*p4 && !std::isspace((unsigned char)*p4))++p4;
-         pcoll_names->push_back(collate_name_t(p1, p2, p3, p4));
-         ++i;
-         re_get_message(buf, 256, i);
-      }
-   }
-}
-
-std::size_t BOOST_REGEX_CALL _re_get_message(char* buf, std::size_t len, std::size_t id)
-{
-   BOOST_RE_GUARD_STACK
-   // get the customised message if any:
-   #if defined(BOOST_HAS_NL_TYPES_H)
-   if(message_cat != (nl_catd)-1)
-   {
-      const char* m = catgets(message_cat, 0, id, 0);
-      if(m)
-      {
-         std::size_t size = std::strlen(m) + 1;
-         if(size > len)
-            return size;
-         std::strcpy(buf, m);
-         return size;
-      }
-   }
-   #endif
-
-   //
-   // now get the default message if any:
-   return boost::re_detail::re_get_default_message(buf, len, id);
-}
-
-void BOOST_REGEX_CALL re_message_init()
-{
-   BOOST_RE_GUARD_STACK
-   if(message_count == 0)
-   {
-      mess_locale = new std::string("xxxxxxxxxxxxxxxx");
-   }
-   ++message_count;
-}
-
-void BOOST_REGEX_CALL re_message_update()
-{
-   BOOST_RE_GUARD_STACK
-   //
-   // called whenever the global locale changes:
-   //
-   std::string l(re_get_locale(LC_MESSAGES));
-   if(*mess_locale != l)
-   {
-      *mess_locale = l;
-#if defined(BOOST_HAS_NL_TYPES_H)
-      if(message_cat != (nl_catd)-1)
-      {
-         catclose(message_cat);
-         message_cat = (nl_catd)-1;
-      }
-      if(*boost::re_detail::c_traits_base::get_catalogue())
-      {
-         message_cat = catopen(boost::re_detail::c_traits_base::get_catalogue(), 0);
-         if(message_cat == (nl_catd)-1)
-         {
-            std::string m("Unable to open message catalog: ");
-            std::runtime_error err(m + boost::re_detail::c_traits_base::get_catalogue());
-            boost::throw_exception(err);
-         }
-      }
-#endif
-      for(int i = 0; i < boost::REG_E_UNKNOWN; ++i)
-      {
-         if(re_custom_error_messages[i])
-         {
-            boost::re_detail::re_strfree(re_custom_error_messages[i]);
-            re_custom_error_messages[i] = 0;
-         }
-      }
-   }
-}
-
-void BOOST_REGEX_CALL re_message_free()
-{
-   BOOST_RE_GUARD_STACK
-   --message_count;
-   if(message_count == 0)
-   {
-#if defined(BOOST_HAS_NL_TYPES_H)
-      if(message_cat != (nl_catd)-1)
-         catclose(message_cat);
-#endif
-      delete mess_locale;
-      for(int i = 0; i < boost::REG_E_UNKNOWN; ++i)
-      {
-         if(re_custom_error_messages[i])
-         {
-            boost::re_detail::re_strfree(re_custom_error_messages[i]);
-            re_custom_error_messages[i] = 0;
-         }
-      }
-   }
-}
-
-
-const char* BOOST_REGEX_CALL re_get_error_str(unsigned int id)
-{
-   BOOST_RE_GUARD_STACK
-#ifdef BOOST_HAS_THREADS
-   boost::re_detail::cs_guard g(*boost::re_detail::p_re_lock);
-#endif
-   if(re_custom_error_messages[id] == 0)
-   {
-      char buf[256];
-      _re_get_message(buf, 256, id + 200);
-      if(*buf)
-      {
-         re_custom_error_messages[id] = boost::re_detail::re_strdup(buf);
-         return re_custom_error_messages[id];
-      }
-      return boost::re_detail::re_default_error_messages[id];
-   }
-   return re_custom_error_messages[id];
-}
-
-} // namespace
 
 namespace boost{
-namespace re_detail{
 
-char c_traits_base::regex_message_catalogue[BOOST_REGEX_MAX_PATH] = {0};
-
-std::string BOOST_REGEX_CALL c_traits_base::error_string(unsigned id)
-{
-   return re_get_error_str(id);
+c_regex_traits<char>::string_type BOOST_REGEX_CALL c_regex_traits<char>::transform(const char* p1, const char* p2)
+{ 
+   std::string result(10, ' ');
+   std::size_t s = result.size();
+   std::size_t r;
+   std::string src(p1, p2);
+   while(s < (r = std::strxfrm(&*result.begin(), src.c_str(), s)))
+   {
+      result.append(r - s + 3, ' ');
+      s = result.size();
+   }
+   result.erase(r);
+   return result; 
 }
 
-void BOOST_REGEX_CALL c_traits_base::do_update_collate()
+c_regex_traits<char>::string_type BOOST_REGEX_CALL c_regex_traits<char>::transform_primary(const char* p1, const char* p2)
 {
-   BOOST_RE_GUARD_STACK
-   re_update_collate();
-   std::string s;
-   const char* p = "zero";
-   if(c_regex_traits<char>::lookup_collatename(s, p, p+4))
+   static char s_delim;
+   static const int s_collate_type = ::boost::re_detail::find_sort_syntax(static_cast<c_regex_traits<char>*>(0), &s_delim);
+   std::string result;
+   //
+   // What we do here depends upon the format of the sort key returned by
+   // sort key returned by this->transform:
+   //
+   switch(s_collate_type)
    {
-      jm_assert(s.size() == 1);
-      re_zero = *s.c_str();
-   }
-   else
-      re_zero = '0';
-
-   p = "ten";
-   if(c_regex_traits<char>::lookup_collatename(s, p, p+3))
-   {
-      jm_assert(s.size() == 1);
-      re_ten = *s.c_str();
-   }
-   else
-      re_ten = 'a';
-}
-
-void BOOST_REGEX_CALL c_traits_base::do_update_ctype()
-{
-   BOOST_RE_GUARD_STACK
-   // start by updating the syntax map:
-   unsigned int i;
-   char buf[map_size+2];
-   std::memset(syntax_map, syntax_char, map_size);
-   for(i = 1; i < syntax_max; ++i)
-   {
-      char* ptr = buf;
-      re_get_message(static_cast<char*>(buf), map_size, i+100);
-      for(; *ptr; ++ptr)
+   case ::boost::re_detail::sort_C:
+   case ::boost::re_detail::sort_unknown:
+      // the best we can do is translate to lower case, then get a regular sort key:
       {
-         syntax_map[(unsigned char)*ptr] = (unsigned char)i;
+         result.assign(p1, p2);
+         for(std::string::size_type i = 0; i < result.size(); ++i)
+            result[i] = static_cast<char>((std::tolower)(static_cast<unsigned char>(result[i])));
+         result = transform(&*result.begin(), &*result.begin() + result.size());
+         break;
       }
-   }
-
-   // now update the character class map,
-   // and lower case map:
-   std::memset(class_map, 0, sizeof(class_map));
-   for(i = 0; i < map_size; ++i)
-   {
-      if(std::isalpha(i))
-         class_map[i] |= char_class_alpha;
-      if(std::iscntrl(i))
-         class_map[i] |= char_class_cntrl;
-      if(std::isdigit(i))
-         class_map[i] |= char_class_digit;
-      if(std::islower(i))
-         class_map[i] |= char_class_lower;
-      if(std::isupper(i))
-         class_map[i] |= char_class_upper;
-      if(std::ispunct(i))
-         class_map[i] |= char_class_punct;
-      if(std::isspace(i))
-         class_map[i] |= char_class_space;
-      if(std::isxdigit(i))
-         class_map[i] |= char_class_xdigit;
-   }
-   class_map[(unsigned char)'_'] |= char_class_underscore;
-   class_map[(unsigned char)' '] |= char_class_blank;
-   class_map[(unsigned char)'\t'] |= char_class_blank;
-   for(i = 0; i < map_size; ++i)
-   {
-      lower_case_map[i] = (char)std::tolower(i);
-   }
-   re_update_classes();
-}
-
-boost::uint_fast32_t BOOST_REGEX_CALL c_traits_base::do_lookup_class(const char* p)
-{
-   BOOST_RE_GUARD_STACK
-   unsigned int i;
-   for(i = 0; i < re_classes_max; ++i)
-   {
-      if(pclasses[i] == p)
+   case ::boost::re_detail::sort_fixed:
       {
-         return re_char_class_id[i];
+         // get a regular sort key, and then truncate it:
+         result = transform(p1, p2);
+         result.erase(s_delim);
+         break;
       }
-   }
-   for(i = 0; i < re_classes_max; ++i)
-   {
-      if(std::strcmp(re_char_class_names[i], p) == 0)
-      {
-         return re_char_class_id[i];
-      }
-   }
-   return 0;
-}
-
-bool BOOST_REGEX_CALL c_traits_base::do_lookup_collate(std::string& buf, const char* p)
-{
-   BOOST_RE_GUARD_STACK
-   std::list<collate_name_t>::iterator first, last;
-   first = pcoll_names->begin();
-   last = pcoll_names->end();
-   while(first != last)
-   {
-      if((*first).name == p)
-      {
-         buf = (*first).value;
-         return true;
-      }
-      ++first;
-   }
-
-   bool result = re_detail::re_lookup_def_collate_name(buf, p);
-   if((result == 0) && (std::strlen(p) == 1))
-   {
-      result = true;
-      buf = *p;
-   }
-   return result;
-}
-
-std::string BOOST_REGEX_CALL c_traits_base::set_message_catalogue(const std::string& l)
-{
-   if(sizeof(regex_message_catalogue) <= l.size())
-      return l;
-   std::string old(regex_message_catalogue);
-   std::strcpy(regex_message_catalogue, l.c_str());
-   return old;
-}
-
-unsigned char c_traits_base::syntax_map[map_size];
-unsigned short c_traits_base::class_map[map_size];
-char c_traits_base::lower_case_map[map_size];
-
-} // namespace re_detail
-
-#ifndef BOOST_NO_WREGEX
-bool BOOST_REGEX_CALL c_regex_traits<regex_wchar_type>::lookup_collatename(std::basic_string<regex_wchar_type>& out, const regex_wchar_type* first, const regex_wchar_type* last)
-{
-   BOOST_RE_GUARD_STACK
-   std::basic_string<regex_wchar_type> s(first, last);
-   std::size_t len = strnarrow(static_cast<char*>(0), 0, s.c_str());
-   scoped_array<char> buf(new char[len]);
-   strnarrow(buf.get(), len, s.c_str());
-   std::string t_out;
-   bool result = base_type::do_lookup_collate(t_out, buf.get());
-   if(t_out.size() == 0) result = false;
-   if(result)
-   {
-      if(t_out[0])
-      {
-         len = strwiden(static_cast<regex_wchar_type*>(0), 0, t_out.c_str());
-         scoped_array<regex_wchar_type> wb(new regex_wchar_type[len]);
-         strwiden(wb.get(), len, t_out.c_str());
-         out = wb.get();
-      }
-      else
-         out.append(1, (regex_wchar_type)0);
-   }
-   return result;
-}
-#endif
-
-c_regex_traits<char> c_regex_traits<char>::i;
-
-void BOOST_REGEX_CALL c_regex_traits<char>::init()
-{
-   BOOST_RE_GUARD_STACK
-#ifdef BOOST_HAS_THREADS
-   re_detail::re_init_threads();
-   re_detail::cs_guard g(*re_detail::p_re_lock);
-#endif
-   // just keep track of entry_count
-   if(entry_count == 0)
-   {
-      ctype_name = new std::string("xxxxxxxxxxxxxxxx");
-#ifndef BOOST_NO_EXCEPTIONS
-      try{
-#endif
-         collate_name = new std::string("xxxxxxxxxxxxxxxx");
-         BOOST_REGEX_NOEH_ASSERT(collate_name)
-#ifndef BOOST_NO_EXCEPTIONS
-      }
-      catch(...)
-      {
-         delete ctype_name;
-         throw;
-      }
-#endif
-   }
-   re_message_init();
-   re_init_classes();
-   re_init_collate();
-   ++entry_count;
-}
-
-void BOOST_REGEX_CALL c_regex_traits<char>::update()
-{
-   BOOST_RE_GUARD_STACK
-   #ifdef BOOST_HAS_THREADS
-   re_detail::cs_guard g(*re_detail::p_re_lock);
-   #endif
-   re_message_update();
-   if(*collate_name != re_get_locale(LC_COLLATE))
-   {
-      do_update_collate();
-      *collate_name = re_get_locale(LC_COLLATE);
-   }
-   if(*ctype_name != re_get_locale(LC_CTYPE))
-   {
-      do_update_ctype();
-      *ctype_name = re_get_locale(LC_CTYPE);
-   }
-   sort_type = re_detail::find_sort_syntax(&i, &sort_delim);
-}
-
-void BOOST_REGEX_CALL c_regex_traits<char>::m_free()
-{
-   BOOST_RE_GUARD_STACK
-   #ifdef BOOST_HAS_THREADS
-   re_detail::cs_guard g(*re_detail::p_re_lock);
-   #endif
-   re_message_free();
-   re_free_classes();
-   re_free_collate();
-   --entry_count;
-   // add reference to static member here to ensure
-   // that the linker includes it in the .exe:
-   if((entry_count == 0) && (0 != &c_regex_traits<char>::i))
-   {
-      delete ctype_name;
-      delete collate_name;
-   }
-#ifdef BOOST_HAS_THREADS
-   g.acquire(false);
-   re_detail::re_free_threads();
-#endif
-}
-
-void BOOST_REGEX_CALL c_regex_traits<char>::transform(std::string& out, const std::string& in)
-{
-   BOOST_RE_GUARD_STACK
-   std::size_t n = std::strxfrm(0, in.c_str(), 0);
-   if(n == (std::size_t)(-1))
-   {
-      out = in;
-      return;
-   }
-   scoped_array<char> buf(new char[n+1]);
-   n = std::strxfrm(buf.get(), in.c_str(), n+1);
-   if(n == (std::size_t)(-1))
-   {
-      out = in;
-      return;
-   }
-   out = buf.get();
-}
-
-void BOOST_REGEX_CALL c_regex_traits<char>::transform_primary(std::string& out, const std::string& in)
-{
-   transform(out, in);
-   switch(sort_type)
-   {
-   case re_detail::sort_C:
-   case re_detail::sort_unknown:
-      break;
-   case re_detail::sort_fixed:
-      out.erase((int)sort_delim);
-      break;
-   case re_detail::sort_delim:
-      for(unsigned int j = 0; j < out.size(); ++j)
-      {
-         if((out[j] == sort_delim) && (j+1 < out.size()))
+   case ::boost::re_detail::sort_delim:
+         // get a regular sort key, and then truncate everything after the delim:
+         result = transform(p1, p2);
+         std::size_t i;
+         for(i = 0; i < result.size(); ++i)
          {
-            out.erase(j+1);
-            break;
+            if(result[i] == s_delim)
+               break;
          }
-      }
-   }
-}
-
-unsigned c_regex_traits<char>::sort_type;
-char c_regex_traits<char>::sort_delim;
-
-
-int BOOST_REGEX_CALL c_regex_traits<char>::toi(char c)
-{
-   if(is_class(c, char_class_digit))
-      return c - re_zero;
-   if(is_class(c, char_class_xdigit))
-      return 10 + translate(c, true) - translate(re_ten, true);
-   return -1; // error!!
-}
-
-int BOOST_REGEX_CALL c_regex_traits<char>::toi(const char*& first, const char* last, int radix)
-{
-   unsigned int maxval;
-   if(radix < 0)
-   {
-      // if radix is less than zero, then restrict
-      // return value to charT. NB assumes sizeof(charT) <= sizeof(int)
-      radix *= -1;
-      maxval = 1u << (sizeof(*first) * CHAR_BIT - 1);
-      maxval /= radix;
-      maxval *= 2;
-      maxval -= 1;
-   }
-   else
-   {
-      maxval = (unsigned int)-1;
-      maxval /= radix;
-   }
-
-   unsigned int result = 0;
-   unsigned int type = (radix > 10) ? char_class_xdigit : char_class_digit;
-   while((first != last) && is_class(*first, type) && (result <= maxval))
-   {
-      result *= radix;
-      result += toi(*first);
-      ++first;
+         result.erase(i);
+         break;
    }
    return result;
 }
 
-#ifndef BOOST_NO_WREGEX
-
-unsigned int BOOST_REGEX_CALL c_regex_traits<regex_wchar_type>::syntax_type(size_type c)
+enum
 {
-   BOOST_RE_GUARD_STACK
-   std::list<syntax_map_t>::const_iterator first, last;
-   first = syntax->begin();
-   last = syntax->end();
-   while(first != last)
+   char_class_space=1<<0, 
+   char_class_print=1<<1, 
+   char_class_cntrl=1<<2, 
+   char_class_upper=1<<3, 
+   char_class_lower=1<<4,
+   char_class_alpha=1<<5, 
+   char_class_digit=1<<6, 
+   char_class_punct=1<<7, 
+   char_class_xdigit=1<<8,
+   char_class_alnum=char_class_alpha|char_class_digit, 
+   char_class_graph=char_class_alnum|char_class_punct,
+   char_class_blank=1<<9,
+   char_class_word=1<<10,
+   char_class_unicode=1<<11
+};
+
+c_regex_traits<char>::char_class_type BOOST_REGEX_CALL c_regex_traits<char>::lookup_classname(const char* p1, const char* p2)
+{
+   static const char_class_type masks[] = 
    {
-      if((uchar_type)(*first).c == c)
-         return (*first).type;
-      ++first;
+      0,
+      char_class_alnum, 
+      char_class_alpha,
+      char_class_blank,
+      char_class_cntrl,
+      char_class_digit,
+      char_class_digit,
+      char_class_graph,
+      char_class_lower,
+      char_class_lower,
+      char_class_print,
+      char_class_punct,
+      char_class_space,
+      char_class_space,
+      char_class_upper,
+      char_class_unicode,
+      char_class_upper,
+      char_class_alnum | char_class_word, 
+      char_class_alnum | char_class_word, 
+      char_class_xdigit,
+   };
+
+   int id = ::boost::re_detail::get_default_class_id(p1, p2);
+   if(id < 0)
+   {
+      std::string s(p1, p2);
+      for(std::string::size_type i = 0; i < s.size(); ++i)
+         s[i] = static_cast<char>((std::tolower)(static_cast<unsigned char>(s[i])));
+      id = ::boost::re_detail::get_default_class_id(&*s.begin(), &*s.begin() + s.size());
    }
-   return 0;
+   BOOST_ASSERT(std::size_t(id+1) < sizeof(masks) / sizeof(masks[0]));
+   return masks[id+1];
 }
 
-void BOOST_REGEX_CALL c_regex_traits<regex_wchar_type>::init()
+bool BOOST_REGEX_CALL c_regex_traits<char>::isctype(char c, char_class_type mask)
 {
-   BOOST_RE_GUARD_STACK
-   re_detail::re_init_threads();
-#ifdef BOOST_HAS_THREADS
-   re_detail::cs_guard g(*re_detail::p_re_lock);
-#endif
-   re_message_init();
-   re_init_classes();
-   re_init_collate();
-   if(nlsw_count == 0)
-   {
-      wlocale_name = new std::string("xxxxxxxxxxxxxxxx");
-#ifndef BOOST_NO_EXCEPTIONS
-      try{
-#endif
-         syntax = new std::list<syntax_map_t>();
-         BOOST_REGEX_NOEH_ASSERT(syntax)
-#ifndef BOOST_NO_EXCEPTIONS
-      }
-      catch(...)
-      {
-         delete wlocale_name;
-         throw;
-      }
-#endif
-   }
-   ++nlsw_count;
+   return
+      ((mask & char_class_space) && (std::isspace)(static_cast<unsigned char>(c)))
+      || ((mask & char_class_print) && (std::isprint)(static_cast<unsigned char>(c)))
+      || ((mask & char_class_cntrl) && (std::iscntrl)(static_cast<unsigned char>(c)))
+      || ((mask & char_class_upper) && (std::isupper)(static_cast<unsigned char>(c)))
+      || ((mask & char_class_lower) && (std::islower)(static_cast<unsigned char>(c)))
+      || ((mask & char_class_alpha) && (std::isalpha)(static_cast<unsigned char>(c)))
+      || ((mask & char_class_digit) && (std::isdigit)(static_cast<unsigned char>(c)))
+      || ((mask & char_class_punct) && (std::ispunct)(static_cast<unsigned char>(c)))
+      || ((mask & char_class_xdigit) && (std::isxdigit)(static_cast<unsigned char>(c)))
+      || ((mask & char_class_blank) && (std::isspace)(static_cast<unsigned char>(c)) && !::boost::re_detail::is_separator(c))
+      || ((mask & char_class_word) && (c == '_'));
 }
 
-bool BOOST_REGEX_CALL c_regex_traits<regex_wchar_type>::do_lookup_collate(std::basic_string<regex_wchar_type>& out, const regex_wchar_type* first, const regex_wchar_type* last)
+c_regex_traits<char>::string_type BOOST_REGEX_CALL c_regex_traits<char>::lookup_collatename(const char* p1, const char* p2)
 {
-   BOOST_RE_GUARD_STACK
-   std::basic_string<regex_wchar_type> s(first, last);
-   std::size_t len = strnarrow(static_cast<char*>(0), 0, s.c_str());
-   scoped_array<char> buf(new char[len]);
-   strnarrow(buf.get(), len, s.c_str());
-   std::string t_out;
-   bool result = base_type::do_lookup_collate(t_out, buf.get());
-   if(result)
-   {
-      len = strwiden(static_cast<regex_wchar_type*>(0), 0, t_out.c_str());
-      scoped_array<regex_wchar_type> wb(new regex_wchar_type[len]);
-      strwiden(wb.get(), len, t_out.c_str());
-      out = wb.get();
-   }
+   std::string s(p1, p2);
+   s = ::boost::re_detail::lookup_default_collate_name(s);
+   if(s.empty() && (p2-p1 == 1))
+      s.append(1, *p1);
+   return s;
+}
+
+int BOOST_REGEX_CALL c_regex_traits<char>::value(char c, int radix)
+{
+   char b[2] = { c, '\0', };
+   char* ep;
+   int result = std::strtol(b, &ep, radix);
+   if(ep == b)
+      return -1;
    return result;
 }
 
-
-void BOOST_REGEX_CALL c_regex_traits<regex_wchar_type>::update()
-{
-   BOOST_RE_GUARD_STACK
-#ifdef BOOST_HAS_THREADS
-   re_detail::cs_guard g(*re_detail::p_re_lock);
+}
+#ifdef BOOST_HAS_ABI_HEADERS
+#  include BOOST_ABI_SUFFIX
 #endif
-   re_message_update();
-   re_update_classes();
-   re_update_collate();
-   std::string l(re_get_locale(LC_CTYPE));
-   if(*wlocale_name != l)
-   {
-      *wlocale_name = l;
-      std::basic_string<regex_wchar_type> s;
-      const regex_wchar_type* p = (const regex_wchar_type*)L"zero";
-      if(do_lookup_collate(s, p, p+4))
-      {
-         jm_assert(s.size() == 1);
-         re_zero_w = *s.c_str();
-      }
-      else
-         re_zero_w = L'0';
 
-      p = (const regex_wchar_type*)L"ten";
-      if(do_lookup_collate(s, p, p+3))
-      {
-         jm_assert(s.size() == 1);
-         re_ten_w = *s.c_str();
-      }
-      else
-         re_ten_w = L'a';
-
-      unsigned int i;
-      regex_wchar_type buf[256];
-      syntax_map_t sm;
-      syntax->clear();
-      for(i = 1; i < syntax_max; ++i)
-      {
-         regex_wchar_type* ptr = buf;
-         re_get_message(static_cast<regex_wchar_type*>(buf), 256, i+100);
-         for(; *ptr; ++ptr)
-         {
-            sm.c = *ptr;
-            sm.type = i;
-            syntax->push_back(sm);
-         }
-      }
-      sort_type = re_detail::find_sort_syntax(&init_, &sort_delim);
-   }
-}
-
-void BOOST_REGEX_CALL c_regex_traits<regex_wchar_type>::m_free()
-{
-   BOOST_RE_GUARD_STACK
-#ifdef BOOST_HAS_THREADS
-   re_detail::cs_guard g(*re_detail::p_re_lock);
 #endif
-   --nlsw_count;
-   re_message_free();
-   re_free_classes();
-   re_free_collate();
-   // add reference to static member here to ensure
-   // that the linker includes it in the .exe:
-   if((nlsw_count == 0) && (0 != &c_regex_traits<regex_wchar_type>::init_))
-   {
-      // cleanup:
-      delete wlocale_name;
-      delete syntax;
-   }
-#ifdef BOOST_HAS_THREADS
-   g.acquire(false);
-   re_detail::re_free_threads();
-#endif
-}
-
-bool BOOST_REGEX_CALL c_regex_traits<regex_wchar_type>::do_iswclass(regex_wchar_type c, boost::uint_fast32_t f)
-{
-   BOOST_RE_GUARD_STACK
-   if((c & ~0xFF) == 0)
-      return BOOST_REGEX_MAKE_BOOL(re_detail::wide_unicode_classes[(uchar_type)c] & f);
-   if((f & char_class_alpha) && std::iswalpha(c))
-      return true;
-   if((f & char_class_cntrl) && std::iswcntrl(c))
-      return true;
-   if((f & char_class_digit) && std::iswdigit(c))
-      return true;
-   if((f & char_class_lower) && std::iswlower(c))
-      return true;
-   if((f & char_class_punct) && std::iswpunct(c))
-      return true;
-   if((f & char_class_space) && std::iswspace(c))
-      return true;
-   if((f & char_class_upper) && std::iswupper(c))
-      return true;
-   if((f & char_class_xdigit) && std::iswxdigit(c))
-      return true;
-   if(f & char_class_unicode)
-      return true;
-   return false;
-}
-
-void BOOST_REGEX_CALL c_regex_traits<regex_wchar_type>::transform(std::basic_string<regex_wchar_type>& out, const std::basic_string<regex_wchar_type>& in)
-{
-   BOOST_RE_GUARD_STACK
-#ifndef BOOST_MSVC
-   std::size_t n = std::wcsxfrm(0, in.c_str(), 0);
-#else
-   // broken wcsxfrm under VC6 doesn't check size of
-   // output buffer, we have no choice but to guess!
-   std::size_t n = 100 * in.size();
-#endif
-   if((n == (std::size_t)(-1)) || (n == 0))
-   {
-      out = in;
-      return;
-   }
-   scoped_array<regex_wchar_type> buf(new regex_wchar_type[n+1]);
-   n = std::wcsxfrm((wchar_t*)buf.get(), (const wchar_t*)in.c_str(), n+1);
-   if(n == (std::size_t)(-1))
-   {
-      out = in;
-      return;
-   }
-   out = buf.get();
-}
-
-void BOOST_REGEX_CALL c_regex_traits<regex_wchar_type>::transform_primary(std::basic_string<regex_wchar_type>& out, const std::basic_string<regex_wchar_type>& in)
-{
-   transform(out, in);
-   switch(sort_type)
-   {
-   case re_detail::sort_C:
-   case re_detail::sort_unknown:
-      break;
-   case re_detail::sort_fixed:
-      if((unsigned)sort_delim < out.size())
-         out.erase((int)sort_delim);
-      break;
-   case re_detail::sort_delim:
-      for(unsigned int i = 0; i < out.size(); ++i)
-      {
-         if((out[i] == sort_delim) && (i+1 < out.size()))
-         {
-            out.erase(i+1);
-            break;
-         }
-      }
-   }
-}
-
-unsigned c_regex_traits<regex_wchar_type>::sort_type;
-regex_wchar_type c_regex_traits<regex_wchar_type>::sort_delim;
-
-
-int BOOST_REGEX_CALL c_regex_traits<regex_wchar_type>::toi(regex_wchar_type c)
-{
-   if(is_class(c, char_class_digit))
-      return c - re_zero_w;
-   if(is_class(c, char_class_xdigit))
-      return 10 + translate(c, true) - translate(re_ten_w, true);
-   return -1; // error!!
-}
-
-int BOOST_REGEX_CALL c_regex_traits<regex_wchar_type>::toi(const regex_wchar_type*& first, const regex_wchar_type* last, int radix)
-{
-   unsigned int maxval;
-   if(radix < 0)
-   {
-      // if radix is less than zero, then restrict
-      // return value to charT. NB assumes sizeof(charT) <= sizeof(int)
-      radix *= -1;
-      maxval = 1u << (sizeof(*first) * CHAR_BIT - 1);
-      maxval /= radix;
-      maxval *= 2;
-      maxval -= 1;
-   }
-   else
-   {
-      maxval = (unsigned int)-1;
-      maxval /= radix;
-   }
-
-   unsigned int result = 0;
-   unsigned int type = (radix > 10) ? char_class_xdigit : char_class_digit;
-   while((first != last) && is_class(*first, type) && (result <= maxval))
-   {
-      result *= radix;
-      result += toi(*first);
-      ++first;
-   }
-   return result;
-}
-
-boost::uint_fast32_t BOOST_REGEX_CALL c_regex_traits<regex_wchar_type>::lookup_classname(const regex_wchar_type* first, const regex_wchar_type* last)
-{
-   std::basic_string<regex_wchar_type> s(first, last);
-   std::size_t len = strnarrow(static_cast<char*>(0), 0, s.c_str());
-   scoped_array<char> buf(new char[len]);
-   strnarrow(buf.get(), len, s.c_str());
-   boost::uint_fast32_t result =  do_lookup_class(buf.get());
-   return result;
-}
-
-c_regex_traits<regex_wchar_type> c_regex_traits<regex_wchar_type>::init_;
-
-std::size_t BOOST_REGEX_CALL c_regex_traits<regex_wchar_type>::strnarrow(char *s1, std::size_t len, const regex_wchar_type *s2)
-{
-   BOOST_RE_GUARD_STACK
-   std::size_t size = std::wcslen((const wchar_t*)s2) + 1;
-   if(size > len)
-      return size;
-   return std::wcstombs(s1, (const wchar_t*)s2, len);
-}
-
-std::size_t BOOST_REGEX_CALL c_regex_traits<regex_wchar_type>::strwiden(regex_wchar_type *s1, std::size_t len, const char *s2)
-{
-   BOOST_RE_GUARD_STACK
-   std::size_t size = std::strlen(s2) + 1;
-   if(size > len)
-      return size;
-   size = std::mbstowcs((wchar_t*)s1, s2, len);
-   s1[size] = 0;
-   return size + 1;
-}
-
-#endif // BOOST_NO_WREGEX
-
-} // namespace boost
-
-
-
-
-
diff --git a/src/c_regex_traits_common.cpp b/src/c_regex_traits_common.cpp
deleted file mode 100644
index 1dc0b4b4..00000000
--- a/src/c_regex_traits_common.cpp
+++ /dev/null
@@ -1,559 +0,0 @@
-/*
- *
- * Copyright (c) 1998-2002
- * Dr 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:        c_regex_traits_common.cpp
-  *   VERSION:     see <boost/version.hpp>
-  *   DESCRIPTION: Implements common code and data for the
-  *                c_regex_traits<charT> traits classes.
-  */
-
-
-#define BOOST_REGEX_SOURCE
-
-#include <clocale>
-#include <cstdio>
-#include <list>
-#include <cctype>
-#include <boost/regex/regex_traits.hpp>
-#ifdef BOOST_REGEX_V3
-#include <boost/regex/v3/regex_synch.hpp>
-#else
-#include <boost/regex/v4/regex_synch.hpp>
-#endif
-
-
-namespace boost{
-   namespace re_detail{
-
-//
-// these are the POSIX collating names:
-//
-BOOST_REGEX_DECL const char* def_coll_names[] = {
-"NUL", "SOH", "STX", "ETX", "EOT", "ENQ", "ACK", "alert", "backspace", "tab", "newline", 
-"vertical-tab", "form-feed", "carriage-return", "SO", "SI", "DLE", "DC1", "DC2", "DC3", "DC4", "NAK", 
-"SYN", "ETB", "CAN", "EM", "SUB", "ESC", "IS4", "IS3", "IS2", "IS1", "space", "exclamation-mark", 
-"quotation-mark", "number-sign", "dollar-sign", "percent-sign", "ampersand", "apostrophe", 
-"left-parenthesis", "right-parenthesis", "asterisk", "plus-sign", "comma", "hyphen", 
-"period", "slash", "zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", 
-"colon", "semicolon", "less-than-sign", "equals-sign", "greater-than-sign", 
-"question-mark", "commercial-at", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", 
-"Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "left-square-bracket", "backslash", 
-"right-square-bracket", "circumflex", "underscore", "grave-accent", "a", "b", "c", "d", "e", "f", 
-"g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "left-curly-bracket", 
-"vertical-line", "right-curly-bracket", "tilde", "DEL", "", 
-};
-
-// these multi-character collating elements
-// should keep most Western-European locales
-// happy - we should really localise these a
-// little more - but this will have to do for
-// now:
-
-BOOST_REGEX_DECL const char* def_multi_coll[] = {
-   "ae",
-   "Ae",
-   "AE",
-   "ch",
-   "Ch",
-   "CH",
-   "ll",
-   "Ll",
-   "LL",
-   "ss",
-   "Ss",
-   "SS",
-   "nj",
-   "Nj",
-   "NJ",
-   "dz",
-   "Dz",
-   "DZ",
-   "lj",
-   "Lj",
-   "LJ",
-   "",
-};
-
-
-
-BOOST_REGEX_DECL bool BOOST_REGEX_CALL re_lookup_def_collate_name(std::string& buf, const char* name)
-{
-   BOOST_RE_GUARD_STACK
-   unsigned int i = 0;
-   while(*def_coll_names[i])
-   {
-      if(std::strcmp(def_coll_names[i], name) == 0)
-      {
-         buf = (char)i;
-         return true;
-      }
-      ++i;
-   }
-   i = 0;
-   while(*def_multi_coll[i])
-   {
-      if(std::strcmp(def_multi_coll[i], name) == 0)
-      {
-         buf = def_multi_coll[i];
-         return true;
-      }
-      ++i;
-   }
-   return false;
-}
-
-//
-// messages:
-BOOST_REGEX_DECL const char * re_default_error_messages[] =
-{  "Success",             /* REG_NOERROR */
-   "No match",             /* REG_NOMATCH */
-   "Invalid regular expression",    /* REG_BADPAT */
-   "Invalid collation character",      /* REG_ECOLLATE */
-   "Invalid character class name",     /* REG_ECTYPE */
-   "Trailing backslash",         /* REG_EESCAPE */
-   "Invalid back reference",        /* REG_ESUBREG */
-   "Unmatched [ or [^",       /* REG_EBRACK */
-   "Unmatched ( or \\(",         /* REG_EPAREN */
-   "Unmatched \\{",           /* REG_EBRACE */
-   "Invalid content of \\{\\}",     /* REG_BADBR */
-   "Invalid range end",       /* REG_ERANGE */
-   "Memory exhausted",           /* REG_ESPACE */
-   "Invalid preceding regular expression",   /* REG_BADRPT */
-   "Premature end of regular expression", /* REG_EEND */
-   "Regular expression too big",    /* REG_ESIZE */
-   "Unmatched ) or \\)",         /* REG_ERPAREN */
-   "Empty expression",           /* REG_EMPTY */
-   "Unknown error",    /* REG_E_UNKNOWN */
-   "",
-   "",
-   "",
-};
-
-const mss default_messages[] = {
-                              { 100+ c_regex_traits<char>::syntax_open_bracket, "(", },
-                              { 100+ c_regex_traits<char>::syntax_close_bracket, ")", },
-                              { 100+ c_regex_traits<char>::syntax_dollar, "$", },
-                              { 100+ c_regex_traits<char>::syntax_caret, "^", },
-                              { 100+ c_regex_traits<char>::syntax_dot, ".", },
-                              { 100+ c_regex_traits<char>::syntax_star, "*", },
-                              { 100+ c_regex_traits<char>::syntax_plus, "+", },
-                              { 100+ c_regex_traits<char>::syntax_question, "?", },
-                              { 100+ c_regex_traits<char>::syntax_open_set, "[", },
-                              { 100+ c_regex_traits<char>::syntax_close_set, "]", },
-                              { 100+ c_regex_traits<char>::syntax_or, "|", },
-                              { 100+ c_regex_traits<char>::syntax_slash, "\\", },
-                              { 100+ c_regex_traits<char>::syntax_hash, "#", },
-                              { 100+ c_regex_traits<char>::syntax_dash, "-", },
-                              { 100+ c_regex_traits<char>::syntax_open_brace, "{", },
-                              { 100+ c_regex_traits<char>::syntax_close_brace, "}", },
-                              { 100+ c_regex_traits<char>::syntax_digit, "0123456789", },
-                              { 100+ c_regex_traits<char>::syntax_b, "b", },
-                              { 100+ c_regex_traits<char>::syntax_B, "B", },
-                              { 100+ c_regex_traits<char>::syntax_left_word, "<", },
-                              { 100+ c_regex_traits<char>::syntax_right_word, ">", },
-                              { 100+ c_regex_traits<char>::syntax_w, "w", },
-                              { 100+ c_regex_traits<char>::syntax_W, "W", },
-                              { 100+ c_regex_traits<char>::syntax_start_buffer, "`A", },
-                              { 100+ c_regex_traits<char>::syntax_end_buffer, "'z", },
-                              { 100+ c_regex_traits<char>::syntax_newline, "\n", },
-                              { 100+ c_regex_traits<char>::syntax_comma, ",", },
-                              { 100+ c_regex_traits<char>::syntax_a, "a", },
-                              { 100+ c_regex_traits<char>::syntax_f, "f", },
-                              { 100+ c_regex_traits<char>::syntax_n, "n", },
-                              { 100+ c_regex_traits<char>::syntax_r, "r", },
-                              { 100+ c_regex_traits<char>::syntax_t, "t", },
-                              { 100+ c_regex_traits<char>::syntax_v, "v", },
-                              { 100+ c_regex_traits<char>::syntax_x, "x", },
-                              { 100+ c_regex_traits<char>::syntax_c, "c", },
-                              { 100+ c_regex_traits<char>::syntax_colon, ":", },
-                              { 100+ c_regex_traits<char>::syntax_equal, "=", },
-
-                              { 100 + c_regex_traits<char>::syntax_e, "e", },
-                              { 100 + c_regex_traits<char>::syntax_l, "l", },
-                              { 100 + c_regex_traits<char>::syntax_L, "L", },
-                              { 100 + c_regex_traits<char>::syntax_u, "u", },
-                              { 100 + c_regex_traits<char>::syntax_U, "U", },
-                              { 100 + c_regex_traits<char>::syntax_s, "s", },
-                              { 100 + c_regex_traits<char>::syntax_S, "S", },
-                              { 100 + c_regex_traits<char>::syntax_d, "d", },
-                              { 100 + c_regex_traits<char>::syntax_D, "D", },
-                              { 100 + c_regex_traits<char>::syntax_E, "E", },
-                              { 100 + c_regex_traits<char>::syntax_Q, "Q", },
-                              { 100 + c_regex_traits<char>::syntax_X, "X", },
-                              { 100 + c_regex_traits<char>::syntax_C, "C", },
-                              { 100 + c_regex_traits<char>::syntax_Z, "Z", },
-                              { 100 + c_regex_traits<char>::syntax_G, "G", },
-
-                              { 100 + c_regex_traits<char>::syntax_not, "!", },
-
-                            { 0, "", },
-                         };
-
-BOOST_REGEX_DECL std::size_t BOOST_REGEX_CALL re_get_default_message(char* buf, std::size_t len, std::size_t id)
-{
-   BOOST_RE_GUARD_STACK
-   const mss* pm = default_messages;
-   while(pm->id)
-   {
-      if(pm->id == id)
-      {
-         std::size_t size = re_strlen(pm->what) + 1;
-         if(size > len)
-            return size;
-         re_strcpy(buf, pm->what);
-         return size;
-      }
-      ++pm;
-   }
-   if(buf && len)
-      *buf = 0;
-   return 1;
-}
-
-#ifndef BOOST_NO_WREGEX
-const regex_wchar_type combining_ranges[] = { 0x0300, 0x0361, 
-                           0x0483, 0x0486, 
-                           0x0903, 0x0903, 
-                           0x093E, 0x0940, 
-                           0x0949, 0x094C,
-                           0x0982, 0x0983,
-                           0x09BE, 0x09C0,
-                           0x09C7, 0x09CC,
-                           0x09D7, 0x09D7,
-                           0x0A3E, 0x0A40,
-                           0x0A83, 0x0A83,
-                           0x0ABE, 0x0AC0,
-                           0x0AC9, 0x0ACC,
-                           0x0B02, 0x0B03,
-                           0x0B3E, 0x0B3E,
-                           0x0B40, 0x0B40,
-                           0x0B47, 0x0B4C,
-                           0x0B57, 0x0B57,
-                           0x0B83, 0x0B83,
-                           0x0BBE, 0x0BBF,
-                           0x0BC1, 0x0BCC,
-                           0x0BD7, 0x0BD7,
-                           0x0C01, 0x0C03,
-                           0x0C41, 0x0C44,
-                           0x0C82, 0x0C83,
-                           0x0CBE, 0x0CBE,
-                           0x0CC0, 0x0CC4,
-                           0x0CC7, 0x0CCB,
-                           0x0CD5, 0x0CD6,
-                           0x0D02, 0x0D03,
-                           0x0D3E, 0x0D40,
-                           0x0D46, 0x0D4C,
-                           0x0D57, 0x0D57,
-                           0x0F7F, 0x0F7F,
-                           0x20D0, 0x20E1, 
-                           0x3099, 0x309A,
-                           0xFE20, 0xFE23, 
-                           0xffff, 0xffff, };
-
-BOOST_REGEX_DECL bool BOOST_REGEX_CALL is_combining(regex_wchar_type c)
-{
-   BOOST_RE_GUARD_STACK
-   const regex_wchar_type* p = combining_ranges + 1;
-   while(*p < c) p += 2;
-   --p;
-   if((c >= *p) && (c <= *(p+1)))
-         return true;
-   return false;
-}
-
-BOOST_REGEX_DECL unsigned short wide_unicode_classes[] = {
-   c_traits_base::char_class_cntrl,        // ''  0
-   c_traits_base::char_class_cntrl,        // ''  1
-   c_traits_base::char_class_cntrl,        // ''  2
-   c_traits_base::char_class_cntrl,        // ''  3
-   c_traits_base::char_class_cntrl,        // ''  4
-   c_traits_base::char_class_cntrl,        // ''  5
-   c_traits_base::char_class_cntrl,        // ''  6
-   c_traits_base::char_class_cntrl,        // ''  7
-   c_traits_base::char_class_cntrl,        // ''  8
-   c_traits_base::char_class_cntrl | c_traits_base::char_class_space | c_traits_base::char_class_blank,        // ''  9
-   c_traits_base::char_class_cntrl | c_traits_base::char_class_space,        // ''  10
-   c_traits_base::char_class_cntrl | c_traits_base::char_class_space,        // ''  11
-   c_traits_base::char_class_cntrl | c_traits_base::char_class_space,        // ''  12
-   c_traits_base::char_class_cntrl | c_traits_base::char_class_space,        // ''  13
-   c_traits_base::char_class_cntrl,        // '.'  14
-   c_traits_base::char_class_cntrl,        // '.'  15
-   c_traits_base::char_class_cntrl,        // '.'  16
-   c_traits_base::char_class_cntrl,        // '.'  17
-   c_traits_base::char_class_cntrl,        // '.'  18
-   c_traits_base::char_class_cntrl,        // '.'  19
-   c_traits_base::char_class_cntrl,        // '.'  20
-   c_traits_base::char_class_cntrl,        // '.'  21
-   c_traits_base::char_class_cntrl,        // '.'  22
-   c_traits_base::char_class_cntrl,        // '.'  23
-   c_traits_base::char_class_cntrl,        // '.'  24
-   c_traits_base::char_class_cntrl,        // ''  25
-   c_traits_base::char_class_cntrl,        // ''  26
-   c_traits_base::char_class_cntrl,        // ''  27
-   c_traits_base::char_class_cntrl,        // '.'  28
-   c_traits_base::char_class_cntrl,        // '.'  29
-   c_traits_base::char_class_cntrl,        // '.'  30
-   c_traits_base::char_class_cntrl,        // '.'  31
-   c_traits_base::char_class_space | c_traits_base::char_class_blank,        // ' '  32
-   c_traits_base::char_class_punct,        // '!'  33
-   c_traits_base::char_class_punct,        // '"'  34
-   c_traits_base::char_class_punct,        // '#'  35
-   c_traits_base::char_class_punct,        // '$'  36
-   c_traits_base::char_class_punct,        // '%'  37
-   c_traits_base::char_class_punct,        // '&'  38
-   c_traits_base::char_class_punct,        // '''  39
-   c_traits_base::char_class_punct,        // '('  40
-   c_traits_base::char_class_punct,        // ')'  41
-   c_traits_base::char_class_punct,        // '*'  42
-   c_traits_base::char_class_punct,        // '+'  43
-   c_traits_base::char_class_punct,        // ','  44
-   c_traits_base::char_class_punct,        // '-'  45
-   c_traits_base::char_class_punct,        // '.'  46
-   c_traits_base::char_class_punct,        // '/'  47
-   c_traits_base::char_class_digit |   c_traits_base::char_class_xdigit,        // '0'  48
-   c_traits_base::char_class_digit |   c_traits_base::char_class_xdigit,        // '1'  49
-   c_traits_base::char_class_digit |   c_traits_base::char_class_xdigit,        // '2'  50
-   c_traits_base::char_class_digit |   c_traits_base::char_class_xdigit,        // '3'  51
-   c_traits_base::char_class_digit |   c_traits_base::char_class_xdigit,        // '4'  52
-   c_traits_base::char_class_digit |   c_traits_base::char_class_xdigit,        // '5'  53
-   c_traits_base::char_class_digit |   c_traits_base::char_class_xdigit,        // '6'  54
-   c_traits_base::char_class_digit |   c_traits_base::char_class_xdigit,        // '7'  55
-   c_traits_base::char_class_digit |   c_traits_base::char_class_xdigit,        // '8'  56
-   c_traits_base::char_class_digit |   c_traits_base::char_class_xdigit,        // '9'  57
-   c_traits_base::char_class_punct,        // ':'  58
-   c_traits_base::char_class_punct,        // ';'  59
-   c_traits_base::char_class_punct,        // '<'  60
-   c_traits_base::char_class_punct,        // '='  61
-   c_traits_base::char_class_punct,        // '>'  62
-   c_traits_base::char_class_punct,        // '?'  63
-   c_traits_base::char_class_punct,        // '@'  64
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper | c_traits_base::char_class_xdigit,        // 'A'  65
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper | c_traits_base::char_class_xdigit,        // 'B'  66
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper | c_traits_base::char_class_xdigit,        // 'C'  67
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper | c_traits_base::char_class_xdigit,        // 'D'  68
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper | c_traits_base::char_class_xdigit,        // 'E'  69
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper | c_traits_base::char_class_xdigit,        // 'F'  70
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'G'  71
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'H'  72
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'I'  73
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'J'  74
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'K'  75
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'L'  76
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'M'  77
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'N'  78
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'O'  79
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'P'  80
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'Q'  81
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'R'  82
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'S'  83
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'T'  84
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'U'  85
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'V'  86
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'W'  87
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'X'  88
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'Y'  89
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'Z'  90
-   c_traits_base::char_class_punct,        // '['  91
-   c_traits_base::char_class_punct,        // '\'  92
-   c_traits_base::char_class_punct,        // ']'  93
-   c_traits_base::char_class_punct,        // '^'  94
-   c_traits_base::char_class_punct | c_traits_base::char_class_underscore,        // '_'  95
-   c_traits_base::char_class_punct,        // '`'  96
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower |  c_traits_base::char_class_xdigit,        // 'a'  97
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower |  c_traits_base::char_class_xdigit,        // 'b'  98
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower |  c_traits_base::char_class_xdigit,        // 'c'  99
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower |  c_traits_base::char_class_xdigit,        // 'd'  100
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower |  c_traits_base::char_class_xdigit,        // 'e'  101
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower |  c_traits_base::char_class_xdigit,        // 'f'  102
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'g'  103
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'h'  104
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'i'  105
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'j'  106
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'k'  107
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'l'  108
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'm'  109
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'n'  110
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'o'  111
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'p'  112
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'q'  113
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'r'  114
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 's'  115
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 't'  116
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'u'  117
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'v'  118
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'w'  119
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'x'  120
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'y'  121
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'z'  122
-   c_traits_base::char_class_punct,        // '{'  123
-   c_traits_base::char_class_punct,        // '|'  124
-   c_traits_base::char_class_punct,        // '}'  125
-   c_traits_base::char_class_punct,        // '~'  126
-
-   c_traits_base::char_class_cntrl,        // ''  127
-   c_traits_base::char_class_cntrl,        // '€'  128
-   c_traits_base::char_class_cntrl,        // '�'  129
-   c_traits_base::char_class_cntrl,        // '‚'  130
-   c_traits_base::char_class_cntrl,        // 'ƒ'  131
-   c_traits_base::char_class_cntrl,        // '„'  132
-   c_traits_base::char_class_cntrl,        // '…'  133
-   c_traits_base::char_class_cntrl,        // '†'  134
-   c_traits_base::char_class_cntrl,        // '‡'  135
-   c_traits_base::char_class_cntrl,        // 'ˆ'  136
-   c_traits_base::char_class_cntrl,        // '‰'  137
-   c_traits_base::char_class_cntrl,        // 'Š'  138
-   c_traits_base::char_class_cntrl,        // '‹'  139
-   c_traits_base::char_class_cntrl,        // 'Œ'  140
-   c_traits_base::char_class_cntrl,        // '�'  141
-   c_traits_base::char_class_cntrl,        // 'Ž'  142
-   c_traits_base::char_class_cntrl,        // '�'  143
-   c_traits_base::char_class_cntrl,        // '�'  144
-   c_traits_base::char_class_cntrl,        // '‘'  145
-   c_traits_base::char_class_cntrl,        // '’'  146
-   c_traits_base::char_class_cntrl,        // '“'  147
-   c_traits_base::char_class_cntrl,        // '”'  148
-   c_traits_base::char_class_cntrl,        // '•'  149
-   c_traits_base::char_class_cntrl,        // '–'  150
-   c_traits_base::char_class_cntrl,        // '—'  151
-   c_traits_base::char_class_cntrl,        // '˜'  152
-   c_traits_base::char_class_cntrl,        // '™'  153
-   c_traits_base::char_class_cntrl,        // 'š'  154
-   c_traits_base::char_class_cntrl,        // '›'  155
-   c_traits_base::char_class_cntrl,        // 'œ'  156
-   c_traits_base::char_class_cntrl,        // '�'  157
-   c_traits_base::char_class_cntrl,        // 'ž'  158
-   c_traits_base::char_class_cntrl,        // 'Ÿ'  159
-   c_traits_base::char_class_space | c_traits_base::char_class_blank,        // ' '  160
-   c_traits_base::char_class_punct,        // '¡'  161
-   c_traits_base::char_class_punct,        // '¢'  162
-   c_traits_base::char_class_punct,        // '£'  163
-   c_traits_base::char_class_punct,        // '¤'  164
-   c_traits_base::char_class_punct,        // '¥'  165
-   c_traits_base::char_class_punct,        // '¦'  166
-   c_traits_base::char_class_punct,        // '§'  167
-   c_traits_base::char_class_punct,        // '¨'  168
-   c_traits_base::char_class_punct,        // '©'  169
-   c_traits_base::char_class_punct,        // 'ª'  170
-   c_traits_base::char_class_punct,        // '«'  171
-   c_traits_base::char_class_punct,        // '¬'  172
-   c_traits_base::char_class_punct,        // '­'  173
-   c_traits_base::char_class_punct,        // '®'  174
-   c_traits_base::char_class_punct,        // '¯'  175
-   c_traits_base::char_class_punct,        // '°'  176
-   c_traits_base::char_class_punct,        // '±'  177
-   c_traits_base::char_class_punct,        // '²'  178
-   c_traits_base::char_class_punct,        // '³'  179
-   c_traits_base::char_class_punct,        // '´'  180
-   c_traits_base::char_class_punct,        // 'µ'  181
-   c_traits_base::char_class_punct,        // '¶'  182
-   c_traits_base::char_class_punct,        // '·'  183
-   c_traits_base::char_class_punct,        // '¸'  184
-   c_traits_base::char_class_punct,        // '¹'  185
-   c_traits_base::char_class_punct,        // 'º'  186
-   c_traits_base::char_class_punct,        // '»'  187
-   c_traits_base::char_class_punct,        // '¼'  188
-   c_traits_base::char_class_punct,        // '½'  189
-   c_traits_base::char_class_punct,        // '¾'  190
-   c_traits_base::char_class_punct,        // '¿'  191
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'À'  192
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'Á'  193
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'Â'  194
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'Ã'  195
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'Ä'  196
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'Å'  197
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'Æ'  198
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'Ç'  199
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'È'  200
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'É'  201
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'Ê'  202
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'Ë'  203
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'Ì'  204
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'Í'  205
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'Î'  206
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'Ï'  207
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'Ð'  208
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'Ñ'  209
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'Ò'  210
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'Ó'  211
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'Ô'  212
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'Õ'  213
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'Ö'  214
-   c_traits_base::char_class_punct,        // '×'  215
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'Ø'  216
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'Ù'  217
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'Ú'  218
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'Û'  219
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'Ü'  220
-   c_traits_base::char_class_alpha |   c_traits_base::char_class_upper,        // 'Ý'  221
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_upper,        // 'Þ'  222
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'ß'  223
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'à'  224
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'á'  225
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'â'  226
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'ã'  227
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'ä'  228
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'å'  229
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'æ'  230
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'ç'  231
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'è'  232
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'é'  233
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'ê'  234
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'ë'  235
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'ì'  236
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'í'  237
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'î'  238
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'ï'  239
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'ð'  240
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'ñ'  241
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'ò'  242
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'ó'  243
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'ô'  244
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'õ'  245
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'ö'  246
-   c_traits_base::char_class_punct,        // '÷'  247
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'ø'  248
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'ù'  249
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'ú'  250
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'û'  251
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'ü'  252
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'ý'  253
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'þ'  254
-   c_traits_base::char_class_alpha |  c_traits_base::char_class_lower,        // 'ÿ'  255
-};
-
-BOOST_REGEX_DECL regex_wchar_type wide_lower_case_map[] = {
-   0x0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf,
-   0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 
-   0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 
-   0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 
-   0x40, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 
-   0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 
-   0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 
-   0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 
-   0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 
-   0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 
-   0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 
-   0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 
-   0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 
-   0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xd7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xdf, 
-   0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 
-   0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff, 
-};
-#endif // BOOST_NO_WREGEX
-
-   } // namespace re_detail
-} // namespace boost
-
-
-
-
diff --git a/src/cpp_regex_traits.cpp b/src/cpp_regex_traits.cpp
index 24b9e10e..7ed0be7d 100644
--- a/src/cpp_regex_traits.cpp
+++ b/src/cpp_regex_traits.cpp
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 1998-2002
+ * Copyright (c) 2004
  * Dr John Maddock
  *
  * Use, modification and distribution are subject to the 
@@ -11,897 +11,103 @@
  
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
-  *   FILE:        c_regex_traits.cpp
-  *   VERSION:     see <boost/version.hpp>
-  *   DESCRIPTION: Implements the cpp_regex_traits<charT> traits class
+  *   FILE         cpp_regex_traits.cpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Implements cpp_regex_traits<char> (and associated helper classes).
   */
 
-
 #define BOOST_REGEX_SOURCE
+#include <boost/config.hpp>
+#ifndef BOOST_NO_STD_LOCALE
+#include <boost/regex/regex_traits.hpp>
+#include <boost/regex/pattern_except.hpp>
 
-#include <boost/regex/config.hpp>
-
-#if defined(BOOST_REGEX_HAS_SHORT_WCHAR_T) && !defined(_NATIVE_WCHAR_T_DEFINED)
-#  pragma message ("disabling support for class cpp_regex_traits<wchar_t> - rebuild with /Zc:wchar_t if you really need this")
-#  define BOOST_NO_WREGEX
+#ifdef BOOST_NO_STDC_NAMESPACE
+namespace std{
+   using ::memset;
+}
 #endif
 
-#if !defined(BOOST_NO_STD_LOCALE)
+namespace boost{ namespace re_detail{
 
-# ifdef BOOST_MSVC
-#  pragma warning(disable:4786 4702 4127 4244)
-#  endif
-
-#include <clocale>
-#include <locale>
-#include <cstdio>
-#include <list>
-#include <cctype>
-#include <ios>
-#include <iostream>
-#include <map>
-#include <boost/regex/regex_traits.hpp>
-#include <boost/cregex.hpp>
-#include <boost/scoped_array.hpp>
-#include "primary_transform.hpp"
-
-# ifdef BOOST_MSVC
-#  pragma warning(disable:4786 4702 4127 4244)
-#  endif
-
-namespace{
-   const unsigned int re_classes_max = 14;
-   const unsigned int char_set_size = CHAR_MAX - CHAR_MIN + 1;
-
-boost::uint_fast32_t re_char_class_id[] = {
-   boost::re_detail::cpp_regex_traits_base::char_class_alnum,
-   boost::re_detail::cpp_regex_traits_base::char_class_alpha,
-   boost::re_detail::cpp_regex_traits_base::char_class_cntrl,
-   boost::re_detail::cpp_regex_traits_base::char_class_digit,
-   boost::re_detail::cpp_regex_traits_base::char_class_graph,
-   boost::re_detail::cpp_regex_traits_base::char_class_lower,
-   boost::re_detail::cpp_regex_traits_base::char_class_print,
-   boost::re_detail::cpp_regex_traits_base::char_class_punct,
-   boost::re_detail::cpp_regex_traits_base::char_class_space,
-   boost::re_detail::cpp_regex_traits_base::char_class_upper,
-   boost::re_detail::cpp_regex_traits_base::char_class_xdigit,
-   boost::re_detail::cpp_regex_traits_base::char_class_blank,
-   boost::re_detail::cpp_regex_traits_base::char_class_word,
-   boost::re_detail::cpp_regex_traits_base::char_class_unicode,
-};
-
-const char* re_char_class_names[] = {
-"alnum",
-"alpha",
-"cntrl",
-"digit",
-"graph",
-"lower",
-"print",
-"punct",
-"space",
-"upper",
-"xdigit",
-"blank",
-"word",
-"unicode",
-};
-
-template <class charT,
-          class traits = ::std::char_traits<charT> >
-class parser_buf : public ::std::basic_streambuf<charT, traits>
+void cpp_regex_traits_char_layer<char>::init() 
 {
-   typedef ::std::basic_streambuf<charT, traits> base_type;
-   typedef typename base_type::int_type int_type;
-   typedef typename base_type::char_type char_type;
-   typedef typename base_type::pos_type pos_type;
-   typedef ::std::streamsize streamsize;
-   typedef typename base_type::off_type off_type;
-public:
-   parser_buf() : base_type() { setbuf(0, 0); }
-   const charT* getnext() { return this->gptr(); }
-protected:
-   std::basic_streambuf<charT, traits>* setbuf(char_type* s, streamsize n);
-   typename parser_buf<charT, traits>::pos_type seekpos(pos_type sp, ::std::ios_base::openmode which);
-   typename parser_buf<charT, traits>::pos_type seekoff(off_type off, ::std::ios_base::seekdir way, ::std::ios_base::openmode which);
-private:
-   parser_buf& operator=(const parser_buf&);
-   parser_buf(const parser_buf&);
-};
-
-template<class charT, class traits>
-std::basic_streambuf<charT, traits>*
-parser_buf<charT, traits>::setbuf(char_type* s, streamsize n)
-{
-   this->setg(s, s, s + n);
-   return this;
-}
-
-template<class charT, class traits>
-typename parser_buf<charT, traits>::pos_type
-parser_buf<charT, traits>::seekoff(off_type off, ::std::ios_base::seekdir way, ::std::ios_base::openmode which)
-{
-   if(which & ::std::ios_base::out)
-      return pos_type(off_type(-1));
-   std::ptrdiff_t size = this->egptr() - this->eback();
-   std::ptrdiff_t pos = this->gptr() - this->eback();
-   charT* g = this->eback();
-   switch(way)
-   {
-   case ::std::ios_base::beg:
-      if((off < 0) || (off > size))
-         return pos_type(off_type(-1));
-      else
-         this->setg(g, g + off, g + size);
-      break;
-   case ::std::ios_base::end:
-      if((off < 0) || (off > size))
-         return pos_type(off_type(-1));
-      else
-         this->setg(g, g + size - off, g + size);
-      break;
-   case ::std::ios_base::cur:
-   {
-      std::ptrdiff_t newpos = pos + off;
-      if((newpos < 0) || (newpos > size))
-         return pos_type(off_type(-1));
-      else
-         this->setg(g, g + newpos, g + size);
-      break;
-   }
-   default: ;
-   }
-   return static_cast<pos_type>(this->gptr() - this->eback());
-}
-
-template<class charT, class traits>
-typename parser_buf<charT, traits>::pos_type
-parser_buf<charT, traits>::seekpos(pos_type sp, ::std::ios_base::openmode which)
-{
-   if(which & ::std::ios_base::out)
-      return pos_type(off_type(-1));
-   off_type size = this->egptr() - this->eback();
-   charT* g = this->eback();
-   if(off_type(sp) <= size)
-   {
-      this->setg(g, g + off_type(sp), g + size);
-   }
-   return pos_type(off_type(-1));
-}
-
-
-} // namespace
-
-namespace boost{
-   namespace re_detail{
-
-template <>
-struct message_data<char>
-{
-   unsigned char syntax_map[CHAR_MAX-CHAR_MIN];
-   std::map<std::string, std::string, std::less<std::string> > collating_elements;
-   std::map<std::string, std::size_t, std::less<std::string> > classes;
-   //std::string _zero;
-   //std::string _ten;
-   parser_buf<char> sbuf;
-   std::istream is;
-   std::string error_strings[boost::REG_E_UNKNOWN+1];
-
-   message_data(const std::locale& l, std::string regex_message_catalogue);
-private:
-   message_data(const message_data&);
-   message_data& operator=(const message_data&);
-};
-
-
-message_data<char>::message_data(const std::locale& l, std::string regex_message_catalogue)
-   : is(&sbuf)
-{
-   is.imbue(l);
+   // we need to start by initialising our syntax map so we know which
+   // character is used for which purpose:
+   std::memset(m_char_map, 0, sizeof(m_char_map));
 #ifndef BOOST_NO_STD_MESSAGES
-
-   const std::messages<char>* pm = 0;
 #ifndef __IBMCPP__
    std::messages<char>::catalog cat = static_cast<std::messages<char>::catalog>(-1);
 #else
    std::messages<char>::catalog cat = reinterpret_cast<std::messages<char>::catalog>(-1);
 #endif
-   if(regex_message_catalogue.size())
+   std::string cat_name(cpp_regex_traits<char>::get_catalog_name());
+   if(cat_name.size())
    {
-      pm = &BOOST_USE_FACET(std::messages<char>, l);
-      cat = pm->open(regex_message_catalogue, l);
-      if(cat < 0)
+      cat = this->m_pmessages->open(
+         cat_name, 
+         this->m_locale);
+      if((int)cat < 0)
       {
          std::string m("Unable to open message catalog: ");
-         std::runtime_error err(m + regex_message_catalogue);
-         boost::throw_exception(err);
-      }
-   } 
-#endif
-   std::memset(syntax_map, cpp_regex_traits<char>::syntax_char, 256);
-   unsigned i;
-   scoped_array<char> a;
-   std::size_t array_size = 0;
-   std::size_t new_size;
-   for(i = 1; i < cpp_regex_traits<char>::syntax_max; ++i)
-   {
-      new_size = re_get_default_message(0, 0, i+100);
-      if(new_size > array_size)
-      {
-         a.reset(new char[new_size]);
-         array_size = new_size;
-      }
-      re_get_default_message(a.get(), array_size, i+100);
-      std::string s = a.get();
-#ifndef BOOST_NO_STD_MESSAGES
-      if((int)cat >= 0)
-         s = pm->get(cat, 0, i+100, s);
-#endif
-      for(std::size_t j = 0; j < s.size(); ++j)
-      {
-         syntax_map[(unsigned char)s[j]] = (unsigned char)(i);
+         std::runtime_error err(m + cat_name);
+         boost::re_detail::raise_runtime_error(err);
       }
    }
-
-#ifndef BOOST_NO_STD_MESSAGES
-   // load any custom collate names:
    //
-   // for some reason Borland C++ Builder 6 won't let us use
-   // std::isspace(char, std::locale) unless we call it
-   // unqualifed - weird.  This seems to be affecting other
-   // STLport users as well (gcc3.1+STLport5), so enable the
-   // workaround for all STLport users...
+   // if we have a valid catalog then load our messages:
    //
-#if (defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)) && !defined(BOOST_MSVC)
-   using namespace std;
-   using stlport::isspace;
-#  define BOOST_REGEX_STD
-#else
-#  define BOOST_REGEX_STD std::
-#endif
-
-   std::string c1, c2;
-   i = 400;
    if((int)cat >= 0)
    {
-      c2 = pm->get(cat, 0, i, c1);
-      while(c2.size())
-      {
-         const char* p1, *p2, *p3, *p4;;
-         p1 = c2.c_str();
-         while(*p1 && BOOST_REGEX_STD isspace((char)*p1, l))++p1;
-         p2 = p1;
-         while(*p2 && !BOOST_REGEX_STD isspace((char)*p2, l))++p2;
-         p3 = p2;
-         while(*p3 && BOOST_REGEX_STD isspace((char)*p3, l))++p3;
-         p4 = p3;
-         while(*p4 && !BOOST_REGEX_STD isspace((char)*p4, l))++p4;
-         collating_elements[std::string(p1, p2)] = std::string(p3, p4);
-
-         ++i;
-         c2 = pm->get(cat, 0, i, c1);
+      try{
+         for(regex_constants::syntax_type i = 1; i < regex_constants::syntax_max; ++i)
+         {
+            string_type mss = this->m_pmessages->get(cat, 0, i, get_default_syntax(i));
+            for(string_type::size_type j = 0; j < mss.size(); ++j)
+            {
+               m_char_map[static_cast<unsigned char>(mss[j])] = i;
+            }
+         }
+         this->m_pmessages->close(cat);
       }
-   }
-#endif
-   std::string m;
-   std::string s;
-#ifndef BOOST_NO_STD_MESSAGES
-   if((int)cat >= 0)
-   {
-      for(i = 0; i < re_classes_max; ++i)
+      catch(...)
       {
-         s = pm->get(cat, 0, i+300, m);
-         if(s.size())
-            classes[s] = i;
+         this->m_pmessages->close(cat);
+         throw;
       }
-      for(i = 0; i <= boost::REG_E_UNKNOWN ; ++i)
-      {
-         s = pm->get(cat, 0, i+200, m);
-         error_strings[i] = s;
-      }
-   }
-
-   if((int)cat >= 0)
-      pm->close(cat);
-#endif
-}
-
-std::string BOOST_REGEX_CALL cpp_regex_traits_base::set_message_catalogue(const std::string& l)
-{
-   if(sizeof(regex_message_cat) <= l.size())
-      return l;
-   std::string old(regex_message_cat);
-   std::strcpy(regex_message_cat, l.c_str());
-   return old;
-}
-
-char cpp_regex_traits_base::regex_message_cat[BOOST_REGEX_MAX_PATH] = {0};
-
-
-} // namespace re_detail
-
-
-cpp_regex_traits<char>::cpp_regex_traits()
-{
-   pmd = new re_detail::message_data<char>(locale_inst, regex_message_cat);
-   psyntax = pmd->syntax_map;
-#ifndef BOOST_NO_EXCEPTIONS
-   try{
-#endif
-      lower_map = new char[char_set_size];
-      BOOST_REGEX_NOEH_ASSERT(lower_map)
-#ifndef BOOST_NO_EXCEPTIONS
-   }
-   catch(...)
-   {
-      delete pmd;
-      throw;
-   }
-#endif
-   for(unsigned int i = 0; i < char_set_size; ++i)
-      lower_map[i] = static_cast<char>(i);
-   pctype = &BOOST_USE_FACET(std::ctype<char>, locale_inst);
-   pctype->tolower(&lower_map[0], &lower_map[char_set_size]);
-   pcollate = &BOOST_USE_FACET(std::collate<char>, locale_inst);
-   sort_type = re_detail::find_sort_syntax(this, &(this->sort_delim));
-}
-
-void cpp_regex_traits<char>::swap(cpp_regex_traits<char>& that)
-{
-   std::swap(locale_inst, that.locale_inst); // this one goes first
-   std::swap(pmd, that.pmd);
-   std::swap(psyntax, that.psyntax);
-   std::swap(lower_map, that.lower_map);
-   std::swap(pctype, that.pctype);
-   std::swap(pcollate, that.pcollate);
-   std::swap(sort_type, that.sort_type);
-   std::swap(sort_delim, that.sort_delim);
-}
-
-cpp_regex_traits<char>::~cpp_regex_traits()
-{
-   delete pmd;
-   delete[] lower_map;
-}
-
-int BOOST_REGEX_CALL cpp_regex_traits<char>::toi(char c)const
-{
-   pmd->sbuf.pubsetbuf(&c, 1);
-   pmd->is.clear();
-   pmd->is >> std::dec;
-   int val;
-   if(pmd->is >> val)
-   {
-      return val;
    }
    else
-      return 0;
-}
-
-int BOOST_REGEX_CALL cpp_regex_traits<char>::toi(const char*& first, const char* last, int radix)const
-{
-   pmd->sbuf.pubsetbuf(const_cast<char*>(static_cast<const char*>(first)), static_cast<std::streamsize>(last-first));
-   pmd->is.clear();
-   if(std::abs(radix) == 16) pmd->is >> std::hex;
-   else if(std::abs(radix) == 8) pmd->is >> std::oct;
-   else pmd->is >> std::dec;
-   int val;
-   if(pmd->is >> val)
    {
-      first = first + ((last - first) - pmd->sbuf.in_avail());
-      return val;
-   }
-   else
-      return 0;
-}
-
-boost::uint_fast32_t BOOST_REGEX_CALL cpp_regex_traits<char>::lookup_classname(const char* first, const char* last)const
-{
-   BOOST_RE_GUARD_STACK
-   unsigned int i;
-   std::string s(first, last);
-
-   std::map<std::string, std::size_t, std::less<std::string> >::const_iterator pos = pmd->classes.find(s);
-   if(pos != pmd->classes.end())
-      return re_char_class_id[(*pos).second];
-
-   for(i = 0; i < re_classes_max; ++i)
-   {
-      if(s == re_char_class_names[i])
-         return re_char_class_id[i];
-   }
-   return 0;
-}
-
-bool BOOST_REGEX_CALL cpp_regex_traits<char>::lookup_collatename(std::string& s, const char* first, const char* last)const
-{
-   BOOST_RE_GUARD_STACK
-   std::string name(first, last);
-   std::map<std::string, std::string, std::less<std::string > >::const_iterator pos = pmd->collating_elements.find(name);
-   if(pos != pmd->collating_elements.end())
-   {
-      s = (*pos).second;
-      return true;
-   }
-   return re_detail::re_lookup_def_collate_name(s, name.c_str());
-}
-
-void BOOST_REGEX_CALL cpp_regex_traits<char>::transform_primary(std::string& out, const std::string& in)const
-{
-   transform(out, in);
-   switch(sort_type)
-   {
-   case re_detail::sort_C:
-   case re_detail::sort_unknown:
-      break;
-   case re_detail::sort_fixed:
-      if((unsigned)sort_delim < out.size())
-         out.erase((int)sort_delim);
-      break;
-   case re_detail::sort_delim:
-      for(unsigned int i = 0; i < out.size(); ++i)
+#endif
+      for(regex_constants::syntax_type i = 1; i < regex_constants::syntax_max; ++i)
       {
-         if((out[i] == sort_delim) && (i+1 < out.size()))
+         const char* ptr = get_default_syntax(i);
+         while(ptr && *ptr)
          {
-            out.erase(i+1);
-            break;
+            m_char_map[static_cast<unsigned char>(*ptr)] = i;
+            ++ptr;
          }
       }
+#ifndef BOOST_NO_STD_MESSAGES
    }
-}
-
-
-std::string BOOST_REGEX_CALL cpp_regex_traits<char>::error_string(unsigned id)const
-{
-   if((id <= boost::REG_E_UNKNOWN) && (pmd->error_strings[id].size()))
-      return pmd->error_strings[id];
-   return boost::re_detail::re_default_error_messages[id];
-}
-
-cpp_regex_traits<char>::locale_type BOOST_REGEX_CALL cpp_regex_traits<char>::imbue(locale_type l)
-{
-   locale_type old_l(locale_inst);
-   locale_inst = l;
-   re_detail::message_data<char>* npmd = new re_detail::message_data<char>(locale_inst, regex_message_cat);
-   delete pmd;
-   pmd = npmd;
-   psyntax = pmd->syntax_map;
-   for(unsigned int i = 0; i < char_set_size; ++i)
-      lower_map[i] = static_cast<char>(i);
-   pctype = &BOOST_USE_FACET(std::ctype<char>, locale_inst);
-   pctype->tolower(&lower_map[0], &lower_map[char_set_size]);
-   pcollate = &BOOST_USE_FACET(std::collate<char>, locale_inst);
-   sort_type = re_detail::find_sort_syntax(this, &(this->sort_delim));
-   return old_l;
-}
-
-#if !defined(BOOST_NO_WREGEX) && !defined(BOOST_NO_STD_WSTREAMBUF)
-
-namespace re_detail{
-
-std::string BOOST_REGEX_CALL to_narrow(const std::basic_string<wchar_t>& is, const std::codecvt<wchar_t, char, std::mbstate_t>& cvt)
-{
-   BOOST_RE_GUARD_STACK
-   std::basic_string<wchar_t>::size_type bufsize = is.size() * 2;
+#endif
    //
-   // declare buffer first as VC6 workaround for internal compiler error!
-   char* pc = new char[bufsize];
-   scoped_array<char> t(pc);
-   #if defined(BOOST_MSVC) && !defined(DINKUMWARE_CE)
-   std::mbstate_t state = 0;
-   #else
-   std::mbstate_t state = std::mbstate_t();
-   #endif
-
-   const wchar_t* next_in;
-   char* next_out;
-   while(true)
-   {
-      switch(cvt.out(state, is.c_str(), is.c_str() + is.size(), next_in, t.get(), t.get() + bufsize, next_out))
-      {
-      case std::codecvt_base::ok:
-         return std::string(t.get(), next_out);
-      case std::codecvt_base::partial:
-         bufsize *= 2;
-         t.reset(new char[bufsize]);
-         continue;
-      case std::codecvt_base::error:
-         // not much we can do here but guess:
-      case std::codecvt_base::noconv:
-         std::string out;
-         for(unsigned i = 0; i < is.size(); ++i)
-         {
-            out.append(1, (char)is[i]);
-         }
-         return out;
-      }
-   }
-}
-
-std::wstring BOOST_REGEX_CALL to_wide(const std::string& is, const std::codecvt<wchar_t, char, std::mbstate_t>& cvt)
-{
-   BOOST_RE_GUARD_STACK
-   std::string::size_type bufsize = is.size() + 2;
-   std::string::size_type maxsize = is.size() * 100;
+   // finish off by calculating our escape types:
    //
-   // declare buffer first as VC6 workaround for internal compiler error!
-   wchar_t* pc = new wchar_t[bufsize];
-   scoped_array<wchar_t> t(pc);
-   #if defined(BOOST_MSVC) && !defined(DINKUMWARE_CE)
-   std::mbstate_t state = 0;
-   #else
-   std::mbstate_t state = std::mbstate_t();
-   #endif
-
-
-   wchar_t* next_out;
-   const char* next_in;
-   while(true)
+   unsigned char i = 'A';
+   do
    {
-      switch(cvt.in(state, is.c_str(), is.c_str() + is.size(), next_in, t.get(), t.get() + bufsize, next_out))
+      if(m_char_map[i] == 0)
       {
-      case std::codecvt_base::ok:
-         return std::wstring(t.get(), next_out);
-      case std::codecvt_base::partial:
-         bufsize *= 2;
-         if(bufsize < maxsize)
-         {
-            t.reset(new wchar_t[bufsize]);
-            continue;
-         }
-         //
-         // error fall through:
-      case std::codecvt_base::error:
-         // not much we can do here but guess:
-      case std::codecvt_base::noconv:
-         std::wstring out;
-         for(unsigned i = 0; i < is.size(); ++i)
-         {
-            out.append(1, is[i]);
-         }
-         return out;
+         if(this->m_pctype->is(std::ctype_base::lower, i)) 
+            m_char_map[i] = regex_constants::escape_type_class;
+         else if(this->m_pctype->is(std::ctype_base::upper, i)) 
+            m_char_map[i] = regex_constants::escape_type_not_class;
       }
-   }
+   }while(0xFF != i++);
 }
 
-
-
-template <>
-struct message_data<wchar_t>
-{
-#ifndef BOOST_NO_STD_MESSAGES
-   typedef std::messages<wchar_t>::string_type string_type;
-#else
-   typedef std::wstring string_type;
+} // re_detail
+} // boost
 #endif
 
-   string_type name;
-
-   struct syntax_map
-   {
-      wchar_t c;
-      unsigned int type;
-   };
-
-   std::list<syntax_map> syntax;
-   std::map<string_type, std::size_t> classes;
-   std::map<string_type, string_type> collating_elements;
-   unsigned char syntax_[CHAR_MAX-CHAR_MIN+1];
-
-   parser_buf<wchar_t> sbuf;
-   std::wistream is;
-   std::string error_strings[boost::REG_E_UNKNOWN+1];
-
-   message_data(const std::locale& l, const std::string& regex_message_catalogue);
-private:
-   message_data(const message_data&);
-   message_data& operator=(const message_data&);
-};
-
-message_data<wchar_t>::message_data(const std::locale& l, const std::string& regex_message_catalogue)
-   : is(&sbuf)
-{
-   is.imbue(l);
-   syntax_map m;
-   typedef std::codecvt<wchar_t, char, std::mbstate_t> cvt_type;
-   const cvt_type& cvt = BOOST_USE_FACET(cvt_type, l);
-#ifndef BOOST_NO_STD_MESSAGES
-   const std::messages<wchar_t>& msgs = BOOST_USE_FACET(std::messages<wchar_t>, l);
-#ifndef __IBMCPP__
-   std::messages<wchar_t>::catalog cat = static_cast<std::messages<wchar_t>::catalog>(-1);
-#else
-   std::messages<wchar_t>::catalog cat = reinterpret_cast<std::messages<wchar_t>::catalog>(-1);
-#endif
-   if(regex_message_catalogue.size())
-   {
-      cat = msgs.open(regex_message_catalogue, l);
-      if(cat < 0)
-      {
-         std::string mess("Unable to open message catalog: ");
-         std::runtime_error err(mess + regex_message_catalogue);
-         boost::throw_exception(err);
-      }
-   }
-#endif
-   scoped_array<char> a;
-   std::size_t array_size = 0;
-   std::size_t new_size;
-   std::size_t i;
-   std::memset(syntax_, cpp_regex_traits<wchar_t>::syntax_char, sizeof(syntax_));
-   for(i = 1; i < cpp_regex_traits<wchar_t>::syntax_max; ++i)
-   {
-      new_size = re_get_default_message(0, 0, i+100);
-      if(new_size > array_size)
-      {
-         a.reset(new char[new_size]);
-         array_size = new_size;
-      }
-      re_get_default_message(a.get(), array_size, i+100);
-      std::string ns = a.get();
-      string_type s = to_wide(ns, cvt);
-#ifndef BOOST_NO_STD_MESSAGES
-      if((int)cat >= 0)
-         s = BOOST_USE_FACET(std::messages<wchar_t>, l).get(cat, 0, (int)i+100, s);
-#endif
-      for(unsigned int j = 0; j < s.size(); ++j)
-      {
-#if defined(WCHAR_MIN) && (WCHAR_MIN == 0)
-         if(s[j] <= UCHAR_MAX)
-#else
-         if((s[j] <= UCHAR_MAX) && (s[j] >= 0))
-#endif
-            syntax_[s[j]] = static_cast<unsigned char>(i);
-         else
-         {
-            m.c = s[j];
-            m.type = static_cast<unsigned int>(i);
-            syntax.push_back(m);
-         }
-      }
-   }
-
-#ifndef BOOST_NO_STD_MESSAGES
-   // load any custom collate names:
-   string_type c1, c2;
-   i = 400;
-   if((int)cat >= 0)
-   {
-      c2 = msgs.get(cat, 0, (int)i, c1);
-      while(c2.size())
-      {
-         const wchar_t* p1, *p2, *p3, *p4;;
-         p1 = c2.c_str();
-         while(*p1 && BOOST_REGEX_STD isspace((wchar_t)*p1, l))++p1;
-         p2 = p1;
-         while(*p2 && !BOOST_REGEX_STD isspace((wchar_t)*p2, l))++p2;
-         p3 = p2;
-         while(*p3 && BOOST_REGEX_STD isspace((wchar_t)*p3, l))++p3;
-         p4 = p3;
-         while(*p4 && !BOOST_REGEX_STD isspace((wchar_t)*p4, l))++p4;
-         collating_elements[std::basic_string<wchar_t>(p1, p2)] = std::basic_string<wchar_t>(p3, p4);
-
-         ++i;
-         c2 = msgs.get(cat, 0, (int)i, c1);
-      }
-   }
-
-   if((int)cat >= 0)
-   {
-      c2.erase();
-      for(i = 0; i < re_classes_max; ++i)
-      {
-         c1 = msgs.get(cat, 0, static_cast<int>(i+300), c2);
-         if(c1.size())
-            classes[c1] = i;
-      }
-      for(i = 0; i <= boost::REG_E_UNKNOWN ; ++i)
-      {
-         c1 = msgs.get(cat, 0, static_cast<int>(i+200), c2);
-         error_strings[i] = to_narrow(c1, cvt);
-      }
-   }
-
-   if((int)cat >= 0)
-      msgs.close(cat);
-#endif      
-}
-
-} // namespace re_detail
-
-unsigned int BOOST_REGEX_CALL cpp_regex_traits<wchar_t>::do_syntax_type(size_type c)const
-{
-   std::list<re_detail::message_data<wchar_t>::syntax_map>::const_iterator i, j;
-   i = pmd->syntax.begin();
-   j = pmd->syntax.end();
-   while(i != j)
-   {
-      if(((uchar_type)(*i).c) == c)
-         return (*i).type;
-      ++i;
-   }
-   return 0;
-}
-
-void BOOST_REGEX_CALL cpp_regex_traits<wchar_t>::transform_primary(std::basic_string<wchar_t>& out, const std::basic_string<wchar_t>& in)const
-{
-   transform(out, in);
-   switch(sort_type)
-   {
-   case re_detail::sort_C:
-   case re_detail::sort_unknown:
-      break;
-   case re_detail::sort_fixed:
-      if((unsigned)sort_delim < out.size())
-         out.erase((int)sort_delim);
-      break;
-   case re_detail::sort_delim:
-      for(unsigned int i = 0; i < out.size(); ++i)
-      {
-         if((out[i] == sort_delim) && (i+1 < out.size()))
-         {
-            out.erase(i+1);
-            break;
-         }
-      }
-   }
-}
-
-int BOOST_REGEX_CALL cpp_regex_traits<wchar_t>::toi(wchar_t c)const
-{
-   pmd->sbuf.pubsetbuf(&c, 1);
-   pmd->is.clear();
-   pmd->is >> std::dec;
-   int val;
-   if(pmd->is >> val)
-   {
-      return val;
-   }
-   else
-      return 0;
-}
-
-int BOOST_REGEX_CALL cpp_regex_traits<wchar_t>::toi(const wchar_t*& first, const wchar_t* last, int radix)const
-{
-   pmd->sbuf.pubsetbuf(const_cast<wchar_t*>(first), static_cast<std::streamsize>(last-first));
-   pmd->is.clear();
-   if(std::abs(radix) == 16) pmd->is >> std::hex;
-   else if(std::abs(radix) == 8) pmd->is >> std::oct;
-   else pmd->is >> std::dec;
-   int val;
-   if(pmd->is >> val)
-   {
-      first = first + ((last - first) - pmd->sbuf.in_avail());
-      return val;
-   }
-   else
-      return 0;
-}
-
-boost::uint_fast32_t BOOST_REGEX_CALL cpp_regex_traits<wchar_t>::lookup_classname(const wchar_t* first, const wchar_t* last)const
-{
-   BOOST_RE_GUARD_STACK
-   unsigned int i;
-   std::wstring s(first, last);
-
-   std::map<std::wstring, std::size_t>::const_iterator pos = pmd->classes.find(s);
-   if(pos != pmd->classes.end())
-      return re_char_class_id[(*pos).second];
-
-   std::string ns = re_detail::to_narrow(s, *pcdv);
-
-   for(i = 0; i < re_classes_max; ++i)
-   {
-      if(ns == re_char_class_names[i])
-         return re_char_class_id[i];
-   }
-   return 0;
-}
-
-bool BOOST_REGEX_CALL cpp_regex_traits<wchar_t>::lookup_collatename(std::basic_string<wchar_t>& s, const wchar_t* first, const wchar_t* last)const
-{
-   BOOST_RE_GUARD_STACK
-   std::wstring name(first, last);
-   std::map<std::wstring, std::wstring>::const_iterator pos = pmd->collating_elements.find(name);
-   if(pos != pmd->collating_elements.end())
-   {
-      s = (*pos).second;
-      return true;
-   }
-   std::string ns = re_detail::to_narrow(name, *pcdv);
-   std::string ns2;
-   bool result = re_detail::re_lookup_def_collate_name(ns2, ns.c_str());
-   s = re_detail::to_wide(ns2, *pcdv);
-   return result;
-}
-
-std::string BOOST_REGEX_CALL cpp_regex_traits<wchar_t>::error_string(unsigned id)const
-{
-   if((id <= boost::REG_E_UNKNOWN) && (pmd->error_strings[id].size()))
-      return pmd->error_strings[id];
-   return boost::re_detail::re_default_error_messages[id];
-}
-
-cpp_regex_traits<wchar_t>::cpp_regex_traits()
-{
-   pmd = new re_detail::message_data<wchar_t>(locale_inst, std::string(regex_message_cat));
-   psyntax = pmd->syntax_;
-#ifndef BOOST_NO_EXCEPTIONS
-   try{
-#endif
-      lower_map = new wchar_t[char_set_size];
-      BOOST_REGEX_NOEH_ASSERT(lower_map)
-#ifndef BOOST_NO_EXCEPTIONS
-   }
-   catch(...)
-   {
-      delete pmd;
-      throw;
-   }
-#endif
-   for(unsigned int i = 0; i < char_set_size; ++i)
-      lower_map[i] = static_cast<wchar_t>(i);
-   pctype = &BOOST_USE_FACET(std::ctype<wchar_t>, locale_inst);
-   pctype->tolower(&lower_map[0], &lower_map[char_set_size]);
-   pcollate = &BOOST_USE_FACET(std::collate<wchar_t>, locale_inst);
-   typedef std::codecvt<wchar_t, char, std::mbstate_t> cvt_t;
-   pcdv = &BOOST_USE_FACET(cvt_t, locale_inst);
-   sort_type = re_detail::find_sort_syntax(this, &(this->sort_delim));
-}
-
-cpp_regex_traits<wchar_t>::~cpp_regex_traits()
-{
-   delete pmd;
-   delete[] lower_map;
-}
-
-cpp_regex_traits<wchar_t>::locale_type BOOST_REGEX_CALL cpp_regex_traits<wchar_t>::imbue(locale_type l)
-{
-   locale_type old_l(locale_inst);
-   locale_inst = l;
-   re_detail::message_data<wchar_t>* npmd = new re_detail::message_data<wchar_t>(locale_inst, std::string(regex_message_cat));
-   delete pmd;
-   pmd = npmd;
-   psyntax = pmd->syntax_;
-   for(unsigned int i = 0; i < char_set_size; ++i)
-      lower_map[i] = static_cast<wchar_t>(i);
-   pctype = &BOOST_USE_FACET(std::ctype<wchar_t>, locale_inst);
-   pctype->tolower(&lower_map[0], &lower_map[char_set_size]);
-   pcollate = &BOOST_USE_FACET(std::collate<wchar_t>, locale_inst);
-   typedef std::codecvt<wchar_t, char, std::mbstate_t> cvt_t;
-   pcdv = &BOOST_USE_FACET(cvt_t, locale_inst);
-   sort_type = re_detail::find_sort_syntax(this, &(this->sort_delim));
-   return old_l;
-}
-
-std::size_t BOOST_REGEX_CALL cpp_regex_traits<wchar_t>::strwiden(wchar_t *s1, std::size_t len, const char *s2)const
-{
-   std::string s(s2);
-   std::wstring ws = re_detail::to_wide(s2, *pcdv);
-   if(len > ws.size())
-      std::wcscpy(s1, ws.c_str());
-   return ws.size()+1;
-}
-
-void cpp_regex_traits<wchar_t>::swap(cpp_regex_traits<wchar_t>& that)
-{
-   std::swap(locale_inst, that.locale_inst); // this one must go first
-   std::swap(pmd, that.pmd);
-   std::swap(psyntax, that.psyntax);
-   std::swap(lower_map, that.lower_map);
-   std::swap(pctype, that.pctype);
-   std::swap(pcollate, that.pcollate);
-   std::swap(pcdv, that.pcdv);
-   std::swap(sort_type, that.sort_type);
-   std::swap(sort_delim, that.sort_delim);
-}
-
-#endif // BOOST_NO_WREGEX
-
-
-} // namespace boost
-
-#endif
-
-
-
-
diff --git a/src/cregex.cpp b/src/cregex.cpp
index ef259946..71b3943e 100644
--- a/src/cregex.cpp
+++ b/src/cregex.cpp
@@ -21,9 +21,6 @@
 
 #include <boost/cregex.hpp>
 #include <boost/regex.hpp>
-#ifndef BOOST_NO_INCLASS_MEMBER_INITIALIZATION
-#  include <boost/integer_traits.hpp>
-#endif
 #if !defined(BOOST_NO_STD_STRING)
 #include <map>
 #include <list>
@@ -36,6 +33,12 @@ typedef boost::match_flag_type match_flag_type;
 #endif
 #include <cstdio>
 
+#if defined(BOOST_NO_STDC_NAMESPACE)
+namespace std{
+   using ::sprintf; using ::strcpy; using ::strcat;
+}
+#endif
+
 namespace boost{
 
 #ifdef __BORLANDC__
@@ -54,7 +57,6 @@ namespace{
 template <class iterator>
 std::string to_string(iterator i, iterator j)
 {
-   BOOST_RE_GUARD_STACK
    std::string s;
    while(i != j)
    {
@@ -108,7 +110,6 @@ public:
 
 void RegExData::update()
 {
-   BOOST_RE_GUARD_STACK
    strings.erase(strings.begin(), strings.end());
    positions.erase(positions.begin(), positions.end());
    if(t == type_pc)
@@ -116,7 +117,7 @@ void RegExData::update()
       for(unsigned int i = 0; i < m.size(); ++i)
       {
          if(m[i].matched) strings[i] = std::string(m[i].first, m[i].second);
-         positions[i] = m[i].matched ? m[i].first - pbase : RegEx::npos;
+         positions[i] = m[i].matched ? m[i].first - pbase : -1;
       }
    }
 #ifndef BOOST_REGEX_NO_FILEITER
@@ -125,7 +126,7 @@ void RegExData::update()
       for(unsigned int i = 0; i < fm.size(); ++i)
       {
          if(fm[i].matched) strings[i] = to_string(fm[i].first, fm[i].second);
-         positions[i] = fm[i].matched ? fm[i].first - fbase : RegEx::npos;
+         positions[i] = fm[i].matched ? fm[i].first - fbase : -1;
       }
    }
 #endif
@@ -134,7 +135,6 @@ void RegExData::update()
 
 void RegExData::clean()
 {
-   BOOST_RE_GUARD_STACK
 #ifndef BOOST_REGEX_NO_FILEITER
    fbase = mapfile::iterator();
    fm = match_results<mapfile::iterator>();
@@ -145,54 +145,46 @@ void RegExData::clean()
 
 RegEx::RegEx()
 {
-   BOOST_RE_GUARD_STACK
    pdata = new re_detail::RegExData();
 }
 
 RegEx::RegEx(const RegEx& o)
 {
-   BOOST_RE_GUARD_STACK
    pdata = new re_detail::RegExData(*(o.pdata));
 }
 
 RegEx::~RegEx()
 {
-   BOOST_RE_GUARD_STACK
    delete pdata;
 }
 
 RegEx::RegEx(const char* c, bool icase)
 {
-   BOOST_RE_GUARD_STACK
    pdata = new re_detail::RegExData();
    SetExpression(c, icase);
 }
 
 RegEx::RegEx(const std::string& s, bool icase)
 {
-   BOOST_RE_GUARD_STACK
    pdata = new re_detail::RegExData();
    SetExpression(s.c_str(), icase);
 }
 
 RegEx& RegEx::operator=(const RegEx& o)
 {
-   BOOST_RE_GUARD_STACK
    *pdata = *(o.pdata);
    return *this;
 }
 
 RegEx& RegEx::operator=(const char* p)
 {
-   BOOST_RE_GUARD_STACK
    SetExpression(p, false);
    return *this;
 }
 
 unsigned int RegEx::SetExpression(const char* p, bool icase)
 {
-   BOOST_RE_GUARD_STACK
-   boost::uint_fast32_t f = icase ? regex::normal | regex::use_except | regex::icase : regex::normal | regex::use_except;
+   boost::uint_fast32_t f = icase ? regex::normal | regex::icase : regex::normal;
    return pdata->e.set_expression(p, f);
 }
 
@@ -204,7 +196,6 @@ unsigned int RegEx::error_code()const
 
 std::string RegEx::Expression()const
 {
-   BOOST_RE_GUARD_STACK
    return pdata->e.expression();
 }
 
@@ -213,7 +204,6 @@ std::string RegEx::Expression()const
 //
 bool RegEx::Match(const char* p, match_flag_type flags)
 {
-   BOOST_RE_GUARD_STACK
    pdata->t = re_detail::RegExData::type_pc;
    pdata->pbase = p;
    const char* end = p;
@@ -229,7 +219,6 @@ bool RegEx::Match(const char* p, match_flag_type flags)
 
 bool RegEx::Search(const char* p, match_flag_type flags)
 {
-   BOOST_RE_GUARD_STACK
    pdata->t = re_detail::RegExData::type_pc;
    pdata->pbase = p;
    const char* end = p;
@@ -257,7 +246,6 @@ struct pred1
 }
 unsigned int RegEx::Grep(GrepCallback cb, const char* p, match_flag_type flags)
 {
-   BOOST_RE_GUARD_STACK
    pdata->t = re_detail::RegExData::type_pc;
    pdata->pbase = p;
    const char* end = p;
@@ -287,7 +275,6 @@ private:
 
 unsigned int RegEx::Grep(std::vector<std::string>& v, const char* p, match_flag_type flags)
 {
-   BOOST_RE_GUARD_STACK
    pdata->t = re_detail::RegExData::type_pc;
    pdata->pbase = p;
    const char* end = p;
@@ -317,7 +304,6 @@ private:
 }
 unsigned int RegEx::Grep(std::vector<std::size_t>& v, const char* p, match_flag_type flags)
 {
-   BOOST_RE_GUARD_STACK
    pdata->t = re_detail::RegExData::type_pc;
    pdata->pbase = p;
    const char* end = p;
@@ -350,7 +336,6 @@ struct pred4
 namespace{
 void BuildFileList(std::list<std::string>* pl, const char* files, bool recurse)
 {
-   BOOST_RE_GUARD_STACK
    file_iterator start(files);
    file_iterator end;
    if(recurse)
@@ -380,7 +365,7 @@ void BuildFileList(std::list<std::string>* pl, const char* files, bool recurse)
 
       while(dstart != dend)
       {
-         std::sprintf(buf, "%s%s%s", dstart.path(), directory_iterator::separator(), ptr);
+         (std::sprintf)(buf, "%s%s%s", dstart.path(), directory_iterator::separator(), ptr);
          BuildFileList(pl, buf, recurse);
          ++dstart;
       }
@@ -395,7 +380,6 @@ void BuildFileList(std::list<std::string>* pl, const char* files, bool recurse)
 
 unsigned int RegEx::GrepFiles(GrepFileCallback cb, const char* files, bool recurse, match_flag_type flags)
 {
-   BOOST_RE_GUARD_STACK
    unsigned int result = 0;
    std::list<std::string> file_list;
    BuildFileList(&file_list, files, recurse);
@@ -423,7 +407,6 @@ unsigned int RegEx::GrepFiles(GrepFileCallback cb, const char* files, bool recur
 
 unsigned int RegEx::FindFiles(FindFilesCallback cb, const char* files, bool recurse, match_flag_type flags)
 {
-   BOOST_RE_GUARD_STACK
    unsigned int result = 0;
    std::list<std::string> file_list;
    BuildFileList(&file_list, files, recurse);
@@ -491,7 +474,6 @@ std::size_t RegEx::Split(std::vector<std::string>& v,
 //
 std::size_t RegEx::Position(int i)const
 {
-   BOOST_RE_GUARD_STACK
    switch(pdata->t)
    {
    case re_detail::RegExData::type_pc:
@@ -511,16 +493,14 @@ std::size_t RegEx::Position(int i)const
    return RegEx::npos;
 }
 
-unsigned int RegEx::Marks()const
+std::size_t RegEx::Marks()const
 {
-   BOOST_RE_GUARD_STACK
    return pdata->e.mark_count();
 }
 
 
 std::size_t RegEx::Length(int i)const
 {
-   BOOST_RE_GUARD_STACK
    switch(pdata->t)
    {
    case re_detail::RegExData::type_pc:
@@ -542,7 +522,6 @@ std::size_t RegEx::Length(int i)const
 
 bool RegEx::Matched(int i)const
 {
-   BOOST_RE_GUARD_STACK
    switch(pdata->t)
    {
    case re_detail::RegExData::type_pc:
@@ -565,7 +544,6 @@ bool RegEx::Matched(int i)const
 
 std::string RegEx::What(int i)const
 {
-   BOOST_RE_GUARD_STACK
    std::string result;
    switch(pdata->t)
    {
@@ -588,14 +566,10 @@ std::string RegEx::What(int i)const
    return result;
 }
 
-#ifndef __MINGW32__
-#ifndef BOOST_NO_INCLASS_MEMBER_INITIALIZATION
-const std::size_t RegEx::npos = ::boost::integer_traits<std::size_t>::const_max;
-#elif defined(BOOST_HAS_LONG_LONG)
-const std::size_t RegEx::npos = ~0ULL;
+#ifdef BOOST_HAS_LONG_LONG
+const std::size_t RegEx::npos = static_cast<std::size_t>(~0ULL);
 #else
-const std::size_t RegEx::npos = ~0UL;
-#endif
+const std::size_t RegEx::npos = static_cast<std::size_t>(~0UL);
 #endif
 
 } // namespace boost
diff --git a/src/fileiter.cpp b/src/fileiter.cpp
index af4c2346..ba408451 100644
--- a/src/fileiter.cpp
+++ b/src/fileiter.cpp
@@ -21,11 +21,33 @@
 
 #include <climits>
 #include <stdexcept>
+#include <string>
+#include <boost/throw_exception.hpp>
 #ifdef BOOST_REGEX_V3
 #include <boost/regex/v3/fileiter.hpp>
 #else
 #include <boost/regex/v4/fileiter.hpp>
 #endif
+#include <boost/regex/pattern_except.hpp>
+
+#include <cstdio>
+#if defined(BOOST_NO_STDC_NAMESPACE)
+namespace std{
+   using ::sprintf;
+   using ::fseek;
+   using ::fread;
+   using ::ftell;
+   using ::fopen;
+   using ::fclose;
+   using ::FILE;
+   using ::strcpy;
+   using ::strcpy;
+   using ::strcat;
+   using ::strcmp;
+   using ::strlen;
+}
+#endif
+
 
 #ifndef BOOST_REGEX_NO_FILEITER
 
@@ -47,7 +69,7 @@ namespace boost{
 // directories are separated with '\\'
 // and names are insensitive of case
 
-const char* _fi_sep = "\\";
+BOOST_REGEX_DECL const char* _fi_sep = "\\";
 const char* _fi_sep_alt = "/";
 #define BOOST_REGEX_FI_TRANSLATE(c) std::tolower(c)
 
@@ -57,7 +79,7 @@ const char* _fi_sep_alt = "/";
 // directories are separated with '/'
 // and names are sensitive of case
 
-const char* _fi_sep = "/";
+BOOST_REGEX_DECL const char* _fi_sep = "/";
 const char* _fi_sep_alt = _fi_sep;
 #define BOOST_REGEX_FI_TRANSLATE(c) c
 
@@ -67,7 +89,6 @@ const char* _fi_sep_alt = _fi_sep;
 
 void mapfile::open(const char* file)
 {
-   BOOST_RE_GUARD_STACK
 #if defined(__CYGWIN__)||defined(__CYGWIN32__)
    char win32file[ MAX_PATH ];
    cygwin_conv_to_win32_path( file, win32file );
@@ -84,7 +105,7 @@ void mapfile::open(const char* file)
          hmap = 0;
          hfile = 0;
          std::runtime_error err("Unable to create file mapping.");
-         boost::throw_exception(err);
+         boost::re_detail::raise_runtime_error(err);
       }
       _first = static_cast<const char*>(MapViewOfFile(hmap, FILE_MAP_READ, 0, 0, 0));
       if(_first == 0)
@@ -110,7 +131,6 @@ void mapfile::open(const char* file)
 
 void mapfile::close()
 {
-   BOOST_RE_GUARD_STACK
    if(hfile != INVALID_HANDLE_VALUE)
    {
       UnmapViewOfFile((void*)_first);
@@ -125,7 +145,6 @@ void mapfile::close()
 
 mapfile_iterator& mapfile_iterator::operator = (const mapfile_iterator& i)
 {
-   BOOST_RE_GUARD_STACK
    if(file && node)
       file->unlock(node);
    file = i.file;
@@ -138,7 +157,6 @@ mapfile_iterator& mapfile_iterator::operator = (const mapfile_iterator& i)
 
 mapfile_iterator& mapfile_iterator::operator++ ()
 {
-   BOOST_RE_GUARD_STACK
    if((++offset == mapfile::buf_size) && file)
    {
       ++node;
@@ -151,7 +169,6 @@ mapfile_iterator& mapfile_iterator::operator++ ()
 
 mapfile_iterator mapfile_iterator::operator++ (int)
 {
-   BOOST_RE_GUARD_STACK
    mapfile_iterator temp(*this);
    if((++offset == mapfile::buf_size) && file)
    {
@@ -165,7 +182,6 @@ mapfile_iterator mapfile_iterator::operator++ (int)
 
 mapfile_iterator& mapfile_iterator::operator-- ()
 {
-   BOOST_RE_GUARD_STACK
    if((offset == 0) && file)
    {
       --node;
@@ -180,7 +196,6 @@ mapfile_iterator& mapfile_iterator::operator-- ()
 
 mapfile_iterator mapfile_iterator::operator-- (int)
 {
-   BOOST_RE_GUARD_STACK
    mapfile_iterator temp(*this);
    if((offset == 0) && file)
    {
@@ -196,7 +211,6 @@ mapfile_iterator mapfile_iterator::operator-- (int)
 
 mapfile_iterator operator + (const mapfile_iterator& i, long off)
 {
-   BOOST_RE_GUARD_STACK
    mapfile_iterator temp(i);
    temp += off;
    return temp;
@@ -204,7 +218,6 @@ mapfile_iterator operator + (const mapfile_iterator& i, long off)
 
 mapfile_iterator operator - (const mapfile_iterator& i, long off)
 {
-   BOOST_RE_GUARD_STACK
    mapfile_iterator temp(i);
    temp -= off;
    return temp;
@@ -212,19 +225,16 @@ mapfile_iterator operator - (const mapfile_iterator& i, long off)
 
 mapfile::iterator mapfile::begin()const
 {
-   BOOST_RE_GUARD_STACK
    return mapfile_iterator(this, 0);
 }
 
 mapfile::iterator mapfile::end()const
 {
-   BOOST_RE_GUARD_STACK
    return mapfile_iterator(this, _size);
 }
 
 void mapfile::lock(pointer* node)const
 {
-   BOOST_RE_GUARD_STACK
    assert(node >= _first);
    assert(node <= _last);
    if(node < _last)
@@ -265,7 +275,6 @@ void mapfile::lock(pointer* node)const
 
 void mapfile::unlock(pointer* node)const
 {
-   BOOST_RE_GUARD_STACK
    assert(node >= _first);
    assert(node <= _last);
    if(node < _last)
@@ -279,7 +288,6 @@ void mapfile::unlock(pointer* node)const
 
 long int get_file_length(std::FILE* hfile)
 {
-   BOOST_RE_GUARD_STACK
    long int result;
    std::fseek(hfile, 0, SEEK_END);
    result = std::ftell(hfile);
@@ -290,7 +298,6 @@ long int get_file_length(std::FILE* hfile)
 
 void mapfile::open(const char* file)
 {
-   BOOST_RE_GUARD_STACK
    hfile = std::fopen(file, "rb");
 #ifndef BOOST_NO_EXCEPTIONS
    try{
@@ -325,7 +332,6 @@ void mapfile::open(const char* file)
 
 void mapfile::close()
 {
-   BOOST_RE_GUARD_STACK
    if(hfile != 0)
    {
       pointer* p = _first;
@@ -350,7 +356,6 @@ void mapfile::close()
 
 file_iterator::file_iterator()
 {
-   BOOST_RE_GUARD_STACK
    _root = _path = 0;
    ref = 0;
 #ifndef BOOST_NO_EXCEPTIONS
@@ -381,7 +386,6 @@ file_iterator::file_iterator()
 
 file_iterator::file_iterator(const char* wild)
 {
-   BOOST_RE_GUARD_STACK
    _root = _path = 0;
    ref = 0;
 #ifndef BOOST_NO_EXCEPTIONS
@@ -450,7 +454,6 @@ file_iterator::file_iterator(const char* wild)
 
 file_iterator::file_iterator(const file_iterator& other)
 {
-   BOOST_RE_GUARD_STACK
    _root = _path = 0;
    ref = 0;
 #ifndef BOOST_NO_EXCEPTIONS
@@ -478,7 +481,6 @@ file_iterator::file_iterator(const file_iterator& other)
 
 file_iterator& file_iterator::operator=(const file_iterator& other)
 {
-   BOOST_RE_GUARD_STACK
    std::strcpy(_root, other._root);
    std::strcpy(_path, other._path);
    ptr = _path + (other.ptr - other._path);
@@ -496,7 +498,6 @@ file_iterator& file_iterator::operator=(const file_iterator& other)
 
 file_iterator::~file_iterator()
 {
-   BOOST_RE_GUARD_STACK
    delete[] _root;
    delete[] _path;
    if(--(ref->count) == 0)
@@ -509,7 +510,6 @@ file_iterator::~file_iterator()
 
 file_iterator file_iterator::operator++(int)
 {
-   BOOST_RE_GUARD_STACK
    file_iterator temp(*this);
    next();
    return temp;
@@ -518,7 +518,6 @@ file_iterator file_iterator::operator++(int)
 
 void file_iterator::next()
 {
-   BOOST_RE_GUARD_STACK
    if(ref->hf != _fi_invalid_handle)
    {
       bool cont = true;
@@ -545,7 +544,6 @@ void file_iterator::next()
 
 directory_iterator::directory_iterator()
 {
-   BOOST_RE_GUARD_STACK
    _root = _path = 0;
    ref = 0;
 #ifndef BOOST_NO_EXCEPTIONS
@@ -576,7 +574,6 @@ directory_iterator::directory_iterator()
 
 directory_iterator::directory_iterator(const char* wild)
 {
-   BOOST_RE_GUARD_STACK
    _root = _path = 0;
    ref = 0;
 #ifndef BOOST_NO_EXCEPTIONS
@@ -643,7 +640,6 @@ directory_iterator::directory_iterator(const char* wild)
 
 directory_iterator::~directory_iterator()
 {
-   BOOST_RE_GUARD_STACK
    delete[] _root;
    delete[] _path;
    if(--(ref->count) == 0)
@@ -656,7 +652,6 @@ directory_iterator::~directory_iterator()
 
 directory_iterator::directory_iterator(const directory_iterator& other)
 {
-   BOOST_RE_GUARD_STACK
    _root = _path = 0;
    ref = 0;
 #ifndef BOOST_NO_EXCEPTIONS
@@ -684,7 +679,6 @@ directory_iterator::directory_iterator(const directory_iterator& other)
 
 directory_iterator& directory_iterator::operator=(const directory_iterator& other)
 {
-   BOOST_RE_GUARD_STACK
    std::strcpy(_root, other._root);
    std::strcpy(_path, other._path);
    ptr = _path + (other.ptr - other._path);
@@ -701,7 +695,6 @@ directory_iterator& directory_iterator::operator=(const directory_iterator& othe
 
 directory_iterator directory_iterator::operator++(int)
 {
-   BOOST_RE_GUARD_STACK
    directory_iterator temp(*this);
    next();
    return temp;
@@ -709,7 +702,6 @@ directory_iterator directory_iterator::operator++(int)
 
 void directory_iterator::next()
 {
-   BOOST_RE_GUARD_STACK
    if(ref->hf != _fi_invalid_handle)
    {
       bool cont = true;
@@ -748,7 +740,6 @@ struct _fi_priv_data
 
 _fi_priv_data::_fi_priv_data(const char* p)
 {
-   BOOST_RE_GUARD_STACK
    std::strcpy(root, p);
    mask = root;
    while(*mask) ++mask;
@@ -775,7 +766,6 @@ _fi_priv_data::_fi_priv_data(const char* p)
 
 bool iswild(const char* mask, const char* name)
 {
-   BOOST_RE_GUARD_STACK
    while(*mask && *name)
    {
       switch(*mask)
@@ -817,12 +807,11 @@ bool iswild(const char* mask, const char* name)
 
 unsigned _fi_attributes(const char* root, const char* name)
 {
-   BOOST_RE_GUARD_STACK
    char buf[MAX_PATH];
    if( ( (root[0] == *_fi_sep) || (root[0] == *_fi_sep_alt) ) && (root[1] == '\0') )
-      std::sprintf(buf, "%s%s", root, name);
+      (std::sprintf)(buf, "%s%s", root, name);
    else
-      std::sprintf(buf, "%s%s%s", root, _fi_sep, name);
+      (std::sprintf)(buf, "%s%s%s", root, _fi_sep, name);
    DIR* d = opendir(buf);
    if(d)
    {
@@ -834,7 +823,6 @@ unsigned _fi_attributes(const char* root, const char* name)
 
 _fi_find_handle _fi_FindFirstFile(const char* lpFileName, _fi_find_data* lpFindFileData)
 {
-   BOOST_RE_GUARD_STACK
    _fi_find_handle dat = new _fi_priv_data(lpFileName);
 
    DIR* h = opendir(dat->root);
@@ -850,7 +838,6 @@ _fi_find_handle _fi_FindFirstFile(const char* lpFileName, _fi_find_data* lpFindF
 
 bool _fi_FindNextFile(_fi_find_handle dat, _fi_find_data* lpFindFileData)
 {
-   BOOST_RE_GUARD_STACK
    dirent* d;
    do
    {
@@ -868,7 +855,6 @@ bool _fi_FindNextFile(_fi_find_handle dat, _fi_find_data* lpFindFileData)
 
 bool _fi_FindClose(_fi_find_handle dat)
 {
-   BOOST_RE_GUARD_STACK
    closedir(dat->d);
    delete dat;
    return true;
diff --git a/src/icu.cpp b/src/icu.cpp
new file mode 100644
index 00000000..e78660ad
--- /dev/null
+++ b/src/icu.cpp
@@ -0,0 +1,445 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         icu.cpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Unicode regular expressions on top of the ICU Library.
+  */
+#define BOOST_REGEX_SOURCE
+
+#include <boost/regex/config.hpp>
+#ifdef BOOST_HAS_ICU
+#include <boost/regex/icu.hpp>
+
+namespace boost{
+
+namespace re_detail{
+
+icu_regex_traits_implementation::string_type icu_regex_traits_implementation::do_transform(const char_type* p1, const char_type* p2, const ::Collator* pcoll) const
+{
+   // TODO make thread safe!!!! :
+   typedef u32_to_u16_iterator<const char_type*, ::UChar> itt;
+   itt i(p1), j(p2);
+   std::vector< ::UChar> t(i, j);
+   ::uint8_t result[100];
+   ::int32_t len = pcoll->getSortKey(&*t.begin(), static_cast< ::int32_t>(t.size()), result, sizeof(result));
+   if(std::size_t(len) > sizeof(result))
+   {
+      scoped_array< ::uint8_t> presult(new ::uint8_t[len+1]);
+      len = pcoll->getSortKey(&*t.begin(), static_cast< ::int32_t>(t.size()), presult.get(), len+1);
+      if(0 == presult[len-1])
+         --len;
+      return string_type(presult.get(), presult.get()+len);
+   }
+   if(0 == result[len-1])
+      --len;
+   return string_type(result, result+len);
+}
+
+}
+
+icu_regex_traits::size_type icu_regex_traits::length(const char_type* p)
+{
+   size_type result = 0;
+   while(*p)
+   {
+      ++p;
+      ++result;
+   }
+   return result;
+}
+
+//
+// define our bitmasks:
+//
+const icu_regex_traits::char_class_type icu_regex_traits::mask_blank = icu_regex_traits::char_class_type(1) << offset_blank;
+const icu_regex_traits::char_class_type icu_regex_traits::mask_space = icu_regex_traits::char_class_type(1) << offset_space;
+const icu_regex_traits::char_class_type icu_regex_traits::mask_xdigit = icu_regex_traits::char_class_type(1) << offset_xdigit;
+const icu_regex_traits::char_class_type icu_regex_traits::mask_underscore = icu_regex_traits::char_class_type(1) << offset_underscore;
+const icu_regex_traits::char_class_type icu_regex_traits::mask_unicode = icu_regex_traits::char_class_type(1) << offset_unicode;
+const icu_regex_traits::char_class_type icu_regex_traits::mask_any = icu_regex_traits::char_class_type(1) << offset_any;
+const icu_regex_traits::char_class_type icu_regex_traits::mask_ascii = icu_regex_traits::char_class_type(1) << offset_ascii;
+
+icu_regex_traits::char_class_type icu_regex_traits::lookup_icu_mask(const ::UChar32* p1, const ::UChar32* p2)
+{
+   static const ::UChar32 prop_name_table[] = {
+      /* any */  'a', 'n', 'y', 
+      /* ascii */  'a', 's', 'c', 'i', 'i', 
+      /* assigned */  'a', 's', 's', 'i', 'g', 'n', 'e', 'd', 
+      /* c* */  'c', '*', 
+      /* cc */  'c', 'c', 
+      /* cf */  'c', 'f', 
+      /* closepunctuation */  'c', 'l', 'o', 's', 'e', 'p', 'u', 'n', 'c', 't', 'u', 'a', 't', 'i', 'o', 'n', 
+      /* cn */  'c', 'n', 
+      /* co */  'c', 'o', 
+      /* connectorpunctuation */  'c', 'o', 'n', 'n', 'e', 'c', 't', 'o', 'r', 'p', 'u', 'n', 'c', 't', 'u', 'a', 't', 'i', 'o', 'n', 
+      /* control */  'c', 'o', 'n', 't', 'r', 'o', 'l', 
+      /* cs */  'c', 's', 
+      /* currencysymbol */  'c', 'u', 'r', 'r', 'e', 'n', 'c', 'y', 's', 'y', 'm', 'b', 'o', 'l', 
+      /* dashpunctuation */  'd', 'a', 's', 'h', 'p', 'u', 'n', 'c', 't', 'u', 'a', 't', 'i', 'o', 'n', 
+      /* decimaldigitnumber */  'd', 'e', 'c', 'i', 'm', 'a', 'l', 'd', 'i', 'g', 'i', 't', 'n', 'u', 'm', 'b', 'e', 'r', 
+      /* enclosingmark */  'e', 'n', 'c', 'l', 'o', 's', 'i', 'n', 'g', 'm', 'a', 'r', 'k', 
+      /* finalpunctuation */  'f', 'i', 'n', 'a', 'l', 'p', 'u', 'n', 'c', 't', 'u', 'a', 't', 'i', 'o', 'n', 
+      /* format */  'f', 'o', 'r', 'm', 'a', 't', 
+      /* initialpunctuation */  'i', 'n', 'i', 't', 'i', 'a', 'l', 'p', 'u', 'n', 'c', 't', 'u', 'a', 't', 'i', 'o', 'n', 
+      /* l* */  'l', '*', 
+      /* letter */  'l', 'e', 't', 't', 'e', 'r', 
+      /* letternumber */  'l', 'e', 't', 't', 'e', 'r', 'n', 'u', 'm', 'b', 'e', 'r', 
+      /* lineseparator */  'l', 'i', 'n', 'e', 's', 'e', 'p', 'a', 'r', 'a', 't', 'o', 'r', 
+      /* ll */  'l', 'l', 
+      /* lm */  'l', 'm', 
+      /* lo */  'l', 'o', 
+      /* lowercaseletter */  'l', 'o', 'w', 'e', 'r', 'c', 'a', 's', 'e', 'l', 'e', 't', 't', 'e', 'r', 
+      /* lt */  'l', 't', 
+      /* lu */  'l', 'u', 
+      /* m* */  'm', '*', 
+      /* mark */  'm', 'a', 'r', 'k', 
+      /* mathsymbol */  'm', 'a', 't', 'h', 's', 'y', 'm', 'b', 'o', 'l', 
+      /* mc */  'm', 'c', 
+      /* me */  'm', 'e', 
+      /* mn */  'm', 'n', 
+      /* modifierletter */  'm', 'o', 'd', 'i', 'f', 'i', 'e', 'r', 'l', 'e', 't', 't', 'e', 'r', 
+      /* modifiersymbol */  'm', 'o', 'd', 'i', 'f', 'i', 'e', 'r', 's', 'y', 'm', 'b', 'o', 'l', 
+      /* n* */  'n', '*', 
+      /* nd */  'n', 'd', 
+      /* nl */  'n', 'l', 
+      /* no */  'n', 'o', 
+      /* nonspacingmark */  'n', 'o', 'n', 's', 'p', 'a', 'c', 'i', 'n', 'g', 'm', 'a', 'r', 'k', 
+      /* notassigned */  'n', 'o', 't', 'a', 's', 's', 'i', 'g', 'n', 'e', 'd', 
+      /* number */  'n', 'u', 'm', 'b', 'e', 'r', 
+      /* openpunctuation */  'o', 'p', 'e', 'n', 'p', 'u', 'n', 'c', 't', 'u', 'a', 't', 'i', 'o', 'n', 
+      /* other */  'o', 't', 'h', 'e', 'r', 
+      /* otherletter */  'o', 't', 'h', 'e', 'r', 'l', 'e', 't', 't', 'e', 'r', 
+      /* othernumber */  'o', 't', 'h', 'e', 'r', 'n', 'u', 'm', 'b', 'e', 'r', 
+      /* otherpunctuation */  'o', 't', 'h', 'e', 'r', 'p', 'u', 'n', 'c', 't', 'u', 'a', 't', 'i', 'o', 'n', 
+      /* othersymbol */  'o', 't', 'h', 'e', 'r', 's', 'y', 'm', 'b', 'o', 'l', 
+      /* p* */  'p', '*', 
+      /* paragraphseparator */  'p', 'a', 'r', 'a', 'g', 'r', 'a', 'p', 'h', 's', 'e', 'p', 'a', 'r', 'a', 't', 'o', 'r', 
+      /* pc */  'p', 'c', 
+      /* pd */  'p', 'd', 
+      /* pe */  'p', 'e', 
+      /* pf */  'p', 'f', 
+      /* pi */  'p', 'i', 
+      /* po */  'p', 'o', 
+      /* privateuse */  'p', 'r', 'i', 'v', 'a', 't', 'e', 'u', 's', 'e', 
+      /* ps */  'p', 's', 
+      /* punctuation */  'p', 'u', 'n', 'c', 't', 'u', 'a', 't', 'i', 'o', 'n', 
+      /* s* */  's', '*', 
+      /* sc */  's', 'c', 
+      /* separator */  's', 'e', 'p', 'a', 'r', 'a', 't', 'o', 'r', 
+      /* sk */  's', 'k', 
+      /* sm */  's', 'm', 
+      /* so */  's', 'o', 
+      /* spaceseparator */  's', 'p', 'a', 'c', 'e', 's', 'e', 'p', 'a', 'r', 'a', 't', 'o', 'r', 
+      /* spacingcombiningmark */  's', 'p', 'a', 'c', 'i', 'n', 'g', 'c', 'o', 'm', 'b', 'i', 'n', 'i', 'n', 'g', 'm', 'a', 'r', 'k', 
+      /* surrogate */  's', 'u', 'r', 'r', 'o', 'g', 'a', 't', 'e', 
+      /* symbol */  's', 'y', 'm', 'b', 'o', 'l', 
+      /* titlecase */  't', 'i', 't', 'l', 'e', 'c', 'a', 's', 'e', 
+      /* titlecaseletter */  't', 'i', 't', 'l', 'e', 'c', 'a', 's', 'e', 'l', 'e', 't', 't', 'e', 'r', 
+      /* uppercaseletter */  'u', 'p', 'p', 'e', 'r', 'c', 'a', 's', 'e', 'l', 'e', 't', 't', 'e', 'r', 
+      /* z* */  'z', '*', 
+      /* zl */  'z', 'l', 
+      /* zp */  'z', 'p', 
+      /* zs */  'z', 's', 
+   };
+
+   static const re_detail::character_pointer_range< ::UChar32> range_data[] = {
+      { prop_name_table+0, prop_name_table+3, }, // any
+      { prop_name_table+3, prop_name_table+8, }, // ascii
+      { prop_name_table+8, prop_name_table+16, }, // assigned
+      { prop_name_table+16, prop_name_table+18, }, // c*
+      { prop_name_table+18, prop_name_table+20, }, // cc
+      { prop_name_table+20, prop_name_table+22, }, // cf
+      { prop_name_table+22, prop_name_table+38, }, // closepunctuation
+      { prop_name_table+38, prop_name_table+40, }, // cn
+      { prop_name_table+40, prop_name_table+42, }, // co
+      { prop_name_table+42, prop_name_table+62, }, // connectorpunctuation
+      { prop_name_table+62, prop_name_table+69, }, // control
+      { prop_name_table+69, prop_name_table+71, }, // cs
+      { prop_name_table+71, prop_name_table+85, }, // currencysymbol
+      { prop_name_table+85, prop_name_table+100, }, // dashpunctuation
+      { prop_name_table+100, prop_name_table+118, }, // decimaldigitnumber
+      { prop_name_table+118, prop_name_table+131, }, // enclosingmark
+      { prop_name_table+131, prop_name_table+147, }, // finalpunctuation
+      { prop_name_table+147, prop_name_table+153, }, // format
+      { prop_name_table+153, prop_name_table+171, }, // initialpunctuation
+      { prop_name_table+171, prop_name_table+173, }, // l*
+      { prop_name_table+173, prop_name_table+179, }, // letter
+      { prop_name_table+179, prop_name_table+191, }, // letternumber
+      { prop_name_table+191, prop_name_table+204, }, // lineseparator
+      { prop_name_table+204, prop_name_table+206, }, // ll
+      { prop_name_table+206, prop_name_table+208, }, // lm
+      { prop_name_table+208, prop_name_table+210, }, // lo
+      { prop_name_table+210, prop_name_table+225, }, // lowercaseletter
+      { prop_name_table+225, prop_name_table+227, }, // lt
+      { prop_name_table+227, prop_name_table+229, }, // lu
+      { prop_name_table+229, prop_name_table+231, }, // m*
+      { prop_name_table+231, prop_name_table+235, }, // mark
+      { prop_name_table+235, prop_name_table+245, }, // mathsymbol
+      { prop_name_table+245, prop_name_table+247, }, // mc
+      { prop_name_table+247, prop_name_table+249, }, // me
+      { prop_name_table+249, prop_name_table+251, }, // mn
+      { prop_name_table+251, prop_name_table+265, }, // modifierletter
+      { prop_name_table+265, prop_name_table+279, }, // modifiersymbol
+      { prop_name_table+279, prop_name_table+281, }, // n*
+      { prop_name_table+281, prop_name_table+283, }, // nd
+      { prop_name_table+283, prop_name_table+285, }, // nl
+      { prop_name_table+285, prop_name_table+287, }, // no
+      { prop_name_table+287, prop_name_table+301, }, // nonspacingmark
+      { prop_name_table+301, prop_name_table+312, }, // notassigned
+      { prop_name_table+312, prop_name_table+318, }, // number
+      { prop_name_table+318, prop_name_table+333, }, // openpunctuation
+      { prop_name_table+333, prop_name_table+338, }, // other
+      { prop_name_table+338, prop_name_table+349, }, // otherletter
+      { prop_name_table+349, prop_name_table+360, }, // othernumber
+      { prop_name_table+360, prop_name_table+376, }, // otherpunctuation
+      { prop_name_table+376, prop_name_table+387, }, // othersymbol
+      { prop_name_table+387, prop_name_table+389, }, // p*
+      { prop_name_table+389, prop_name_table+407, }, // paragraphseparator
+      { prop_name_table+407, prop_name_table+409, }, // pc
+      { prop_name_table+409, prop_name_table+411, }, // pd
+      { prop_name_table+411, prop_name_table+413, }, // pe
+      { prop_name_table+413, prop_name_table+415, }, // pf
+      { prop_name_table+415, prop_name_table+417, }, // pi
+      { prop_name_table+417, prop_name_table+419, }, // po
+      { prop_name_table+419, prop_name_table+429, }, // privateuse
+      { prop_name_table+429, prop_name_table+431, }, // ps
+      { prop_name_table+431, prop_name_table+442, }, // punctuation
+      { prop_name_table+442, prop_name_table+444, }, // s*
+      { prop_name_table+444, prop_name_table+446, }, // sc
+      { prop_name_table+446, prop_name_table+455, }, // separator
+      { prop_name_table+455, prop_name_table+457, }, // sk
+      { prop_name_table+457, prop_name_table+459, }, // sm
+      { prop_name_table+459, prop_name_table+461, }, // so
+      { prop_name_table+461, prop_name_table+475, }, // spaceseparator
+      { prop_name_table+475, prop_name_table+495, }, // spacingcombiningmark
+      { prop_name_table+495, prop_name_table+504, }, // surrogate
+      { prop_name_table+504, prop_name_table+510, }, // symbol
+      { prop_name_table+510, prop_name_table+519, }, // titlecase
+      { prop_name_table+519, prop_name_table+534, }, // titlecaseletter
+      { prop_name_table+534, prop_name_table+549, }, // uppercaseletter
+      { prop_name_table+549, prop_name_table+551, }, // z*
+      { prop_name_table+551, prop_name_table+553, }, // zl
+      { prop_name_table+553, prop_name_table+555, }, // zp
+      { prop_name_table+555, prop_name_table+557, }, // zs
+   };
+
+   static const icu_regex_traits::char_class_type icu_class_map[] = {
+      icu_regex_traits::mask_any, // any
+      icu_regex_traits::mask_ascii, // ascii
+      (0x3FFFFFFFu) & ~(U_GC_CN_MASK), // assigned
+      U_GC_C_MASK, // c*
+      U_GC_CC_MASK, // cc
+      U_GC_CF_MASK, // cf
+      U_GC_PE_MASK, // closepunctuation
+      U_GC_CN_MASK, // cn
+      U_GC_CO_MASK, // co
+      U_GC_PC_MASK, // connectorpunctuation
+      U_GC_CC_MASK, // control
+      U_GC_CS_MASK, // cs
+      U_GC_SC_MASK, // currencysymbol
+      U_GC_PD_MASK, // dashpunctuation
+      U_GC_ND_MASK, // decimaldigitnumber
+      U_GC_ME_MASK, // enclosingmark
+      U_GC_PF_MASK, // finalpunctuation
+      U_GC_CF_MASK, // format
+      U_GC_PI_MASK, // initialpunctuation
+      U_GC_L_MASK, // l*
+      U_GC_L_MASK, // letter
+      U_GC_NL_MASK, // letternumber
+      U_GC_ZL_MASK, // lineseparator
+      U_GC_LL_MASK, // ll
+      U_GC_LM_MASK, // lm
+      U_GC_LO_MASK, // lo
+      U_GC_LL_MASK, // lowercaseletter
+      U_GC_LT_MASK, // lt
+      U_GC_LU_MASK, // lu
+      U_GC_M_MASK, // m*
+      U_GC_M_MASK, // mark
+      U_GC_SM_MASK, // mathsymbol
+      U_GC_MC_MASK, // mc
+      U_GC_ME_MASK, // me
+      U_GC_MN_MASK, // mn
+      U_GC_LM_MASK, // modifierletter
+      U_GC_SK_MASK, // modifiersymbol
+      U_GC_N_MASK, // n*
+      U_GC_ND_MASK, // nd
+      U_GC_NL_MASK, // nl
+      U_GC_NO_MASK, // no
+      U_GC_MN_MASK, // nonspacingmark
+      U_GC_CN_MASK, // notassigned
+      U_GC_N_MASK, // number
+      U_GC_PS_MASK, // openpunctuation
+      U_GC_C_MASK, // other
+      U_GC_LO_MASK, // otherletter
+      U_GC_NO_MASK, // othernumber
+      U_GC_PO_MASK, // otherpunctuation
+      U_GC_SO_MASK, // othersymbol
+      U_GC_P_MASK, // p*
+      U_GC_ZP_MASK, // paragraphseparator
+      U_GC_PC_MASK, // pc
+      U_GC_PD_MASK, // pd
+      U_GC_PE_MASK, // pe
+      U_GC_PF_MASK, // pf
+      U_GC_PI_MASK, // pi
+      U_GC_PO_MASK, // po
+      U_GC_CO_MASK, // privateuse
+      U_GC_PS_MASK, // ps
+      U_GC_P_MASK, // punctuation
+      U_GC_S_MASK, // s*
+      U_GC_SC_MASK, // sc
+      U_GC_Z_MASK, // separator
+      U_GC_SK_MASK, // sk
+      U_GC_SM_MASK, // sm
+      U_GC_SO_MASK, // so
+      U_GC_ZS_MASK, // spaceseparator
+      U_GC_MC_MASK, // spacingcombiningmark
+      U_GC_CS_MASK, // surrogate
+      U_GC_S_MASK, // symbol
+      U_GC_LT_MASK, // titlecase
+      U_GC_LT_MASK, // titlecaseletter
+      U_GC_LU_MASK, // uppercaseletter
+      U_GC_Z_MASK, // z*
+      U_GC_ZL_MASK, // zl
+      U_GC_ZP_MASK, // zp
+      U_GC_ZS_MASK, // zs
+   };
+
+
+   static const re_detail::character_pointer_range< ::UChar32>* ranges_begin = range_data;
+   static const re_detail::character_pointer_range< ::UChar32>* ranges_end = range_data + (sizeof(range_data)/sizeof(range_data[0]));
+   
+   re_detail::character_pointer_range< ::UChar32> t = { p1, p2, };
+   const re_detail::character_pointer_range< ::UChar32>* p = std::lower_bound(ranges_begin, ranges_end, t);
+   if((p != ranges_end) && (t == *p))
+      return icu_class_map[p - ranges_begin];
+   return 0;
+}
+
+icu_regex_traits::char_class_type icu_regex_traits::lookup_classname(const char_type* p1, const char_type* p2) const
+{
+   static const char_class_type masks[] = 
+   {
+      0,
+      U_GC_L_MASK | U_GC_ND_MASK, 
+      U_GC_L_MASK,
+      mask_blank,
+      U_GC_CC_MASK | U_GC_CF_MASK | U_GC_ZL_MASK | U_GC_ZP_MASK,
+      U_GC_ND_MASK,
+      U_GC_ND_MASK,
+      (0x3FFFFFFFu) & ~(U_GC_CC_MASK | U_GC_CF_MASK | U_GC_CS_MASK | U_GC_CN_MASK | U_GC_Z_MASK),
+      U_GC_LL_MASK,
+      U_GC_LL_MASK,
+      ~(U_GC_C_MASK),
+      U_GC_P_MASK,
+      char_class_type(U_GC_Z_MASK) | mask_space,
+      char_class_type(U_GC_Z_MASK) | mask_space,
+      U_GC_LU_MASK,
+      mask_unicode,
+      U_GC_LU_MASK,
+      char_class_type(U_GC_L_MASK | U_GC_ND_MASK | U_GC_MN_MASK) | mask_underscore, 
+      char_class_type(U_GC_L_MASK | U_GC_ND_MASK | U_GC_MN_MASK) | mask_underscore, 
+      char_class_type(U_GC_ND_MASK) | mask_xdigit,
+   };
+
+   int id = ::boost::re_detail::get_default_class_id(p1, p2);
+   if(id >= 0)
+      return masks[id+1];
+   char_class_type result = lookup_icu_mask(p1, p2);
+   if(result != 0)
+      return result;
+
+   if(id < 0)
+   {
+      string_type s(p1, p2);
+      string_type::size_type i = 0;
+      while(i < s.size())
+      {
+         s[i] = static_cast<char>((::u_tolower)(s[i]));
+         if(::u_isspace(s[i]) || (s[i] == '-') || (s[i] == '_'))
+            s.erase(s.begin()+i, s.begin()+i+1);
+         else
+         {
+            s[i] = static_cast<char>((::u_tolower)(s[i]));
+            ++i;
+         }
+      }
+      id = ::boost::re_detail::get_default_class_id(&*s.begin(), &*s.begin() + s.size());
+      if(id >= 0)
+         return masks[id+1];
+      result = lookup_icu_mask(&*s.begin(), &*s.begin() + s.size());
+      if(result != 0)
+         return result;
+   }
+   BOOST_ASSERT(std::size_t(id+1) < sizeof(masks) / sizeof(masks[0]));
+   return masks[id+1];
+}
+
+icu_regex_traits::string_type icu_regex_traits::lookup_collatename(const char_type* p1, const char_type* p2) const
+{
+   string_type result;
+   if(std::find_if(p1, p2, std::bind2nd(std::greater< ::UChar32>(), 0x7f)) == p2)
+   {
+      std::string s(p1, p2);
+      // Try Unicode name:
+      UErrorCode err = U_ZERO_ERROR;
+      UChar32 c = ::u_charFromName(U_UNICODE_CHAR_NAME, s.c_str(), &err);
+      if(U_SUCCESS(err))
+      {
+         result.push_back(c);
+         return result;
+      }
+      // Try Unicode-extended name:
+      err = U_ZERO_ERROR;
+      c = ::u_charFromName(U_EXTENDED_CHAR_NAME, s.c_str(), &err);
+      if(U_SUCCESS(err))
+      {
+         result.push_back(c);
+         return result;
+      }
+      // try POSIX name:
+      s = ::boost::re_detail::lookup_default_collate_name(s);
+      result.assign(s.begin(), s.end());
+   }
+   if(result.empty() && (p2-p1 == 1))
+      result.push_back(*p1);
+   return result;
+}
+
+bool icu_regex_traits::isctype(char_type c, char_class_type f) const
+{
+   // check for standard catagories first:
+   char_class_type m = char_class_type(1u << u_charType(c));
+   if((m & f) != 0) 
+      return true;
+   // now check for special cases:
+   if(((f & mask_blank) != 0) && u_isblank(c))
+      return true;
+   if(((f & mask_space) != 0) && u_isspace(c))
+      return true;
+   if(((f & mask_xdigit) != 0) && (u_digit(c, 16) >= 0))
+      return true;
+   if(((f & mask_unicode) != 0) && (c >= 0x100))
+      return true;
+   if(((f & mask_underscore) != 0) && (c == '_'))
+      return true;
+   if(((f & mask_any) != 0) && (c <= 0x10FFFF))
+      return true;
+   if(((f & mask_ascii) != 0) && (c <= 0x7F))
+      return true;
+   return false;
+}
+
+}
+
+#endif // BOOST_HAS_ICU
diff --git a/src/posix_api.cpp b/src/posix_api.cpp
index 56ef8552..b31947ee 100644
--- a/src/posix_api.cpp
+++ b/src/posix_api.cpp
@@ -19,8 +19,18 @@
 #define BOOST_REGEX_SOURCE
 
 #include <cstdio>
+#include <boost/cregex.hpp>
 #include <boost/regex.hpp>
 
+#if defined(BOOST_NO_STDC_NAMESPACE)
+namespace std{
+   using ::sprintf;
+   using ::strcpy;
+   using ::strcmp;
+}
+#endif
+
+
 namespace boost{
 
 namespace{
@@ -35,7 +45,6 @@ const char* names[] = {"REG_NOERROR", "REG_NOMATCH", "REG_BADPAT", "REG_ECOLLATE
 
 BOOST_REGEX_DECL int BOOST_REGEX_CCALL regcompA(regex_tA* expression, const char* ptr, int f)
 {
-   BOOST_RE_GUARD_STACK
    if(expression->re_magic != magic_value)
    {
       expression->guts = 0;
@@ -54,7 +63,7 @@ BOOST_REGEX_DECL int BOOST_REGEX_CCALL regcompA(regex_tA* expression, const char
 #endif
    }
    // set default flags:
-   boost::uint_fast32_t flags = (f & REG_EXTENDED) ? regex::extended : regex::basic;
+   boost::uint_fast32_t flags = (f & REG_PERLEX) ? 0 : ((f & REG_EXTENDED) ? regex::extended : regex::basic);
    expression->eflags = (f & REG_NEWLINE) ? match_not_dot_newline : match_default;
    // and translate those that are actually set:
 
@@ -67,20 +76,19 @@ BOOST_REGEX_DECL int BOOST_REGEX_CCALL regcompA(regex_tA* expression, const char
    }
 
    if(f & REG_NOSUB)
-      expression->eflags |= match_any;
+   {
+      //expression->eflags |= match_any;
+      flags |= regex::nosubs;
+   }
 
    if(f & REG_NOSPEC)
       flags |= regex::literal;
    if(f & REG_ICASE)
       flags |= regex::icase;
    if(f & REG_ESCAPE_IN_LISTS)
-      flags |= regex::escape_in_lists;
+      flags &= ~regex::no_escape_in_lists;
    if(f & REG_NEWLINE_ALT)
       flags |= regex::newline_alt;
-#ifndef BOOST_REGEX_V3
-   if(f & REG_PERLEX)
-      flags |= regex::perlex;
-#endif
 
    const char* p2;
    if(f & REG_PEND)
@@ -97,7 +105,12 @@ BOOST_REGEX_DECL int BOOST_REGEX_CCALL regcompA(regex_tA* expression, const char
       expression->re_nsub = static_cast<regex*>(expression->guts)->mark_count() - 1;
       result = static_cast<regex*>(expression->guts)->error_code();
 #ifndef BOOST_NO_EXCEPTIONS
-   } catch(...)
+   } 
+   catch(const boost::regex_error& be)
+   {
+      result = be.code();
+   }
+   catch(...)
    {
       result = REG_E_UNKNOWN;
    }
@@ -110,12 +123,11 @@ BOOST_REGEX_DECL int BOOST_REGEX_CCALL regcompA(regex_tA* expression, const char
 
 BOOST_REGEX_DECL regsize_t BOOST_REGEX_CCALL regerrorA(int code, const regex_tA* e, char* buf, regsize_t buf_size)
 {
-   BOOST_RE_GUARD_STACK
    std::size_t result = 0;
    if(code & REG_ITOA)
    {
       code &= ~REG_ITOA;
-      if(code <= REG_E_UNKNOWN)
+      if(code <= (int)REG_E_UNKNOWN)
       {
          result = std::strlen(names[code]) + 1;
          if(buf_size >= result)
@@ -129,30 +141,29 @@ BOOST_REGEX_DECL regsize_t BOOST_REGEX_CCALL regerrorA(int code, const regex_tA*
       char localbuf[5];
       if(e == 0)
          return 0;
-      for(int i = 0; i <= REG_E_UNKNOWN; ++i)
+      for(int i = 0; i <= (int)REG_E_UNKNOWN; ++i)
       {
          if(std::strcmp(e->re_endp, names[i]) == 0)
          {
-            std::sprintf(localbuf, "%d", i);
+            (std::sprintf)(localbuf, "%d", i);
             if(std::strlen(localbuf) < buf_size)
                std::strcpy(buf, localbuf);
             return std::strlen(localbuf) + 1;
          }
       }
-      std::sprintf(localbuf, "%d", 0);
+      (std::sprintf)(localbuf, "%d", 0);
       if(std::strlen(localbuf) < buf_size)
          std::strcpy(buf, localbuf);
       return std::strlen(localbuf) + 1;
    }
-   if(code <= REG_E_UNKNOWN)
+   if(code <= (int)REG_E_UNKNOWN)
    {
       std::string p;
       if((e) && (e->re_magic == magic_value))
-         p = static_cast<regex*>(e->guts)->get_traits().error_string(code);
+         p = static_cast<regex*>(e->guts)->get_traits().error_string(static_cast< ::boost::regex_constants::error_type>(code));
       else
       {
-         boost::regex_traits<char> t;
-         p = t.error_string(code);
+         p = re_detail::get_default_error_string(static_cast< ::boost::regex_constants::error_type>(code));
       }
       std::size_t len = p.size();
       if(len < buf_size)
@@ -168,7 +179,10 @@ BOOST_REGEX_DECL regsize_t BOOST_REGEX_CCALL regerrorA(int code, const regex_tA*
 
 BOOST_REGEX_DECL int BOOST_REGEX_CCALL regexecA(const regex_tA* expression, const char* buf, regsize_t n, regmatch_t* array, int eflags)
 {
-   BOOST_RE_GUARD_STACK
+#ifdef BOOST_MSVC
+#pragma warning(push)
+#pragma warning(disable:4267)
+#endif
    bool result = false;
    match_flag_type flags = match_default | expression->eflags;
    const char* end;
@@ -209,7 +223,7 @@ BOOST_REGEX_DECL int BOOST_REGEX_CCALL regexecA(const regex_tA* expression, cons
    if(result)
    {
       // extract what matched:
-     unsigned int i;
+      std::size_t i;
       for(i = 0; (i < n) && (i < expression->re_nsub + 1); ++i)
       {
          array[i].rm_so = (m[i].matched == false) ? -1 : (m[i].first - buf);
@@ -224,11 +238,13 @@ BOOST_REGEX_DECL int BOOST_REGEX_CCALL regexecA(const regex_tA* expression, cons
       return 0;
    }
    return REG_NOMATCH;
+#ifdef BOOST_MSVC
+#pragma warning(pop)
+#endif
 }
 
 BOOST_REGEX_DECL void BOOST_REGEX_CCALL regfreeA(regex_tA* expression)
 {
-   BOOST_RE_GUARD_STACK
    if(expression->re_magic == magic_value)
    {
       delete static_cast<regex*>(expression->guts);
diff --git a/src/regex.cpp b/src/regex.cpp
index 4b990f86..9a40322c 100644
--- a/src/regex.cpp
+++ b/src/regex.cpp
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 1998-2002
+ * Copyright (c) 1998-2004
  * Dr John Maddock
  *
  * Use, modification and distribution are subject to the 
@@ -26,6 +26,13 @@
 #if defined(BOOST_REGEX_HAS_MS_STACK_GUARD) && defined(_MSC_VER) && (_MSC_VER >= 1300)
 #  include <malloc.h>
 #endif
+#ifdef BOOST_REGEX_HAS_MS_STACK_GUARD
+#define WIN32_LEAN_AND_MEAN
+#define NOMINMAX
+#define NOGDI
+#define NOUSER
+#include <windows.h>
+#endif
 
 #if defined(BOOST_REGEX_NON_RECURSIVE) && !defined(BOOST_REGEX_V3)
 #if BOOST_REGEX_MAX_CACHE_BLOCKS == 0
@@ -43,18 +50,39 @@ namespace boost{
 // that dll builds contain the Virtual table for these
 // types - this ensures that exceptions can be thrown
 // from the dll and caught in an exe.
-bad_pattern::~bad_pattern() throw() {}
-bad_expression::~bad_expression() throw() {}
+regex_error::regex_error(const std::string& s, regex_constants::error_type err, std::ptrdiff_t pos) 
+   : std::runtime_error(s)
+   , m_error_code(err)
+   , m_position(pos) 
+{
+}
 
-regbase::regbase()
-   : _flags(regbase::failbit){}
+regex_error::regex_error(regex_constants::error_type err) 
+   : std::runtime_error(::boost::re_detail::get_default_error_string(err))
+   , m_error_code(err)
+   , m_position(0) 
+{
+}
+
+regex_error::~regex_error() throw() 
+{
+}
+
+void regex_error::raise()const
+{
+#ifndef BOOST_NO_EXCEPTIONS
+   ::boost::throw_exception(*this);
+#endif
+}
 
-regbase::regbase(const regbase& b)
-   : _flags(b._flags){}
 
 
 namespace re_detail{
 
+BOOST_REGEX_DECL void BOOST_REGEX_CALL raise_runtime_error(const std::runtime_error& ex)
+{
+   ::boost::throw_exception(ex);
+}
 //
 // error checking API:
 //
@@ -74,6 +102,29 @@ BOOST_REGEX_DECL void BOOST_REGEX_CALL verify_options(boost::regex::flag_type /*
 
 #ifdef BOOST_REGEX_HAS_MS_STACK_GUARD
 
+static void execute_eror()
+{
+   // we only get here after a stack overflow,
+   // this has to be a separate proceedure because we 
+   // can't mix __try{}__except block with local objects  
+   // that have destructors:
+   reset_stack_guard_page();
+   std::runtime_error err("Out of stack space, while attempting to match a regular expression.");
+   raise_runtime_error(err);
+}
+
+bool BOOST_REGEX_CALL abstract_protected_call::execute()const
+{
+   __try{
+      return this->call();
+   }__except(EXCEPTION_STACK_OVERFLOW == GetExceptionCode())
+   {
+      execute_eror();
+   }
+   // We never really get here at all:
+   return false;
+}
+
 BOOST_REGEX_DECL void BOOST_REGEX_CALL reset_stack_guard_page()
 {
 #if defined(BOOST_REGEX_HAS_MS_STACK_GUARD) && defined(_MSC_VER) && (_MSC_VER >= 1300)
@@ -118,12 +169,6 @@ BOOST_REGEX_DECL void BOOST_REGEX_CALL reset_stack_guard_page()
 }
 #endif
 
-BOOST_REGEX_DECL void BOOST_REGEX_CALL raise_regex_exception(const std::string& msg)
-{
-   bad_expression e(msg);
-   throw_exception(e);
-}
-
 #if defined(BOOST_REGEX_NON_RECURSIVE) && !defined(BOOST_REGEX_V3)
 
 #if BOOST_REGEX_MAX_CACHE_BLOCKS == 0
@@ -140,7 +185,11 @@ BOOST_REGEX_DECL void BOOST_REGEX_CALL put_mem_block(void* p)
 
 #else
 
+#ifdef BOOST_HAS_THREADS
+mem_block_cache block_cache = { 0, 0, BOOST_STATIC_MUTEX_INIT, };
+#else
 mem_block_cache block_cache = { 0, 0, };
+#endif
 
 BOOST_REGEX_DECL void* BOOST_REGEX_CALL get_mem_block()
 {
diff --git a/src/regex_debug.cpp b/src/regex_debug.cpp
index 883d0a5f..75a0f329 100644
--- a/src/regex_debug.cpp
+++ b/src/regex_debug.cpp
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 1998-2002
+ * Copyright (c) 1998-2004
  * Dr John Maddock
  *
  * Use, modification and distribution are subject to the 
@@ -21,199 +21,6 @@
 
 #include <boost/regex/config.hpp>
 
-#ifdef BOOST_REGEX_DEBUG
-
-#ifdef BOOST_MSVC
-#include <crtdbg.h>
-#endif
-
-#ifdef BOOST_REGEX_V3
-#include <boost/regex/v3/regex_raw_buffer.hpp>
-#else
-#include <boost/regex/v4/regex_raw_buffer.hpp>
-#endif
-#include <boost/regex.hpp>
-
-#ifndef BOOST_RE_OLD_IOSTREAM
-#include <ostream>
-#else 
-#include <ostream.h>
-#endif
-
-namespace boost { namespace re_detail {
-std::ostream& operator<<(std::ostream& s, syntax_element_type x)
-{
-    return s << static_cast<unsigned long>(x);
-}
-}} // namespace boost::re_detail
-
-
-namespace {
-
-char b1[32] = {0,};
-char guard_pattern[32] 
-= { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, };
-char b2[32] = {0,};
-
-static const int guard_size = 32;
-
-bool check_pattern(void* p)
-{
-   return p ? memcmp(p, guard_pattern, guard_size) : 0;
-}
-
-inline unsigned maxi(unsigned i, unsigned j)
-{
-   return i < j ? j : i;
-}
-
-unsigned int allocated = 0;
-
-struct init
-{
-   init();
-   ~init();
-};
-
-init::init()
-{ 
-#ifdef BOOST_MSVC
-   _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF|_CRTDBG_DELAY_FREE_MEM_DF|_CRTDBG_LEAK_CHECK_DF);
-#endif
-}
-
-init::~init() 
-{ 
-}
-
-
-init i;
-
-void* get_mem(size_t n)
-{
-   ++allocated;
-   char* p = (char*)malloc(n + guard_size * 2 + maxi(sizeof(int) + sizeof(void*), boost::re_detail::padding_size) + boost::re_detail::padding_size);
-   char* base = p;
-   p = (char*)((std::ptrdiff_t)(p + boost::re_detail::padding_mask) & ~boost::re_detail::padding_mask);
-   std::memcpy(p + maxi(sizeof(int) + sizeof(void*), boost::re_detail::padding_size), guard_pattern, guard_size);
-   std::memcpy(p + maxi(sizeof(int) + sizeof(void*), boost::re_detail::padding_size) + guard_size + n, guard_pattern, guard_size);
-   *(int*)p = n;
-   *(void**)(p + sizeof(int)) = base;
-   return p + guard_size + maxi(sizeof(int) + sizeof(void*), boost::re_detail::padding_size);
-}
-
-void free_mem(void* b)
-{
-   if(b)
-   {
-      char* p = (char*)b;
-      p -= (guard_size + maxi(sizeof(int) + sizeof(void*), boost::re_detail::padding_size));
-      if(check_pattern(p + maxi(sizeof(int) + sizeof(void*), boost::re_detail::padding_size)) || check_pattern(p + maxi(sizeof(int) + sizeof(void*), boost::re_detail::padding_size) + guard_size + *(int*)p))
-      {
-         cerr << "Error: freed memory has been written past end..." << endl;
-      }
-      free(*(void**)(p + sizeof(int)));
-      --allocated;
-   }
-}
-
-} // namespace
-
-void* operator new(size_t n)
-{
-   return get_mem(n);
-}
-
-void* operator new[](size_t n)
-{
-   return get_mem(n);
-}
-
-void operator delete(void* p)
-{
-   free_mem(p);
-}
-
-void operator delete[](void* p)
-{
-   free_mem(p);
-}
-
-#include <set>
-
-namespace boost{
-   namespace re_detail{
-
-std::set<debug_guard*, std::less<debug_guard*> >* patterns = 0;
-
-int pattern_count = 0;
-
-void check_patterns(const char* f, int l)
-{
-   if(pattern_count)
-   {
-      std::set<debug_guard*, std::less<debug_guard*> >::iterator i, j;
-      i = patterns->begin();
-      j = patterns->end();
-      while(i != j)
-      {
-         if(check_pattern((void*)(*i)->g1) || check_pattern((*i)->g2) || check_pattern((void*)(*i)->pc) || check_pattern((*i)->pnc))
-         {
-            cerr << "Error: static memory corruption at " << hex << *i << dec << " in " << (*i)->file << "@" << (*i)->line << " called from " << f << "@" << l << endl;
-         }
-         ++i;
-      }
-   }
-}
-
-debug_guard::debug_guard(const char* f, int l, const char* p1, char* p2)
-{
-   if(++pattern_count == 1)
-      patterns = new std::set<debug_guard*, std::less<debug_guard*> >;
-   file = f;
-   line = l;
-   std::memcpy(g1, guard_pattern, guard_size);
-   std::memcpy(g2, guard_pattern, guard_size);
-   if(p1)
-   {
-      pc = p1;
-   }
-   else
-      pc = 0;
-   if(p2)
-   {
-      pnc = p2;
-      std::memcpy(pnc, guard_pattern, guard_size);
-   }
-   else
-      pnc = 0;
-   patterns->insert(this);
-}
-
-debug_guard::~debug_guard()
-{
-   check_patterns(file, line);
-   if(check_pattern(g1) || check_pattern(g2))
-   {
-      cerr << "Error: memory corruption " << file << "@" << line << endl;
-   }
-   patterns->erase(this);
-   if(--pattern_count == 0)
-   {
-      delete patterns;
-      patterns = 0;
-   }
-}
-
-   } // namespace re_detail
-
-} // namespace boost
-
-
-
-#endif
-
 
 //
 // regex configuration information: this prints out the settings used
diff --git a/src/regex_raw_buffer.cpp b/src/regex_raw_buffer.cpp
new file mode 100644
index 00000000..d2d8642b
--- /dev/null
+++ b/src/regex_raw_buffer.cpp
@@ -0,0 +1,70 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         regex_raw_buffer.cpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Member functions for class raw_storage.
+  */
+
+
+#define BOOST_REGEX_SOURCE
+#include <memory>
+#include <cstring>
+#include <boost/assert.hpp>
+#include <boost/regex/v4/regex_raw_buffer.hpp>
+
+#if defined(BOOST_NO_STDC_NAMESPACE)
+namespace std{
+   using ::memcpy;
+   using ::memmove;
+}
+#endif
+
+
+namespace boost{ namespace re_detail{
+
+void BOOST_REGEX_CALL raw_storage::resize(size_type n)
+{
+   register size_type newsize = start ? last - start : 1024;
+   while(newsize < n)
+      newsize *= 2;
+   register size_type datasize = end - start;
+   // extend newsize to WORD/DWORD boundary:
+   newsize = (newsize + padding_mask) & ~(padding_mask);
+
+   // allocate and copy data:
+   register pointer ptr = static_cast<pointer>(::operator new(newsize));
+   BOOST_REGEX_NOEH_ASSERT(ptr)
+   std::memcpy(ptr, start, datasize);
+
+   // get rid of old buffer:
+   ::operator delete(start);
+
+   // and set up pointers:
+   start = ptr;
+   end = ptr + datasize;
+   last = ptr + newsize;
+}
+
+void* BOOST_REGEX_CALL raw_storage::insert(size_type pos, size_type n)
+{
+   BOOST_ASSERT(pos <= size_type(end - start));
+   if(size_type(last - end) < n)
+      resize(n + (end - start));
+   register void* result = start + pos;
+   std::memmove(start + pos + n, start + pos, (end - start) - pos);
+   end += n;
+   return result;
+}
+
+}} // namespaces
diff --git a/src/regex_synch.cpp b/src/regex_synch.cpp
deleted file mode 100644
index cf7d7d55..00000000
--- a/src/regex_synch.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- *
- * Copyright (c) 1998-2002
- * Dr 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:        regex_synch.cpp
-  *   VERSION:     see <boost/version.hpp>
-  *   DESCRIPTION: Thread synch helper functions, for regular
-  *                expression library.
-  */
-
-
-#define BOOST_REGEX_SOURCE
-
-#include <boost/regex/config.hpp>
-#ifdef BOOST_REGEX_V3
-#include <boost/regex/v3/regex_synch.hpp>
-#else
-#include <boost/regex/v4/regex_synch.hpp>
-#endif
-
-namespace boost{
-   namespace re_detail{
-
-void BOOST_REGEX_CALL re_init_threads()
-{
-   BOOST_RE_GUARD_STACK
-#ifdef BOOST_HAS_THREADS
-   if(p_re_lock == 0)
-      p_re_lock = new critical_section();
-   cs_guard g(*p_re_lock);
-   ++re_lock_count;
-#endif
-}
-
-void BOOST_REGEX_CALL re_free_threads()
-{
-   BOOST_RE_GUARD_STACK
-#ifdef BOOST_HAS_THREADS
-   cs_guard g(*p_re_lock);
-   --re_lock_count;
-   if(re_lock_count == 0)
-   {
-      g.acquire(false);
-      delete p_re_lock;
-      p_re_lock = 0;
-   }
-#endif
-}
-
-#ifdef BOOST_HAS_THREADS
-
-BOOST_REGEX_DECL critical_section* p_re_lock = 0;
-
-BOOST_REGEX_DECL unsigned int re_lock_count = 0;
-
-#endif
-
-   } // namespace re_detail
-} // namespace boost
-
-
-
-
-
-
diff --git a/src/regex_traits_defaults.cpp b/src/regex_traits_defaults.cpp
new file mode 100644
index 00000000..e48d25ce
--- /dev/null
+++ b/src/regex_traits_defaults.cpp
@@ -0,0 +1,688 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         regex_traits_defaults.cpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Declares API's for access to regex_traits default properties.
+  */
+
+#define BOOST_REGEX_SOURCE
+#include <boost/regex/regex_traits.hpp>
+
+#include <cctype>
+#ifndef BOOST_NO_WREGEX
+#include <cwctype>
+#endif
+
+#if defined(BOOST_NO_STDC_NAMESPACE)
+namespace std{
+   using ::tolower;
+   using ::toupper;
+#ifndef BOOST_NO_WREGEX
+   using ::towlower;
+   using ::towupper;
+#endif
+}
+#endif
+
+
+namespace boost{ namespace re_detail{
+
+BOOST_REGEX_DECL const char* BOOST_REGEX_CALL get_default_syntax(regex_constants::syntax_type n)
+{
+   // if the user hasn't supplied a message catalog, then this supplies
+   // default "messages" for us to load in the range 1-100.
+   const char* messages[] = {
+         "",
+         "(",
+         ")",
+         "$",
+         "^",
+         ".",
+         "*",
+         "+",
+         "?",
+         "[",
+         "]",
+         "|",
+         "\\",
+         "#",
+         "-",
+         "{",
+         "}",
+         "0123456789",
+         "b",
+         "B",
+         "<",
+         ">",
+         "",
+         "",
+         "A`",
+         "z'",
+         "\n",
+         ",",
+         "a",
+         "f",
+         "n",
+         "r",
+         "t",
+         "v",
+         "x",
+         "c",
+         ":",
+         "=",
+         "e",
+         "",
+         "",
+         "",
+         "",
+         "",
+         "",
+         "",
+         "",
+         "E",
+         "Q",
+         "X",
+         "C",
+         "Z",
+         "G",
+         "!",
+         "p",
+         "P",
+         "N",
+   };
+
+   return ((n >= (sizeof(messages) / sizeof(messages[1]))) ? "" : messages[n]);
+}
+
+BOOST_REGEX_DECL const char* BOOST_REGEX_CALL get_default_error_string(regex_constants::error_type n)
+{
+   static const char* const s_default_error_messages[] = {
+      "Success",             /* REG_NOERROR */
+      "No match",             /* REG_NOMATCH */
+      "Invalid regular expression",    /* REG_BADPAT */
+      "Invalid collation character",      /* REG_ECOLLATE */
+      "Invalid character class name",     /* REG_ECTYPE */
+      "Invalid or trailing backslash",         /* REG_EESCAPE */
+      "Invalid back reference",        /* REG_ESUBREG */
+      "Unmatched [ or [^",       /* REG_EBRACK */
+      "Unmatched ( or \\(",         /* REG_EPAREN */
+      "Unmatched { or \\{",           /* REG_EBRACE */
+      "Invalid content of repeat range",     /* REG_BADBR */
+      "Invalid range end",       /* REG_ERANGE */
+      "Memory exhausted",           /* REG_ESPACE */
+      "Invalid preceding regular expression",   /* REG_BADRPT */
+      "Premature end of regular expression", /* REG_EEND */
+      "Regular expression too big",    /* REG_ESIZE */
+      "Unmatched ) or \\)",         /* REG_ERPAREN */
+      "Empty expression",           /* REG_EMPTY */
+      "Complexity requirements exceeded",  /* REG_ECOMPLEXITY */
+      "Out of stack space", /* REG_ESTACK */
+      "Unknown error",    /* REG_E_UNKNOWN */
+      "",
+      "",
+      "",
+   };
+
+   return (n > ::boost::regex_constants::error_unknown) ? s_default_error_messages[ ::boost::regex_constants::error_unknown] : s_default_error_messages[n];
+}
+
+BOOST_REGEX_DECL bool BOOST_REGEX_CALL is_combining_implementation(boost::uint_least16_t c)
+{
+   const boost::uint_least16_t combining_ranges[] = { 0x0300, 0x0361, 
+                           0x0483, 0x0486, 
+                           0x0903, 0x0903, 
+                           0x093E, 0x0940, 
+                           0x0949, 0x094C,
+                           0x0982, 0x0983,
+                           0x09BE, 0x09C0,
+                           0x09C7, 0x09CC,
+                           0x09D7, 0x09D7,
+                           0x0A3E, 0x0A40,
+                           0x0A83, 0x0A83,
+                           0x0ABE, 0x0AC0,
+                           0x0AC9, 0x0ACC,
+                           0x0B02, 0x0B03,
+                           0x0B3E, 0x0B3E,
+                           0x0B40, 0x0B40,
+                           0x0B47, 0x0B4C,
+                           0x0B57, 0x0B57,
+                           0x0B83, 0x0B83,
+                           0x0BBE, 0x0BBF,
+                           0x0BC1, 0x0BCC,
+                           0x0BD7, 0x0BD7,
+                           0x0C01, 0x0C03,
+                           0x0C41, 0x0C44,
+                           0x0C82, 0x0C83,
+                           0x0CBE, 0x0CBE,
+                           0x0CC0, 0x0CC4,
+                           0x0CC7, 0x0CCB,
+                           0x0CD5, 0x0CD6,
+                           0x0D02, 0x0D03,
+                           0x0D3E, 0x0D40,
+                           0x0D46, 0x0D4C,
+                           0x0D57, 0x0D57,
+                           0x0F7F, 0x0F7F,
+                           0x20D0, 0x20E1, 
+                           0x3099, 0x309A,
+                           0xFE20, 0xFE23, 
+                           0xffff, 0xffff, };
+
+      const boost::uint_least16_t* p = combining_ranges + 1;
+   while(*p < c) p += 2;
+   --p;
+   if((c >= *p) && (c <= *(p+1)))
+         return true;
+   return false;
+}
+
+//
+// these are the POSIX collating names:
+//
+BOOST_REGEX_DECL const char* def_coll_names[] = {
+"NUL", "SOH", "STX", "ETX", "EOT", "ENQ", "ACK", "alert", "backspace", "tab", "newline", 
+"vertical-tab", "form-feed", "carriage-return", "SO", "SI", "DLE", "DC1", "DC2", "DC3", "DC4", "NAK", 
+"SYN", "ETB", "CAN", "EM", "SUB", "ESC", "IS4", "IS3", "IS2", "IS1", "space", "exclamation-mark", 
+"quotation-mark", "number-sign", "dollar-sign", "percent-sign", "ampersand", "apostrophe", 
+"left-parenthesis", "right-parenthesis", "asterisk", "plus-sign", "comma", "hyphen", 
+"period", "slash", "zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", 
+"colon", "semicolon", "less-than-sign", "equals-sign", "greater-than-sign", 
+"question-mark", "commercial-at", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", 
+"Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "left-square-bracket", "backslash", 
+"right-square-bracket", "circumflex", "underscore", "grave-accent", "a", "b", "c", "d", "e", "f", 
+"g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "left-curly-bracket", 
+"vertical-line", "right-curly-bracket", "tilde", "DEL", "", 
+};
+
+// these multi-character collating elements
+// should keep most Western-European locales
+// happy - we should really localise these a
+// little more - but this will have to do for
+// now:
+
+BOOST_REGEX_DECL const char* def_multi_coll[] = {
+   "ae",
+   "Ae",
+   "AE",
+   "ch",
+   "Ch",
+   "CH",
+   "ll",
+   "Ll",
+   "LL",
+   "ss",
+   "Ss",
+   "SS",
+   "nj",
+   "Nj",
+   "NJ",
+   "dz",
+   "Dz",
+   "DZ",
+   "lj",
+   "Lj",
+   "LJ",
+   "",
+};
+
+
+
+BOOST_REGEX_DECL std::string BOOST_REGEX_CALL lookup_default_collate_name(const std::string& name)
+{
+   unsigned int i = 0;
+   while(*def_coll_names[i])
+   {
+      if(def_coll_names[i] == name)
+      {
+         return std::string(1, char(i));
+      }
+      ++i;
+   }
+   i = 0;
+   while(*def_multi_coll[i])
+   {
+      if(def_multi_coll[i] == name)
+      {
+         return def_multi_coll[i];
+      }
+      ++i;
+   }
+   return std::string();
+}
+
+BOOST_REGEX_DECL char BOOST_REGEX_CALL global_lower(char c)
+{
+   return static_cast<char>((std::tolower)(c));
+}
+
+BOOST_REGEX_DECL char BOOST_REGEX_CALL global_upper(char c)
+{
+   return static_cast<char>((std::toupper)(c));
+}
+#ifndef BOOST_NO_WREGEX
+BOOST_REGEX_DECL wchar_t BOOST_REGEX_CALL global_lower(wchar_t c)
+{
+   return (std::towlower)(c);
+}
+
+BOOST_REGEX_DECL wchar_t BOOST_REGEX_CALL global_upper(wchar_t c)
+{
+   return (std::towupper)(c);
+}
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+BOOST_REGEX_DECL unsigned short BOOST_REGEX_CALL global_lower(unsigned short c)
+{
+   return (std::towlower)(c);
+}
+
+BOOST_REGEX_DECL unsigned short BOOST_REGEX_CALL global_upper(unsigned short c)
+{
+   return (std::towupper)(c);
+}
+#endif
+
+#endif
+
+BOOST_REGEX_DECL regex_constants::escape_syntax_type BOOST_REGEX_CALL get_default_escape_syntax_type(char c)
+{
+   //
+   // char_syntax determines how the compiler treats a given character
+   // in a regular expression.
+   //
+   static regex_constants::escape_syntax_type char_syntax[] = {
+      regex_constants::escape_type_identity,        /**/
+      regex_constants::escape_type_identity,        /**/
+      regex_constants::escape_type_identity,        /**/
+      regex_constants::escape_type_identity,        /**/
+      regex_constants::escape_type_identity,        /**/
+      regex_constants::escape_type_identity,        /**/
+      regex_constants::escape_type_identity,        /**/
+      regex_constants::escape_type_identity,        /**/
+      regex_constants::escape_type_identity,        /**/
+      regex_constants::escape_type_identity,        /**/
+      regex_constants::escape_type_identity,     /**/
+      regex_constants::escape_type_identity,        /**/
+      regex_constants::escape_type_identity,        /**/
+      regex_constants::escape_type_identity,        /**/
+      regex_constants::escape_type_identity,        /**/
+      regex_constants::escape_type_identity,        /**/
+      regex_constants::escape_type_identity,        /**/
+      regex_constants::escape_type_identity,        /**/
+      regex_constants::escape_type_identity,        /**/
+      regex_constants::escape_type_identity,        /**/
+      regex_constants::escape_type_identity,        /**/
+      regex_constants::escape_type_identity,        /**/
+      regex_constants::escape_type_identity,        /**/
+      regex_constants::escape_type_identity,        /**/
+      regex_constants::escape_type_identity,        /**/
+      regex_constants::escape_type_identity,        /**/
+      regex_constants::escape_type_identity,        /**/
+      regex_constants::escape_type_identity,        /**/
+      regex_constants::escape_type_identity,        /**/
+      regex_constants::escape_type_identity,        /**/
+      regex_constants::escape_type_identity,        /**/
+      regex_constants::escape_type_identity,        /**/
+      regex_constants::escape_type_identity,        /* */    // 32
+      regex_constants::escape_type_identity,        /*!*/
+      regex_constants::escape_type_identity,        /*"*/
+      regex_constants::escape_type_identity,        /*#*/
+      regex_constants::escape_type_identity,        /*$*/
+      regex_constants::escape_type_identity,        /*%*/
+      regex_constants::escape_type_identity,        /*&*/
+      regex_constants::escape_type_end_buffer,        /*'*/
+      regex_constants::syntax_open_mark,        /*(*/
+      regex_constants::syntax_close_mark,        /*)*/
+      regex_constants::escape_type_identity,        /***/
+      regex_constants::syntax_plus,                 /*+*/
+      regex_constants::escape_type_identity,        /*,*/
+      regex_constants::escape_type_identity,        /*-*/
+      regex_constants::escape_type_identity,        /*.*/
+      regex_constants::escape_type_identity,        /*/*/
+      regex_constants::escape_type_decimal,        /*0*/
+      regex_constants::escape_type_backref,        /*1*/
+      regex_constants::escape_type_backref,        /*2*/
+      regex_constants::escape_type_backref,        /*3*/
+      regex_constants::escape_type_backref,        /*4*/
+      regex_constants::escape_type_backref,        /*5*/
+      regex_constants::escape_type_backref,        /*6*/
+      regex_constants::escape_type_backref,        /*7*/
+      regex_constants::escape_type_backref,        /*8*/
+      regex_constants::escape_type_backref,        /*9*/
+      regex_constants::escape_type_identity,        /*:*/
+      regex_constants::escape_type_identity,        /*;*/
+      regex_constants::escape_type_left_word,        /*<*/
+      regex_constants::escape_type_identity,        /*=*/
+      regex_constants::escape_type_right_word,        /*>*/
+      regex_constants::syntax_question,              /*?*/
+      regex_constants::escape_type_identity,         /*@*/
+      regex_constants::escape_type_start_buffer,     /*A*/
+      regex_constants::escape_type_not_word_assert,  /*B*/
+      regex_constants::escape_type_C,                /*C*/
+      regex_constants::escape_type_not_class,        /*D*/
+      regex_constants::escape_type_E,                /*E*/
+      regex_constants::escape_type_not_class,        /*F*/
+      regex_constants::escape_type_G,                /*G*/
+      regex_constants::escape_type_not_class,        /*H*/
+      regex_constants::escape_type_not_class,        /*I*/
+      regex_constants::escape_type_not_class,        /*J*/
+      regex_constants::escape_type_not_class,        /*K*/
+      regex_constants::escape_type_not_class,        /*L*/
+      regex_constants::escape_type_not_class,        /*M*/
+      regex_constants::escape_type_named_char,       /*N*/
+      regex_constants::escape_type_not_class,        /*O*/
+      regex_constants::escape_type_not_property,     /*P*/
+      regex_constants::escape_type_Q,                /*Q*/
+      regex_constants::escape_type_not_class,        /*R*/
+      regex_constants::escape_type_not_class,        /*S*/
+      regex_constants::escape_type_not_class,        /*T*/
+      regex_constants::escape_type_not_class,        /*U*/
+      regex_constants::escape_type_not_class,        /*V*/
+      regex_constants::escape_type_not_class,        /*W*/
+      regex_constants::escape_type_X,                /*X*/
+      regex_constants::escape_type_not_class,        /*Y*/
+      regex_constants::escape_type_Z,                /*Z*/
+      regex_constants::escape_type_identity,        /*[*/
+      regex_constants::escape_type_identity,        /*\*/
+      regex_constants::escape_type_identity,        /*]*/
+      regex_constants::escape_type_identity,        /*^*/
+      regex_constants::escape_type_identity,        /*_*/
+      regex_constants::escape_type_start_buffer,        /*`*/
+      regex_constants::escape_type_control_a,        /*a*/
+      regex_constants::escape_type_word_assert,        /*b*/
+      regex_constants::escape_type_ascii_control,        /*c*/
+      regex_constants::escape_type_class,        /*d*/
+      regex_constants::escape_type_e,        /*e*/
+      regex_constants::escape_type_control_f,       /*f*/
+      regex_constants::escape_type_class,        /*g*/
+      regex_constants::escape_type_class,        /*h*/
+      regex_constants::escape_type_class,        /*i*/
+      regex_constants::escape_type_class,        /*j*/
+      regex_constants::escape_type_class,        /*k*/
+      regex_constants::escape_type_class,        /*l*/
+      regex_constants::escape_type_class,        /*m*/
+      regex_constants::escape_type_control_n,       /*n*/
+      regex_constants::escape_type_class,           /*o*/
+      regex_constants::escape_type_property,        /*p*/
+      regex_constants::escape_type_class,           /*q*/
+      regex_constants::escape_type_control_r,       /*r*/
+      regex_constants::escape_type_class,           /*s*/
+      regex_constants::escape_type_control_t,       /*t*/
+      regex_constants::escape_type_class,         /*u*/
+      regex_constants::escape_type_control_v,       /*v*/
+      regex_constants::escape_type_class,           /*w*/
+      regex_constants::escape_type_hex,             /*x*/
+      regex_constants::escape_type_class,           /*y*/
+      regex_constants::escape_type_end_buffer,      /*z*/
+      regex_constants::syntax_open_brace,           /*{*/
+      regex_constants::syntax_or,                   /*|*/
+      regex_constants::syntax_close_brace,          /*}*/
+      regex_constants::escape_type_identity,        /*~*/
+      regex_constants::escape_type_identity,        /**/
+      regex_constants::escape_type_identity,        /*€*/
+      regex_constants::escape_type_identity,        /*�*/
+      regex_constants::escape_type_identity,        /*‚*/
+      regex_constants::escape_type_identity,        /*ƒ*/
+      regex_constants::escape_type_identity,        /*„*/
+      regex_constants::escape_type_identity,        /*…*/
+      regex_constants::escape_type_identity,        /*†*/
+      regex_constants::escape_type_identity,        /*‡*/
+      regex_constants::escape_type_identity,        /*ˆ*/
+      regex_constants::escape_type_identity,        /*‰*/
+      regex_constants::escape_type_identity,        /*Š*/
+      regex_constants::escape_type_identity,        /*‹*/
+      regex_constants::escape_type_identity,        /*Œ*/
+      regex_constants::escape_type_identity,        /*�*/
+      regex_constants::escape_type_identity,        /*Ž*/
+      regex_constants::escape_type_identity,        /*�*/
+      regex_constants::escape_type_identity,        /*�*/
+      regex_constants::escape_type_identity,        /*‘*/
+      regex_constants::escape_type_identity,        /*’*/
+      regex_constants::escape_type_identity,        /*“*/
+      regex_constants::escape_type_identity,        /*”*/
+      regex_constants::escape_type_identity,        /*•*/
+      regex_constants::escape_type_identity,        /*–*/
+      regex_constants::escape_type_identity,        /*—*/
+      regex_constants::escape_type_identity,        /*˜*/
+      regex_constants::escape_type_identity,        /*™*/
+      regex_constants::escape_type_identity,        /*š*/
+      regex_constants::escape_type_identity,        /*›*/
+      regex_constants::escape_type_identity,        /*œ*/
+      regex_constants::escape_type_identity,        /*�*/
+      regex_constants::escape_type_identity,        /*ž*/
+      regex_constants::escape_type_identity,        /*Ÿ*/
+      regex_constants::escape_type_identity,        /* */
+      regex_constants::escape_type_identity,        /*¡*/
+      regex_constants::escape_type_identity,        /*¢*/
+      regex_constants::escape_type_identity,        /*£*/
+      regex_constants::escape_type_identity,        /*¤*/
+      regex_constants::escape_type_identity,        /*¥*/
+      regex_constants::escape_type_identity,        /*¦*/
+      regex_constants::escape_type_identity,        /*§*/
+      regex_constants::escape_type_identity,        /*¨*/
+      regex_constants::escape_type_identity,        /*©*/
+      regex_constants::escape_type_identity,        /*ª*/
+      regex_constants::escape_type_identity,        /*«*/
+      regex_constants::escape_type_identity,        /*¬*/
+      regex_constants::escape_type_identity,        /*­*/
+      regex_constants::escape_type_identity,        /*®*/
+      regex_constants::escape_type_identity,        /*¯*/
+      regex_constants::escape_type_identity,        /*°*/
+      regex_constants::escape_type_identity,        /*±*/
+      regex_constants::escape_type_identity,        /*²*/
+      regex_constants::escape_type_identity,        /*³*/
+      regex_constants::escape_type_identity,        /*´*/
+      regex_constants::escape_type_identity,        /*µ*/
+      regex_constants::escape_type_identity,        /*¶*/
+   };
+
+   return char_syntax[(unsigned char)c];
+}
+
+BOOST_REGEX_DECL regex_constants::syntax_type BOOST_REGEX_CALL get_default_syntax_type(char c)
+{
+   //
+   // char_syntax determines how the compiler treats a given character
+   // in a regular expression.
+   //
+   static regex_constants::syntax_type char_syntax[] = {
+      regex_constants::syntax_char,        /**/
+      regex_constants::syntax_char,        /**/
+      regex_constants::syntax_char,        /**/
+      regex_constants::syntax_char,        /**/
+      regex_constants::syntax_char,        /**/
+      regex_constants::syntax_char,        /**/
+      regex_constants::syntax_char,        /**/
+      regex_constants::syntax_char,        /**/
+      regex_constants::syntax_char,        /**/
+      regex_constants::syntax_char,        /**/
+      regex_constants::syntax_newline,     /**/
+      regex_constants::syntax_char,        /**/
+      regex_constants::syntax_char,        /**/
+      regex_constants::syntax_char,        /**/
+      regex_constants::syntax_char,        /**/
+      regex_constants::syntax_char,        /**/
+      regex_constants::syntax_char,        /**/
+      regex_constants::syntax_char,        /**/
+      regex_constants::syntax_char,        /**/
+      regex_constants::syntax_char,        /**/
+      regex_constants::syntax_char,        /**/
+      regex_constants::syntax_char,        /**/
+      regex_constants::syntax_char,        /**/
+      regex_constants::syntax_char,        /**/
+      regex_constants::syntax_char,        /**/
+      regex_constants::syntax_char,        /**/
+      regex_constants::syntax_char,        /**/
+      regex_constants::syntax_char,        /**/
+      regex_constants::syntax_char,        /**/
+      regex_constants::syntax_char,        /**/
+      regex_constants::syntax_char,        /**/
+      regex_constants::syntax_char,        /**/
+      regex_constants::syntax_char,        /* */    // 32
+      regex_constants::syntax_not,        /*!*/
+      regex_constants::syntax_char,        /*"*/
+      regex_constants::syntax_hash,        /*#*/
+      regex_constants::syntax_dollar,        /*$*/
+      regex_constants::syntax_char,        /*%*/
+      regex_constants::syntax_char,        /*&*/
+      regex_constants::syntax_char,        /*'*/
+      regex_constants::syntax_open_mark,        /*(*/
+      regex_constants::syntax_close_mark,        /*)*/
+      regex_constants::syntax_star,        /***/
+      regex_constants::syntax_plus,        /*+*/
+      regex_constants::syntax_comma,        /*,*/
+      regex_constants::syntax_dash,        /*-*/
+      regex_constants::syntax_dot,        /*.*/
+      regex_constants::syntax_char,        /*/*/
+      regex_constants::syntax_digit,        /*0*/
+      regex_constants::syntax_digit,        /*1*/
+      regex_constants::syntax_digit,        /*2*/
+      regex_constants::syntax_digit,        /*3*/
+      regex_constants::syntax_digit,        /*4*/
+      regex_constants::syntax_digit,        /*5*/
+      regex_constants::syntax_digit,        /*6*/
+      regex_constants::syntax_digit,        /*7*/
+      regex_constants::syntax_digit,        /*8*/
+      regex_constants::syntax_digit,        /*9*/
+      regex_constants::syntax_colon,        /*:*/
+      regex_constants::syntax_char,        /*;*/
+      regex_constants::escape_type_left_word, /*<*/
+      regex_constants::syntax_equal,        /*=*/
+      regex_constants::escape_type_right_word, /*>*/
+      regex_constants::syntax_question,        /*?*/
+      regex_constants::syntax_char,        /*@*/
+      regex_constants::syntax_char,        /*A*/
+      regex_constants::syntax_char,        /*B*/
+      regex_constants::syntax_char,        /*C*/
+      regex_constants::syntax_char,        /*D*/
+      regex_constants::syntax_char,        /*E*/
+      regex_constants::syntax_char,        /*F*/
+      regex_constants::syntax_char,        /*G*/
+      regex_constants::syntax_char,        /*H*/
+      regex_constants::syntax_char,        /*I*/
+      regex_constants::syntax_char,        /*J*/
+      regex_constants::syntax_char,        /*K*/
+      regex_constants::syntax_char,        /*L*/
+      regex_constants::syntax_char,        /*M*/
+      regex_constants::syntax_char,        /*N*/
+      regex_constants::syntax_char,        /*O*/
+      regex_constants::syntax_char,        /*P*/
+      regex_constants::syntax_char,        /*Q*/
+      regex_constants::syntax_char,        /*R*/
+      regex_constants::syntax_char,        /*S*/
+      regex_constants::syntax_char,        /*T*/
+      regex_constants::syntax_char,        /*U*/
+      regex_constants::syntax_char,        /*V*/
+      regex_constants::syntax_char,        /*W*/
+      regex_constants::syntax_char,        /*X*/
+      regex_constants::syntax_char,        /*Y*/
+      regex_constants::syntax_char,        /*Z*/
+      regex_constants::syntax_open_set,        /*[*/
+      regex_constants::syntax_escape,        /*\*/
+      regex_constants::syntax_close_set,        /*]*/
+      regex_constants::syntax_caret,        /*^*/
+      regex_constants::syntax_char,        /*_*/
+      regex_constants::syntax_char,        /*`*/
+      regex_constants::syntax_char,        /*a*/
+      regex_constants::syntax_char,        /*b*/
+      regex_constants::syntax_char,        /*c*/
+      regex_constants::syntax_char,        /*d*/
+      regex_constants::syntax_char,        /*e*/
+      regex_constants::syntax_char,        /*f*/
+      regex_constants::syntax_char,        /*g*/
+      regex_constants::syntax_char,        /*h*/
+      regex_constants::syntax_char,        /*i*/
+      regex_constants::syntax_char,        /*j*/
+      regex_constants::syntax_char,        /*k*/
+      regex_constants::syntax_char,        /*l*/
+      regex_constants::syntax_char,        /*m*/
+      regex_constants::syntax_char,        /*n*/
+      regex_constants::syntax_char,        /*o*/
+      regex_constants::syntax_char,        /*p*/
+      regex_constants::syntax_char,        /*q*/
+      regex_constants::syntax_char,        /*r*/
+      regex_constants::syntax_char,        /*s*/
+      regex_constants::syntax_char,        /*t*/
+      regex_constants::syntax_char,        /*u*/
+      regex_constants::syntax_char,        /*v*/
+      regex_constants::syntax_char,        /*w*/
+      regex_constants::syntax_char,        /*x*/
+      regex_constants::syntax_char,        /*y*/
+      regex_constants::syntax_char,        /*z*/
+      regex_constants::syntax_open_brace,        /*{*/
+      regex_constants::syntax_or,        /*|*/
+      regex_constants::syntax_close_brace,        /*}*/
+      regex_constants::syntax_char,        /*~*/
+      regex_constants::syntax_char,        /**/
+      regex_constants::syntax_char,        /*€*/
+      regex_constants::syntax_char,        /*�*/
+      regex_constants::syntax_char,        /*‚*/
+      regex_constants::syntax_char,        /*ƒ*/
+      regex_constants::syntax_char,        /*„*/
+      regex_constants::syntax_char,        /*…*/
+      regex_constants::syntax_char,        /*†*/
+      regex_constants::syntax_char,        /*‡*/
+      regex_constants::syntax_char,        /*ˆ*/
+      regex_constants::syntax_char,        /*‰*/
+      regex_constants::syntax_char,        /*Š*/
+      regex_constants::syntax_char,        /*‹*/
+      regex_constants::syntax_char,        /*Œ*/
+      regex_constants::syntax_char,        /*�*/
+      regex_constants::syntax_char,        /*Ž*/
+      regex_constants::syntax_char,        /*�*/
+      regex_constants::syntax_char,        /*�*/
+      regex_constants::syntax_char,        /*‘*/
+      regex_constants::syntax_char,        /*’*/
+      regex_constants::syntax_char,        /*“*/
+      regex_constants::syntax_char,        /*”*/
+      regex_constants::syntax_char,        /*•*/
+      regex_constants::syntax_char,        /*–*/
+      regex_constants::syntax_char,        /*—*/
+      regex_constants::syntax_char,        /*˜*/
+      regex_constants::syntax_char,        /*™*/
+      regex_constants::syntax_char,        /*š*/
+      regex_constants::syntax_char,        /*›*/
+      regex_constants::syntax_char,        /*œ*/
+      regex_constants::syntax_char,        /*�*/
+      regex_constants::syntax_char,        /*ž*/
+      regex_constants::syntax_char,        /*Ÿ*/
+      regex_constants::syntax_char,        /* */
+      regex_constants::syntax_char,        /*¡*/
+      regex_constants::syntax_char,        /*¢*/
+      regex_constants::syntax_char,        /*£*/
+      regex_constants::syntax_char,        /*¤*/
+      regex_constants::syntax_char,        /*¥*/
+      regex_constants::syntax_char,        /*¦*/
+      regex_constants::syntax_char,        /*§*/
+      regex_constants::syntax_char,        /*¨*/
+      regex_constants::syntax_char,        /*©*/
+      regex_constants::syntax_char,        /*ª*/
+      regex_constants::syntax_char,        /*«*/
+      regex_constants::syntax_char,        /*¬*/
+      regex_constants::syntax_char,        /*­*/
+      regex_constants::syntax_char,        /*®*/
+      regex_constants::syntax_char,        /*¯*/
+      regex_constants::syntax_char,        /*°*/
+      regex_constants::syntax_char,        /*±*/
+      regex_constants::syntax_char,        /*²*/
+      regex_constants::syntax_char,        /*³*/
+      regex_constants::syntax_char,        /*´*/
+      regex_constants::syntax_char,        /*µ*/
+      regex_constants::syntax_char,        /*¶*/
+   };
+
+   return char_syntax[(unsigned char)c];
+}
+
+
+} // re_detail
+} // boost
diff --git a/src/static_mutex.cpp b/src/static_mutex.cpp
new file mode 100644
index 00000000..03e292c1
--- /dev/null
+++ b/src/static_mutex.cpp
@@ -0,0 +1,177 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         static_mutex.cpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Declares static_mutex lock type.
+  */
+
+#define BOOST_REGEX_SOURCE
+#include <boost/config.hpp>
+
+#ifdef BOOST_HAS_THREADS
+
+#include <boost/regex/pending/static_mutex.hpp>
+
+#if defined(BOOST_HAS_WINTHREADS)
+#define NOMINMAX
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <boost/static_assert.hpp>
+#endif
+
+
+namespace boost{
+
+#if defined(BOOST_HAS_PTHREADS) && defined(PTHREAD_MUTEX_INITIALIZER)
+
+scoped_static_mutex_lock::scoped_static_mutex_lock(static_mutex& m, bool lk)
+: m_mutex(m), m_have_lock(false)
+{
+   if(lk)
+      lock();
+}
+
+scoped_static_mutex_lock::~scoped_static_mutex_lock()
+{
+   if(m_have_lock)
+      unlock();
+}
+
+void scoped_static_mutex_lock::lock()
+{
+   if(0 == m_have_lock)
+   {
+      pthread_mutex_lock(&(m_mutex.m_mutex));
+      m_have_lock = true;
+   }
+}
+
+void scoped_static_mutex_lock::unlock()
+{
+   if(m_have_lock)
+   {
+      pthread_mutex_unlock(&(m_mutex.m_mutex));
+      m_have_lock = false;
+   }
+}
+
+#elif defined(BOOST_HAS_WINTHREADS)
+
+BOOST_STATIC_ASSERT(sizeof(LONG) == sizeof(boost::int32_t));
+
+scoped_static_mutex_lock::scoped_static_mutex_lock(static_mutex& m, bool lk)
+: m_mutex(m), m_have_lock(false)
+{
+   if(lk)
+      lock();
+}
+
+scoped_static_mutex_lock::~scoped_static_mutex_lock()
+{
+   if(m_have_lock)
+      unlock();
+}
+
+void scoped_static_mutex_lock::lock()
+{
+   if(0 == m_have_lock)
+   {
+#if !defined(InterlockedCompareExchangePointer)
+      while(0 != InterlockedCompareExchange(reinterpret_cast<void**>((boost::uint_least16_t*)&(m_mutex.m_mutex)), (void*)1, 0))
+#else
+      while(0 != InterlockedCompareExchange(reinterpret_cast<LONG*>(&(m_mutex.m_mutex)), 1, 0))
+#endif
+      {
+         Sleep(0);
+      }
+      m_have_lock = true;
+   }
+}
+
+void scoped_static_mutex_lock::unlock()
+{
+   if(m_have_lock)
+   {
+#if !defined(InterlockedCompareExchangePointer)
+      InterlockedExchange((LONG*)&(m_mutex.m_mutex), 0);
+#else
+      InterlockedExchange(reinterpret_cast<LONG*>(&(m_mutex.m_mutex)), 0);
+#endif
+      m_have_lock = false;
+   }
+}
+
+#else
+//
+// Portable version of a static mutex based on Boost.Thread library:
+//
+#include <stdlib.h>
+#include <assert.h>
+
+boost::recursive_mutex* static_mutex::m_pmutex = 0;
+boost::once_flag static_mutex::m_once = BOOST_ONCE_INIT;
+
+extern "C" BOOST_REGEX_DECL void free_static_mutex()
+{
+   delete static_mutex::m_pmutex;
+   static_mutex::m_pmutex = 0;
+}
+
+void static_mutex::init()
+{
+   m_pmutex = new boost::recursive_mutex();
+   int r = atexit(free_static_mutex);
+   assert(0 == r);
+}
+
+scoped_static_mutex_lock::scoped_static_mutex_lock(static_mutex& , bool lk)
+: m_plock(0), m_have_lock(false)
+{
+   if(lk)
+      lock();
+}
+
+scoped_static_mutex_lock::~scoped_static_mutex_lock()
+{
+   if(m_have_lock)
+      unlock();
+   delete m_plock;
+}
+
+void scoped_static_mutex_lock::lock()
+{
+   if(0 == m_have_lock)
+   {
+      boost::call_once(&static_mutex::init, static_mutex::m_once);
+      if(0 == m_plock)
+         m_plock = new boost::recursive_mutex::scoped_lock(*static_mutex::m_pmutex, false);
+      m_plock->lock();
+      m_have_lock = true;
+   }
+}
+
+void scoped_static_mutex_lock::unlock()
+{
+   if(m_have_lock)
+   {
+      m_plock->unlock();
+      m_have_lock = false;
+   }
+}
+
+#endif
+
+}
+
+#endif // BOOST_HAS_THREADS
diff --git a/src/usinstances.cpp b/src/usinstances.cpp
new file mode 100644
index 00000000..b8d0bd27
--- /dev/null
+++ b/src/usinstances.cpp
@@ -0,0 +1,50 @@
+/*
+ *
+ * Copyright (c) 1998-2002
+ * Dr 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:        winstances.cpp
+  *   VERSION:     see <boost/version.hpp>
+  *   DESCRIPTION: regex unsigned short template instances (MSVC only).
+  */
+
+#define BOOST_REGEX_SOURCE
+
+#include <boost/regex/config.hpp>
+
+#if !defined(BOOST_NO_WREGEX) && defined(BOOST_REGEX_HAS_OTHER_WCHAR_T) && !defined(BOOST_REGEX_NO_EXTERNAL_TEMPLATES)
+#define BOOST_REGEX_US_INSTANTIATE
+
+#ifdef _DLL_CPPLIB
+namespace std{
+template _CRTIMP2 bool __cdecl operator==(
+	const basic_string<unsigned short, char_traits<unsigned short>, allocator<unsigned short> >&,
+	const basic_string<unsigned short, char_traits<unsigned short>, allocator<unsigned short> >&);
+template _CRTIMP2 bool __cdecl operator==(
+	const unsigned short *,
+	const basic_string<unsigned short, char_traits<unsigned short>, allocator<unsigned short> >&);
+template _CRTIMP2 bool __cdecl operator==(
+	const basic_string<unsigned short, char_traits<unsigned short>, allocator<unsigned short> >&,
+	const unsigned short *);
+template _CRTIMP2 bool __cdecl operator<(
+	const basic_string<unsigned short, char_traits<unsigned short>, allocator<unsigned short> >&,
+	const basic_string<unsigned short, char_traits<unsigned short>, allocator<unsigned short> >&);
+template _CRTIMP2 bool __cdecl operator>(
+	const basic_string<unsigned short, char_traits<unsigned short>, allocator<unsigned short> >&,
+	const basic_string<unsigned short, char_traits<unsigned short>, allocator<unsigned short> >&);
+}
+#endif
+
+
+#include <boost/regex.hpp>
+
+#endif
+
diff --git a/src/w32_regex_traits.cpp b/src/w32_regex_traits.cpp
index b65c9866..d8a29f77 100644
--- a/src/w32_regex_traits.cpp
+++ b/src/w32_regex_traits.cpp
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 1998-2002
+ * Copyright (c) 2004
  * Dr John Maddock
  *
  * Use, modification and distribution are subject to the 
@@ -11,1094 +11,451 @@
  
  /*
   *   LOCATION:    see http://www.boost.org for most recent version.
-  *   FILE:        w32_regex_traits.cpp
-  *   VERSION:     see <boost/version.hpp>
-  *   DESCRIPTION: Implements the w32_regex_traits<charT> traits class
+  *   FILE         w32_regex_traits.cpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Implements w32_regex_traits<char> (and associated helper classes).
   */
 
 #define BOOST_REGEX_SOURCE
+#include <boost/regex/config.hpp>
 
-#include <clocale>
-#include <cstdio>
-#include <list>
-#include <cctype>
-#include <cstdio>
-#include <boost/regex/regex_traits.hpp>
 #if defined(_WIN32) && !defined(BOOST_REGEX_NO_W32)
-#include <boost/cregex.hpp>
-#ifdef BOOST_REGEX_V3
-#include <boost/regex/v3/regex_synch.hpp>
-#include <boost/regex/v3/regex_cstring.hpp>
-#else
-#include <boost/regex/v4/regex_synch.hpp>
-#include <boost/regex/v4/regex_cstring.hpp>
-#endif
-#include <boost/scoped_array.hpp>
+#include <boost/regex/regex_traits.hpp>
+#include <boost/regex/pattern_except.hpp>
 
+#define WIN32_LEAN_AND_MEAN
+#define NOMINMAX
+#define NOGDI
+#include <windows.h>
 
-//
-// VC6 needs to link to user32.lib, as do all compilers that
-// claim to be VC6/7 compatible:
-//
-#if defined(_MSC_VER) && !defined(__BORLANDC__)
+#ifdef _MSC_VER
 #pragma comment(lib, "user32.lib")
 #endif
 
-namespace{
-
-//
-// character classes:
-
-boost::uint_fast32_t re_char_class_id[] = {
-   boost::re_detail::w32_traits_base::char_class_alnum,
-   boost::re_detail::w32_traits_base::char_class_alpha,
-   boost::re_detail::w32_traits_base::char_class_cntrl,
-   boost::re_detail::w32_traits_base::char_class_digit,
-   boost::re_detail::w32_traits_base::char_class_graph,
-   boost::re_detail::w32_traits_base::char_class_lower,
-   boost::re_detail::w32_traits_base::char_class_print,
-   boost::re_detail::w32_traits_base::char_class_punct,
-   boost::re_detail::w32_traits_base::char_class_space,
-   boost::re_detail::w32_traits_base::char_class_upper,
-   boost::re_detail::w32_traits_base::char_class_xdigit,
-   boost::re_detail::w32_traits_base::char_class_blank,
-   boost::re_detail::w32_traits_base::char_class_word,
-   boost::re_detail::w32_traits_base::char_class_unicode,
-};
-
-const char* re_char_class_names[] = {
-"alnum",
-"alpha",
-"cntrl",
-"digit",
-"graph",
-"lower",
-"print",
-"punct",
-"space",
-"upper",
-"xdigit",
-"blank",
-"word",
-"unicode",
-};
-
-std::string* pclasses = 0;
-const unsigned int re_classes_max = 14;
-
-//
-// collate names:
-
-struct collate_name_t
-{
-   std::string name;
-   std::string value;
-   collate_name_t(){}
-   collate_name_t(const char* p1, const char* p2, const char* p3, const char* p4)
-      : name(p1, p2), value(p3, p4) {}
-};
-
-std::list<collate_name_t>* pcoll_names = 0;
-
-//
-// message handling:
-#ifndef BOOST_RE_MESSAGE_BASE
-#define BOOST_RE_MESSAGE_BASE 0
+#ifdef BOOST_NO_STDC_NAMESPACE
+namespace std{
+   using ::memset;
+}
 #endif
 
-HINSTANCE hresmod = 0;
+namespace boost{ namespace re_detail{
 
-char* re_custom_error_messages[] = {
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-   0,
-};
-
-char re_zero;
-char re_ten;
-
-unsigned int entry_count = 0;
-bool is_init = false;
-
-enum syntax_map_size
+void w32_regex_traits_char_layer<char>::init() 
 {
-   map_size = UCHAR_MAX + 1
-};
-
-#ifndef BOOST_NO_WREGEX
-
-boost::regex_wchar_type re_zero_w;
-boost::regex_wchar_type re_ten_w;
-
-bool isPlatformNT = false;
-
-struct syntax_map_t
-{
-   boost::regex_wchar_type c;
-   unsigned int type;
-};
-
-std::list<syntax_map_t>* syntax;
-
-#endif
-
-std::size_t BOOST_REGEX_CALL _re_get_message(char* buf, std::size_t len, unsigned id);
-
-std::size_t BOOST_REGEX_CALL get_message(boost::regex_wchar_type* buf, std::size_t len, unsigned id)
-{
-   std::size_t size = _re_get_message(static_cast<char*>(0), 0, id);
-   if(len < size)
-      return size;
-   boost::scoped_array<char> cb(new char[size]);
-   _re_get_message(cb.get(), size, id);
-   size = boost::w32_regex_traits<boost::regex_wchar_type>::strwiden(buf, len, cb.get());
-   return size;
-}
-
-inline std::size_t BOOST_REGEX_CALL get_message(char* buf, std::size_t len, unsigned id)
-{
-   return _re_get_message(buf, len, id);
-}
-
-std::size_t BOOST_REGEX_CALL _re_get_message(char* buf, std::size_t len, unsigned id)
-{
-   BOOST_RE_GUARD_STACK
-   // get the customised message if any:
-   if(len < 255)
-      return 255;
-   std::size_t size = 0;
-   if(hresmod)
-      size = LoadStringA(hresmod, BOOST_RE_MESSAGE_BASE + id, buf, 255);
-   if(size)
-      return size;
-
+   // we need to start by initialising our syntax map so we know which
+   // character is used for which purpose:
+   std::memset(m_char_map, 0, sizeof(m_char_map));
+   cat_type cat;
+   std::string cat_name(w32_regex_traits<char>::get_catalog_name());
+   if(cat_name.size())
+   {
+      cat = ::boost::re_detail::w32_cat_open(cat_name);
+      if(!cat)
+      {
+         std::string m("Unable to open message catalog: ");
+         std::runtime_error err(m + cat_name);
+         ::boost::re_detail::raise_runtime_error(err);
+      }
+   }
    //
-   // now get the default message if any:
-   return boost::re_detail::re_get_default_message(buf, len, id);
-}
-
-const char* BOOST_REGEX_CALL re_get_error_str(unsigned int id)
-{
-   BOOST_RE_GUARD_STACK
-#ifdef BOOST_HAS_THREADS
-   boost::re_detail::cs_guard g(*boost::re_detail::p_re_lock);
-#endif
-   if(re_custom_error_messages[id] == 0)
+   // if we have a valid catalog then load our messages:
+   //
+   if(cat)
    {
-      char buf[256];
-      _re_get_message(buf, 256, id + 200);
-      if(*buf)
+      for(regex_constants::syntax_type i = 1; i < regex_constants::syntax_max; ++i)
       {
-         re_custom_error_messages[id] = boost::re_detail::re_strdup(buf);
-         return re_custom_error_messages[id];
-      }
-      return boost::re_detail::re_default_error_messages[id];
-   }
-   return re_custom_error_messages[id];
-}
-
-} // namespace
-
-namespace boost{
-
-namespace re_detail{
-
-char w32_traits_base::regex_message_catalogue[BOOST_REGEX_MAX_PATH] = {0};
-
-void BOOST_REGEX_CALL w32_traits_base::do_init()
-{
-   BOOST_RE_GUARD_STACK
-   if(is_init == 0)
-   {
-      //
-      // update the messages first:
-      is_init = true;
-      if(*regex_message_catalogue)
-      {
-         hresmod = LoadLibraryA(regex_message_catalogue);
-         if(hresmod == NULL)
+         string_type mss = ::boost::re_detail::w32_cat_get(cat, this->m_locale, i, get_default_syntax(i));
+         for(string_type::size_type j = 0; j < mss.size(); ++j)
          {
-            std::string s("Unable to open dll: ");
-            std::runtime_error err(s + regex_message_catalogue);
-            boost::throw_exception(err);
+            m_char_map[static_cast<unsigned char>(mss[j])] = i;
          }
       }
-      unsigned int i;
-      for(i = 0; i < REG_E_UNKNOWN; ++i)
-      {
-         if(re_custom_error_messages[i])
-         {
-            re_detail::re_strfree(re_custom_error_messages[i]);
-            re_custom_error_messages[i] = 0;
-         }
-      }
-#ifndef BOOST_NO_WREGEX
-      //
-      // wide character strings:
-      syntax = new std::list<syntax_map_t>();
-      OSVERSIONINFO VersionInformation = {0};
-      VersionInformation.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-      GetVersionEx(&VersionInformation);
-      if(VersionInformation.dwPlatformId == VER_PLATFORM_WIN32_NT)
-         isPlatformNT = true;
-#endif
-      //
-      // now the character classes:
-      pclasses = new std::string[re_classes_max];
-      char buf[map_size+2];
-      for(i = 0; i < re_classes_max; ++i)
-      {
-         get_message(buf, 256, i+300);
-         pclasses[i] = buf;
-      }
-      // start by updating the syntax map:
-      std::memset(syntax_map, syntax_char, map_size);
-      for(i = 1; i < syntax_max; ++i)
-      {
-         char* ptr = buf;
-         get_message(buf, map_size, i+100);
-         for(; *ptr; ++ptr)
-         {
-            syntax_map[(unsigned char)*ptr] = (unsigned char)i;
-         }
-      }
-
-      // now update the character class map,
-      // and lower case map:
-      for(i = 0; i < map_size; ++i)
-      {
-         buf[i] = (char)i;
-      }
-      buf[map_size] = (char)0;
-      GetStringTypeA(GetUserDefaultLCID(), CT_CTYPE1, buf, map_size, class_map);
-      for(i = 0; i < map_size; ++i)
-      {
-         class_map[i] &= char_class_win;
-      }
-      class_map[(unsigned char)'_'] |= char_class_underscore;
-      LCMapStringA(GetUserDefaultLCID(), LCMAP_LOWERCASE, buf, map_size, lower_case_map, map_size);
-      //
-      // update our collating elements:
-      pcoll_names = new std::list<collate_name_t>();
-      i = 400;
-      get_message(buf, 256, i);
-      while(*buf)
-      {
-         char* p1, *p2, *p3, *p4;;
-         p1 = buf;
-         while(*p1 && isspace(*p1))++p1;
-         p2 = p1;
-         while(*p2 && !isspace(*p2))++p2;
-         p3 = p2;
-         while(*p3 && isspace(*p3))++p3;
-         p4 = p3;
-         while(*p4 && !isspace(*p4))++p4;
-         pcoll_names->push_back(collate_name_t(p1, p2, p3, p4));
-         ++i;
-         get_message(buf, 256, i);
-      }
-      std::string s;
-      const char* p = "zero";
-      if(w32_regex_traits<char>::lookup_collatename(s, p, p+4))
-      {
-         jm_assert(s.size() == 1);
-         re_zero = *s.c_str();
-      }
-      else
-         re_zero = '0';
-
-      p = "ten";
-      if(w32_regex_traits<char>::lookup_collatename(s, p, p+3))
-      {
-         jm_assert(s.size() == 1);
-         re_ten = *s.c_str();
-      }
-      else
-         re_ten = 'a';
-#ifndef BOOST_NO_WREGEX
-      //
-      // wide string data:
-      std::basic_string<regex_wchar_type> ws;
-      const regex_wchar_type* wp = (const regex_wchar_type*)L"zero";
-      if(w32_regex_traits<regex_wchar_type>::lookup_collatename(ws, wp, wp+4))
-      {
-         jm_assert(ws.size() == 1);
-         re_zero_w = *ws.c_str();
-      }
-      else
-         re_zero_w = (regex_wchar_type)L'0';
-
-      wp = (const regex_wchar_type*)L"ten";
-      if(w32_regex_traits<regex_wchar_type>::lookup_collatename(ws, wp, wp+3))
-      {
-         jm_assert(ws.size() == 1);
-         re_ten_w = *ws.c_str();
-      }
-      else
-         re_ten_w = L'a';
-
-      regex_wchar_type wbuf[256];
-      syntax_map_t sm;
-      syntax->clear();
-      for(i = 1; i < syntax_max; ++i)
-      {
-         regex_wchar_type* ptr = wbuf;
-         get_message(wbuf, 256, i+100);
-         for(; *ptr; ++ptr)
-         {
-            sm.c = *ptr;
-            sm.type = i;
-            syntax->push_back(sm);
-         }
-      }
-#endif // BOOST_NO_WREGEX
-   }
-}
-
-void BOOST_REGEX_CALL w32_traits_base::do_free()
-{
-   BOOST_RE_GUARD_STACK
-   delete[] pclasses;
-   pclasses = 0;
-   delete pcoll_names;
-   pcoll_names = 0;
-#ifndef BOOST_NO_WREGEX
-   delete syntax;
-   syntax = 0;
-#endif
-   if(hresmod)
-   {
-      FreeLibrary(hresmod);
-      hresmod = 0;
-   }
-   for(int i = 0; i < REG_E_UNKNOWN; ++i)
-   {
-      if(re_custom_error_messages[i])
-      {
-         re_detail::re_strfree(re_custom_error_messages[i]);
-         re_custom_error_messages[i] = 0;
-      }
-   }
-   is_init = false;
-}
-
-std::string BOOST_REGEX_CALL w32_traits_base::error_string(unsigned id)
-{
-   return re_get_error_str(id);
-}
-
-boost::uint_fast32_t BOOST_REGEX_CALL w32_traits_base::do_lookup_class(const char* p)
-{
-   BOOST_RE_GUARD_STACK
-   unsigned int i;
-   for(i = 0; i < re_classes_max; ++i)
-   {
-      if(pclasses[i] == p)
-      {
-         return re_char_class_id[i];
-      }
-   }
-   for(i = 0; i < re_classes_max; ++i)
-   {
-      if(std::strcmp(re_char_class_names[i], p) == 0)
-      {
-         return re_char_class_id[i];
-      }
-   }
-   return 0;
-}
-
-bool BOOST_REGEX_CALL w32_traits_base::do_lookup_collate(std::string& buf, const char* p)
-{
-   BOOST_RE_GUARD_STACK
-   std::list<collate_name_t>::iterator first, last;
-   first = pcoll_names->begin();
-   last = pcoll_names->end();
-   while(first != last)
-   {
-      if((*first).name == p)
-      {
-         buf = (*first).value;
-         return true;
-      }
-      ++first;
-   }
-
-   bool result = re_detail::re_lookup_def_collate_name(buf, p);
-   if((result == 0) && (std::strlen(p) == 1))
-   {
-      result = true;
-      buf = *p;
-   }
-   return result;
-}
-
-std::string BOOST_REGEX_CALL w32_traits_base::set_message_catalogue(const std::string& l)
-{
-   BOOST_RE_GUARD_STACK
-   #ifdef BOOST_HAS_THREADS
-   re_detail::cs_guard g(*re_detail::p_re_lock);
-   #endif
-   if(sizeof(regex_message_catalogue) <= l.size())
-      return l;
-   std::string old(regex_message_catalogue);
-   std::strcpy(regex_message_catalogue, l.c_str());
-   return old;
-}
-
-unsigned char w32_traits_base::syntax_map[map_size];
-unsigned short w32_traits_base::class_map[map_size];
-char w32_traits_base::lower_case_map[map_size];
-
-} // namespace re_detail
-
-w32_regex_traits<char> w32_regex_traits<char>::i;
-
-void BOOST_REGEX_CALL w32_regex_traits<char>::update()
-{
-   BOOST_RE_GUARD_STACK
-   #ifdef BOOST_HAS_THREADS
-   re_detail::cs_guard g(*re_detail::p_re_lock);
-   #endif
-   do_init();
-}
-
-w32_regex_traits<char>::w32_regex_traits()
-{
-   BOOST_RE_GUARD_STACK
-   #ifdef BOOST_HAS_THREADS
-   re_detail::re_init_threads();
-   re_detail::cs_guard g(*re_detail::p_re_lock);
-   #endif
-   ++entry_count;
-}
-
-w32_regex_traits<char>::~w32_regex_traits()
-{
-   BOOST_RE_GUARD_STACK
-#ifdef BOOST_HAS_THREADS
-   re_detail::cs_guard g(*re_detail::p_re_lock);
-#endif
-   // add reference to static member here to ensure
-   // that the linker includes it in the .exe:
-   if((--entry_count == 0) && (0 != &w32_regex_traits<char>::i) && is_init)
-      do_free();
-#ifdef BOOST_HAS_THREADS
-   g.acquire(false);
-   re_detail::re_free_threads();
-#endif
-}
-
-void BOOST_REGEX_CALL w32_regex_traits<char>::transform(std::string& out, const std::string& in)
-{
-   BOOST_RE_GUARD_STACK
-   size_t n = LCMapStringA(GetUserDefaultLCID(), LCMAP_SORTKEY, in.c_str(), -1, 0, 0);
-   if(n == (size_t)(-1))
-   {
-      out = in;
-      return;
-   }
-   scoped_array<char> buf(new char[n+1]);
-   n = LCMapStringA(GetUserDefaultLCID(), LCMAP_SORTKEY, in.c_str(), -1, buf.get(), (int)n);
-   if(n == (size_t)(-1))
-   {
-      out = in;
-      return;
-   }
-   out = buf.get();
-}
-
-void BOOST_REGEX_CALL w32_regex_traits<char>::transform_primary(std::string& out, const std::string& in)
-{
-   transform(out, in);
-   for(unsigned int i = 0; i < out.size(); ++i)
-   {
-      if((out[i] == 1) && (i+1 < out.size()))
-      {
-         out.erase(i+1);
-         break;
-      }
-   }
-}
-
-
-int BOOST_REGEX_CALL w32_regex_traits<char>::toi(char c)
-{
-   if(is_class(c, char_class_digit))
-      return c - re_zero;
-   if(is_class(c, char_class_xdigit))
-      return 10 + translate(c, true) - translate(re_ten, true);
-   return -1; // error!!
-}
-
-int BOOST_REGEX_CALL w32_regex_traits<char>::toi(const char*& first, const char* last, int radix)
-{
-   unsigned int maxval;
-   if(radix < 0)
-   {
-      // if radix is less than zero, then restrict
-      // return value to charT. NB assumes sizeof(charT) <= sizeof(int)
-      radix *= -1;
-      maxval = 1 << (sizeof(*first) * CHAR_BIT - 1);
-      maxval /= radix;
-      maxval *= 2;
-      maxval -= 1;
    }
    else
    {
-      maxval = (unsigned int)-1;
-      maxval /= radix;
-   }
-
-   unsigned int result = 0;
-   unsigned int type = (radix > 10) ? char_class_xdigit : char_class_digit;
-   while((first != last) && is_class(*first, type) && (result <= maxval))
-   {
-      result *= radix;
-      result += toi(*first);
-      ++first;
-   }
-   return result;
-}
-
-#ifndef BOOST_NO_WREGEX
-
-bool BOOST_REGEX_CALL w32_regex_traits<regex_wchar_type>::lookup_collatename(std::basic_string<regex_wchar_type>& out, const regex_wchar_type* first, const regex_wchar_type* last)
-{
-   BOOST_RE_GUARD_STACK
-   std::basic_string<regex_wchar_type> s(first, last);
-   std::size_t len = strnarrow(static_cast<char*>(0), 0, s.c_str());
-   scoped_array<char> buf(new char[len]);
-   strnarrow(buf.get(), len, s.c_str());
-   std::string t_out;
-   bool result = base_type::do_lookup_collate(t_out, buf.get());
-   if(t_out.size() == 0) result = false;
-   if(result)
-   {
-      if(t_out[0])
+      for(regex_constants::syntax_type i = 1; i < regex_constants::syntax_max; ++i)
       {
-         len = strwiden(static_cast<regex_wchar_type*>(0), 0, t_out.c_str());
-         scoped_array<regex_wchar_type> wb(new regex_wchar_type[len]);
-         strwiden(wb.get(), len, t_out.c_str());
-         out = wb.get();
+         const char* ptr = get_default_syntax(i);
+         while(ptr && *ptr)
+         {
+            m_char_map[static_cast<unsigned char>(*ptr)] = i;
+            ++ptr;
+         }
       }
-      else
-         out.append(1,(regex_wchar_type)0);
    }
-   return result;
-}
-
-unsigned int BOOST_REGEX_CALL w32_regex_traits<regex_wchar_type>::syntax_type(size_type c)
-{
-   BOOST_RE_GUARD_STACK
-   std::list<syntax_map_t>::const_iterator first, last;
-   first = syntax->begin();
-   last = syntax->end();
-   while(first != last)
+   //
+   // finish off by calculating our escape types:
+   //
+   unsigned char i = 'A';
+   do
    {
-      if((size_type)(uchar_type)((*first).c) == c)
-         return (*first).type;
-      ++first;
-   }
-   return 0;
+      if(m_char_map[i] == 0)
+      {
+         if(::boost::re_detail::w32_is(this->m_locale, 0x0002u, (char)i)) 
+            m_char_map[i] = regex_constants::escape_type_class;
+         else if(::boost::re_detail::w32_is(this->m_locale, 0x0001u, (char)i)) 
+            m_char_map[i] = regex_constants::escape_type_not_class;
+      }
+   }while(0xFF != i++);
+
+   //
+   // fill in lower case map:
+   //
+   char char_map[1 << CHAR_BIT];
+   for(int ii = 0; ii < (1 << CHAR_BIT); ++ii)
+      char_map[ii] = static_cast<char>(ii);
+   int r = ::LCMapStringA(this->m_locale, LCMAP_LOWERCASE, char_map, 1 << CHAR_BIT, this->m_lower_map, 1 << CHAR_BIT);
+   BOOST_ASSERT(r == 1 << CHAR_BIT);
+   r = ::GetStringTypeExA(this->m_locale, CT_CTYPE1, char_map, 1 << CHAR_BIT, this->m_type_map);
+   BOOST_ASSERT(0 != r);
 }
 
-bool BOOST_REGEX_CALL w32_regex_traits<regex_wchar_type>::do_lookup_collate(std::basic_string<regex_wchar_type>& out, const regex_wchar_type* first, const regex_wchar_type* last)
+BOOST_REGEX_DECL lcid_type BOOST_REGEX_CALL w32_get_default_locale()
 {
-   BOOST_RE_GUARD_STACK
-   std::basic_string<regex_wchar_type> s(first, last);
-   std::size_t len = strnarrow(static_cast<char*>(0), 0, s.c_str());
-   scoped_array<char> buf(new char[len]);
-   strnarrow(buf.get(), len, s.c_str());
-   std::string t_out;
-   bool result =  base_type::do_lookup_collate(t_out, buf.get());
-   if(result)
-   {
-      len = strwiden(static_cast<regex_wchar_type*>(0), 0, t_out.c_str());
-      scoped_array<regex_wchar_type> wb(new regex_wchar_type[len]);
-      strwiden(wb.get(), len, t_out.c_str());
-      out = wb.get();
-   }
-   return result;
+   return ::GetUserDefaultLCID();
 }
 
-
-void BOOST_REGEX_CALL w32_regex_traits<regex_wchar_type>::update()
+BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is_lower(char c, lcid_type id)
 {
-   BOOST_RE_GUARD_STACK
-#ifdef BOOST_HAS_THREADS
-   re_detail::cs_guard g(*re_detail::p_re_lock);
-#endif
-   do_init();
-}
-
-w32_regex_traits<regex_wchar_type>::w32_regex_traits()
-{
-   BOOST_RE_GUARD_STACK
-#ifdef BOOST_HAS_THREADS
-   re_detail::re_init_threads();
-   re_detail::cs_guard g(*re_detail::p_re_lock);
-#endif
-   ++entry_count;
-}
-
-w32_regex_traits<regex_wchar_type>::~w32_regex_traits()
-{
-   BOOST_RE_GUARD_STACK
-#ifdef BOOST_HAS_THREADS
-   re_detail::cs_guard g(*re_detail::p_re_lock);
-#endif
-   // add reference to static member here to ensure
-   // that the linker includes it in the .exe:
-   if((--entry_count == 0) && (0 != &w32_regex_traits<regex_wchar_type>::init_) && is_init)
-      do_free();
-#ifdef BOOST_HAS_THREADS
-   g.acquire(false);
-   re_detail::re_free_threads();
-#endif
-}
-
-bool BOOST_REGEX_CALL w32_regex_traits<regex_wchar_type>::do_iswclass(regex_wchar_type c, boost::uint_fast32_t f)
-{
-   BOOST_RE_GUARD_STACK
-   if((c & ~0xFF) == 0)
-      return BOOST_REGEX_MAKE_BOOL(re_detail::wide_unicode_classes[(uchar_type)c] & f & char_class_win);
    WORD mask;
-   if(f & char_class_unicode)
+   if(::GetStringTypeExA(id, CT_CTYPE1, &c, 1, &mask) && (mask & C1_LOWER))
       return true;
-   else if(isPlatformNT && GetStringTypeW(CT_CTYPE1, (const wchar_t*)&c, 1, &mask))
-      return BOOST_REGEX_MAKE_BOOL(mask & f & char_class_win);
-   else if((f & char_class_graph) == char_class_graph)
-      return true;  // all wide characters are considered "graphics"
    return false;
 }
 
-void BOOST_REGEX_CALL w32_regex_traits<regex_wchar_type>::transform(std::basic_string<regex_wchar_type>& out, const std::basic_string<regex_wchar_type>& in)
+BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is_lower(wchar_t c, lcid_type id)
 {
-   BOOST_RE_GUARD_STACK
-   scoped_array<char> alt;
-   size_t n;
-   if(isPlatformNT)
-      n = LCMapStringW(GetUserDefaultLCID(), LCMAP_SORTKEY, (const wchar_t*)in.c_str(), -1, 0, 0);
-   else
-   {
-      n = strnarrow(static_cast<char*>(0), 0, in.c_str());
-      alt.reset(new char[n+1]);
-      strnarrow(alt.get(), n+1, in.c_str());
-      n = LCMapStringA(GetUserDefaultLCID(), LCMAP_SORTKEY, alt.get(), -1, 0, 0);
-   }
-   if((n == (size_t)(-1)) || (n == 0))
-   {
-      out = in;
-      return;
-   }
-   scoped_array<regex_wchar_type> buf(new regex_wchar_type[n+1]);
-   // under win32 we get mapped to an array of bytes
-   // not characters; since the underlying engine has to
-   // deal with chars we widen the bytes to regex_wchar_type to ensure
-   // the sort order remains unchanged when we compare.
-   scoped_array<char> t(new char[n+1]);
-   if(isPlatformNT)
-      n = LCMapStringW(GetUserDefaultLCID(), LCMAP_SORTKEY, (const wchar_t*)in.c_str(), -1, reinterpret_cast<wchar_t*>(t.get()), (int)n);
-   else
-      n = LCMapStringA(GetUserDefaultLCID(), LCMAP_SORTKEY, alt.get(), -1, t.get(), (int)n);
-   int i = -1;
-   do
-   {
-      ++i;
-      buf[i] = (regex_wchar_type)(unsigned char)t[i];
-   } while(t[i]);
-   if(n == (size_t)(-1))
-   {
-      out = in;
-      return;
-   }
-   out = buf.get();
+   WORD mask;
+   if(::GetStringTypeExW(id, CT_CTYPE1, &c, 1, &mask) && (mask & C1_LOWER))
+      return true;
+   return false;
+}
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is_lower(unsigned short ca, lcid_type id)
+{
+   WORD mask;
+   wchar_t c = ca;
+   if(::GetStringTypeExW(id, CT_CTYPE1, &c, 1, &mask) && (mask & C1_LOWER))
+      return true;
+   return false;
+}
+#endif
+
+BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is_upper(char c, lcid_type id)
+{
+   WORD mask;
+   if(::GetStringTypeExA(id, CT_CTYPE1, &c, 1, &mask) && (mask & C1_UPPER))
+      return true;
+   return false;
 }
 
-void BOOST_REGEX_CALL w32_regex_traits<regex_wchar_type>::transform_primary(std::basic_string<regex_wchar_type>& out, const std::basic_string<regex_wchar_type>& in)
+BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is_upper(wchar_t c, lcid_type id)
 {
-   transform(out, in);
-   for(unsigned int i = 0; i < out.size(); ++i)
-   {
-      if((out[i] == 1) && ((i + 1) < out.size()))
-      {
-         out.erase(i+1);
-         break;
-      }
-   }
+   WORD mask;
+   if(::GetStringTypeExW(id, CT_CTYPE1, &c, 1, &mask) && (mask & C1_UPPER))
+      return true;
+   return false;
+}
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is_upper(unsigned short ca, lcid_type id)
+{
+   WORD mask;
+   wchar_t c = ca;
+   if(::GetStringTypeExW(id, CT_CTYPE1, &c, 1, &mask) && (mask & C1_UPPER))
+      return true;
+   return false;
+}
+#endif
+
+void free_module(void* mod)
+{
+   ::FreeLibrary(static_cast<HMODULE>(mod));
 }
 
-
-int BOOST_REGEX_CALL w32_regex_traits<regex_wchar_type>::toi(regex_wchar_type c)
+BOOST_REGEX_DECL cat_type BOOST_REGEX_CALL w32_cat_open(const std::string& name)
 {
-   if(is_class(c, char_class_digit))
-      return c - re_zero_w;
-   if(is_class(c, char_class_xdigit))
-      return 10 + translate(c, true) - translate(re_ten_w, true);
-   return -1; // error!!
+   cat_type result(::LoadLibraryA(name.c_str()), &free_module);
+   return result;
 }
 
-int BOOST_REGEX_CALL w32_regex_traits<regex_wchar_type>::toi(const regex_wchar_type*& first, const regex_wchar_type* last, int radix)
+BOOST_REGEX_DECL std::string BOOST_REGEX_CALL w32_cat_get(const cat_type& cat, lcid_type, int i, const std::string& def)
 {
-   unsigned int maxval;
-   if(radix < 0)
+   char buf[256];
+   if(0 == ::LoadStringA(
+      static_cast<HMODULE>(cat.get()),
+      i,
+      buf,
+      256
+   ))
    {
-      // if radix is less than zero, then restrict
-      // return value to charT. NB assumes sizeof(charT) <= sizeof(int)
-      radix *= -1;
-      maxval = 1 << (sizeof(*first) * CHAR_BIT - 1);
-      maxval /= radix;
-      maxval *= 2;
-      maxval -= 1;
-   }
-   else
-   {
-      maxval = (unsigned int)-1;
-      maxval /= radix;
+      return def;
    }
+   return std::string(buf);
+}
 
-   unsigned int result = 0;
-   unsigned int type = (radix > 10) ? char_class_xdigit : char_class_digit;
-   while((first != last) && is_class(*first, type) && (result <= maxval))
+#ifndef BOOST_NO_WREGEX
+BOOST_REGEX_DECL std::wstring BOOST_REGEX_CALL w32_cat_get(const cat_type& cat, lcid_type, int i, const std::wstring& def)
+{
+   wchar_t buf[256];
+   if(0 == ::LoadStringW(
+      static_cast<HMODULE>(cat.get()),
+      i,
+      buf,
+      256
+   ))
    {
-      result *= radix;
-      result += toi(*first);
-      ++first;
+      return def;
+   }
+   return std::wstring(buf);
+}
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+BOOST_REGEX_DECL std::basic_string<unsigned short> BOOST_REGEX_CALL w32_cat_get(const cat_type& cat, lcid_type, int i, const std::basic_string<unsigned short>& def)
+{
+   unsigned short buf[256];
+   if(0 == ::LoadStringW(
+      static_cast<HMODULE>(cat.get()),
+      i,
+      (LPWSTR)buf,
+      256
+   ))
+   {
+      return def;
+   }
+   return std::basic_string<unsigned short>(buf);
+}
+#endif
+#endif
+BOOST_REGEX_DECL std::string BOOST_REGEX_CALL w32_transform(lcid_type id, const char* p1, const char* p2)
+{
+   int bytes = ::LCMapStringA(
+      id,       // locale identifier
+      LCMAP_SORTKEY,  // mapping transformation type
+      p1,  // source string
+      p2 - p1,        // 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 = ::LCMapStringA(
+      id,       // locale identifier
+      LCMAP_SORTKEY,  // mapping transformation type
+      p1,  // source string
+      p2 - p1,        // number of characters in source string
+      &*result.begin(),  // destination buffer
+      bytes        // size of destination buffer
+      );
+   if(bytes > static_cast<int>(result.size()))
+      return std::string(p1, p2);
+   while(result.size() && result[result.size()-1] == '\0')
+   {
+      result.erase(result.size()-1);
    }
    return result;
 }
 
-boost::uint_fast32_t BOOST_REGEX_CALL w32_regex_traits<regex_wchar_type>::lookup_classname(const regex_wchar_type* first, const regex_wchar_type* last)
+#ifndef BOOST_NO_WREGEX
+BOOST_REGEX_DECL std::wstring BOOST_REGEX_CALL w32_transform(lcid_type id, const wchar_t* p1, const wchar_t* p2)
 {
-   std::basic_string<regex_wchar_type> s(first, last);
-   std::size_t len = strnarrow(static_cast<char*>(0), 0, s.c_str());
-   scoped_array<char> buf(new char[len]);
-   strnarrow(buf.get(), len, s.c_str());
-   boost::uint_fast32_t result =  do_lookup_class(buf.get());
-   return result;
+   int bytes = ::LCMapStringW(
+      id,       // locale identifier
+      LCMAP_SORTKEY,  // mapping transformation type
+      p1,  // source string
+      p2 - p1,        // number of characters in source string
+      0,  // destination buffer
+      0        // size of destination buffer
+      );
+   if(!bytes)
+      return std::wstring(p1, p2);
+   std::string result(++bytes, '\0');
+   bytes = ::LCMapStringW(
+      id,       // locale identifier
+      LCMAP_SORTKEY,  // mapping transformation type
+      p1,  // source string
+      p2 - p1,        // number of characters in source string
+      reinterpret_cast<wchar_t*>(&*result.begin()),  // destination buffer *of bytes*
+      bytes        // size of destination buffer
+      );
+   if(bytes > static_cast<int>(result.size()))
+      return std::wstring(p1, p2);
+   while(result.size() && result[result.size()-1] == L'\0')
+   {
+      result.erase(result.size()-1);
+   }
+   std::wstring r2;
+   for(std::string::size_type i = 0; i < result.size(); ++i)
+      r2.append(1, static_cast<wchar_t>(static_cast<unsigned char>(result[i])));
+   return r2;
+}
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+BOOST_REGEX_DECL std::basic_string<unsigned short> BOOST_REGEX_CALL w32_transform(lcid_type id, const unsigned short* p1, const unsigned short* p2)
+{
+   int bytes = ::LCMapStringW(
+      id,       // locale identifier
+      LCMAP_SORTKEY,  // mapping transformation type
+      (LPCWSTR)p1,  // source string
+      p2 - p1,        // number of characters in source string
+      0,  // destination buffer
+      0        // size of destination buffer
+      );
+   if(!bytes)
+      return std::basic_string<unsigned short>(p1, p2);
+   std::string result(++bytes, '\0');
+   bytes = ::LCMapStringW(
+      id,       // locale identifier
+      LCMAP_SORTKEY,  // mapping transformation type
+      (LPCWSTR)p1,  // source string
+      p2 - p1,        // number of characters in source string
+      reinterpret_cast<wchar_t*>(&*result.begin()),  // destination buffer *of bytes*
+      bytes        // size of destination buffer
+      );
+   if(bytes > static_cast<int>(result.size()))
+      return std::basic_string<unsigned short>(p1, p2);
+   while(result.size() && result[result.size()-1] == L'\0')
+   {
+      result.erase(result.size()-1);
+   }
+   std::basic_string<unsigned short> r2;
+   for(std::string::size_type i = 0; i < result.size(); ++i)
+      r2.append(1, static_cast<unsigned short>(static_cast<unsigned char>(result[i])));
+   return r2;
+}
+#endif
+#endif
+BOOST_REGEX_DECL char BOOST_REGEX_CALL w32_tolower(char c, lcid_type id)
+{
+   char result[2];
+   int b = ::LCMapStringA(
+      id,       // locale identifier
+      LCMAP_LOWERCASE,  // mapping transformation type
+      &c,  // source string
+      1,        // number of characters in source string
+      result,  // destination buffer
+      1);        // size of destination buffer
+   if(b == 0)
+      return c;
+   return result[0];
 }
 
-regex_wchar_type BOOST_REGEX_CALL w32_regex_traits<regex_wchar_type>::wtolower(regex_wchar_type c)
+#ifndef BOOST_NO_WREGEX
+BOOST_REGEX_DECL wchar_t BOOST_REGEX_CALL w32_tolower(wchar_t c, lcid_type id)
 {
-   BOOST_RE_GUARD_STACK
-   if(isPlatformNT)
-      return LOWORD(CharLowerW(reinterpret_cast<wchar_t*>(static_cast<unsigned short>(c))));
-   return c;
+   wchar_t result[2];
+   int b = ::LCMapStringW(
+      id,       // locale identifier
+      LCMAP_LOWERCASE,  // mapping transformation type
+      &c,  // source string
+      1,        // number of characters in source string
+      result,  // destination buffer
+      1);        // size of destination buffer
+   if(b == 0)
+      return c;
+   return result[0];
+}
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+BOOST_REGEX_DECL unsigned short BOOST_REGEX_CALL w32_tolower(unsigned short c, lcid_type id)
+{
+   wchar_t result[2];
+   int b = ::LCMapStringW(
+      id,       // locale identifier
+      LCMAP_LOWERCASE,  // mapping transformation type
+      (wchar_t const*)&c,  // source string
+      1,        // number of characters in source string
+      result,  // destination buffer
+      1);        // size of destination buffer
+   if(b == 0)
+      return c;
+   return result[0];
+}
+#endif
+#endif
+BOOST_REGEX_DECL char BOOST_REGEX_CALL w32_toupper(char c, lcid_type id)
+{
+   char result[2];
+   int b = ::LCMapStringA(
+      id,       // locale identifier
+      LCMAP_UPPERCASE,  // mapping transformation type
+      &c,  // source string
+      1,        // number of characters in source string
+      result,  // destination buffer
+      1);        // size of destination buffer
+   if(b == 0)
+      return c;
+   return result[0];
 }
 
-
-w32_regex_traits<regex_wchar_type> w32_regex_traits<regex_wchar_type>::init_;
-
-std::size_t BOOST_REGEX_CALL w32_regex_traits<regex_wchar_type>::strnarrow(char *s1, std::size_t len, const regex_wchar_type *s2)
+#ifndef BOOST_NO_WREGEX
+BOOST_REGEX_DECL wchar_t BOOST_REGEX_CALL w32_toupper(wchar_t c, lcid_type id)
 {
-   BOOST_RE_GUARD_STACK
-   std::size_t size = WideCharToMultiByte(CP_ACP, 0, (const wchar_t*)s2, -1, s1, 0, 0, 0);
-   if(size > len)
-      return size;
-   return WideCharToMultiByte(CP_ACP, 0, (const wchar_t*)s2, -1, s1, (int)len, 0, 0);
+   wchar_t result[2];
+   int b = ::LCMapStringW(
+      id,       // locale identifier
+      LCMAP_UPPERCASE,  // mapping transformation type
+      &c,  // source string
+      1,        // number of characters in source string
+      result,  // destination buffer
+      1);        // size of destination buffer
+   if(b == 0)
+      return c;
+   return result[0];
+}
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+BOOST_REGEX_DECL unsigned short BOOST_REGEX_CALL w32_toupper(unsigned short c, lcid_type id)
+{
+   wchar_t result[2];
+   int b = ::LCMapStringW(
+      id,       // locale identifier
+      LCMAP_UPPERCASE,  // mapping transformation type
+      (wchar_t const*)&c,  // source string
+      1,        // number of characters in source string
+      result,  // destination buffer
+      1);        // size of destination buffer
+   if(b == 0)
+      return c;
+   return result[0];
+}
+#endif
+#endif
+BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is(lcid_type id, boost::uint32_t m, char c)
+{
+   WORD mask;
+   if(::GetStringTypeExA(id, CT_CTYPE1, &c, 1, &mask) && (mask & m & w32_regex_traits_implementation<char>::mask_base))
+      return true;
+   if((m & w32_regex_traits_implementation<char>::mask_word) && (c == '_'))
+      return true;
+   return false;
 }
 
-std::size_t BOOST_REGEX_CALL w32_regex_traits<regex_wchar_type>::strwiden(regex_wchar_type *s1, std::size_t len, const char *s2)
+#ifndef BOOST_NO_WREGEX
+BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is(lcid_type id, boost::uint32_t m, wchar_t c)
 {
-   BOOST_RE_GUARD_STACK
-   std::size_t size = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED,   s2, -1, (wchar_t*)s1, 0);
-   if(size > len)
-      return size;
-   return MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, s2, -1, (wchar_t*)s1, (int)len);
+   WORD mask;
+   if(::GetStringTypeExW(id, CT_CTYPE1, &c, 1, &mask) && (mask & m & w32_regex_traits_implementation<wchar_t>::mask_base))
+      return true;
+   if((m & w32_regex_traits_implementation<wchar_t>::mask_word) && (c == '_'))
+      return true;
+   if((m & w32_regex_traits_implementation<wchar_t>::mask_unicode) && (c > 0xff))
+      return true;
+   return false;
 }
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+BOOST_REGEX_DECL bool BOOST_REGEX_CALL w32_is(lcid_type id, boost::uint32_t m, unsigned short c)
+{
+   WORD mask;
+   if(::GetStringTypeExW(id, CT_CTYPE1, (wchar_t const*)&c, 1, &mask) && (mask & m & w32_regex_traits_implementation<wchar_t>::mask_base))
+      return true;
+   if((m & w32_regex_traits_implementation<wchar_t>::mask_word) && (c == '_'))
+      return true;
+   if((m & w32_regex_traits_implementation<wchar_t>::mask_unicode) && (c > 0xff))
+      return true;
+   return false;
+}
+#endif
+#endif
 
-unsigned short w32_regex_traits<regex_wchar_type>::wide_unicode_classes[] = {
-   re_detail::w32_traits_base::char_class_cntrl,        // ''  0
-   re_detail::w32_traits_base::char_class_cntrl,        // ''  1
-   re_detail::w32_traits_base::char_class_cntrl,        // ''  2
-   re_detail::w32_traits_base::char_class_cntrl,        // ''  3
-   re_detail::w32_traits_base::char_class_cntrl,        // ''  4
-   re_detail::w32_traits_base::char_class_cntrl,        // ''  5
-   re_detail::w32_traits_base::char_class_cntrl,        // ''  6
-   re_detail::w32_traits_base::char_class_cntrl,        // ''  7
-   re_detail::w32_traits_base::char_class_cntrl,        // ''  8
-   re_detail::w32_traits_base::char_class_cntrl | re_detail::w32_traits_base::char_class_space | re_detail::w32_traits_base::char_class_blank,        // ''  9
-   re_detail::w32_traits_base::char_class_cntrl | re_detail::w32_traits_base::char_class_space,        // ''  10
-   re_detail::w32_traits_base::char_class_cntrl | re_detail::w32_traits_base::char_class_space,        // ''  11
-   re_detail::w32_traits_base::char_class_cntrl | re_detail::w32_traits_base::char_class_space,        // ''  12
-   re_detail::w32_traits_base::char_class_cntrl | re_detail::w32_traits_base::char_class_space,        // ''  13
-   re_detail::w32_traits_base::char_class_cntrl,        // '.'  14
-   re_detail::w32_traits_base::char_class_cntrl,        // '.'  15
-   re_detail::w32_traits_base::char_class_cntrl,        // '.'  16
-   re_detail::w32_traits_base::char_class_cntrl,        // '.'  17
-   re_detail::w32_traits_base::char_class_cntrl,        // '.'  18
-   re_detail::w32_traits_base::char_class_cntrl,        // '.'  19
-   re_detail::w32_traits_base::char_class_cntrl,        // '.'  20
-   re_detail::w32_traits_base::char_class_cntrl,        // '.'  21
-   re_detail::w32_traits_base::char_class_cntrl,        // '.'  22
-   re_detail::w32_traits_base::char_class_cntrl,        // '.'  23
-   re_detail::w32_traits_base::char_class_cntrl,        // '.'  24
-   re_detail::w32_traits_base::char_class_cntrl,        // ''  25
-   re_detail::w32_traits_base::char_class_cntrl,        // ''  26
-   re_detail::w32_traits_base::char_class_cntrl,        // ''  27
-   re_detail::w32_traits_base::char_class_cntrl,        // '.'  28
-   re_detail::w32_traits_base::char_class_cntrl,        // '.'  29
-   re_detail::w32_traits_base::char_class_cntrl,        // '.'  30
-   re_detail::w32_traits_base::char_class_cntrl,        // '.'  31
-   re_detail::w32_traits_base::char_class_space | re_detail::w32_traits_base::char_class_blank,        // ' '  32
-   re_detail::w32_traits_base::char_class_punct,        // '!'  33
-   re_detail::w32_traits_base::char_class_punct,        // '"'  34
-   re_detail::w32_traits_base::char_class_punct,        // '#'  35
-   re_detail::w32_traits_base::char_class_punct,        // '$'  36
-   re_detail::w32_traits_base::char_class_punct,        // '%'  37
-   re_detail::w32_traits_base::char_class_punct,        // '&'  38
-   re_detail::w32_traits_base::char_class_punct,        // '''  39
-   re_detail::w32_traits_base::char_class_punct,        // '('  40
-   re_detail::w32_traits_base::char_class_punct,        // ')'  41
-   re_detail::w32_traits_base::char_class_punct,        // '*'  42
-   re_detail::w32_traits_base::char_class_punct,        // '+'  43
-   re_detail::w32_traits_base::char_class_punct,        // ','  44
-   re_detail::w32_traits_base::char_class_punct,        // '-'  45
-   re_detail::w32_traits_base::char_class_punct,        // '.'  46
-   re_detail::w32_traits_base::char_class_punct,        // '/'  47
-   re_detail::w32_traits_base::char_class_digit |   re_detail::w32_traits_base::char_class_xdigit,        // '0'  48
-   re_detail::w32_traits_base::char_class_digit |   re_detail::w32_traits_base::char_class_xdigit,        // '1'  49
-   re_detail::w32_traits_base::char_class_digit |   re_detail::w32_traits_base::char_class_xdigit,        // '2'  50
-   re_detail::w32_traits_base::char_class_digit |   re_detail::w32_traits_base::char_class_xdigit,        // '3'  51
-   re_detail::w32_traits_base::char_class_digit |   re_detail::w32_traits_base::char_class_xdigit,        // '4'  52
-   re_detail::w32_traits_base::char_class_digit |   re_detail::w32_traits_base::char_class_xdigit,        // '5'  53
-   re_detail::w32_traits_base::char_class_digit |   re_detail::w32_traits_base::char_class_xdigit,        // '6'  54
-   re_detail::w32_traits_base::char_class_digit |   re_detail::w32_traits_base::char_class_xdigit,        // '7'  55
-   re_detail::w32_traits_base::char_class_digit |   re_detail::w32_traits_base::char_class_xdigit,        // '8'  56
-   re_detail::w32_traits_base::char_class_digit |   re_detail::w32_traits_base::char_class_xdigit,        // '9'  57
-   re_detail::w32_traits_base::char_class_punct,        // ':'  58
-   re_detail::w32_traits_base::char_class_punct,        // ';'  59
-   re_detail::w32_traits_base::char_class_punct,        // '<'  60
-   re_detail::w32_traits_base::char_class_punct,        // '='  61
-   re_detail::w32_traits_base::char_class_punct,        // '>'  62
-   re_detail::w32_traits_base::char_class_punct,        // '?'  63
-   re_detail::w32_traits_base::char_class_punct,        // '@'  64
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper | re_detail::w32_traits_base::char_class_xdigit,        // 'A'  65
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper | re_detail::w32_traits_base::char_class_xdigit,        // 'B'  66
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper | re_detail::w32_traits_base::char_class_xdigit,        // 'C'  67
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper | re_detail::w32_traits_base::char_class_xdigit,        // 'D'  68
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper | re_detail::w32_traits_base::char_class_xdigit,        // 'E'  69
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper | re_detail::w32_traits_base::char_class_xdigit,        // 'F'  70
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'G'  71
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'H'  72
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'I'  73
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'J'  74
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'K'  75
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'L'  76
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'M'  77
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'N'  78
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'O'  79
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'P'  80
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'Q'  81
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'R'  82
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'S'  83
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'T'  84
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'U'  85
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'V'  86
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'W'  87
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'X'  88
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'Y'  89
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'Z'  90
-   re_detail::w32_traits_base::char_class_punct,        // '['  91
-   re_detail::w32_traits_base::char_class_punct,        // '\'  92
-   re_detail::w32_traits_base::char_class_punct,        // ']'  93
-   re_detail::w32_traits_base::char_class_punct,        // '^'  94
-   re_detail::w32_traits_base::char_class_punct | re_detail::w32_traits_base::char_class_underscore,        // '_'  95
-   re_detail::w32_traits_base::char_class_punct,        // '`'  96
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower |  re_detail::w32_traits_base::char_class_xdigit,        // 'a'  97
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower |  re_detail::w32_traits_base::char_class_xdigit,        // 'b'  98
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower |  re_detail::w32_traits_base::char_class_xdigit,        // 'c'  99
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower |  re_detail::w32_traits_base::char_class_xdigit,        // 'd'  100
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower |  re_detail::w32_traits_base::char_class_xdigit,        // 'e'  101
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower |  re_detail::w32_traits_base::char_class_xdigit,        // 'f'  102
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'g'  103
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'h'  104
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'i'  105
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'j'  106
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'k'  107
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'l'  108
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'm'  109
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'n'  110
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'o'  111
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'p'  112
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'q'  113
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'r'  114
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 's'  115
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 't'  116
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'u'  117
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'v'  118
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'w'  119
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'x'  120
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'y'  121
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'z'  122
-   re_detail::w32_traits_base::char_class_punct,        // '{'  123
-   re_detail::w32_traits_base::char_class_punct,        // '|'  124
-   re_detail::w32_traits_base::char_class_punct,        // '}'  125
-   re_detail::w32_traits_base::char_class_punct,        // '~'  126
-
-   re_detail::w32_traits_base::char_class_cntrl,        // ''  127
-   re_detail::w32_traits_base::char_class_cntrl,        // '€'  128
-   re_detail::w32_traits_base::char_class_cntrl,        // '�'  129
-   re_detail::w32_traits_base::char_class_cntrl,        // '‚'  130
-   re_detail::w32_traits_base::char_class_cntrl,        // 'ƒ'  131
-   re_detail::w32_traits_base::char_class_cntrl,        // '„'  132
-   re_detail::w32_traits_base::char_class_cntrl,        // '…'  133
-   re_detail::w32_traits_base::char_class_cntrl,        // '†'  134
-   re_detail::w32_traits_base::char_class_cntrl,        // '‡'  135
-   re_detail::w32_traits_base::char_class_cntrl,        // 'ˆ'  136
-   re_detail::w32_traits_base::char_class_cntrl,        // '‰'  137
-   re_detail::w32_traits_base::char_class_cntrl,        // 'Š'  138
-   re_detail::w32_traits_base::char_class_cntrl,        // '‹'  139
-   re_detail::w32_traits_base::char_class_cntrl,        // 'Œ'  140
-   re_detail::w32_traits_base::char_class_cntrl,        // '�'  141
-   re_detail::w32_traits_base::char_class_cntrl,        // 'Ž'  142
-   re_detail::w32_traits_base::char_class_cntrl,        // '�'  143
-   re_detail::w32_traits_base::char_class_cntrl,        // '�'  144
-   re_detail::w32_traits_base::char_class_cntrl,        // '‘'  145
-   re_detail::w32_traits_base::char_class_cntrl,        // '’'  146
-   re_detail::w32_traits_base::char_class_cntrl,        // '“'  147
-   re_detail::w32_traits_base::char_class_cntrl,        // '”'  148
-   re_detail::w32_traits_base::char_class_cntrl,        // '•'  149
-   re_detail::w32_traits_base::char_class_cntrl,        // '–'  150
-   re_detail::w32_traits_base::char_class_cntrl,        // '—'  151
-   re_detail::w32_traits_base::char_class_cntrl,        // '˜'  152
-   re_detail::w32_traits_base::char_class_cntrl,        // '™'  153
-   re_detail::w32_traits_base::char_class_cntrl,        // 'š'  154
-   re_detail::w32_traits_base::char_class_cntrl,        // '›'  155
-   re_detail::w32_traits_base::char_class_cntrl,        // 'œ'  156
-   re_detail::w32_traits_base::char_class_cntrl,        // '�'  157
-   re_detail::w32_traits_base::char_class_cntrl,        // 'ž'  158
-   re_detail::w32_traits_base::char_class_cntrl,        // 'Ÿ'  159
-   re_detail::w32_traits_base::char_class_space | re_detail::w32_traits_base::char_class_blank,        // ' '  160
-   re_detail::w32_traits_base::char_class_punct,        // '¡'  161
-   re_detail::w32_traits_base::char_class_punct,        // '¢'  162
-   re_detail::w32_traits_base::char_class_punct,        // '£'  163
-   re_detail::w32_traits_base::char_class_punct,        // '¤'  164
-   re_detail::w32_traits_base::char_class_punct,        // '¥'  165
-   re_detail::w32_traits_base::char_class_punct,        // '¦'  166
-   re_detail::w32_traits_base::char_class_punct,        // '§'  167
-   re_detail::w32_traits_base::char_class_punct,        // '¨'  168
-   re_detail::w32_traits_base::char_class_punct,        // '©'  169
-   re_detail::w32_traits_base::char_class_punct,        // 'ª'  170
-   re_detail::w32_traits_base::char_class_punct,        // '«'  171
-   re_detail::w32_traits_base::char_class_punct,        // '¬'  172
-   re_detail::w32_traits_base::char_class_punct,        // '­'  173
-   re_detail::w32_traits_base::char_class_punct,        // '®'  174
-   re_detail::w32_traits_base::char_class_punct,        // '¯'  175
-   re_detail::w32_traits_base::char_class_punct,        // '°'  176
-   re_detail::w32_traits_base::char_class_punct,        // '±'  177
-   re_detail::w32_traits_base::char_class_punct,        // '²'  178
-   re_detail::w32_traits_base::char_class_punct,        // '³'  179
-   re_detail::w32_traits_base::char_class_punct,        // '´'  180
-   re_detail::w32_traits_base::char_class_punct,        // 'µ'  181
-   re_detail::w32_traits_base::char_class_punct,        // '¶'  182
-   re_detail::w32_traits_base::char_class_punct,        // '·'  183
-   re_detail::w32_traits_base::char_class_punct,        // '¸'  184
-   re_detail::w32_traits_base::char_class_punct,        // '¹'  185
-   re_detail::w32_traits_base::char_class_punct,        // 'º'  186
-   re_detail::w32_traits_base::char_class_punct,        // '»'  187
-   re_detail::w32_traits_base::char_class_punct,        // '¼'  188
-   re_detail::w32_traits_base::char_class_punct,        // '½'  189
-   re_detail::w32_traits_base::char_class_punct,        // '¾'  190
-   re_detail::w32_traits_base::char_class_punct,        // '¿'  191
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'À'  192
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'Á'  193
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'Â'  194
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'Ã'  195
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'Ä'  196
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'Å'  197
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'Æ'  198
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'Ç'  199
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'È'  200
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'É'  201
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'Ê'  202
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'Ë'  203
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'Ì'  204
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'Í'  205
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'Î'  206
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'Ï'  207
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'Ð'  208
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'Ñ'  209
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'Ò'  210
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'Ó'  211
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'Ô'  212
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'Õ'  213
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'Ö'  214
-   re_detail::w32_traits_base::char_class_punct,        // '×'  215
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'Ø'  216
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'Ù'  217
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'Ú'  218
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'Û'  219
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'Ü'  220
-   re_detail::w32_traits_base::char_class_alpha |   re_detail::w32_traits_base::char_class_upper,        // 'Ý'  221
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_upper,        // 'Þ'  222
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'ß'  223
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'à'  224
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'á'  225
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'â'  226
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'ã'  227
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'ä'  228
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'å'  229
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'æ'  230
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'ç'  231
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'è'  232
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'é'  233
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'ê'  234
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'ë'  235
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'ì'  236
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'í'  237
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'î'  238
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'ï'  239
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'ð'  240
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'ñ'  241
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'ò'  242
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'ó'  243
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'ô'  244
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'õ'  245
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'ö'  246
-   re_detail::w32_traits_base::char_class_punct,        // '÷'  247
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'ø'  248
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'ù'  249
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'ú'  250
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'û'  251
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'ü'  252
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'ý'  253
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'þ'  254
-   re_detail::w32_traits_base::char_class_alpha |  re_detail::w32_traits_base::char_class_lower,        // 'ÿ'  255
-};
-
-
-
-#endif // BOOST_NO_WREGEX
-
-
-} // namespace boost
-
-#endif // #if defined(_WIN32) && !defined(BOOST_REGEX_NO_W32)
-
-
-
-
+} // re_detail
+} // boost
 
+#endif
 
diff --git a/src/wc_regex_traits.cpp b/src/wc_regex_traits.cpp
new file mode 100644
index 00000000..f86c5122
--- /dev/null
+++ b/src/wc_regex_traits.cpp
@@ -0,0 +1,262 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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:        wc_regex_traits.cpp
+  *   VERSION:     see <boost/version.hpp>
+  *   DESCRIPTION: Implements out of line members for c_regex_traits<wchar_t>
+  */
+
+
+#define BOOST_REGEX_SOURCE
+
+#include <boost/config.hpp>
+#include <boost/detail/workaround.hpp>
+
+#if !BOOST_WORKAROUND(__BORLANDC__, < 0x560)
+
+#include <boost/regex/v4/c_regex_traits.hpp>
+#ifndef BOOST_NO_WREGEX
+#include <boost/regex/v4/primary_transform.hpp>
+#include <boost/regex/v4/regex_traits_defaults.hpp>
+
+#if defined(BOOST_NO_STDC_NAMESPACE)
+namespace std{
+   using ::wcstol;
+}
+#endif
+
+namespace boost{
+
+c_regex_traits<wchar_t>::string_type BOOST_REGEX_CALL c_regex_traits<wchar_t>::transform(const wchar_t* p1, const wchar_t* p2) 
+{ 
+   std::size_t r;
+   std::size_t s = 10;
+   std::wstring src(p1, p2);
+   std::wstring result(s, L' ');
+   while(s < (r = std::wcsxfrm(&*result.begin(), src.c_str(), s)))
+   {
+      result.append(r - s + 3, L' ');
+      s = result.size();
+   }
+   result.erase(r);
+   return result; 
+}
+
+c_regex_traits<wchar_t>::string_type BOOST_REGEX_CALL c_regex_traits<wchar_t>::transform_primary(const wchar_t* p1, const wchar_t* p2) 
+{
+   static wchar_t s_delim;
+   static const int s_collate_type = ::boost::re_detail::find_sort_syntax(static_cast<const c_regex_traits<wchar_t>*>(0), &s_delim);
+   std::wstring result;
+   //
+   // What we do here depends upon the format of the sort key returned by
+   // sort key returned by this->transform:
+   //
+   switch(s_collate_type)
+   {
+   case ::boost::re_detail::sort_C:
+   case ::boost::re_detail::sort_unknown:
+      // the best we can do is translate to lower case, then get a regular sort key:
+      {
+         result.assign(p1, p2);
+         for(std::wstring::size_type i = 0; i < result.size(); ++i)
+            result[i] = (std::towlower)(result[i]);
+         result = c_regex_traits<wchar_t>::transform(&*result.begin(), &*result.begin() + result.size());
+         break;
+      }
+   case ::boost::re_detail::sort_fixed:
+      {
+         // get a regular sort key, and then truncate it:
+         result = c_regex_traits<wchar_t>::transform(&*result.begin(), &*result.begin() + result.size());
+         result.erase(s_delim);
+         break;
+      }
+   case ::boost::re_detail::sort_delim:
+         // get a regular sort key, and then truncate everything after the delim:
+         result = c_regex_traits<wchar_t>::transform(&*result.begin(), &*result.begin() + result.size());
+         std::size_t i;
+         for(i = 0; i < result.size(); ++i)
+         {
+            if(result[i] == s_delim)
+               break;
+         }
+         result.erase(i);
+         break;
+   }
+   return result;
+}
+
+enum
+{
+   char_class_space=1<<0, 
+   char_class_print=1<<1, 
+   char_class_cntrl=1<<2, 
+   char_class_upper=1<<3, 
+   char_class_lower=1<<4,
+   char_class_alpha=1<<5, 
+   char_class_digit=1<<6, 
+   char_class_punct=1<<7, 
+   char_class_xdigit=1<<8,
+   char_class_alnum=char_class_alpha|char_class_digit, 
+   char_class_graph=char_class_alnum|char_class_punct,
+   char_class_blank=1<<9,
+   char_class_word=1<<10,
+   char_class_unicode=1<<11
+};
+
+c_regex_traits<wchar_t>::char_class_type BOOST_REGEX_CALL c_regex_traits<wchar_t>::lookup_classname(const wchar_t* p1, const wchar_t* p2) 
+{
+   static const char_class_type masks[] = 
+   {
+      0,
+      char_class_alnum, 
+      char_class_alpha,
+      char_class_blank,
+      char_class_cntrl,
+      char_class_digit,
+      char_class_digit,
+      char_class_graph,
+      char_class_lower,
+      char_class_lower,
+      char_class_print,
+      char_class_punct,
+      char_class_space,
+      char_class_space,
+      char_class_upper,
+      char_class_unicode,
+      char_class_upper,
+      char_class_alnum | char_class_word, 
+      char_class_alnum | char_class_word, 
+      char_class_xdigit,
+   };
+
+   int id = ::boost::re_detail::get_default_class_id(p1, p2);
+   if(id < 0)
+   {
+      std::wstring s(p1, p2);
+      for(std::wstring::size_type i = 0; i < s.size(); ++i)
+         s[i] = (std::towlower)(s[i]);
+      id = ::boost::re_detail::get_default_class_id(&*s.begin(), &*s.begin() + s.size());
+   }
+   BOOST_ASSERT(id+1 < static_cast<int>(sizeof(masks) / sizeof(masks[0])));
+   return masks[id+1];
+}
+
+bool BOOST_REGEX_CALL c_regex_traits<wchar_t>::isctype(wchar_t c, char_class_type mask) 
+{
+   return
+      ((mask & char_class_space) && (std::iswspace)(c))
+      || ((mask & char_class_print) && (std::iswprint)(c))
+      || ((mask & char_class_cntrl) && (std::iswcntrl)(c))
+      || ((mask & char_class_upper) && (std::iswupper)(c))
+      || ((mask & char_class_lower) && (std::iswlower)(c))
+      || ((mask & char_class_alpha) && (std::iswalpha)(c))
+      || ((mask & char_class_digit) && (std::iswdigit)(c))
+      || ((mask & char_class_punct) && (std::iswpunct)(c))
+      || ((mask & char_class_xdigit) && (std::iswxdigit)(c))
+      || ((mask & char_class_blank) && (std::iswspace)(c) && !::boost::re_detail::is_separator(c))
+      || ((mask & char_class_word) && (c == '_'))
+      || ((mask & char_class_unicode) && (c & ~static_cast<wchar_t>(0xff)));
+}
+
+c_regex_traits<wchar_t>::string_type BOOST_REGEX_CALL c_regex_traits<wchar_t>::lookup_collatename(const wchar_t* p1, const wchar_t* p2) 
+{
+#if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS)\
+               && !BOOST_WORKAROUND(BOOST_MSVC, < 1300)\
+               && !BOOST_WORKAROUND(__BORLANDC__, <= 0x0551)
+   std::string name(p1, p2);
+#else
+   std::string name;
+   const charT* p0 = p1;
+   while(p0 != p2)
+	   name.append(1, char(*p0++));
+#endif
+   name = ::boost::re_detail::lookup_default_collate_name(name);
+#if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS)\
+               && !BOOST_WORKAROUND(BOOST_MSVC, < 1300)\
+               && !BOOST_WORKAROUND(__BORLANDC__, <= 0x0551)
+   if(name.size())
+      return string_type(name.begin(), name.end());
+#else
+   if(name.size())
+   {
+	   string_type result;
+	   typedef std::string::const_iterator iter;
+	   iter b = name.begin();
+	   iter e = name.end();
+	   while(b != e)
+		   result.append(1, charT(*b++));
+	   return result;
+   }
+#endif
+   if(p2 - p1 == 1)
+      return string_type(1, *p1);
+   return string_type();
+}
+
+int BOOST_REGEX_CALL c_regex_traits<wchar_t>::value(wchar_t c, int radix) 
+{
+#ifdef __BORLANDC__
+   // workaround for broken wcstol:
+   if((std::iswxdigit)(c) == 0)
+      return -1;
+#endif
+   wchar_t b[2] = { c, '\0', };
+   wchar_t* ep;
+   int result = std::wcstol(b, &ep, radix);
+   if(ep == b)
+      return -1;
+   return result;
+}
+
+#ifdef BOOST_REGEX_HAS_OTHER_WCHAR_T
+c_regex_traits<unsigned short>::string_type BOOST_REGEX_CALL c_regex_traits<unsigned short>::transform(const unsigned short* p1, const unsigned short* p2)
+{
+   std::wstring result = c_regex_traits<wchar_t>::transform((const wchar_t*)p1, (const wchar_t*)p2);
+   return string_type(result.begin(), result.end());
+}
+
+c_regex_traits<unsigned short>::string_type BOOST_REGEX_CALL c_regex_traits<unsigned short>::transform_primary(const unsigned short* p1, const unsigned short* p2)
+{
+   std::wstring result = c_regex_traits<wchar_t>::transform_primary((const wchar_t*)p1, (const wchar_t*)p2);
+   return string_type(result.begin(), result.end());
+}
+
+c_regex_traits<unsigned short>::char_class_type BOOST_REGEX_CALL c_regex_traits<unsigned short>::lookup_classname(const unsigned short* p1, const unsigned short* p2)
+{
+   return c_regex_traits<wchar_t>::lookup_classname((const wchar_t*)p1, (const wchar_t*)p2);
+}
+
+c_regex_traits<unsigned short>::string_type BOOST_REGEX_CALL c_regex_traits<unsigned short>::lookup_collatename(const unsigned short* p1, const unsigned short* p2)
+{
+   std::wstring result = c_regex_traits<wchar_t>::lookup_collatename((const wchar_t*)p1, (const wchar_t*)p2);
+   return string_type(result.begin(), result.end());
+}
+
+bool BOOST_REGEX_CALL c_regex_traits<unsigned short>::isctype(unsigned short c, char_class_type m)
+{
+   return c_regex_traits<wchar_t>::isctype(c, m);
+}
+
+int BOOST_REGEX_CALL c_regex_traits<unsigned short>::value(unsigned short c, int radix)
+{
+   return c_regex_traits<wchar_t>::value(c, radix);
+}
+
+#endif
+
+}
+
+#endif // BOOST_NO_WREGEX
+
+#endif // __BORLANDC__
+
diff --git a/src/wide_posix_api.cpp b/src/wide_posix_api.cpp
index fab55b1c..b02e1c0e 100644
--- a/src/wide_posix_api.cpp
+++ b/src/wide_posix_api.cpp
@@ -22,12 +22,22 @@
 
 #ifndef BOOST_NO_WREGEX
 
+#include <boost/cregex.hpp>
 #include <boost/regex.hpp>
 
 #include <cwchar>
 #include <cstring>
 #include <cstdio>
 
+#if defined(BOOST_NO_STDC_NAMESPACE)
+namespace std{
+#  ifndef BOOST_NO_SWPRINTF
+      using ::swprintf;
+#  endif
+}
+#endif
+
+
 namespace boost{
 
 namespace {
@@ -43,7 +53,6 @@ const wchar_t* wnames[] = {L"REG_NOERROR", L"REG_NOMATCH", L"REG_BADPAT", L"REG_
 
 BOOST_REGEX_DECL int BOOST_REGEX_CCALL regcompW(regex_tW* expression, const wchar_t* ptr, int f)
 {
-   BOOST_RE_GUARD_STACK
    if(expression->re_magic != wmagic_value)
    {
       expression->guts = 0;
@@ -62,7 +71,7 @@ BOOST_REGEX_DECL int BOOST_REGEX_CCALL regcompW(regex_tW* expression, const wcha
 #endif
    }
    // set default flags:
-   boost::uint_fast32_t flags = (f & REG_EXTENDED) ? wregex::extended : wregex::basic;
+   boost::uint_fast32_t flags = (f & REG_PERLEX) ? 0 : ((f & REG_EXTENDED) ? wregex::extended : wregex::basic);
    expression->eflags = (f & REG_NEWLINE) ? match_not_dot_newline : match_default;
 
    // and translate those that are actually set:
@@ -75,20 +84,19 @@ BOOST_REGEX_DECL int BOOST_REGEX_CCALL regcompW(regex_tW* expression, const wcha
    }
 
    if(f & REG_NOSUB)
-      expression->eflags |= match_any;
+   {
+      //expression->eflags |= match_any;
+      flags |= wregex::nosubs;
+   }
 
    if(f & REG_NOSPEC)
       flags |= wregex::literal;
    if(f & REG_ICASE)
       flags |= wregex::icase;
    if(f & REG_ESCAPE_IN_LISTS)
-      flags |= wregex::escape_in_lists;
+      flags &= ~wregex::no_escape_in_lists;
    if(f & REG_NEWLINE_ALT)
       flags |= wregex::newline_alt;
-#ifndef BOOST_REGEX_V3
-   if(f & REG_PERLEX)
-      flags |= wregex::perlex;
-#endif
 
    const wchar_t* p2;
    if(f & REG_PEND)
@@ -105,7 +113,12 @@ BOOST_REGEX_DECL int BOOST_REGEX_CCALL regcompW(regex_tW* expression, const wcha
       expression->re_nsub = static_cast<wregex*>(expression->guts)->mark_count() - 1;
       result = static_cast<wregex*>(expression->guts)->error_code();
 #ifndef BOOST_NO_EXCEPTIONS
-   } catch(...)
+   } 
+   catch(const boost::regex_error& be)
+   {
+      result = be.code();
+   }
+   catch(...)
    {
       result = REG_E_UNKNOWN;
    }
@@ -118,12 +131,11 @@ BOOST_REGEX_DECL int BOOST_REGEX_CCALL regcompW(regex_tW* expression, const wcha
 
 BOOST_REGEX_DECL regsize_t BOOST_REGEX_CCALL regerrorW(int code, const regex_tW* e, wchar_t* buf, regsize_t buf_size)
 {
-   BOOST_RE_GUARD_STACK
    std::size_t result = 0;
    if(code & REG_ITOA)
    {
       code &= ~REG_ITOA;
-      if(code <= REG_E_UNKNOWN)
+      if((code <= (int)REG_E_UNKNOWN) && (code >= 0))
       {
          result = std::wcslen(wnames[code]) + 1;
          if(buf_size >= result)
@@ -138,34 +150,35 @@ BOOST_REGEX_DECL regsize_t BOOST_REGEX_CCALL regerrorW(int code, const regex_tW*
       wchar_t localbuf[5];
       if(e == 0)
          return 0;
-      for(int i = 0; i <= REG_E_UNKNOWN; ++i)
+      for(int i = 0; i <= (int)REG_E_UNKNOWN; ++i)
       {
          if(std::wcscmp(e->re_endp, wnames[i]) == 0)
          {
-            std::swprintf(localbuf, 5, L"%d", i);
+            (std::swprintf)(localbuf, 5, L"%d", i);
             if(std::wcslen(localbuf) < buf_size)
                std::wcscpy(buf, localbuf);
             return std::wcslen(localbuf) + 1;
          }
       }
-      std::swprintf(localbuf, 5, L"%d", 0);
+      (std::swprintf)(localbuf, 5, L"%d", 0);
       if(std::wcslen(localbuf) < buf_size)
          std::wcscpy(buf, localbuf);
       return std::wcslen(localbuf) + 1;
    }
 #endif
-   if(code <= REG_E_UNKNOWN)
+   if(code <= (int)REG_E_UNKNOWN)
    {
-      regex_traits<wchar_t> rt;
-      const regex_traits<wchar_t>* pt = &rt;
-      if(e && (e->re_magic == wmagic_value))
-         pt = &static_cast<wregex*>(e->guts)->get_traits();
-      (void)pt; // warning suppression
-      std::string p = pt->error_string(code);
-      std::size_t len = pt->strwiden(static_cast<wchar_t*>(0), 0, p.c_str());
+      std::string p;
+      if((e) && (e->re_magic == wmagic_value))
+         p = static_cast<wregex*>(e->guts)->get_traits().error_string(static_cast< ::boost::regex_constants::error_type>(code));
+      else
+      {
+         p = re_detail::get_default_error_string(static_cast< ::boost::regex_constants::error_type>(code));
+      }
+      std::size_t len = p.size();
       if(len < buf_size)
       {
-         pt->strwiden(buf, buf_size, p.c_str());
+         std::copy(p.c_str(), p.c_str() + p.size() + 1, buf);
       }
       return len + 1;
    }
@@ -176,7 +189,10 @@ BOOST_REGEX_DECL regsize_t BOOST_REGEX_CCALL regerrorW(int code, const regex_tW*
 
 BOOST_REGEX_DECL int BOOST_REGEX_CCALL regexecW(const regex_tW* expression, const wchar_t* buf, regsize_t n, regmatch_t* array, int eflags)
 {
-   BOOST_RE_GUARD_STACK
+#ifdef BOOST_MSVC
+#pragma warning(push)
+#pragma warning(disable:4267)
+#endif
    bool result = false;
    match_flag_type flags = match_default | expression->eflags;
    const wchar_t* end;
@@ -216,7 +232,7 @@ BOOST_REGEX_DECL int BOOST_REGEX_CCALL regexecW(const regex_tW* expression, cons
    if(result)
    {
       // extract what matched:
-     unsigned int i;
+      std::size_t i;
       for(i = 0; (i < n) && (i < expression->re_nsub + 1); ++i)
       {
          array[i].rm_so = (m[i].matched == false) ? -1 : (m[i].first - buf);
@@ -231,11 +247,13 @@ BOOST_REGEX_DECL int BOOST_REGEX_CCALL regexecW(const regex_tW* expression, cons
       return 0;
    }
    return REG_NOMATCH;
+#ifdef BOOST_MSVC
+#pragma warning(pop)
+#endif
 }
 
 BOOST_REGEX_DECL void BOOST_REGEX_CCALL regfreeW(regex_tW* expression)
 {
-   BOOST_RE_GUARD_STACK
    if(expression->re_magic == wmagic_value)
    {
       delete static_cast<wregex*>(expression->guts);
diff --git a/test/Jamfile b/test/Jamfile
index ad637f64..095800a8 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -6,14 +6,76 @@ subproject libs/regex/test ;
 import testing ;
 subinclude libs/regex/test/captures ;
 
+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
+;
+
+#
+# test for MFC by looking inside VC++ include directories:
+#
+if ! $(gMFC_CHECK)
+{
+   gMFC_CHECK = true ;
+   if $(VS71COMNTOOLS)
+   {
+      VS71COMNTOOLS = $(VS71COMNTOOLS:J=" ") ;
+      if [ GLOB $(VS71COMNTOOLS)..\\..\\VC7\\atlmfc\\include : cstringt.h ]
+      {
+         ECHO MFC/ATL regex wrappers will be tested when building with VC7.1 ;
+         REGEX_MFC_OPTS += "<vc-7_1><*><define>TEST_MFC=1" ;
+      }
+   }
+   if $(VSCOMNTOOLS)
+   {
+      VSCOMNTOOLS = $(VSCOMNTOOLS:J=" ") ;
+      if [ GLOB $(VSCOMNTOOLS)\\..\\..\\VC7\\atlmfc\\include : cstringt.h ]
+      {
+         ECHO MFC/ATL regex wrappers will be tested when building with VC7 ;
+         REGEX_MFC_OPTS += "<vc7><*><define>TEST_MFC=1" ;
+      }
+   }
+   if $(VS80COMNTOOLS)
+   {
+      VS80COMNTOOLS = $(VS80COMNTOOLS:J=" ") ;
+      if [ GLOB $(VS80COMNTOOLS)..\\..\\VC8\\atlmfc\\include : cstringt.h ]
+      {
+         ECHO MFC/ATL regex wrappers will be tested when building with VC8 ;
+         REGEX_MFC_OPTS += "<vc-8_0><*><define>TEST_MFC=1" ;
+      }
+   }
+}
+
 #
 # this template defines the options common to
 # all regex tests:
 #
 template test 
    : <template>../build/regex-options 
+     <template>../build/regex-test-options
      <lib>../build/boost_regex            # sources
    : <threading>multi
+     $(REGEX_MFC_OPTS)
    ;
  
 #
@@ -22,9 +84,7 @@ template test
 #
 template regression
     : <template>test                    # sources
-      regress/parse.cpp
-      regress/regress.cpp 
-      regress/tests.cpp
+      regress/$(R_SOURCE)
       <lib>../../test/build/boost_prg_exec_monitor
     ;
 
@@ -46,6 +106,7 @@ rule regex-test ( name : sources + : requirements * : input-files * )
 #
 template test-dll 
    : <template>../build/regex-dll-options 
+     <template>../build/regex-test-options
      <dll>../build/boost_regex            # sources
    : <threading>multi
    ;
@@ -56,9 +117,7 @@ template test-dll
 #
 template regression-dll
     : <template>test-dll                    # sources
-      regress/parse.cpp
-      regress/regress.cpp 
-      regress/tests.cpp
+      regress/$(R_SOURCE)
       <lib>../../test/build/boost_prg_exec_monitor
     ;
 
@@ -67,14 +126,7 @@ test-suite regex
       [ regex-test regex_regress
           : <template>regression     # sources
           :                          # requirements
-          : regress/tests.txt        # input files
-      ]
-
-      [ regex-test regex_wide_regress
-          : <template>regression     # sources
-            <template>../build/msvc-stlport-tricky
-          : <define>TEST_UNICODE=1   # requirements
-          : regress/tests.txt        # input files
+          :                          # input files
       ]
 
       [ regex-test posix_api_check
@@ -107,6 +159,17 @@ test-suite regex
             <lib>../../test/build/boost_test_exec_monitor
       ]
       
+      [ run unicode/unicode_iterator_test.cpp ]
+      [ regex-test static_mutex_test
+          : <template>test                      # sources
+            static_mutex/static_mutex_test.cpp
+            <dll>../../thread/build/boost_thread
+      ]
+      [ regex-test object_cache_test
+          : <template>test                      # sources
+            object_cache/object_cache_test.cpp
+      ]
+      
       [ run config_info/regex_config_info.cpp <template>test 
       : : : <test-info>always_show_run_output ]
 
@@ -116,20 +179,13 @@ test-suite regex
 
       [ regex-test regex_regress_dll
           : <template>regression-dll     # sources
-          :                          # requirements
-          : regress/tests.txt        # input files
-      ]
-
-      [ regex-test regex_wide_regress_dll
-          : <template>regression-dll     # sources
-            <template>../build/msvc-stlport-tricky
-          : <define>TEST_UNICODE=1   # requirements
-          : regress/tests.txt        # input files
+          :                              # requirements
+          :                              # input files
       ]
 
       [ compile concepts/concept_check.cpp
       ]
-      [ compile concepts/wide_concept_check.cpp
+      [ compile concepts/icu_concept_check.cpp
       ]
       
      [ run
@@ -163,3 +219,8 @@ test-suite regex
 
 
 
+
+
+
+
+
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index d9ef4d85..3f25eeea 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -1,7 +1,7 @@
 # copyright John Maddock 2003
 
 project
-    : requirements <threading>multi
+    : requirements <threading>multi <link>shared:<define>BOOST_REGEX_DYN_LINK=1
     ;
 
 #
@@ -16,77 +16,77 @@ rule regex-test ( name : sources + : requirements * : input-files * )
                : $(name) ] ;
 }
 
-local regress-sources = regress/parse.cpp
-                        regress/regress.cpp 
-                        regress/tests.cpp
+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
+;
+
+local regress-sources = regress/$(R_SOURCE)
                         ../../test/build//boost_prg_exec_monitor ;
 
 test-suite regex
       : 
-      [ regex-test regex_regress
-          : $(regress-sources)       # sources
-          :                          # requirements
-          : regress/tests.txt        # input files
+      [ run regress/$(R_SOURCE) ../../test/build//boost_prg_exec_monitor ../build//boost_regex ]
+      #[ run c_compiler_checks/posix_api_check.c ../../test/build//boost_prg_exec_monitor ../build//boost_regex ]
+      #[ compile c_compiler_checks/wide_posix_api_check.c  ]
+      [ run c_compiler_checks/posix_api_check.cpp ../../test/build//boost_prg_exec_monitor ../build//boost_regex ]
+      [ run c_compiler_checks/wide_posix_api_check.cpp ../build//boost_regex ]
+
+      [ run pathology/bad_expression_test.cpp
+            ../../test/build//boost_test_exec_monitor ../build//boost_regex
       ]
 
-      [ regex-test regex_wide_regress
-          : $(regress-sources)       # sources
-          : <define>TEST_UNICODE=1   # requirements
-          : regress/tests.txt        # input files
+      [ run pathology/recursion_test.cpp
+            ../../test/build//boost_test_exec_monitor ../build//boost_regex
       ]
-
-      [ regex-test regex_regress_dll
-          : $(regress-sources)       # sources
-          : <link>shared             # requirements
-          : regress/tests.txt        # input files
+      
+      [ run unicode/unicode_iterator_test.cpp ../build//boost_regex ]
+      [ run static_mutex/static_mutex_test.cpp
+            ../../thread/build//boost_thread ../build//boost_regex
       ]
-
-      [ regex-test regex_wide_regress_dll
-          : $(regress-sources)       # sources
-          : <define>TEST_UNICODE=1   
-            <link>shared             # requirements
-          : regress/tests.txt        # input files
+      [ run object_cache/object_cache_test.cpp ../build//boost_regex
       ]
+      
+      [ run config_info/regex_config_info.cpp ../build//boost_regex ]
 
-      [ regex-test posix_api_check
-          : c_compiler_checks/posix_api_check.c
+      [ compile concepts/concept_check.cpp ../build//boost_regex
       ]
-
-      [ compile c_compiler_checks/wide_posix_api_check.c 
-          : : wide_posix_api_check_c ]
-
-      [ regex-test posix_api_check_cpp
-          : c_compiler_checks/posix_api_check.cpp
+      [ compile concepts/icu_concept_check.cpp ../build//boost_regex
       ]
-
-      [ regex-test wide_posix_api_check_cpp
-          : c_compiler_checks/wide_posix_api_check.cpp
-      ]
-
-      [ regex-test bad_expression_test
-          : pathology/bad_expression_test.cpp
-            ../../test/build//boost_test_exec_monitor
-      ]
-
-      [ regex-test recursion_test
-          : pathology/recursion_test.cpp
-            ../../test/build//boost_test_exec_monitor
-      ]
-
-      [ run config_info/regex_config_info.cpp 
-      : : : <test-info>always_show_run_output ]
-
-      [ run config_info/regex_config_info.cpp 
-      : : : <test-info>always_show_run_output <link>shared
-      : regex_dll_config_info ]
-
-      [ compile concepts/concept_check.cpp
-      ]
-      [ compile concepts/wide_concept_check.cpp
-      ]
-      [ run captures/captures_test.cpp captures//boost_regex_extra 
-            ../../test/build//boost_test_exec_monitor
-      : : : <define>BOOST_REGEX_MATCH_EXTRA=1
-      ]
-      ;
+      
+     [ run
+    # sources
+    captures/captures_test.cpp
+    captures//boost_regex_extra
+    ../../test/build//boost_test_exec_monitor
+ :  # additional args
+ :  # test-files
+ :  # requirements
+    <threading>multi
+    <define>BOOST_REGEX_MATCH_EXTRA=1
+    <define>BOOST_REGEX_NO_LIB=1
+ :  # test name
+    captures_test
+ ]
+;
       
\ No newline at end of file
diff --git a/test/captures/Jamfile b/test/captures/Jamfile
index 80b4fcc0..35126aa5 100644
--- a/test/captures/Jamfile
+++ b/test/captures/Jamfile
@@ -2,11 +2,25 @@
 
 subproject libs/regex/test/captures ;
 
-EX_SOURCES = c_regex_traits c_regex_traits_common cpp_regex_traits
-       cregex fileiter posix_api regex regex_debug
-       regex_synch w32_regex_traits wide_posix_api instances winstances ;
+EX_SOURCES = 
+   c_regex_traits.cpp
+   cpp_regex_traits.cpp
+   cregex.cpp
+   fileiter.cpp
+   instances.cpp
+   posix_api.cpp
+   regex.cpp
+   regex_debug.cpp
+   regex_raw_buffer.cpp
+   regex_traits_defaults.cpp
+   static_mutex.cpp
+   w32_regex_traits.cpp
+   wc_regex_traits.cpp
+   wide_posix_api.cpp
+   winstances.cpp
+   usinstances.cpp ;
        
-lib boost_regex_extra : ../../src/$(EX_SOURCES).cpp <template>../../build/regex-options
+lib boost_regex_extra : ../../src/$(EX_SOURCES) <template>../../build/regex-options
     : 
         <define>BOOST_REGEX_MATCH_EXTRA=1
     : 
diff --git a/test/captures/Jamfile.v2 b/test/captures/Jamfile.v2
index eadeb69c..682e1495 100644
--- a/test/captures/Jamfile.v2
+++ b/test/captures/Jamfile.v2
@@ -4,13 +4,29 @@ project
     : source-location ../../src
     ;
 
-EX_SOURCES = c_regex_traits c_regex_traits_common cpp_regex_traits
-       cregex fileiter posix_api regex regex_debug
-       regex_synch w32_regex_traits wide_posix_api instances winstances ;
+EX_SOURCES = 
+   c_regex_traits.cpp
+   cpp_regex_traits.cpp
+   cregex.cpp
+   fileiter.cpp
+   icu.cpp
+   instances.cpp
+   posix_api.cpp
+   regex.cpp
+   regex_debug.cpp
+   regex_raw_buffer.cpp
+   regex_traits_defaults.cpp
+   static_mutex.cpp
+   w32_regex_traits.cpp
+   wc_regex_traits.cpp
+   wide_posix_api.cpp
+   winstances.cpp 
+   usinstances.cpp ;
        
-lib boost_regex_extra : $(EX_SOURCES).cpp
+lib boost_regex_extra : $(EX_SOURCES)
     : 
         <define>BOOST_REGEX_MATCH_EXTRA=1
+	     <link>shared:<define>BOOST_REGEX_DYN_LINK=1
     : 
     ;
 
diff --git a/test/concepts/concept_check.cpp b/test/concepts/concept_check.cpp
index 07cbfb64..89a204ae 100644
--- a/test/concepts/concept_check.cpp
+++ b/test/concepts/concept_check.cpp
@@ -9,21 +9,19 @@
  *
  */
 
-
-#include <cstdlib> // for abort
-#include <boost/regex.hpp>
+#include <boost/config.hpp>
 
 #if defined(BOOST_MSVC)
 // this lets us compile at warning level 4 without seeing concept-check related warnings
 #  pragma warning(disable:4100)
 #endif
-
-#include <boost/concept_archetype.hpp>
-#include <boost/concept_check.hpp>
+#ifdef __BORLANDC__
+#pragma option -w-8019 -w-8004 -w-8008
+#endif
+#include <boost/regex.hpp>
 #include <boost/detail/workaround.hpp>
-
-#ifdef BOOST_NO_STDC_NAMESPACE
-namespace std{ using ::abort; }
+#if !BOOST_WORKAROUND(_MSC_VER, < 1310) && !defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(__IBMCPP__) && !BOOST_WORKAROUND(__GNUC__, < 3)
+#include <boost/regex/concepts.hpp>
 #endif
 
 
@@ -31,75 +29,70 @@ int main()
 {
    // VC6 and VC7 can't cope with the iterator architypes, 
    // don't bother testing as it doesn't work:
-#if !BOOST_WORKAROUND(_MSC_VER, < 1310)
-   typedef boost::bidirectional_iterator_archetype<char> iterator_type;
-   typedef boost::input_iterator_archetype<char> input_iterator_type;
-   input_iterator_type i, j;
-#if!defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(__IBMCPP__) && !BOOST_WORKAROUND(__GNUC__, < 3)
-   boost::regex r(i, j);
-   r.assign(i, j);
-#else
-   boost::regex r;
-#endif
-   iterator_type a, b;
-   boost::detail::dummy_constructor dummy;
-   boost::output_iterator_archetype<char> out(dummy);
-   std::string s;
-   boost::match_results<iterator_type> what;
-
-   boost::regex_match(a, b, r);
-   boost::regex_match(a, b, what, r);
-   boost::regex_search(a, b, r);
-   boost::regex_search(a, b, what, r);
-   out = boost::regex_replace(out, a, b, r, s, boost::match_default);
-   s = boost::regex_replace(s, r, s, boost::match_default);
-
-   out = what.format(out, s, boost::format_default);
-   s = what.format(s, boost::format_default);
-
+#if !BOOST_WORKAROUND(_MSC_VER, < 1310) && !defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(__IBMCPP__) && !BOOST_WORKAROUND(__GNUC__, < 3)
    boost::function_requires<
-      boost::ForwardIteratorConcept<
-         boost::regex_iterator<iterator_type>
+      boost::RegexTraitsConcept<
+         boost::regex_traits<char>
       >
    >();
-   // this fails with glibc++v2 :
-#if !BOOST_WORKAROUND(__GNUC__, < 3) && !BOOST_WORKAROUND(BOOST_MSVC, <1300)
+#ifndef BOOST_NO_STD_LOCALE
    boost::function_requires<
-      boost::ForwardIteratorConcept<
-         boost::regex_token_iterator<iterator_type>
+      boost::BoostRegexConcept<
+         boost::basic_regex<char, boost::cpp_regex_traits<char> >
+      >
+   >();
+#ifndef BOOST_NO_WREGEX
+   boost::function_requires<
+      boost::BoostRegexConcept<
+         boost::basic_regex<wchar_t, boost::cpp_regex_traits<wchar_t> >
       >
    >();
 #endif
-   //
-   // verify basic_regex member functions:
-   //
-   const char* c_exp = "abc";
-   r = c_exp;
-   r = r;
-   r = s;
-   if((r.mark_count()) || (0 == r.max_size()) || (r.empty()) || (0 == r.size()) || (r.begin() == r.end())) std::abort();
-
-   r.assign(r);
-   r.assign(c_exp);
-   r.assign(c_exp, boost::regex::perl);
-   r.assign(c_exp, 1, boost::regex::perl);
-   r.assign(s);
-   r.assign(s, boost::regex::perl);
-   r.assign(c_exp, c_exp+1);
-   r.assign(c_exp, c_exp+1, boost::regex::perl);
-#endif 
-
-#ifndef BOOST_NO_STD_ITERATOR
-   //
-   //check iterators work with std lib algorithms:
-   //
-   boost::cregex_iterator ri, rj;
-   std::distance(ri, rj);
-   std::advance(ri, 0);
-   boost::cregex_token_iterator rk, rm;
-   std::distance(rk, rm);
-   std::advance(rk, 0);
 #endif
+#if !BOOST_WORKAROUND(__BORLANDC__, < 0x560)
+   boost::function_requires<
+      boost::BoostRegexConcept<
+         boost::basic_regex<char, boost::c_regex_traits<char> >
+      >
+   >();
+#ifndef BOOST_NO_WREGEX
+   boost::function_requires<
+      boost::BoostRegexConcept<
+         boost::basic_regex<wchar_t, boost::c_regex_traits<wchar_t> >
+      >
+   >();
+#endif
+#endif
+#if defined(_WIN32) && !defined(BOOST_REGEX_NO_W32)
+   boost::function_requires<
+      boost::BoostRegexConcept<
+         boost::basic_regex<char, boost::w32_regex_traits<char> >
+      >
+   >();
+#ifndef BOOST_NO_WREGEX
+   boost::function_requires<
+      boost::BoostRegexConcept<
+         boost::basic_regex<wchar_t, boost::w32_regex_traits<wchar_t> >
+      >
+   >();
+#endif
+#endif
+   //
+   // now test the regex_traits concepts:
+   //
+   typedef boost::basic_regex<char, boost::regex_traits_architype<char> > regex_traits_tester_type1;
+   boost::function_requires<
+      boost::BoostRegexConcept<
+         regex_traits_tester_type1
+      >
+   >();
+   typedef boost::basic_regex<boost::char_architype, boost::regex_traits_architype<boost::char_architype> > regex_traits_tester_type2;
+   boost::function_requires<
+      boost::BaseRegexConcept<
+         regex_traits_tester_type2
+      >
+   >();
+#endif   
    return 0;
 }
 
diff --git a/test/concepts/icu_concept_check.cpp b/test/concepts/icu_concept_check.cpp
new file mode 100644
index 00000000..bf0d3fcb
--- /dev/null
+++ b/test/concepts/icu_concept_check.cpp
@@ -0,0 +1,150 @@
+/*
+ *
+ * Copyright (c) 2003
+ * Dr 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)
+ *
+ */
+#include <boost/regex/config.hpp>
+
+#if defined(BOOST_MSVC)
+// this lets us compile at warning level 4 without seeing concept-check related warnings
+#  pragma warning(disable:4100)
+#endif
+#ifdef __BORLANDC__
+#pragma option -w-8019 -w-8004 -w-8008
+#endif
+
+#ifdef BOOST_HAS_ICU
+
+#include <boost/regex/icu.hpp>
+#include <boost/detail/workaround.hpp>
+#if !BOOST_WORKAROUND(_MSC_VER, < 1310) && !defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(__IBMCPP__) && !BOOST_WORKAROUND(__GNUC__, < 3)
+#include <boost/regex/concepts.hpp>
+#endif
+
+
+int main()
+{
+   // VC6 and VC7 can't cope with the iterator architypes, 
+   // don't bother testing as it doesn't work:
+#if !BOOST_WORKAROUND(_MSC_VER, < 1310) && !defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(__IBMCPP__) && !BOOST_WORKAROUND(__GNUC__, < 3)
+   boost::function_requires<
+      boost::RegexTraitsConcept<
+         boost::icu_regex_traits
+      >
+   >();
+   boost::function_requires<
+      boost::BoostRegexConcept<
+         boost::u32regex
+      >
+   >();
+   //
+   // Now test additional function overloads:
+   //
+   bool b;
+   unsigned long buf[2] = { 0, };
+   const void* pb = buf;
+   typedef boost::bidirectional_iterator_archetype<char> utf8_arch1;
+   typedef boost::bidirectional_iterator_archetype<unsigned char> utf8_arch2;
+   typedef boost::bidirectional_iterator_archetype<UChar> utf16_arch;
+   typedef boost::bidirectional_iterator_archetype<wchar_t> wchar_arch;
+   boost::match_results<utf8_arch1> m1;
+   boost::match_results<utf8_arch2> m2;
+   boost::match_results<utf16_arch> m3;
+   boost::match_results<wchar_arch> m4;
+   boost::match_results<const char*> cm1;
+   boost::match_results<const unsigned char*> cm2;
+   boost::match_results<const UChar*> cm3;
+   boost::match_results<const wchar_t*> cm4;
+   boost::match_results<std::string::const_iterator> sm1;
+   boost::match_results<std::wstring::const_iterator> sm2;
+   boost::u32regex e1;
+   boost::regex_constants::match_flag_type flgs = boost::regex_constants::match_default;
+   std::string s1;
+   std::wstring s2;
+   UnicodeString us;
+   b = boost::u32regex_match(utf8_arch1(), utf8_arch1(), m1, e1, flgs);
+   b = boost::u32regex_match(utf8_arch1(), utf8_arch1(), m1, e1);
+   b = boost::u32regex_match(utf8_arch2(), utf8_arch2(), m2, e1, flgs);
+   b = boost::u32regex_match(utf8_arch2(), utf8_arch2(), m2, e1);
+   b = boost::u32regex_match(utf16_arch(), utf16_arch(), m3, e1, flgs);
+   b = boost::u32regex_match(utf16_arch(), utf16_arch(), m3, e1);
+   b = boost::u32regex_match(wchar_arch(), wchar_arch(), m4, e1, flgs);
+   b = boost::u32regex_match(wchar_arch(), wchar_arch(), m4, e1);
+   b = boost::u32regex_match((const char*)(pb), cm1, e1, flgs);
+   b = boost::u32regex_match((const char*)(pb), cm1, e1);
+   b = boost::u32regex_match((const unsigned char*)(pb), cm2, e1, flgs);
+   b = boost::u32regex_match((const unsigned char*)(pb), cm2, e1);
+   b = boost::u32regex_match((const UChar*)(pb), cm3, e1, flgs);
+   b = boost::u32regex_match((const UChar*)(pb), cm3, e1);
+   b = boost::u32regex_match((const wchar_t*)(pb), cm4, e1, flgs);
+   b = boost::u32regex_match((const wchar_t*)(pb), cm4, e1);
+   b = boost::u32regex_match(s1, sm1, e1, flgs);
+   b = boost::u32regex_match(s1, sm1, e1);
+   b = boost::u32regex_match(s2, sm2, e1, flgs);
+   b = boost::u32regex_match(s2, sm2, e1);
+   b = boost::u32regex_match(us, cm3, e1, flgs);
+   b = boost::u32regex_match(us, cm3, e1);
+
+   b = boost::u32regex_search(utf8_arch1(), utf8_arch1(), m1, e1, flgs);
+   b = boost::u32regex_search(utf8_arch1(), utf8_arch1(), m1, e1);
+   b = boost::u32regex_search(utf8_arch2(), utf8_arch2(), m2, e1, flgs);
+   b = boost::u32regex_search(utf8_arch2(), utf8_arch2(), m2, e1);
+   b = boost::u32regex_search(utf16_arch(), utf16_arch(), m3, e1, flgs);
+   b = boost::u32regex_search(utf16_arch(), utf16_arch(), m3, e1);
+   b = boost::u32regex_search(wchar_arch(), wchar_arch(), m4, e1, flgs);
+   b = boost::u32regex_search(wchar_arch(), wchar_arch(), m4, e1);
+   b = boost::u32regex_search((const char*)(pb), cm1, e1, flgs);
+   b = boost::u32regex_search((const char*)(pb), cm1, e1);
+   b = boost::u32regex_search((const unsigned char*)(pb), cm2, e1, flgs);
+   b = boost::u32regex_search((const unsigned char*)(pb), cm2, e1);
+   b = boost::u32regex_search((const UChar*)(pb), cm3, e1, flgs);
+   b = boost::u32regex_search((const UChar*)(pb), cm3, e1);
+   b = boost::u32regex_search((const wchar_t*)(pb), cm4, e1, flgs);
+   b = boost::u32regex_search((const wchar_t*)(pb), cm4, e1);
+   b = boost::u32regex_search(s1, sm1, e1, flgs);
+   b = boost::u32regex_search(s1, sm1, e1);
+   b = boost::u32regex_search(s2, sm2, e1, flgs);
+   b = boost::u32regex_search(s2, sm2, e1);
+   b = boost::u32regex_search(us, cm3, e1, flgs);
+   b = boost::u32regex_search(us, cm3, e1);
+   boost::output_iterator_archetype<char> out1 = boost::detail::dummy_constructor();
+   out1 = boost::u32regex_replace(out1, utf8_arch1(), utf8_arch1(), e1, (const char*)(pb), flgs);
+   boost::output_iterator_archetype<unsigned char> out2 = boost::detail::dummy_constructor();
+   out2 = boost::u32regex_replace(out2, utf8_arch2(), utf8_arch2(), e1, (const unsigned char*)(pb), flgs);
+   boost::output_iterator_archetype<UChar> out3 = boost::detail::dummy_constructor();
+   out3 = boost::u32regex_replace(out3, utf16_arch(), utf16_arch(), e1, (const UChar*)(pb), flgs);
+   boost::output_iterator_archetype<wchar_t> out4 = boost::detail::dummy_constructor();
+   out4 = boost::u32regex_replace(out4, wchar_arch(), wchar_arch(), e1, (const wchar_t*)(pb), flgs);
+
+   out1 = boost::u32regex_replace(out1, utf8_arch1(), utf8_arch1(), e1, s1, flgs);
+   out2 = boost::u32regex_replace(out2, utf8_arch2(), utf8_arch2(), e1, s1, flgs);
+   out3 = boost::u32regex_replace(out3, utf16_arch(), utf16_arch(), e1, s1, flgs);
+   out4 = boost::u32regex_replace(out4, wchar_arch(), wchar_arch(), e1, s1, flgs);
+   out1 = boost::u32regex_replace(out1, utf8_arch1(), utf8_arch1(), e1, s2, flgs);
+   out2 = boost::u32regex_replace(out2, utf8_arch2(), utf8_arch2(), e1, s2, flgs);
+   out3 = boost::u32regex_replace(out3, utf16_arch(), utf16_arch(), e1, s2, flgs);
+   out4 = boost::u32regex_replace(out4, wchar_arch(), wchar_arch(), e1, s2, flgs);
+   out1 = boost::u32regex_replace(out1, utf8_arch1(), utf8_arch1(), e1, us, flgs);
+   out2 = boost::u32regex_replace(out2, utf8_arch2(), utf8_arch2(), e1, us, flgs);
+   out3 = boost::u32regex_replace(out3, utf16_arch(), utf16_arch(), e1, us, flgs);
+   out4 = boost::u32regex_replace(out4, wchar_arch(), wchar_arch(), e1, us, flgs);
+   // string overloads:
+   s1 = boost::u32regex_replace(s1, e1, (const char*)(pb), flgs);
+   s2 = boost::u32regex_replace(s2, e1, (const wchar_t*)(pb), flgs);
+   s1 = boost::u32regex_replace(s1, e1, s1, flgs);
+   s2 = boost::u32regex_replace(s2, e1, s2, flgs);
+   s1 = boost::u32regex_replace(s1, e1, (const char*)(pb));
+   s2 = boost::u32regex_replace(s2, e1, (const wchar_t*)(pb));
+   s1 = boost::u32regex_replace(s1, e1, s1);
+   s2 = boost::u32regex_replace(s2, e1, s2);
+
+#endif   
+   return 0;
+}
+
+#endif
diff --git a/test/concepts/wide_concept_check.cpp b/test/concepts/wide_concept_check.cpp
deleted file mode 100644
index 8b33c504..00000000
--- a/test/concepts/wide_concept_check.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- *
- * Copyright (c) 2003
- * Dr 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)
- *
- */
-
-#include <boost/regex.hpp>
-#include <boost/concept_archetype.hpp>
-#if defined(BOOST_MSVC)
-// this lets us compile at warning level 4 without seeing concept-check related warnings
-#  pragma warning(disable:4100)
-#endif
-#include <boost/concept_check.hpp>
-#include <boost/detail/workaround.hpp>
-
-
-int main()
-{
-#ifndef BOOST_NO_WREGEX
-   // VC6 and VC7 can't cope with the iterator architypes, 
-   // don't bother testing as it doesn't work:
-#if !BOOST_WORKAROUND(_MSC_VER, < 1310)
-   typedef boost::bidirectional_iterator_archetype<wchar_t> iterator_type;
-   typedef boost::input_iterator_archetype<wchar_t> input_iterator_type;
-   input_iterator_type i, j;
-#if!defined(BOOST_NO_MEMBER_TEMPLATES) && !defined(__IBMCPP__)
-   boost::wregex r(i, j);
-   r.assign(i, j);
-#else
-   boost::wregex r;
-#endif
-   iterator_type a, b;
-   boost::detail::dummy_constructor dummy;
-   boost::output_iterator_archetype<wchar_t> out(dummy);
-   std::wstring s;
-   boost::match_results<iterator_type> what;
-
-   boost::regex_match(a, b, r);
-   boost::regex_match(a, b, what, r);
-   boost::regex_search(a, b, r);
-   boost::regex_search(a, b, what, r);
-   out = boost::regex_replace(out, a, b, r, s, boost::match_default);
-   s = boost::regex_replace(s, r, s, boost::match_default);
-
-   out = what.format(out, s, boost::format_default);
-   s = what.format(s, boost::format_default);
-
-   boost::function_requires<
-      boost::ForwardIteratorConcept<
-         boost::regex_iterator<iterator_type>
-      >
-   >();
-   // this fails with glibc++v2 :
-#if !BOOST_WORKAROUND(__GNUC__, < 3) && !BOOST_WORKAROUND(BOOST_MSVC, <1300)
-   boost::function_requires<
-      boost::ForwardIteratorConcept<
-         boost::regex_token_iterator<iterator_type>
-      >
-   >();
-#endif // GCC 2.x
-#endif // MSVC 6
-#endif // BOOST_NO_WREGEX
-   return 0;
-}
-
-
diff --git a/test/object_cache/object_cache_test.cpp b/test/object_cache/object_cache_test.cpp
new file mode 100644
index 00000000..3b82c3ff
--- /dev/null
+++ b/test/object_cache/object_cache_test.cpp
@@ -0,0 +1,75 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         object_cache_test.cpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Test code for a generic object cache.
+  */
+#include <boost/regex/pending/object_cache.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>
+
+class test_object
+{
+public:
+   test_object(int i)
+      : m_value(i)
+   {
+      ++s_count;
+   }
+   int value()const
+   {
+      return m_value;
+   }
+   static int count()
+   {
+      return s_count;
+   }
+private:
+   int m_value;
+   static int s_count;
+};
+
+int test_object::s_count = 0;
+
+static const int max_cache_size = 5;
+
+int test_main(int /*argc*/, char * /*argv*/[])
+{
+   int i;
+   for(i = 0; i < 20; ++i)
+   {
+      boost::shared_ptr<test_object> p = boost::object_cache<int, test_object>::get(i, max_cache_size);
+      BOOST_TEST(p->value() == i);
+      p = boost::object_cache<int, test_object>::get(i, max_cache_size);
+      BOOST_TEST(p->value() == i);
+      if(i)
+      {
+         p = boost::object_cache<int, test_object>::get(i-1, max_cache_size);
+         BOOST_TEST(p->value() == i-1);
+      }
+   }
+   int current_count = test_object::count();
+   for(int j = 0; j < 10; ++j)
+   {
+      for(i = 20 - max_cache_size; i < 20; ++i)
+      {
+         boost::shared_ptr<test_object> p = boost::object_cache<int, test_object>::get(i, max_cache_size);
+         BOOST_TEST(p->value() == i);
+         p = boost::object_cache<int, test_object>::get(i, max_cache_size);
+         BOOST_TEST(p->value() == i);
+      }
+   }
+   BOOST_TEST(current_count == test_object::count());
+   return 0;
+}
+
diff --git a/test/profile/Makefile b/test/profile/Makefile
new file mode 100644
index 00000000..4c52a8e1
--- /dev/null
+++ b/test/profile/Makefile
@@ -0,0 +1,11 @@
+
+
+regress :
+	g++ -fprofile-arcs -ftest-coverage -DBOOST_REGEX_RECURSIVE -DBOOST_REGEX_BLOCKSIZE=512 -DBOOST_REGEX_MAX_CACHE_BLOCKS=0 -DBOOST_REGEX_MATCH_EXTRA -g -I../../../../ -o regress ../regress/*.cpp ../../src/*.cpp ../../../test/src/ex*.cpp ../../../test/src/cpp_main.cpp
+	./regress
+	gcov basic_tests.cpp
+
+
+
+
+
diff --git a/test/regress/basic_tests.cpp b/test/regress/basic_tests.cpp
new file mode 100644
index 00000000..d247a887
--- /dev/null
+++ b/test/regress/basic_tests.cpp
@@ -0,0 +1,195 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         basic_tests.cpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: main regex test declarations.
+  */
+
+#include <boost/detail/workaround.hpp>
+
+#if BOOST_WORKAROUND(__BORLANDC__, < 0x560)
+// we get unresolved externals from basic_string
+// unless we do this, a well known Borland bug:
+#define _RWSTD_COMPILE_INSTANTIATE
+#endif
+
+#include "test.hpp"
+
+#ifdef BOOST_MSVC
+#pragma warning(disable:4127)
+#endif
+
+void basic_tests()
+{
+   using namespace boost::regex_constants;
+   TEST_REGEX_SEARCH("a", basic, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("a", basic, "bba", match_default, make_array(2, 3, -2, -2));
+   TEST_REGEX_SEARCH("Z", perl, "aaa", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("Z", perl, "xxxxZZxxx", match_default, make_array(4, 5, -2, 5, 6, -2, -2));
+   // and some simple brackets:
+   TEST_REGEX_SEARCH("(a)", perl, "zzzaazz", match_default, make_array(3, 4, 3, 4, -2, 4, 5, 4, 5, -2, -2));
+   TEST_REGEX_SEARCH("()", perl, "zzz", match_default, make_array(0, 0, 0, 0, -2, 1, 1, 1, 1, -2, 2, 2, 2, 2, -2, 3, 3, 3, 3, -2, -2));
+   TEST_REGEX_SEARCH("()", perl, "", match_default, make_array(0, 0, 0, 0, -2, -2));
+   TEST_INVALID_REGEX("(", perl);
+   TEST_INVALID_REGEX("", perl);
+   TEST_INVALID_REGEX(")", perl);
+   TEST_INVALID_REGEX("(aa", perl);
+   TEST_INVALID_REGEX("aa)", perl);
+   TEST_REGEX_SEARCH("a", perl, "b", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("\\(\\)", perl, "()", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("\\(a\\)", perl, "(a)", match_default, make_array(0, 3, -2, -2));
+   TEST_INVALID_REGEX("\\()", perl);
+   TEST_INVALID_REGEX("(\\)", perl);
+   TEST_REGEX_SEARCH("p(a)rameter", perl, "ABCparameterXYZ", match_default, make_array(3, 12, 4, 5, -2, -2));
+   TEST_REGEX_SEARCH("[pq](a)rameter", perl, "ABCparameterXYZ", match_default, make_array(3, 12, 4, 5, -2, -2));
+
+   // now try escaped brackets:
+   TEST_REGEX_SEARCH("\\(a\\)", basic, "zzzaazz", match_default, make_array(3, 4, 3, 4, -2, 4, 5, 4, 5, -2, -2));
+   TEST_REGEX_SEARCH("\\(\\)", basic, "zzz", match_default, make_array(0, 0, 0, 0, -2, 1, 1, 1, 1, -2, 2, 2, 2, 2, -2, 3, 3, 3, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\(\\)", basic, "", match_default, make_array(0, 0, 0, 0, -2, -2));
+   TEST_INVALID_REGEX("\\(", basic);
+   TEST_INVALID_REGEX("\\)", basic);
+   TEST_INVALID_REGEX("\\(aa", basic);
+   TEST_INVALID_REGEX("aa\\)", basic);
+   TEST_REGEX_SEARCH("()", basic, "()", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("(a)", basic, "(a)", match_default, make_array(0, 3, -2, -2));
+   TEST_INVALID_REGEX("\\()", basic);
+   TEST_INVALID_REGEX("(\\)", basic);
+   TEST_REGEX_SEARCH("p\\(a\\)rameter", basic, "ABCparameterXYZ", match_default, make_array(3, 12, 4, 5, -2, -2));
+   TEST_REGEX_SEARCH("[pq]\\(a\\)rameter", basic, "ABCparameterXYZ", match_default, make_array(3, 12, 4, 5, -2, -2));
+
+   // now move on to "." wildcards
+   TEST_REGEX_SEARCH(".", perl, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH(".", perl, "\n", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH(".", perl, "\r", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH(".", perl, "\0", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH(".", perl, "a", match_not_dot_newline, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH(".", perl, "\n", match_not_dot_newline, make_array(-2, -2));
+   TEST_REGEX_SEARCH(".", perl, "\r", match_not_dot_newline, make_array(-2, -2));
+   TEST_REGEX_SEARCH(".", perl, "\0", match_not_dot_newline, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH(".", perl, "\n", match_not_dot_null | match_not_dot_newline, make_array(-2, -2));
+   TEST_REGEX_SEARCH(".", perl, "\r", match_not_dot_null | match_not_dot_newline, make_array(-2, -2));
+   TEST_REGEX_SEARCH(".", perl, "\0", match_not_dot_null | match_not_dot_newline, make_array(-2, -2));
+   TEST_REGEX_SEARCH(".", basic, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH(".", basic, "\n", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH(".", basic, "\r", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH(".", basic, "\0", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH(".", basic, "a", match_not_dot_newline, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH(".", basic, "\n", match_not_dot_newline, make_array(-2, -2));
+   TEST_REGEX_SEARCH(".", basic, "\r", match_not_dot_newline, make_array(-2, -2));
+   TEST_REGEX_SEARCH(".", basic, "\0", match_not_dot_newline, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH(".", basic, "\n", match_not_dot_null | match_not_dot_newline, make_array(-2, -2));
+   TEST_REGEX_SEARCH(".", basic, "\r", match_not_dot_null | match_not_dot_newline, make_array(-2, -2));
+   TEST_REGEX_SEARCH(".", basic, "\0", match_not_dot_null | match_not_dot_newline, make_array(-2, -2));
+}
+
+void test_non_marking_paren()
+{
+   using namespace boost::regex_constants;
+   //
+   // non-marking parenthesis added 25/04/00
+   //
+   TEST_REGEX_SEARCH("(?:abc)+", perl, "xxabcabcxx", match_default, make_array(2, 8, -2, -2));
+   TEST_REGEX_SEARCH("(?:a+)(b+)", perl, "xaaabbbx", match_default, make_array(1, 7, 4, 7, -2, -2));
+   TEST_REGEX_SEARCH("(a+)(?:b+)", perl, "xaaabbba", match_default, make_array(1, 7, 1, 4, -2, -2));
+   TEST_REGEX_SEARCH("(?:(a+)b+)", perl, "xaaabbba", match_default, make_array(1, 7, 1, 4, -2, -2));
+   TEST_REGEX_SEARCH("(?:a+(b+))", perl, "xaaabbba", match_default, make_array(1, 7, 4, 7, -2, -2));
+   TEST_REGEX_SEARCH("a+(?#b+)b+", perl, "xaaabbba", match_default, make_array(1, 7, -2, -2));
+   TEST_REGEX_SEARCH("(a)(?:b|$)", perl, "ab", match_default, make_array(0, 2, 0, 1, -2, -2));
+   TEST_REGEX_SEARCH("(a)(?:b|$)", perl, "a", match_default, make_array(0, 1, 0, 1, -2, -2));
+}
+
+void test_partial_match()
+{
+   using namespace boost::regex_constants;
+   //
+   // try some partial matches:
+   //
+   TEST_REGEX_SEARCH("(xyz)(.*)abc", perl, "xyzaaab", match_default|match_partial, make_array(0, 7, -2, -2));
+   TEST_REGEX_SEARCH("(xyz)(.*)abc", perl, "xyz", match_default|match_partial, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("(xyz)(.*)abc", perl, "xy", match_default|match_partial, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("(xyz)(.*)abc", perl, "x", match_default|match_partial, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("(xyz)(.*)abc", perl, "", match_default|match_partial, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(xyz)(.*)abc", perl, "aaaa", match_default|match_partial, make_array(-2, -2));
+   TEST_REGEX_SEARCH(".abc", perl, "aaab", match_default|match_partial, make_array(1, 4, -2, -2));
+   TEST_REGEX_SEARCH("a[_]", perl, "xxa", match_default|match_partial, make_array(2, 3, -2, -2));
+   TEST_REGEX_SEARCH(".{4,}", perl, "xxa", match_default|match_partial, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH(".{4,}", perl, "xxa", match_default|match_partial|match_not_dot_null, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("[\\x0-\\xff]{4,}", perl, "xxa", match_default|match_partial, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a{4,}", perl, "aaa", match_default|match_partial, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\w{4,}", perl, "aaa", match_default|match_partial, make_array(0, 3, -2, -2));
+}
+
+void test_nosubs()
+{
+   using namespace boost::regex_constants;
+   // subtleties of matching with no sub-expressions marked
+   TEST_REGEX_SEARCH("a(b?c)+d", perl, "accd", match_default|match_nosubs, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("(wee|week)(knights|night)", perl, "weeknights", match_default|match_nosubs, make_array(0, 10, -2, -2));
+   TEST_REGEX_SEARCH(".*", perl, "abc", match_default|match_nosubs, make_array(0, 3, -2, 3, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b|(c))d", perl, "abd", match_default|match_nosubs, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b|(c))d", perl, "acd", match_default|match_nosubs, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b*|c|e)d", perl, "abbd", match_default|match_nosubs, make_array(0, 4, -2, -2));
+   
+   TEST_REGEX_SEARCH("a(b*|c|e)d", perl, "acd", match_default|match_nosubs, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b*|c|e)d", perl, "ad", match_default|match_nosubs, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(b?)c", perl, "abc", match_default|match_nosubs, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b?)c", perl, "ac", match_default|match_nosubs, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(b+)c", perl, "abc", match_default|match_nosubs, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b+)c", perl, "abbbc", match_default|match_nosubs, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("a(b*)c", perl, "ac", match_default|match_nosubs, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("(a|ab)(bc([de]+)f|cde)", perl, "abcdef", match_default|match_nosubs, make_array(0, 6, -2, -2));
+   TEST_REGEX_SEARCH("a([bc]?)c", perl, "abc", match_default|match_nosubs, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a([bc]?)c", perl, "ac", match_default|match_nosubs, make_array(0, 2, -2, -2));
+
+   TEST_REGEX_SEARCH("a([bc]+)c", perl, "abc", match_default|match_nosubs, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a([bc]+)c", perl, "abcc", match_default|match_nosubs, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("a([bc]+)bc", perl, "abcbc", match_default|match_nosubs, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("a(bb+|b)b", perl, "abb", match_default|match_nosubs, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(bbb+|bb+|b)b", perl, "abb", match_default|match_nosubs, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(bbb+|bb+|b)b", perl, "abbb", match_default|match_nosubs, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("a(bbb+|bb+|b)bb", perl, "abbb", match_default|match_nosubs, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("(.*).*", perl, "abcdef", match_default|match_nosubs, make_array(0, 6, -2, 6, 6, -2, -2));
+   TEST_REGEX_SEARCH("(a*)*", perl, "bc", match_default|match_nosubs, make_array(0, 0, -2, 1, 1, -2, 2, 2, -2, -2));
+
+   TEST_REGEX_SEARCH("a(b?c)+d", perl|nosubs, "accd", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("(wee|week)(knights|night)", perl|nosubs, "weeknights", match_default, make_array(0, 10, -2, -2));
+   TEST_REGEX_SEARCH(".*", perl|nosubs, "abc", match_default, make_array(0, 3, -2, 3, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b|(c))d", perl|nosubs, "abd", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b|(c))d", perl|nosubs, "acd", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b*|c|e)d", perl|nosubs, "abbd", match_default, make_array(0, 4, -2, -2));
+   
+   TEST_REGEX_SEARCH("a(b*|c|e)d", perl|nosubs, "acd", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b*|c|e)d", perl|nosubs, "ad", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(b?)c", perl|nosubs, "abc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b?)c", perl|nosubs, "ac", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(b+)c", perl|nosubs, "abc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b+)c", perl|nosubs, "abbbc", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("a(b*)c", perl|nosubs, "ac", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("(a|ab)(bc([de]+)f|cde)", perl|nosubs, "abcdef", match_default, make_array(0, 6, -2, -2));
+   TEST_REGEX_SEARCH("a([bc]?)c", perl|nosubs, "abc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a([bc]?)c", perl|nosubs, "ac", match_default, make_array(0, 2, -2, -2));
+
+   TEST_REGEX_SEARCH("a([bc]+)c", perl|nosubs, "abc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a([bc]+)c", perl|nosubs, "abcc", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("a([bc]+)bc", perl|nosubs, "abcbc", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("a(bb+|b)b", perl|nosubs, "abb", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(bbb+|bb+|b)b", perl|nosubs, "abb", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(bbb+|bb+|b)b", perl|nosubs, "abbb", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("a(bbb+|bb+|b)bb", perl|nosubs, "abbb", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("(.*).*", perl|nosubs, "abcdef", match_default, make_array(0, 6, -2, 6, 6, -2, -2));
+   TEST_REGEX_SEARCH("(a*)*", perl|nosubs, "bc", match_default, make_array(0, 0, -2, 1, 1, -2, 2, 2, -2, -2));
+}
+
+
diff --git a/test/regress/bc55.mak b/test/regress/bc55.mak
deleted file mode 100644
index 14cb0210..00000000
--- a/test/regress/bc55.mak
+++ /dev/null
@@ -1,143 +0,0 @@
-
-# very basic makefile for regress
-#
-# Borland C++ tools
-#
-# BCROOT defines the root directory of your bcb install
-#
-!ifndef BCROOT
-BCROOT=$(MAKEDIR)\..
-!endif
-#
-# sources to compile for each test:
-#
-SOURCES=tests.cpp parse.cpp regress.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
-
-BCC32   = $(BCROOT)\bin\Bcc32.exe 
-TLINK32 = $(BCROOT)\bin\ILink32.exe
-
-IDE_LinkFLAGS32 =  -L$(BCROOT)\LIB
-LINKOPTS= -ap -Tpe -x
-CFLAGS= -O2 -tWC -DSTRICT; -Vx -Ve -w-inl -w-aus -w-csu -w-eff -w-rch -I$(BCROOT)\include;..\..\..\..\; -L..\..\..\..\stage\lib -L..\..\build\bcb5
-
-all :: r1.exe r2.exe r3.exe r4.exe r5.exe r6.exe r1m.exe r2m.exe r3m.exe r4m.exe r5m.exe r6m.exe r1l.exe r2l.exe r3l.exe r4l.exe r5l.exe r6l.exe r1lm.exe r2lm.exe r3lm.exe r4lm.exe r5lm.exe r6lm.exe
-	echo testing static single threaded version....
-	r1 tests.txt test1252.txt
-	r2 tests.txt
-	r3 tests.txt
-	r4 tests.txt test1252.txt
-	r5 tests.txt
-	r6 tests.txt
-	echo testing static multi-threaded version....
-	r1m tests.txt test1252.txt
-	r2m tests.txt
-	r3m tests.txt
-	r4m tests.txt test1252.txt
-	r5m tests.txt
-	r6m tests.txt
-	echo testing dll single threaded version....
-	r1l tests.txt test1252.txt
-	r2l tests.txt
-	r3l tests.txt
-	r4l tests.txt test1252.txt
-	r5l tests.txt
-	r6l tests.txt
-	echo testing dll multi-threaded version....
-	r1lm tests.txt test1252.txt
-	r2lm tests.txt
-	r3lm tests.txt
-	r4lm tests.txt test1252.txt
-	r5lm tests.txt
-	r6lm tests.txt
-
-
-r1.exe : tests.cpp regress.cpp parse.cpp
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er1.exe -DBOOST_RE_TEST_LOCALE_W32 tests.cpp regress.cpp parse.cpp
-
-r2.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er2.exe -DBOOST_RE_TEST_LOCALE_C $(SOURCES)
-
-r3.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er3.exe -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES)
-
-r4.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er4.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES)
-
-r5.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er5.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES)
-
-r6.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er6.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES)
-	
-
-r1m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er1m.exe -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES)
-
-r2m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er2m.exe -DBOOST_RE_TEST_LOCALE_C $(SOURCES)
-
-r3m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er3m.exe -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES)
-
-r4m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er4m.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES)
-
-r5m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er5m.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES)
-
-r6m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er6m.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES)
-
-
-r1l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er1l.exe -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES)
-
-r2l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er2l.exe -DBOOST_RE_TEST_LOCALE_C $(SOURCES)
-
-r3l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er3l.exe -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES)
-
-r4l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er4l.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES)
-
-r5l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er5l.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES)
-
-r6l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er6l.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES)
-
-
-r1lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er1lm.exe -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES)
-
-r2lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er2lm.exe -DBOOST_RE_TEST_LOCALE_C $(SOURCES)
-
-r3lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er3lm.exe -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES)
-
-r4lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er4lm.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES)
-
-r5lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er5lm.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES)
-
-r6lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er6lm.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/test/regress/bcb4.mak b/test/regress/bcb4.mak
deleted file mode 100644
index 7fd6f842..00000000
--- a/test/regress/bcb4.mak
+++ /dev/null
@@ -1,193 +0,0 @@
-
-# very basic makefile for regress
-#
-# Borland C++ tools
-#
-# BCROOT defines the root directory of your bcb install
-#
-!ifndef BCROOT
-BCROOT=$(MAKEDIR)\..
-!endif
-
-BCC32   = $(BCROOT)\bin\Bcc32.exe 
-TLINK32 = $(BCROOT)\bin\ILink32.exe
-#
-# sources to compile for each test:
-#
-SOURCES=tests.cpp parse.cpp regress.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
-
-IDE_LinkFLAGS32 =  -L$(BCROOT)\LIB
-LINKOPTS= -ap -Tpe -x
-CFLAGS= -O2 -tWC -DSTRICT; -Vx -Ve -w-inl -w-aus -w-csu -w-eff -w-rch -I$(BCROOT)\include;..\..\..\..\; -L..\..\build\bcb4
-
-all :: r1.exe r2.exe r3.exe r4.exe r5.exe r6.exe r1m.exe r2m.exe r3m.exe r4m.exe r5m.exe r6m.exe r1v.exe r2v.exe r3v.exe r4v.exe r5v.exe r6v.exe r1l.exe r2l.exe r3l.exe r4l.exe r5l.exe r6l.exe r1lm.exe r2lm.exe r3lm.exe r4lm.exe r5lm.exe r6lm.exe r1lv.exe r2lv.exe r3lv.exe r4lv.exe r5lv.exe r6lv.exe
-	echo testing static single threaded version....
-	r1 tests.txt test1252.txt
-	r2 tests.txt
-	r3 tests.txt
-	r4 tests.txt test1252.txt
-	r5 tests.txt
-	r6 tests.txt
-	echo testing static multi-threaded version....
-	r1m tests.txt test1252.txt
-	r2m tests.txt
-	r3m tests.txt
-	r4m tests.txt test1252.txt
-	r5m tests.txt
-	r6m tests.txt
-	echo testing static VCL version....
-	r1v tests.txt test1252.txt
-	r2v tests.txt
-	r3v tests.txt
-	r4v tests.txt test1252.txt
-	r5v tests.txt
-	r6v tests.txt
-	echo testing dll single threaded version....
-	r1l tests.txt test1252.txt
-	r2l tests.txt
-	r3l tests.txt
-	r4l tests.txt test1252.txt
-	r5l tests.txt
-	r6l tests.txt
-	echo testing dll multi-threaded version....
-	r1lm tests.txt test1252.txt
-	r2lm tests.txt
-	r3lm tests.txt
-	r4lm tests.txt test1252.txt
-	r5lm tests.txt
-	r6lm tests.txt
-	echo testing dll VCL version....
-	r1lv tests.txt test1252.txt
-	r2lv tests.txt
-	r3lv tests.txt
-	r4lv tests.txt test1252.txt
-	r5lv tests.txt
-	r6lv tests.txt
-
-
-r1.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er1.exe -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES)
-
-r2.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er2.exe -DBOOST_RE_TEST_LOCALE_C $(SOURCES)
-
-r3.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er3.exe -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES)
-
-r4.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er4.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES)
-
-r5.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er5.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES)
-
-r6.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er6.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES)
-	
-
-r1m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er1m.exe -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES)
-
-r2m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er2m.exe -DBOOST_RE_TEST_LOCALE_C $(SOURCES)
-
-r3m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er3m.exe -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES)
-
-r4m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er4m.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES)
-
-r5m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er5m.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES)
-
-r6m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er6m.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES)
-
-
-r1v.exe : $(SOURCES)
-	$(BCC32) -tWM -tWV $(CFLAGS) -er1v.exe -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES)
-
-r2v.exe : $(SOURCES)
-	$(BCC32) -tWM -tWV $(CFLAGS) -er2v.exe -DBOOST_RE_TEST_LOCALE_C $(SOURCES)
-
-r3v.exe : $(SOURCES)
-	$(BCC32) -tWM -tWV $(CFLAGS) -er3v.exe -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES)
-
-r4v.exe : $(SOURCES)
-	$(BCC32) -tWM -tWV $(CFLAGS) -er4v.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES)
-
-r5v.exe : $(SOURCES)
-	$(BCC32) -tWM -tWV $(CFLAGS) -er5v.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES)
-
-r6v.exe : $(SOURCES)
-	$(BCC32) -tWM -tWV $(CFLAGS) -er6v.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES)
-
-
-r1l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er1l.exe -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES)
-
-r2l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er2l.exe -DBOOST_RE_TEST_LOCALE_C $(SOURCES)
-
-r3l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er3l.exe -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES)
-
-r4l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er4l.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES)
-
-r5l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er5l.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES)
-
-r6l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er6l.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES)
-
-
-r1lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er1lm.exe -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES)
-
-r2lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er2lm.exe -DBOOST_RE_TEST_LOCALE_C $(SOURCES)
-
-r3lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er3lm.exe -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES)
-
-r4lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er4lm.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES)
-
-r5lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er5lm.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES)
-
-r6lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er6lm.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES)
-
-
-r1lv.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er1lv.exe -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES)
-
-r2lv.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er2lv.exe -DBOOST_RE_TEST_LOCALE_C $(SOURCES)
-
-r3lv.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er3lv.exe -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES)
-
-r4lv.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er4lv.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES)
-
-r5lv.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er5lv.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES)
-
-r6lv.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er6lv.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/test/regress/bcb5.mak b/test/regress/bcb5.mak
deleted file mode 100644
index e539c839..00000000
--- a/test/regress/bcb5.mak
+++ /dev/null
@@ -1,195 +0,0 @@
-
-# very basic makefile for regress
-#
-# Borland C++ tools
-#
-# BCROOT defines the root directory of your bcb install
-#
-!ifndef BCROOT
-BCROOT=$(MAKEDIR)\..
-!endif
-#
-# sources to compile for each test:
-#
-SOURCES=tests.cpp parse.cpp regress.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
-
-BCC32   = $(BCROOT)\bin\Bcc32.exe 
-TLINK32 = $(BCROOT)\bin\ILink32.exe
-
-IDE_LinkFLAGS32 =  -L$(BCROOT)\LIB
-LINKOPTS= -ap -Tpe -x
-CFLAGS= -O2 -tWC -DSTRICT; -Vx -Ve -w-inl -w-aus -w-csu -w-eff -w-rch -I$(BCROOT)\include;..\..\..\..\; -L..\..\..\..\stage\lib -L..\..\build\bcb5 $(CXXFLAGS)
-
-all :: r1.exe r2.exe r3.exe r4.exe r5.exe r6.exe r1m.exe r2m.exe r3m.exe r4m.exe r5m.exe r6m.exe r1v.exe r2v.exe r3v.exe r4v.exe r5v.exe r6v.exe r1l.exe r2l.exe r3l.exe r4l.exe r5l.exe r6l.exe r1lm.exe r2lm.exe r3lm.exe r4lm.exe r5lm.exe r6lm.exe r1lv.exe r2lv.exe r3lv.exe r4lv.exe r5lv.exe r6lv.exe
-	echo testing static single threaded version....
-	r1 tests.txt test1252.txt
-	r2 tests.txt
-	r3 tests.txt
-	r4 tests.txt test1252.txt
-	r5 tests.txt
-	r6 tests.txt
-	echo testing static multi-threaded version....
-	r1m tests.txt test1252.txt
-	r2m tests.txt
-	r3m tests.txt
-	r4m tests.txt test1252.txt
-	r5m tests.txt
-	r6m tests.txt
-	echo testing static VCL version....
-	r1v tests.txt test1252.txt
-	r2v tests.txt
-	r3v tests.txt
-	r4v tests.txt test1252.txt
-	r5v tests.txt
-	r6v tests.txt
-	echo testing dll single threaded version....
-	r1l tests.txt test1252.txt
-	r2l tests.txt
-	r3l tests.txt
-	r4l tests.txt test1252.txt
-	r5l tests.txt
-	r6l tests.txt
-	echo testing dll multi-threaded version....
-	r1lm tests.txt test1252.txt
-	r2lm tests.txt
-	r3lm tests.txt
-	r4lm tests.txt test1252.txt
-	r5lm tests.txt
-	r6lm tests.txt
-	echo testing dll VCL version....
-	r1lv tests.txt test1252.txt
-	r2lv tests.txt
-	r3lv tests.txt
-	r4lv tests.txt test1252.txt
-	r5lv tests.txt
-	r6lv tests.txt
-
-
-r1.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er1.exe -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES)
-
-r2.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er2.exe -DBOOST_RE_TEST_LOCALE_C $(SOURCES)
-
-r3.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er3.exe -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES)
-
-r4.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er4.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES)
-
-r5.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er5.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES)
-
-r6.exe : $(SOURCES)
-	$(BCC32) -tWM- -D_NO_VCL $(CFLAGS) -er6.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES)
-	
-
-r1m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er1m.exe -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES)
-
-r2m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er2m.exe -DBOOST_RE_TEST_LOCALE_C $(SOURCES)
-
-r3m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er3m.exe -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES)
-
-r4m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er4m.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES)
-
-r5m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er5m.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES)
-
-r6m.exe : $(SOURCES)
-	$(BCC32) -tWM -D_NO_VCL $(CFLAGS) -er6m.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES)
-
-
-r1v.exe : $(SOURCES)
-	$(BCC32) -tWM -tWV $(CFLAGS) -er1v.exe -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES)
-
-r2v.exe : $(SOURCES)
-	$(BCC32) -tWM -tWV $(CFLAGS) -er2v.exe -DBOOST_RE_TEST_LOCALE_C $(SOURCES)
-
-r3v.exe : $(SOURCES)
-	$(BCC32) -tWM -tWV $(CFLAGS) -er3v.exe -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES)
-
-r4v.exe : $(SOURCES)
-	$(BCC32) -tWM -tWV $(CFLAGS) -er4v.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES)
-
-r5v.exe : $(SOURCES)
-	$(BCC32) -tWM -tWV $(CFLAGS) -er5v.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES)
-
-r6v.exe : $(SOURCES)
-	$(BCC32) -tWM -tWV $(CFLAGS) -er6v.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES)
-
-
-r1l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er1l.exe -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES)
-
-r2l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er2l.exe -DBOOST_RE_TEST_LOCALE_C $(SOURCES)
-
-r3l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er3l.exe -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES)
-
-r4l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er4l.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES)
-
-r5l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er5l.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES)
-
-r6l.exe : $(SOURCES)
-	$(BCC32) -tWM- -tWR -D_NO_VCL $(CFLAGS) -er6l.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES)
-
-
-r1lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er1lm.exe -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES)
-
-r2lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er2lm.exe -DBOOST_RE_TEST_LOCALE_C $(SOURCES)
-
-r3lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er3lm.exe -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES)
-
-r4lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er4lm.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES)
-
-r5lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er5lm.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES)
-
-r6lm.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -D_NO_VCL $(CFLAGS) -er6lm.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES)
-
-
-r1lv.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er1lv.exe -DBOOST_RE_TEST_LOCALE_W32 $(SOURCES)
-
-r2lv.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er2lv.exe -DBOOST_RE_TEST_LOCALE_C $(SOURCES)
-
-r3lv.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er3lv.exe -DBOOST_RE_TEST_LOCALE_CPP $(SOURCES)
-
-r4lv.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er4lv.exe -DBOOST_RE_TEST_LOCALE_W32 -DTEST_UNICODE $(SOURCES)
-
-r5lv.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er5lv.exe -DBOOST_RE_TEST_LOCALE_C -DTEST_UNICODE $(SOURCES)
-
-r6lv.exe : $(SOURCES)
-	$(BCC32) -tWM -tWR -tWV -tWC $(CFLAGS) -er6lv.exe -DBOOST_RE_TEST_LOCALE_CPP -DTEST_UNICODE $(SOURCES)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/test/regress/bcb6.mak b/test/regress/bcb6.mak
index ea132fef..cc7ef6fa 100644
--- a/test/regress/bcb6.mak
+++ b/test/regress/bcb6.mak
@@ -11,7 +11,7 @@ BCROOT=$(MAKEDIR)\..
 #
 # sources to compile for each test:
 #
-SOURCES=tests.cpp parse.cpp regress.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
+SOURCES=*.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
 
 BCC32   = $(BCROOT)\bin\Bcc32.exe 
 TLINK32 = $(BCROOT)\bin\ILink32.exe
@@ -202,6 +202,8 @@ r6lv.exe : $(SOURCES)
 
 
 
+
+
 
 
 
diff --git a/test/regress/gcc.mak b/test/regress/gcc.mak
index 8d909c3d..6e2f4c11 100644
--- a/test/regress/gcc.mak
+++ b/test/regress/gcc.mak
@@ -7,16 +7,19 @@ CXX= g++ $(INCLUDES) -L../../../../stage/lib -I../../../../ -I./ $(CXXFLAGS) -L.
 #
 # sources to compile for each test:
 #
-SOURCES=tests.cpp parse.cpp regress.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
+SOURCES=*.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
 
 total : gcc_regress
 	export LD_LIBRARY_PATH="../../build/gcc:$LD_LIBRARY_PATH" && ./gcc_regress tests.txt
 
 gcc_regress : $(SOURCES)
-	$(CXX) -O2 -o gcc_regress $(SOURCES) -lboost_regex $(LIBS)
+	$(CXX) -O2 -o gcc_regress $(SOURCES) ../../build/gcc/libboost_regex-gcc*.a $(LIBS)
 
 debug : $(SOURCES)
-	$(CXX) -g -o gcc_regress $(SOURCES) -lboost_regex_debug $(LIBS)
+	$(CXX) -g -o gcc_regress $(SOURCES) ../../build/gcc/libboost_regex-gcc-d*.a $(LIBS)
+
+
+
 
 
 
diff --git a/test/regress/info.hpp b/test/regress/info.hpp
new file mode 100644
index 00000000..5cc540d8
--- /dev/null
+++ b/test/regress/info.hpp
@@ -0,0 +1,184 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         info.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Error handling for test cases.
+  */
+
+#ifndef BOOST_REGEX_REGRESS_INFO_HPP
+#define BOOST_REGEX_REGRESS_INFO_HPP
+#include <iostream>
+#include <string>
+#include <boost/regex.hpp>
+//
+// class test info, 
+// store information about the test we are about to conduct:
+//
+template <class charT>
+class test_info_base
+{
+public:
+   typedef std::basic_string<charT> string_type;
+private:
+   struct data_type
+   {
+      std::string file;
+      int line;
+      string_type expression;
+      boost::regex_constants::syntax_option_type options;
+      string_type search_text;
+      boost::regex_constants::match_flag_type match_options;
+      const int* answer_table;
+      string_type format_string;
+      string_type result_string;
+      bool need_to_print;
+      std::string expression_type_name;
+   };
+   static data_type& data()
+   {
+      static data_type d;
+      return d;
+   }
+public:
+   test_info_base(){};
+   static void set_info(
+      const char* file,
+      int line,
+      const string_type& ex,
+      boost::regex_constants::syntax_option_type opt,
+      const string_type& search_text = string_type(),
+      boost::regex_constants::match_flag_type match_options = boost::match_default,
+      const int* answer_table = 0,
+      const string_type& format_string = string_type(),
+      const string_type& result_string = string_type())
+   {
+      data_type& dat = data();
+      dat.file = file;
+      dat.line = line;
+      dat.expression = ex;
+      dat.options = opt;
+      dat.search_text = search_text;
+      dat.match_options = match_options;
+      dat.answer_table = answer_table;
+      dat.format_string = format_string;
+      dat.result_string = result_string;
+      dat.need_to_print = true;
+   }
+   static void set_typename(const std::string& n)
+   {
+      data().expression_type_name = n;
+   }
+
+   static const string_type& expression()
+   {
+      return data().expression;
+   }
+   static boost::regex_constants::syntax_option_type syntax_options()
+   {
+      return data().options;
+   }
+   static const string_type& search_text()
+   {
+      return data().search_text;
+   }
+   static boost::regex_constants::match_flag_type match_options()
+   {
+      return data().match_options;
+   }
+   static const int* answer_table()
+   {
+      return data().answer_table;
+   }
+   static const string_type& format_string()
+   {
+      return data().format_string;
+   }
+   static const string_type& result_string()
+   {
+      return data().result_string;
+   }  
+   static bool need_to_print()
+   {
+      return data().need_to_print;
+   }
+   static const std::string& file()
+   {
+      return data().file;
+   }
+   static int line()
+   {
+      return data().line;
+   }
+   static void clear()
+   {
+      data().need_to_print = false;
+   }
+   static std::string& expression_typename()
+   {
+      return data().expression_type_name;
+   }
+};
+
+template <class T>
+struct test_info
+   : public test_info_base<wchar_t>
+{};
+
+template<>
+struct test_info<char>
+   : public test_info_base<char>
+{};
+
+template <class charT>
+std::ostream& operator<<(std::ostream& os, const test_info<charT>&)
+{
+   if(test_info<charT>::need_to_print())
+   {
+      os << test_info<charT>::file() << ":" << test_info<charT>::line() << ": Error in test here:" << std::endl;
+      test_info<charT>::clear();
+   }
+   return os;
+}
+//
+// define some test macros:
+//
+extern int error_count;
+
+#define BOOST_REGEX_TEST_ERROR(msg, charT)\
+   ++error_count;\
+   std::cerr << test_info<charT>();\
+   std::cerr << "  " << __FILE__ << ":" << __LINE__ << ":" << msg \
+             << " (While testing " << test_info<charT>::expression_typename() << ")" << std::endl
+
+class errors_as_warnings
+{
+public:
+   errors_as_warnings()
+   {
+      m_saved_error_count = error_count;
+   }
+   ~errors_as_warnings()
+   {
+      if(m_saved_error_count != error_count)
+      {
+         std::cerr << "<note>The above " << (error_count - m_saved_error_count) << " errors are treated as warnings only.</note>" << std::endl;
+         error_count = m_saved_error_count;
+      }
+   }
+private:
+   int m_saved_error_count;
+};
+
+#endif
+
diff --git a/test/regress/main.cpp b/test/regress/main.cpp
new file mode 100644
index 00000000..a6374321
--- /dev/null
+++ b/test/regress/main.cpp
@@ -0,0 +1,106 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         main.cpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: entry point for test program.
+  */
+
+#define BOOST_REGEX_TEST_INSTANCES
+#include "test.hpp"
+#include "test_locale.hpp"
+#include <stdarg.h>
+
+int error_count = 0;
+
+int cpp_main(int /*argc*/, char * /*argv*/[])
+{
+   basic_tests();
+   test_simple_repeats();
+   test_alt();
+   test_sets();
+   test_sets2();
+   test_anchors();
+   test_backrefs();
+   test_character_escapes();
+   test_assertion_escapes();
+   test_tricky_cases();
+   test_tricky_cases2();
+   test_grep();
+   test_replace();
+   test_non_greedy_repeats();
+   test_non_marking_paren();
+   test_partial_match();
+   test_forward_lookahead_asserts();
+   test_fast_repeats();
+   test_fast_repeats2();
+   test_independent_subs();
+   test_nosubs();
+   test_conditionals();
+   test_options();
+   test_options2();
+   test_en_locale();
+   test_emacs();
+   test_operators();
+   test_overloads();
+   test_unicode();
+   return error_count;
+}
+
+const int* make_array(int first, ...)
+{
+   //
+   // this function takes a variable number of arguments
+   // and packs them into an array that we can pass through
+   // our testing macros (ideally we would use an array literal
+   // but these can't apparently be used as macro arguments).
+   //
+   static int data[200];
+   va_list ap;
+   va_start(ap, first);
+   //
+   // keep packing args, until we get two successive -2 values:
+   //
+   int terminator_count;
+   int next_position = 1;
+   data[0] = first;
+   if(first == -2)
+      terminator_count = 1;
+   else
+      terminator_count = 0;
+   while(terminator_count < 2)
+   {
+      data[next_position] = va_arg(ap, int);
+      if(data[next_position] == -2)
+         ++terminator_count;
+      else
+         terminator_count = 0;
+      ++next_position;
+   }
+   va_end(ap);
+   return data;
+}
+
+#ifdef BOOST_NO_EXCEPTIONS
+
+namespace boost{
+
+void throw_exception(std::exception const & e)
+{
+   std::abort();
+}
+
+}
+
+#endif
+
diff --git a/test/regress/parse.cpp b/test/regress/parse.cpp
deleted file mode 100644
index 26f6a34a..00000000
--- a/test/regress/parse.cpp
+++ /dev/null
@@ -1,346 +0,0 @@
-/*
- *
- * Copyright (c) 1998-2002
- * Dr 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)
- *
- */
- 
- /*
-  *
-  *   FILE     parse.cpp
-  *   VERSION  see <boost/version.hpp>
-  *
-  * Input parsing functions for regress.
-  *
-  */
-
-#include <boost/regex.hpp>
-#include "regress.h"
-
-#ifndef BOOST_REGEX_NO_TEST
-
-#ifndef BOOST_RE_ALGO_INCLUDED
-#include <algorithm>
-#endif
-
-using namespace boost;
-
-#ifdef BOOST_REGEX_V3
-#define regex_constants regbase
-#endif
-
-
-//
-// start by defining all our flag types:
-
-flag_info flag_data[] = {
-                          { BOOST_RE_STR("REG_BASIC"), 9, REG_BASIC, 0 },
-                          { BOOST_RE_STR("REG_EXTENDED"), 12, REG_EXTENDED, 0 },
-                          { BOOST_RE_STR("REG_ESCAPE_IN_LISTS"), 19, REG_ESCAPE_IN_LISTS, 0 },
-                          { BOOST_RE_STR("REG_ICASE"), 9, REG_ICASE, 0 },
-                          { BOOST_RE_STR("REG_NOSUB"), 9, REG_NOSUB, 0 },
-                          { BOOST_RE_STR("REG_NEWLINE"), 11, REG_NEWLINE, 0 },
-                          { BOOST_RE_STR("REG_NOCOLLATE"), 13, REG_NOCOLLATE, 0 },
-                          { BOOST_RE_STR("REG_NOSPEC"), 10, REG_NOSPEC, 0 },
-                          { BOOST_RE_STR("REG_NEWLINE_ALT"), 15, REG_NEWLINE_ALT , 0 },
-                          { BOOST_RE_STR("REG_PERL"), 8, REG_PERL, 0 },
-                          { BOOST_RE_STR("REG_AWK"), 7, REG_AWK, 0 },
-                          { BOOST_RE_STR("REG_EGREP"), 9, REG_EGREP, 0 },
-
-                          { BOOST_RE_STR("REG_NOTBOL"), 10, REG_NOTBOL, 1 },
-                          { BOOST_RE_STR("REG_NOTEOL"), 10, REG_NOTEOL, 1 },
-                          { BOOST_RE_STR("REG_STARTEND"), 12, REG_STARTEND, 1 },
-
-                          { BOOST_RE_STR("basic"), 5, regex_constants::basic, 2 },
-                          { BOOST_RE_STR("escape_in_lists"), 15, regex_constants::escape_in_lists, 2 },
-                          { BOOST_RE_STR("char_classes"), 12, regex_constants::char_classes, 2 },
-                          { BOOST_RE_STR("intervals"), 9, regex_constants::intervals, 2 },
-                          { BOOST_RE_STR("limited_ops"), 11, regex_constants::limited_ops, 2 },
-                          { BOOST_RE_STR("newline_alt"), 11, regex_constants::newline_alt, 2 },
-                          { BOOST_RE_STR("bk_plus_qm"), 10, regex_constants::bk_plus_qm, 2 },
-                          { BOOST_RE_STR("bk_braces"), 9, regex_constants::bk_braces, 2 },
-                          { BOOST_RE_STR("bk_parens"), 9, regex_constants::bk_parens, 2 },
-                          { BOOST_RE_STR("bk_refs"), 7, regex_constants::bk_refs, 2 },
-                          { BOOST_RE_STR("bk_vbar"), 7, regex_constants::bk_vbar, 2 },
-                          { BOOST_RE_STR("use_except"), 10, regex_constants::use_except, 2 },
-                          { BOOST_RE_STR("literal"), 7, regex_constants::literal, 2 },
-#ifndef BOOST_REGEX_V3
-                          { BOOST_RE_STR("nosubs"), 6, regex_constants::nosubs, 2 },
-                          { BOOST_RE_STR("optimize"), 8, regex_constants::optimize, 2 },
-                          { BOOST_RE_STR("perlex"), 6, regex_constants::perlex, 2 },
-#endif
-                          { BOOST_RE_STR("normal"), 6, regex_constants::normal, 2 },
-                          { BOOST_RE_STR("basic"), 5, regex_constants::basic, 2 },
-                          { BOOST_RE_STR("extended"), 8, regex_constants::extended, 2 },
-                          { BOOST_RE_STR("perl"), 6, regex_constants::perl, 2 },
-
-                          { BOOST_RE_STR("match_default"), 13, match_default, 3 },
-                          { BOOST_RE_STR("match_not_bol"), 13, match_not_bol, 3 },
-                          { BOOST_RE_STR("match_not_eol"), 13, match_not_eol, 3 },
-                          { BOOST_RE_STR("match_not_bob"), 13, match_not_bob, 3 },
-                          { BOOST_RE_STR("match_not_eob"), 13, match_not_eob, 3 },
-                          { BOOST_RE_STR("match_not_bow"), 13, match_not_bow, 3 },
-                          { BOOST_RE_STR("match_not_eow"), 13, match_not_eow, 3 },
-                          { BOOST_RE_STR("match_not_dot_newline"), 21, match_not_dot_newline, 3 },
-                          { BOOST_RE_STR("match_not_dot_null"), 18, match_not_dot_null, 3 },
-                          { BOOST_RE_STR("match_prev_avail"), 16, match_prev_avail, 3 },
-                          { BOOST_RE_STR("match_any"), 9, match_any, 3 },
-                          { BOOST_RE_STR("match_not_null"), 14, match_not_null, 3 },
-                          { BOOST_RE_STR("match_continuous"), 16, match_continuous, 3 },
-                          { BOOST_RE_STR("match_partial"), 13, match_partial, 3 },
-#ifndef BOOST_REGEX_V3
-                          { BOOST_RE_STR("match_nosubs"), 12, match_nosubs, 3 },
-                          { BOOST_RE_STR("match_single_line"), 17, match_single_line, 3 },
-#endif
-                          { BOOST_RE_STR("format_all"), 10, format_all, 3 },
-                          { BOOST_RE_STR("format_sed"), 10, format_sed, 3 },
-                          { BOOST_RE_STR("format_perl"), 11, format_perl, 3 },
-                          { BOOST_RE_STR("format_no_copy"), 14, format_no_copy, 3 },
-                          { BOOST_RE_STR("format_first_only"), 17, format_first_only, 3 },
-
-                          { BOOST_RE_STR("REG_NO_POSIX_TEST"), 17, REG_NO_POSIX_TEST, 4 },
-                          { BOOST_RE_STR("REG_UNICODE_ONLY"), 16, REG_UNICODE_ONLY, 4 },
-                          { BOOST_RE_STR("REG_GREP"), 8, REG_GREP, 4 },
-                          { BOOST_RE_STR("REG_MERGE"), 9, REG_MERGE, 4 },
-                          { BOOST_RE_STR("REG_MERGE_COPY"), 14, REG_MERGE_COPY, 4 },
-                          { BOOST_RE_STR("REG_PARTIAL_MATCH"), 17, REG_PARTIAL_MATCH, 4 },
-
-                          { BOOST_RE_STR(""), 0, 0, 0 },
-                        };
-
-// basically we create a simple token parser
-// using regular expressions
-
-const char_t* expression_text =        BOOST_RE_STR("(;.*)|")                            // comment
-                                       BOOST_RE_STR("(^[[:blank:]]*-)|")                 // -
-                                       BOOST_RE_STR("([^\"[:space:]][^[:space:]]*)|")    // token
-                                       BOOST_RE_STR("(\"((\\\\\"|[^\"])*)\")")             // "token"   
-                                      ;
-
-typedef basic_regex<char_t> re_parse_t;
-typedef match_results<string_type::const_iterator>  parse_grep;
-typedef string_type::const_iterator parse_iterator;
-
-re_parse_t parse_expression(expression_text, regex_constants::normal);
-
-//
-// now define our grep predicate function object:
-class parse_function
-{
-   int mode;
-public:
-   parse_function() : mode(0) {}
-   parse_function(const parse_function& o) : mode(o.mode) {}
-   bool operator()(const parse_grep& i);
-};
-
-bool parse_function::operator()(const parse_grep& g)
-{
-   parse_iterator i, j;
-   // determine what caused the match:
-   if(g[1].matched)
-   {
-      // we have a comment:
-      return true;
-   }
-   else if(g[2].matched)
-   {
-      // we have the start of a line of flags
-      mode = -1;
-      for(int i = 0; i < 5; ++i)
-         flags[i] = 0;
-      return true;
-   }
-   else if(g[3].matched)
-   {
-      // token:
-      i = g[3].first;
-      j = g[3].second;
-   }
-   else
-   {
-      // token delimited by ""
-      i = g[5].first;
-      j = g[5].second;
-   }
-   
-   // now we need to switch depending upon what mode we are in:
-   switch(mode)
-   {
-   case -1:
-   {
-      // parse the flag:
-      unsigned int id = 0;
-      while(flag_data[id].len != 0)
-      {
-         if(static_cast<unsigned int>(j - i) != flag_data[id].len)
-         {
-            ++id;
-            continue;
-         }
-         if(std::equal(i, j, flag_data[id].name) == true)
-         {
-            flags[flag_data[id].id] |= flag_data[id].value;
-            return true;
-         }
-         ++id;
-      }
-      cout << "Warning: Unknown flag: ";
-      string_type t(i, j);
-      cout << make_narrow(t).c_str();
-      cout << endl;
-      return true;
-   }
-   case 0:
-      // set the expression text:
-      expression = string_type(i, j);
-      do_test = true;
-      break;
-   case 1:
-      // set the text to match:
-      search_text = string_type(i, j);
-      jm_trace("Initial search text: " << make_narrow(search_text).c_str());
-      expand_escapes(search_text);
-      jm_trace("Search text after escapes expanded: " << make_narrow(search_text).c_str());
-      break;
-   case 2:
-      // maybe set format string:
-      if(flags[4] & REG_MERGE)
-      {
-         format_string = string_type(i, j);
-         break;
-      }
-      else
-      {
-         matches[mode - 2] = to_int(i, j);
-         break;
-      }
-   case 3:
-      // maybe set format result:
-      if(flags[4] & REG_MERGE)
-      {
-         merge_string = string_type(i, j);
-         expand_escapes(merge_string);
-         break;
-      }
-      else
-      {
-         matches[mode - 2] = to_int(i, j);
-         break;
-      }
-   default:
-      jm_assert(mode >= 2);
-      // set the relevent int value:
-      matches[mode - 2] = to_int(i, j);
-   }
-   ++mode;
-   return true;
-}
-
-void parse_input_line(const string_type& s)
-{
-   // set matches back to starting values:
-   for(int i = 0; i < MAX_MATCHES; ++i)
-   {
-      matches[i] = -2;
-   }
-   parse_function op;
-   do_test = false;
-   regex_grep(op, s.begin(), s.end(), parse_expression);
-   jm_trace("expression: " << make_narrow(expression).c_str());
-   jm_trace("search string: " << make_narrow(search_text).c_str());
-}
-
-int to_int(string_type::const_iterator i, string_type::const_iterator j)
-{
-   int val = 0;
-   bool neg = false;
-   if((i != j) && (*i == BOOST_RE_STR('-')))
-   {
-      neg = true;
-      ++i;
-   }
-   while (i != j)
-   {
-      val *= 10;
-      val += *i - BOOST_RE_STR('0');
-      ++i;
-   }
-   if(neg)
-      val *= -1;
-   return val;
-}
-
-void expand_escapes(string_type& s)
-{
-   for(unsigned int i = 0; i < s.size(); ++i)
-   {
-      if(s[i] == BOOST_RE_STR('\\'))
-      {
-         switch(s[i+1])
-         {
-         case BOOST_RE_STR('a'):
-            s.erase(s.begin() + i);
-            s[i] = BOOST_RE_STR('\a');
-            break;
-         case BOOST_RE_STR('b'):
-            s.erase(s.begin() + i);
-            s[i] = BOOST_RE_STR('\b');
-            break;
-         case BOOST_RE_STR('f'):
-            s.erase(s.begin() + i);
-            s[i] = BOOST_RE_STR('\f');
-            break;
-         case BOOST_RE_STR('n'):
-            s.erase(s.begin() + i);
-            s[i] = BOOST_RE_STR('\n');
-            break;
-         case BOOST_RE_STR('r'):
-            s.erase(s.begin() + i);
-            s[i] = BOOST_RE_STR('\r');
-            break;
-         case BOOST_RE_STR('t'):
-            s.erase(s.begin() + i);
-            s[i] = BOOST_RE_STR('\t');
-            break;
-         case BOOST_RE_STR('v'):
-            s.erase(s.begin() + i);
-            s[i] = BOOST_RE_STR('\v');
-            break;
-         default:
-            if( (s[i + 1] >= BOOST_RE_STR('0')) && (s[i + 1] <= BOOST_RE_STR('9')) )
-            {
-               int val = 0;
-               unsigned int pos = i;
-               ++i;
-               while((i < s.size()) && (s[i] >= BOOST_RE_STR('0')) && (s[i] <= BOOST_RE_STR('9')))
-               {
-                  val *= 10;
-                  val += s[i] - BOOST_RE_STR('0');
-                  ++i;
-               }
-               s.erase(s.begin() + pos, s.begin() + i);
-               if(0 == val)
-               {
-                  s.insert(s.begin()+pos, ' ');
-                  s[pos] = 0;
-               }
-               else
-                  s.insert(s.begin() + pos, (string_type::value_type)val);
-               i = pos;
-            }
-            else
-            {
-               s.erase(s.begin() + i);
-            }
-         }
-      }
-   }
-}
-
-#endif
-
diff --git a/test/regress/regex_test.cpp b/test/regress/regex_test.cpp
deleted file mode 100644
index 420450b0..00000000
--- a/test/regress/regex_test.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- *
- * Copyright (c) 1998-2002
- * Dr 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         regex_test.cpp
-  *   VERSION      see <boost/version.hpp>
-  *   DESCRIPTION: Builds regression test program with default
-  *                locale and narrow character tests.  Also
-  *                instantiates all the templates in the library
-  *                as a sanity check.
-  */
-
-// disable automatic selection of support library:
-#define BOOST_REGEX_NO_LIB
-#define BOOST_REGEX_STATIC_LINK
-#define BOOST_REGEX_NO_EXTERNAL_TEMPLATES
-
-#include <boost/regex.hpp>
-#include <boost/regex/src.cpp>
-
-#ifdef BOOST_MSVC
-#  pragma warning(disable: 4660)
-#endif
-//
-// instantiate templates used:
-//
-namespace boost{
-
-#if defined(__GNUC__) && defined(__BEOS__)
-#define ra_it const char*
-#define test_char_type char
-#else
-typedef const char* ra_it;
-typedef char test_char_type;
-#endif
-typedef std::basic_string<test_char_type> test_string_type;
-
-bool pred1(const match_results<ra_it>&)
-{ return true; }
-
-typedef bool (*pred1_type)(const match_results<ra_it>&);
-typedef bool (*pred2_type)(const match_results<test_string_type::const_iterator>&);
-
-//check that all the defined flags are available:
-regex::flag_type f = regex::escape_in_lists | regex::char_classes | regex::intervals | regex::limited_ops
-                       | regex::newline_alt | regex::bk_plus_qm | regex::bk_braces
-                       | regex::bk_parens | regex::bk_refs | regex::bk_vbar | regex::use_except
-                       | regex::failbit | regex::literal | regex::icase | regex::nocollate | regex::basic
-                       | regex::extended | regex::normal | regex::emacs | regex::awk | regex::grep | regex::egrep | regex::sed;
-
-template class reg_expression<test_char_type>;
-template struct sub_match<ra_it>;
-template class match_results<ra_it>;
-#if 0
-template bool regex_match(ra_it,
-                 ra_it,
-                 match_results<ra_it>& m,
-                 const reg_expression<test_char_type>& e,
-                 unsigned flags);
-template bool regex_match(ra_it,
-                 ra_it,
-                 const reg_expression<test_char_type>& e,
-                 unsigned flags);
-template bool regex_search(ra_it,
-                ra_it,
-                match_results<ra_it>& m,
-                const reg_expression<test_char_type>& e,
-                unsigned flags);
-template unsigned int regex_grep(pred1_type,
-                        ra_it,
-                        ra_it,
-                        const reg_expression<test_char_type>& e,
-                        unsigned flags);
-template test_char_type* regex_format(test_char_type*,
-                            const match_results<ra_it>& m,
-                            const test_char_type* fmt,
-                            unsigned flags);
-template test_char_type* regex_format(test_char_type*,
-                            const match_results<ra_it>& m,
-                            const test_string_type& fmt,
-                            unsigned flags);
-template test_char_type* regex_replace(test_char_type*,
-                          ra_it,
-                          ra_it,
-                          const reg_expression<test_char_type>&,
-                          const test_char_type*,
-                          unsigned int flags);
-template test_char_type* regex_replace(test_char_type*,
-                           ra_it,
-                           ra_it,
-                           const reg_expression<test_char_type>& e,
-                           const test_string_type&,
-                           unsigned int flags);
-template std::size_t regex_split(test_string_type*,
-                        test_string_type&,
-                        const reg_expression<test_char_type>&,
-                        unsigned flags,
-                        std::size_t);
-template std::size_t regex_split(test_string_type*,
-                        test_string_type& s,
-                        const reg_expression<test_char_type>& e,
-                        unsigned flags);
-
-template std::size_t regex_split(test_string_type*, test_string_type&);
-
-#ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
-//
-// the following prototypes are only available if partial ordering
-// of template functions is supported:
-//
-template bool regex_match(const test_char_type*,
-                 match_results<const test_char_type*>& m,
-                 const reg_expression<test_char_type>& e,
-                 unsigned flags);
-template bool regex_match(const test_string_type&,
-                 match_results<test_string_type::const_iterator>&,
-                 const reg_expression<test_char_type>&,
-                 unsigned flags);
-template bool regex_match(const test_char_type*,
-                 const reg_expression<test_char_type>&,
-                 unsigned flags);
-template bool regex_match(const test_string_type&,
-                 const reg_expression<test_char_type>&,
-                 unsigned flags);
-template bool regex_search(const test_char_type*,
-                match_results<const test_char_type*>&,
-                const reg_expression<test_char_type>&,
-                unsigned flags);
-template bool regex_search(const test_string_type&,
-                match_results<test_string_type::const_iterator>&,
-                const reg_expression<test_char_type>&,
-                unsigned flags);
-template unsigned int regex_grep(pred1_type,
-              const test_char_type*,
-              const reg_expression<test_char_type>&,
-              unsigned flags);
-template unsigned int regex_grep(pred2_type,
-              const test_string_type&,
-              const reg_expression<test_char_type>&,
-              unsigned flags);
-template test_string_type regex_format
-                                 (const match_results<test_string_type::const_iterator>& m,
-                                  const test_char_type*,
-                                  unsigned flags);
-template test_string_type regex_format
-                                 (const match_results<test_string_type::const_iterator>&,
-                                  const test_string_type&,
-                                  unsigned flags);
-template test_string_type regex_replace(const test_string_type&,
-                                     const reg_expression<test_char_type>&,
-                                     const test_char_type*,
-                                     unsigned int flags);
-template test_string_type regex_replace(const test_string_type&,
-                                     const reg_expression<test_char_type>&,
-                                     const test_string_type&,
-                                     unsigned int flags);
-
-#endif
-#endif
-} // namespace boost
-
-//
-// include regression test source files:
-//
-#ifdef BOOST_REGEX_USE_WIN32_LOCALE
-#define BOOST_RE_TEST_LOCALE_W32
-#elif !defined(BOOST_REGEX_USE_C_LOCALE)
-#define BOOST_RE_TEST_LOCALE_CPP
-#endif
-
-#include "tests.cpp"
-#include "parse.cpp"
-#include "regress.cpp"
-
-//
-// Como goes into an infinite loop trying to link this,
-// just have it fail for now:
-//
-#if defined(__COMO__) && defined(_MSC_VER)
-#error "Comeau in VC6 mode goes into an infinite loop trying to link this program!!!"
-#endif
-
-
-
-
diff --git a/test/regress/regress.cpp b/test/regress/regress.cpp
deleted file mode 100644
index 4b58b497..00000000
--- a/test/regress/regress.cpp
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- *
- * Copyright (c) 1998-2002
- * Dr 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)
- *
- */
- 
- /*
-  *
-  *   FILE     regress.cpp
-  *   VERSION  see <boost/version.hpp>
-  *
-  * main() and associated code for regress.
-  *
-  */
-
-#include <cstdlib>
-#include <boost/regex.hpp>
-#ifdef BOOST_RE_OLD_IOSTREAM
-#include <fstream.h>
-#else
-#include <fstream>
-using std::ifstream;
-using std::ofstream;
-//using std::cin;
-//using std::cout;
-using std::endl;
-#endif
-
-#ifdef __BORLANDC__
-#pragma hrdstop
-#endif
-
-#include <boost/test/execution_monitor.hpp>
-
-#include "regress.h"
-
-#ifndef BOOST_REGEX_NO_TEST
-
-#if defined(BOOST_MSVC) && defined(_DEBUG)
-#include <CRTDBG.H>
-#endif
-#ifdef TIME_TEST
-#include <boost/timer.hpp>
-#endif
-
-
-//
-// declare all our globals here:
-//
-
-string_type expression;
-string_type search_text;
-string_type format_string;
-string_type merge_string;
-int matches[MAX_MATCHES];
-
-char file[MAX_PATH];
-int line;
-bool do_test = false;
-unsigned int flags[5];
-unsigned error_count = 0;
-
-void usage()
-{
-   cout <<
-
-"Usage: regress filename [filename2...]\n"
-"see tests.txt for an example test script\n"
-"and the script format.\n";
-
-}
-
-int cpp_main(int argc, char * argv[])
-{
-#if defined(BOOST_MSVC) && defined(_DEBUG)
-   // turn on heap reporting at program exit:
-   //int tmpFlag = _CrtSetDbgFlag( _CRTDBG_REPORT_FLAG );
-   //tmpFlag |= _CRTDBG_LEAK_CHECK_DF;
-   //tmpFlag &= ~_CRTDBG_CHECK_CRT_DF;
-   //_CrtSetDbgFlag( tmpFlag );
-#endif
-#ifdef TIME_TEST
-   boost::timer tim;
-#endif
-   if(argc < 2)
-       usage();
-   int i;
-   for(i = 1; i < argc; ++i)
-   {
-      reset_error();
-      ifstream is(argv[i]);
-      if(is.good() == false)
-      {
-         cout << "Error unable to open file: " << argv[i] << endl << endl;
-         return -1;
-      }
-      std::strcpy(file, argv[i]);
-      line = 0;
-      unsigned int tests = 0;
-      while(is.good())
-      {
-         string_type s;
-         get_line(is, s);
-         ++line;
-         jm_trace("Reading test script line " << line << " " << make_narrow(s).c_str());
-         parse_input_line(s);
-         if(do_test)
-         {
-            run_tests();
-            ++tests;
-         }
-      }
-      cout << line << " lines, " << tests << " tests completed in file " << argv[i] << endl;
-   }
-#ifdef TIME_TEST
-   double elapsed_time = tim.elapsed();
-   cout << "Elapsed time = " << elapsed_time << "s" << endl;
-#endif
-
-   return error_count;
-}
-
-#ifdef TEST_UNICODE
-
-std::string make_narrow(const wchar_t* ptr)
-{
-   std::string result;
-   while(*ptr)
-   {
-      if(*ptr & ~0x7F)
-      {
-         char buf[10];
-         std::sprintf(buf, "\\x%.4x", (int)*ptr);
-         result.append(buf);
-         ++ptr;
-      }
-      else
-      {
-         result.append(1, (char)*ptr);
-         ++ptr;
-      }
-   }
-   return result;
-}
-
-istream& get_line(istream& is, nstring_type& s, char delim)
-{
-   char c = (char)is.get();
-   s.erase(s.begin(), s.end());
-   while((c != delim) && is.good())
-   {
-      s.append(1, c);
-      c = (char)is.get();
-   }
-   return is;
-}
-
-#ifdef BOOST_NO_STDC_NAMESPACE
-namespace std{ using ::mbtowc; }
-#endif
-
-istream& get_line(istream& is, string_type& s, char delim)
-{
-   nstring_type t;
-   get_line(is, t, delim);
-   s.erase(s.begin(), s.end());
-   const char* i, *j;
-   i = t.c_str();
-   j = t.c_str() + t.size();
-   wchar_t* buf = new wchar_t[MB_CUR_MAX + 1];
-   int cchars;
-   while(i != j)
-   {
-      cchars = std::mbtowc(buf, i, j - i);
-      if(cchars == -1)
-         break;
-      if(cchars == 0)
-         break;
-      s.insert(s.end(), buf, buf + cchars);
-      i += cchars;
-   }
-   delete[] buf;
-   return is;
-}
-
-
-#else
-
-istream& get_line(istream& is, string_type& s, char delim)
-{
-   char c = (char)is.get();
-   s.erase(s.begin(), s.end());
-   while((c != delim) && is.good())
-   {
-      s.append(1, c);
-      c = (char)is.get();
-   }
-   return is;
-}
-
-#endif
-
-jm_debug_alloc::jm_debug_alloc()
-{
-   blocks = new int;
-   count = new int;
-   *blocks = 0;
-   *count = 1;
-   guard = this;
-}
-
-jm_debug_alloc::jm_debug_alloc(const jm_debug_alloc& d)
-{
-   if(&d != this)
-   {
-      blocks = d.blocks;
-      count = d.count;
-      ++(*count);
-      guard = this;
-   }
-}
-jm_debug_alloc& jm_debug_alloc::operator=(const jm_debug_alloc& d)
-{
-   if(&d != this)
-   {
-      free_();
-      blocks = d.blocks;
-      count = d.count;
-      ++(*count);
-   }
-   return *this;
-}
-
-jm_debug_alloc::~jm_debug_alloc()
-{
-   if(guard != this)
-   {
-      cout << "Error: attempt to destroy object already destroyed" << endl;
-   }
-   else
-   {
-      free_();
-      guard = 0;
-   }
-}
-void jm_debug_alloc::free_()
-{
-    if(--(*count) == 0)
-    {
-       if(*blocks)
-       {
-          begin_error();
-          cout << "Error: " << *blocks << " blocks not freed by allocator" << endl;
-       }
-       delete count;
-       delete blocks;
-    }
-}
-
-void* jm_debug_alloc::allocate(size_type n, void*)
-{
-   pointer p = new char[n + maxi(sizeof(size_type), boost::re_detail::padding_size)];
-   *(size_type*)p = n;
-   ++(*blocks);
-   return p + maxi(sizeof(size_type), boost::re_detail::padding_size);
-}
-void jm_debug_alloc::deallocate(void* pv, size_type n)
-{
-   char* p = (char*)pv;
-   p -= maxi(sizeof(size_type), boost::re_detail::padding_size);
-   if(*(size_type*)p != n)
-   {
-      begin_error();
-      cout << "Error: size mismatch in allocate/deallocate calls" << endl;
-   }
-   --(*blocks);
-   delete[] p;
-}
-
-#else
-
-#include <iostream>
-
-int cpp_main(int argc, char * argv[])
-{
-   std::cout <<
-   "\n<note>\n"
-#if defined(BOOST_NO_WREGEX) && defined(TEST_UNICODE)
-   "This platform does not provide the needed wide character support for this test.\n"
-#elif defined(BOOST_REGEX_DYN_LINK)
-   "Dynamic linking with this compiler is known not to work in this case - please complain to your compiler vendor.\n"
-#else
-   "This test has been disabled due to a compiler bug - please complain to your compiler vendor.\n"
-#endif
-   "</note>\n";
-   return 0;
-}
-
-#endif
-
-
diff --git a/test/regress/regress.h b/test/regress/regress.h
index 7fa56bca..757858ef 100644
--- a/test/regress/regress.h
+++ b/test/regress/regress.h
@@ -429,15 +429,19 @@ __iterator_category(const debug_iterator<T>&) {
 #define BOOST_RE_TEST_LOCALE_W32
 #endif
 
+// TODO:
+#define BOOST_RE_TEST_LOCALE_CPP
+#undef BOOST_RE_TEST_LOCALE_W32
+
 #ifdef BOOST_REGEX_V3
 #  define basic_regex reg_expression
 #endif
 #ifdef BOOST_RE_TEST_LOCALE_W32
-typedef boost::basic_regex<char_t, boost::w32_regex_traits<char_t>, jm_debug_alloc> re_type;
+typedef boost::basic_regex<char_t, boost::w32_regex_traits<char_t> > re_type;
 #elif defined(BOOST_RE_TEST_LOCALE_CPP)
-typedef boost::basic_regex<char_t, boost::cpp_regex_traits<char_t>, jm_debug_alloc> re_type;
+typedef boost::basic_regex<char_t, boost::cpp_regex_traits<char_t> > re_type;
 #else
-typedef boost::basic_regex<char_t, boost::c_regex_traits<char_t>, jm_debug_alloc> re_type;
+typedef boost::basic_regex<char_t, boost::c_regex_traits<char_t> > re_type;
 #endif
 #define REG_NO_POSIX_TEST 1
 #define REG_UNICODE_ONLY 2
diff --git a/test/regress/sunpro.mak b/test/regress/sunpro.mak
index 7b9d39cf..0127da62 100644
--- a/test/regress/sunpro.mak
+++ b/test/regress/sunpro.mak
@@ -8,7 +8,7 @@ CXX= CC $(INCLUDES) -I../../../../ -I./ $(CXXFLAGS) -L../../../../stage/lib -L..
 #
 # sources to compile for each test:
 #
-SOURCES=tests.cpp parse.cpp regress.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
+SOURCES=*.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
 
 total : r rm r/regress rm/regress rs rms rs/regress rms/regress rw rmw rw/regress rmw/regress rsw rmsw rsw/regress rmsw/regress
 	echo testsing narrow character versions:
@@ -132,6 +132,8 @@ clean:
 
 
 
+
+
 
 
 
diff --git a/test/regress/test.hpp b/test/regress/test.hpp
new file mode 100644
index 00000000..20087643
--- /dev/null
+++ b/test/regress/test.hpp
@@ -0,0 +1,243 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         test.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Macros for test cases.
+  */
+
+
+#ifndef BOOST_REGEX_REGRESS_TEST_HPP
+#define BOOST_REGEX_REGRESS_TEST_HPP
+#include <typeinfo>
+#include "test_not_regex.hpp"
+#include "test_regex_search.hpp"
+#include "test_regex_replace.hpp"
+#include "test_deprecated.hpp"
+#include "test_mfc.hpp"
+#include "test_icu.hpp"
+#include "test_locale.hpp"
+
+
+//
+// define test entry proc, this forwards on to the appropriate
+// real test:
+//
+template <class charT, class tagT>
+void test(const charT& c, const tagT& tag)
+{
+#ifndef BOOST_NO_STD_LOCALE
+   test_info<charT>::set_typename(typeid(boost::basic_regex<charT, boost::cpp_regex_traits<charT> >).name());
+   boost::basic_regex<charT, boost::cpp_regex_traits<charT> > e1;
+   if(test_locale::cpp_locale_state() == test_locale::test_with_locale)
+      e1.imbue(test_locale::cpp_locale());
+   if(test_locale::cpp_locale_state() != test_locale::no_test)
+      test(e1, tag);
+#endif
+#if !BOOST_WORKAROUND(__BORLANDC__, < 0x560)
+   test_info<charT>::set_typename(typeid(boost::basic_regex<charT, boost::c_regex_traits<charT> >).name());
+   boost::basic_regex<charT, boost::c_regex_traits<charT> > e2;
+   if(test_locale::c_locale_state() != test_locale::no_test)
+      test(e2, tag);
+#endif
+#if defined(_WIN32) && !defined(BOOST_REGEX_NO_W32)
+   test_info<charT>::set_typename(typeid(boost::basic_regex<charT, boost::w32_regex_traits<charT> >).name());
+   boost::basic_regex<charT, boost::w32_regex_traits<charT> > e3;
+   if(test_locale::win_locale_state() == test_locale::test_with_locale)
+      e3.imbue(test_locale::win_locale());
+   if(test_locale::win_locale_state() != test_locale::no_test)
+      test(e3, tag);
+#endif
+   // test old depecated code:
+   test_info<charT>::set_typename("Deprecated interfaces");
+   if((test_locale::win_locale_state() == test_locale::test_no_locale)
+      && (test_locale::c_locale_state() == test_locale::test_no_locale)
+      &&(test_locale::cpp_locale_state() == test_locale::test_no_locale))
+      test_deprecated(c, tag);
+   // test MFC/ATL wrappers:
+   test_info<charT>::set_typename("MFC/ATL interfaces");
+   if((test_locale::win_locale_state() == test_locale::test_no_locale)
+      && (test_locale::c_locale_state() == test_locale::test_no_locale)
+      &&(test_locale::cpp_locale_state() == test_locale::test_no_locale))
+      test_mfc(c, tag);
+   // test ICU code:
+   test_info<charT>::set_typename("ICU interfaces");
+   test_icu(c, tag);
+}
+
+//
+// define function to pack args into an array:
+//
+const int* make_array(int first, ...);
+
+
+//
+// define macros for testing invalid regexes:
+//
+#define TEST_INVALID_REGEX_N(s, f)\
+   do{\
+      const char e[] = { s };\
+      std::string se(e, sizeof(e) - 1);\
+      test_info<char>::set_info(__FILE__, __LINE__, se, f);\
+      test(char(0), test_invalid_regex_tag());\
+   }while(0)
+
+#ifndef BOOST_NO_WREGEX
+#define TEST_INVALID_REGEX_W(s, f)\
+   do{\
+      const wchar_t e[] = { s };\
+      std::wstring se(e, (sizeof(e) / sizeof(wchar_t)) - 1);\
+      test_info<wchar_t>::set_info(__FILE__, __LINE__, se, f);\
+      test(wchar_t(0), test_invalid_regex_tag());\
+   }while(0)
+#else
+#define TEST_INVALID_REGEX_W(s, f)
+#endif
+
+#define TEST_INVALID_REGEX(s, f)\
+   TEST_INVALID_REGEX_N(s, f);\
+   TEST_INVALID_REGEX_W(BOOST_JOIN(L, s), f)
+
+//
+// define macros for testing regex searches:
+//
+#define TEST_REGEX_SEARCH_N(s, f, t, m, a)\
+   do{\
+      const char e[] = { s };\
+      std::string se(e, sizeof(e) - 1);\
+      const char st[] = { t };\
+      std::string sst(st, sizeof(st) - 1);\
+      test_info<char>::set_info(__FILE__, __LINE__, se, f, sst, m, a);\
+      test(char(0), test_regex_search_tag());\
+   }while(0)
+
+#ifndef BOOST_NO_WREGEX
+#define TEST_REGEX_SEARCH_W(s, f, t, m, a)\
+   do{\
+      const wchar_t e[] = { s };\
+      std::wstring se(e, (sizeof(e) / sizeof(wchar_t)) - 1);\
+      const wchar_t st[] = { t };\
+      std::wstring sst(st, (sizeof(st) / sizeof(wchar_t)) - 1);\
+      test_info<wchar_t>::set_info(__FILE__, __LINE__, se, f, sst, m, a);\
+      test(wchar_t(0), test_regex_search_tag());\
+   }while(0)
+#else
+#define TEST_REGEX_SEARCH_W(s, f, t, m, a)
+#endif
+
+#define TEST_REGEX_SEARCH(s, f, t, m, a)\
+   TEST_REGEX_SEARCH_N(s, f, t, m, a);\
+   TEST_REGEX_SEARCH_W(BOOST_JOIN(L, s), f, BOOST_JOIN(L, t), m, a)
+
+#if (defined(__GNUC__) && (__GNUC__ == 3) && (__GNUC_MINOR__ >= 4))
+#define TEST_REGEX_SEARCH_L(s, f, t, m, a) TEST_REGEX_SEARCH_W(BOOST_JOIN(L, s), f, BOOST_JOIN(L, t), m, a)
+#else
+#define TEST_REGEX_SEARCH_L(s, f, t, m, a) TEST_REGEX_SEARCH(s, f, t, m, a)
+#endif
+
+//
+// define macros for testing regex replaces:
+//
+#define TEST_REGEX_REPLACE_N(s, f, t, m, fs, r)\
+   do{\
+      const char e[] = { s };\
+      std::string se(e, sizeof(e) - 1);\
+      const char st[] = { t };\
+      std::string sst(st, sizeof(st) - 1);\
+      const char ft[] = { fs };\
+      std::string sft(ft, sizeof(ft) - 1);\
+      const char rt[] = { r };\
+      std::string srt(rt, sizeof(rt) - 1);\
+      test_info<char>::set_info(__FILE__, __LINE__, se, f, sst, m, 0, sft, srt);\
+      test(char(0), test_regex_replace_tag());\
+   }while(0)
+
+#ifndef BOOST_NO_WREGEX
+#define TEST_REGEX_REPLACE_W(s, f, t, m, fs, r)\
+   do{\
+      const wchar_t e[] = { s };\
+      std::wstring se(e, (sizeof(e) / sizeof(wchar_t)) - 1);\
+      const wchar_t st[] = { t };\
+      std::wstring sst(st, (sizeof(st) / sizeof(wchar_t)) - 1);\
+      const wchar_t ft[] = { fs };\
+      std::wstring sft(ft, (sizeof(ft) / sizeof(wchar_t)) - 1);\
+      const wchar_t rt[] = { r };\
+      std::wstring srt(rt, (sizeof(rt) / sizeof(wchar_t)) - 1);\
+      test_info<wchar_t>::set_info(__FILE__, __LINE__, se, f, sst, m, 0, sft, srt);\
+      test(wchar_t(0), test_regex_replace_tag());\
+   }while(0)
+#else
+#define TEST_REGEX_REPLACE_W(s, f, t, m, fs, r)
+#endif
+
+#define TEST_REGEX_REPLACE(s, f, t, m, fs, r)\
+   TEST_REGEX_REPLACE_N(s, f, t, m, fs, r);\
+   TEST_REGEX_REPLACE_W(BOOST_JOIN(L, s), f, BOOST_JOIN(L, t), m, BOOST_JOIN(L, fs), BOOST_JOIN(L, r))
+
+//
+// define the test group proceedures:
+//
+void basic_tests();
+void test_simple_repeats();
+void test_alt();
+void test_sets();
+void test_sets2();
+void test_anchors();
+void test_backrefs();
+void test_character_escapes();
+void test_assertion_escapes();
+void test_tricky_cases();
+void test_grep();
+void test_replace();
+void test_non_greedy_repeats();
+void test_non_marking_paren();
+void test_partial_match();
+void test_forward_lookahead_asserts();
+void test_fast_repeats();
+void test_fast_repeats2();
+void test_tricky_cases2();
+void test_independent_subs();
+void test_nosubs();
+void test_conditionals();
+void test_options();
+void test_options2();
+void test_en_locale();
+void test_emacs();
+void test_operators();
+void test_overloads();
+void test_unicode();
+
+//
+// template instances:
+// we pretty much have to instantiate these separately
+// otherwise compilation times are really excessive...
+//
+#ifndef BOOST_REGEX_TEST_INSTANCES
+#define template template<>
+#endif
+
+template void test<char, test_regex_replace_tag>(const char&, const test_regex_replace_tag&);
+template void test<char, test_regex_search_tag>(const char&, const test_regex_search_tag&);
+template void test<char, test_invalid_regex_tag>(const char&, const test_invalid_regex_tag&);
+
+#ifndef BOOST_NO_WREGEX
+template void test<wchar_t, test_regex_replace_tag>(const wchar_t&, const test_regex_replace_tag&);
+template void test<wchar_t, test_regex_search_tag>(const wchar_t&, const test_regex_search_tag&);
+template void test<wchar_t, test_invalid_regex_tag>(const wchar_t&, const test_invalid_regex_tag&);
+#endif
+
+#ifndef BOOST_REGEX_TEST_INSTANCES
+#undef template
+#endif
+
+#endif
diff --git a/test/regress/test1252.txt b/test/regress/test1252.txt
deleted file mode 100644
index 9a05478e..00000000
--- a/test/regress/test1252.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-;
-; This file tests code page 1252 - US / Western European code page.
-;
-; See tests.txt for a desciption of the scipt format.
-;
-
-- match_default extended REG_EXTENDED
-
-; start by testing character classes:
-[[:lower:]]+ Þßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþ÷ 1 32
-[[:upper:]]+ ¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞß 1 31
-[[:punct:]]+ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À 0 31
-[[:print:]]+ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþ 0 94
-[[:graph:]]+ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþ 0 94
-[a-z]+ ßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþ 0 31
-[a-z]+ ¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞ 1 31
-[[:word:]]+ ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþ 0 61
-;and equivalence classes:
-[[=a=]]+ aAàáâãäåÀÁÂÃÄÅ 0 14
-
-; and then test case mapping:
-- match_default extended REG_EXTENDED REG_ICASE
-;[A-Z]+ ßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþ 0 31
-;[a-z]+ ¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞ 1 31
-ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝ ßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþ 1 30
-
-
-
-
-
-
-
-
-
diff --git a/test/regress/test_alt.cpp b/test/regress/test_alt.cpp
new file mode 100644
index 00000000..01d7b2a9
--- /dev/null
+++ b/test/regress/test_alt.cpp
@@ -0,0 +1,46 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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)
+ *
+ */
+
+#include "test.hpp"
+
+#ifdef BOOST_MSVC
+#pragma warning(disable:4127)
+#endif
+
+void test_alt()
+{
+   using namespace boost::regex_constants;
+   // now test the alternation operator |
+   TEST_REGEX_SEARCH("a|b", perl, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("a|b", perl, "b", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("a|b|c", perl, "c", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("a|(b)|.", perl, "b", match_default, make_array(0, 1, 0, 1, -2, -2));
+   TEST_REGEX_SEARCH("(a)|b|.", perl, "a", match_default, make_array(0, 1, 0, 1, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c)", perl, "ab", match_default, make_array(0, 2, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c)", perl, "ac", match_default, make_array(0, 2, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c)", perl, "ad", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(a|b|c)", perl, "c", match_default, make_array(0, 1, 0, 1, -2, -2));
+   TEST_REGEX_SEARCH("(a|(b)|.)", perl, "b", match_default, make_array(0, 1, 0, 1, 0, 1, -2, -2));
+   TEST_INVALID_REGEX("|c", perl);
+   TEST_INVALID_REGEX("c|", perl);
+   TEST_INVALID_REGEX("(|)", perl);
+   TEST_INVALID_REGEX("(a|)", perl);
+   TEST_INVALID_REGEX("(|a)", perl);
+   TEST_REGEX_SEARCH("a\\|", perl, "a|", match_default, make_array(0, 2, -2, -2));
+
+   TEST_REGEX_SEARCH("a|", basic, "a|", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("a\\|", basic, "a|", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("|", basic, "|", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("a|", basic|bk_vbar, "a|", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("a\\|b", basic|bk_vbar, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("a\\|b", basic|bk_vbar, "b", match_default, make_array(0, 1, -2, -2));
+}
+
diff --git a/test/regress/test_anchors.cpp b/test/regress/test_anchors.cpp
new file mode 100644
index 00000000..86dc67e3
--- /dev/null
+++ b/test/regress/test_anchors.cpp
@@ -0,0 +1,67 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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)
+ *
+ */
+
+#include "test.hpp"
+
+#ifdef BOOST_MSVC
+#pragma warning(disable:4127)
+#endif
+
+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", basic, "ab", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("^ab", basic, "xxabxx", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("^ab", basic, "xx\nabzz", match_default, make_array(3, 5, -2, -2));
+   TEST_REGEX_SEARCH("ab$", basic, "ab", match_default, make_array(0, 2, -2, -2));
+   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", 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", 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));
+   //
+   // 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));
+#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));
+#endif
+}
+
diff --git a/test/regress/test_asserts.cpp b/test/regress/test_asserts.cpp
new file mode 100644
index 00000000..0e657950
--- /dev/null
+++ b/test/regress/test_asserts.cpp
@@ -0,0 +1,69 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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)
+ *
+ */
+
+#include "test.hpp"
+
+#ifdef BOOST_MSVC
+#pragma warning(disable:4127)
+#endif
+
+void test_forward_lookahead_asserts()
+{
+   //
+   // forward lookahead asserts added 21/01/02
+   //
+   using namespace boost::regex_constants;
+   TEST_REGEX_SEARCH("((?:(?!a|b)\\w)+)(\\w+)", perl, "  xxxabaxxx  ", match_default, make_array(2, 11, 2, 5, 5, 11, -2, -2));
+   TEST_REGEX_SEARCH("/\\*(?:(?!\\*/).)*\\*/", perl, "  /**/  ", match_default, make_array(2, 6, -2, -2));
+   TEST_REGEX_SEARCH("/\\*(?:(?!\\*/).)*\\*/", perl, "  /***/  ", match_default, make_array(2, 7, -2, -2));
+   TEST_REGEX_SEARCH("/\\*(?:(?!\\*/).)*\\*/", perl, "  /********/  ", match_default, make_array(2, 12, -2, -2));
+   TEST_REGEX_SEARCH("/\\*(?:(?!\\*/).)*\\*/", perl, "  /* comment */  ", match_default, make_array(2, 15, -2, -2));
+   TEST_REGEX_SEARCH("<\\s*a[^>]*>((?:(?!<\\s*/\\s*a\\s*>).)*)<\\s*/\\s*a\\s*>", perl, " <a href=\"here\">here</a> ", match_default, make_array(1, 24, 16, 20, -2, -2));
+   TEST_REGEX_SEARCH("<\\s*a[^>]*>((?:(?!<\\s*/\\s*a\\s*>).)*)<\\s*/\\s*a\\s*>", perl, " <a href=\"here\">here< /  a > ", match_default, make_array(1, 28, 16, 20, -2, -2));
+   TEST_REGEX_SEARCH("<\\s*a[^>]*>((?:(?!<\\s*/\\s*a\\s*>).)*)(?=<\\s*/\\s*a\\s*>)", perl, " <a href=\"here\">here</a> ", match_default, make_array(1, 20, 16, 20, -2, -2));
+   TEST_REGEX_SEARCH("<\\s*a[^>]*>((?:(?!<\\s*/\\s*a\\s*>).)*)(?=<\\s*/\\s*a\\s*>)", perl, " <a href=\"here\">here< /  a > ", match_default, make_array(1, 20, 16, 20, -2, -2));
+   TEST_REGEX_SEARCH("^(?!^(?:PRN|AUX|CLOCK\\$|NUL|CON|COM\\d|LPT\\d|\\..*)(?:\\..+)?$)[^\\x00-\\x1f\\\\?*:\"|/]+$", perl, "command.com", match_default, make_array(0, 11, -2, -2));
+   TEST_REGEX_SEARCH("^(?!^(?:PRN|AUX|CLOCK\\$|NUL|CON|COM\\d|LPT\\d|\\..*)(?:\\..+)?$)[^\\x00-\\x1f\\\\?*:\"|/]+$", perl, "PRN", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("^(?!^(?:PRN|AUX|CLOCK\\$|NUL|CON|COM\\d|LPT\\d|\\..*)(?:\\..+)?$)[^\\x00-\\x1f\\\\?*:\"|/]+$", perl, "COM2", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("^(?=.*\\d).{4,8}$", perl, "abc3", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("^(?=.*\\d).{4,8}$", perl, "abc3def4", match_default, make_array(0, 8, -2, -2));
+   TEST_REGEX_SEARCH("^(?=.*\\d).{4,8}$", perl, "ab2", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("^(?=.*\\d).{4,8}$", perl, "abcdefg", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z]).{4,8}$", perl, "abc3", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z]).{4,8}$", perl, "abC3", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("^(?=.*\\d)(?=.*[a-z])(?=.*[A-Z]).{4,8}$", perl, "ABCD3", match_default, make_array(-2, -2));
+
+   // lookbehind assertions, added 2004-04-30
+   TEST_REGEX_SEARCH("/\\*.*(?<=\\*)/", perl, "/**/", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("/\\*.*(?<=\\*)/", perl, "/*****/   ", match_default, make_array(0, 7, -2, -2));
+   TEST_REGEX_SEARCH("(?<=['\"]).*?(?=['\"])", perl, " 'ac' ", match_default, make_array(2, 4, -2, -2));
+   TEST_REGEX_SEARCH("(?<=['\"]).*?(?=['\"])", perl, " \"ac\" ", match_default, make_array(2, 4, -2, -2));
+   TEST_REGEX_SEARCH("(?<=['\"]).*?(?<!\\\\)(?=['\"])", perl, " \"ac\" ", match_default, make_array(2, 4, -2, -2));
+   TEST_REGEX_SEARCH("(?<=['\"]).*?(?<!\\\\)(?=['\"])", perl, " \"ac\\\"\" ", match_default, make_array(2, 6, -2, -2));
+   // lookbehind, with nested lookahead! :
+   TEST_REGEX_SEARCH("/\\*.*(?<=(?=[[:punct:]])\\*)/", perl, "/**/", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("/\\*.*(?<=(?![[:alnum:]])\\*)/", perl, "/**/", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("/\\*.*(?<=(?>\\*))/", perl, "/**/", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("/\\*.*(?<=(?:\\*))/", perl, "/**/", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("/\\*.*(?<=(\\*))/", perl, "/**/", match_default, make_array(0, 4, 2, 3, -2, -2));
+   // lookbehind with invalid content:
+   TEST_INVALID_REGEX("(/)\\*.*(?<=\\1)/", perl);
+   TEST_INVALID_REGEX("/\\*.*(?<=\\*+)/", perl);
+   TEST_INVALID_REGEX("/\\*.*(?<=\\X)/", perl);
+   TEST_INVALID_REGEX("/\\*.*(?<=[[.ae.]])/", perl);
+
+   TEST_INVALID_REGEX("(?<=[abc]", perl);
+   TEST_INVALID_REGEX("(?<=", perl);
+   TEST_INVALID_REGEX("(?<", perl);
+   TEST_INVALID_REGEX("(?<*", perl);
+   TEST_INVALID_REGEX("(?", perl);
+}
+
diff --git a/test/regress/test_backrefs.cpp b/test/regress/test_backrefs.cpp
new file mode 100644
index 00000000..1a397896
--- /dev/null
+++ b/test/regress/test_backrefs.cpp
@@ -0,0 +1,43 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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)
+ *
+ */
+
+#include "test.hpp"
+
+#ifdef BOOST_MSVC
+#pragma warning(disable:4127)
+#endif
+
+void test_backrefs()
+{
+   using namespace boost::regex_constants;
+   TEST_INVALID_REGEX("a(b)\\2c", perl);
+   TEST_INVALID_REGEX("a(b\\1)c", perl);
+   TEST_REGEX_SEARCH("a(b*)c\\1d", perl, "abbcbbd", match_default, make_array(0, 7, 1, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b*)c\\1d", perl, "abbcbd", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("a(b*)c\\1d", perl, "abbcbbbd", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("^(.)\\1", perl, "abc", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("a([bc])\\1d", perl, "abcdabbd", match_default, make_array(4, 8, 5, 6, -2, -2));
+   TEST_REGEX_SEARCH("a\\([bc]\\)\\1d", basic, "abcdabbd", match_default, make_array(4, 8, 5, 6, -2, -2));
+   // strictly speaking this is at best ambiguous, at worst wrong, this is what most
+   // re implimentations will match though.
+   TEST_REGEX_SEARCH("a(([bc])\\2)*d", perl, "abbccd", match_default, make_array(0, 6, 3, 5, 3, 4, -2, -2));
+   TEST_REGEX_SEARCH("a(([bc])\\2)*d", perl, "abbcbd", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("a((b)*\\2)*d", perl, "abbbd", match_default, make_array(0, 5, 1, 4, 2, 3, -2, -2));
+   TEST_REGEX_SEARCH("(ab*)[ab]*\\1", perl, "ababaaa", match_default, make_array(0, 4, 0, 2, -2, 4, 7, 4, 5, -2, -2));
+   TEST_REGEX_SEARCH("(a)\\1bcd", perl, "aabcd", match_default, make_array(0, 5, 0, 1, -2, -2));
+   TEST_REGEX_SEARCH("(a)\\1bc*d", perl, "aabcd", match_default, make_array(0, 5, 0, 1, -2, -2));
+   TEST_REGEX_SEARCH("(a)\\1bc*d", perl, "aabd", match_default, make_array(0, 4, 0, 1, -2, -2));
+   TEST_REGEX_SEARCH("(a)\\1bc*d", perl, "aabcccd", match_default, make_array(0, 7, 0, 1, -2, -2));
+   TEST_REGEX_SEARCH("(a)\\1bc*[ce]d", perl, "aabcccd", match_default, make_array(0, 7, 0, 1, -2, -2));
+   TEST_REGEX_SEARCH("^(a)\\1b(c)*cd$", perl, "aabcccd", match_default, make_array(0, 7, 0, 1, 4, 5, -2, -2));
+   TEST_REGEX_SEARCH("(ab*)[ab]*\\1", extended, "ababaaa", match_default, make_array(0, 7, 0, 1, -2, -2));
+}
+
diff --git a/test/regress/test_deprecated.cpp b/test/regress/test_deprecated.cpp
new file mode 100644
index 00000000..ae23df9d
--- /dev/null
+++ b/test/regress/test_deprecated.cpp
@@ -0,0 +1,316 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         test_deprecated.cpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Tests for deprecated interfaces.
+  */
+
+#include "test.hpp"
+#include <boost/cregex.hpp>
+
+#ifdef BOOST_MSVC
+#pragma warning(disable:4267)
+#endif
+
+int get_posix_compile_options(boost::regex_constants::syntax_option_type opts)
+{
+   using namespace boost;
+   int result = 0;
+   switch(opts & regbase::main_option_type)
+   {
+   case regbase::perl:
+      result = (opts & regbase::no_perl_ex) ? REG_EXTENDED : REG_PERL;
+      if(opts & (regbase::no_bk_refs|regbase::no_mod_m|regbase::mod_x|regbase::mod_s|regbase::no_mod_s|regbase::no_escape_in_lists))
+         return -1;
+      break;
+   case regbase::basic:
+      result = REG_BASIC;
+      if(opts & (regbase::no_char_classes|regbase::no_intervals|regbase::bk_plus_qm|regbase::bk_vbar))
+         return -1;
+      if((opts & regbase::no_escape_in_lists) == 0)
+         return -1;
+      break;
+   default:
+      return -1;
+   }
+
+   if(opts & regbase::icase)
+      result |= REG_ICASE;
+   if(opts & regbase::nosubs)
+      result |= REG_NOSUB;
+   if(opts & regbase::newline_alt)
+      result |= REG_NEWLINE;
+   if((opts & regbase::collate) == 0)
+      result |= REG_NOCOLLATE;
+
+   return result;
+}
+
+int get_posix_match_flags(boost::regex_constants::match_flag_type f)
+{
+   int result = 0;
+   if(f & boost::regex_constants::match_not_bol)
+      result |= boost::REG_NOTBOL;
+   if(f & boost::regex_constants::match_not_eol)
+      result |= boost::REG_NOTEOL;
+   if(f & ~(boost::regex_constants::match_not_bol|boost::regex_constants::match_not_eol))
+      return -1;
+   return result;
+}
+
+void test_deprecated(const char&, const test_regex_search_tag&)
+{
+   const std::string& expression = test_info<char>::expression();
+   if(expression.find('\0') != std::string::npos)
+      return;
+   const std::string& search_text = test_info<char>::search_text();
+   if(search_text.find('\0') != std::string::npos)
+      return;
+   int posix_options = get_posix_compile_options(test_info<char>::syntax_options());
+   if(posix_options < 0)
+      return;
+   int posix_match_options = get_posix_match_flags(test_info<char>::match_options());
+   if(posix_match_options < 0)
+      return;
+   const int* results = test_info<char>::answer_table();
+
+   // OK try and compile the expression:
+   boost::regex_tA re;
+   if(boost::regcompA(&re, expression.c_str(), posix_options) != 0)
+   {
+      BOOST_REGEX_TEST_ERROR("Expression : \"" << expression.c_str() << "\" did not compile with the POSIX C API.", char);
+      return;
+   }
+   // try and find the first occurance:
+   boost::regmatch_t matches[50];
+   if(boost::regexecA(&re, search_text.c_str(), 50, matches, posix_match_options) == 0)
+   {
+      int i = 0;
+      while(results[2*i] != -2)
+      {
+         if(results[2*i] != matches[i].rm_so)
+         {
+            BOOST_REGEX_TEST_ERROR("Mismatch in start of subexpression " << i << " found with the POSIX C API.", char);
+         }
+         if(results[2*i+1] != matches[i].rm_eo)
+         {
+            BOOST_REGEX_TEST_ERROR("Mismatch in end of subexpression " << i << " found with the POSIX C API.", char);
+         }
+         ++i;
+      }
+   }
+   else
+   {
+      if(results[0] >= 0)
+      {
+         BOOST_REGEX_TEST_ERROR("Expression : \"" << expression.c_str() << "\" was not found with the POSIX C API.", char);
+      }
+   }
+   // clean up whatever:
+   boost::regfreeA(&re);
+
+   //
+   // now try the RegEx class:
+   //
+   if(test_info<char>::syntax_options() & ~boost::regex::icase)
+      return;
+   try{
+      boost::RegEx e(expression, test_info<char>::syntax_options() & boost::regex::icase);
+      if(e.error_code())
+      {
+         BOOST_REGEX_TEST_ERROR("Expression did not compile when it should have done, error code = " << e.error_code(), char);
+      }
+      if(e.Search(search_text, test_info<char>::match_options()))
+      {
+         int i = 0;
+         while(results[i*2] != -2)
+         {
+            if(e.Matched(i))
+            {
+               if(results[2*i] != static_cast<int>(e.Position(i)))
+               {
+                  BOOST_REGEX_TEST_ERROR("Mismatch in start of subexpression " << i << " found with the RegEx class (found " << e.Position(i) << " expected " << results[2*i] << ").", char);
+               }
+               if(results[2*i+1] != static_cast<int>(e.Position(i) + e.Length(i)))
+               {
+                  BOOST_REGEX_TEST_ERROR("Mismatch in end of subexpression " << i << " found with the RegEx class (found " << e.Position(i) + e.Length(i) << " expected " << results[2*i+1] << ").", char);
+               }
+            }
+            else
+            {
+               if(results[2*i] >= 0)
+               {
+                  BOOST_REGEX_TEST_ERROR("Mismatch in start of subexpression " << i << " found with the RegEx class (found " << e.Position(i) << " expected " << results[2*i] << ").", char);
+               }
+               if(results[2*i+1] >= 0)
+               {
+                  BOOST_REGEX_TEST_ERROR("Mismatch in end of subexpression " << i << " found with the RegEx class (found " << e.Position(i) + e.Length(i) << " expected " << results[2*i+1] << ").", char);
+               }
+            }
+            ++i;
+         }
+      }
+      else
+      {
+         if(results[0] >= 0)
+         {
+            BOOST_REGEX_TEST_ERROR("Expression : \"" << expression.c_str() << "\" was not found with class RegEx.", char);
+         }
+      }
+   }
+   catch(const boost::bad_expression& r)
+   {
+      BOOST_REGEX_TEST_ERROR("Expression did not compile with RegEx class: " << r.what(), char);
+   }
+   catch(const std::runtime_error& r)
+   {
+      BOOST_REGEX_TEST_ERROR("Unexpected std::runtime_error : " << r.what(), char);
+   }
+   catch(const std::exception& r)
+   {
+      BOOST_REGEX_TEST_ERROR("Unexpected std::exception: " << r.what(), char);
+   }
+   catch(...)
+   {
+      BOOST_REGEX_TEST_ERROR("Unexpected exception of unknown type", char);
+   }
+
+}
+
+void test_deprecated(const wchar_t&, const test_regex_search_tag&)
+{
+#ifndef BOOST_NO_WREGEX
+   const std::wstring& expression = test_info<wchar_t>::expression();
+   if(expression.find(L'\0') != std::wstring::npos)
+      return;
+   const std::wstring& search_text = test_info<wchar_t>::search_text();
+   if(search_text.find(L'\0') != std::wstring::npos)
+      return;
+   int posix_options = get_posix_compile_options(test_info<wchar_t>::syntax_options());
+   if(posix_options < 0)
+      return;
+   int posix_match_options = get_posix_match_flags(test_info<wchar_t>::match_options());
+   if(posix_match_options < 0)
+      return;
+   const int* results = test_info<wchar_t>::answer_table();
+
+   // OK try and compile the expression:
+   boost::regex_tW re;
+   if(boost::regcompW(&re, expression.c_str(), posix_options) != 0)
+   {
+      BOOST_REGEX_TEST_ERROR("Expression : \"" << expression.c_str() << "\" did not compile with the POSIX C API.", wchar_t);
+      return;
+   }
+   // try and find the first occurance:
+   boost::regmatch_t matches[50];
+   if(boost::regexecW(&re, search_text.c_str(), 50, matches, posix_match_options) == 0)
+   {
+      int i = 0;
+      while(results[2*i] != -2)
+      {
+         if(results[2*i] != matches[i].rm_so)
+         {
+            BOOST_REGEX_TEST_ERROR("Mismatch in start of subexpression " << i << " found with the POSIX C API.", wchar_t);
+         }
+         if(results[2*i+1] != matches[i].rm_eo)
+         {
+            BOOST_REGEX_TEST_ERROR("Mismatch in end of subexpression " << i << " found with the POSIX C API.", wchar_t);
+         }
+         ++i;
+      }
+   }
+   else
+   {
+      if(results[0] >= 0)
+      {
+         BOOST_REGEX_TEST_ERROR("Expression : \"" << expression.c_str() << "\" was not found with the POSIX C API.", wchar_t);
+      }
+   }
+   // clean up whatever:
+   boost::regfreeW(&re);
+#endif
+}
+
+void test_deprecated(const char&, const test_invalid_regex_tag&)
+{
+   const std::string& expression = test_info<char>::expression();
+   if(expression.find('\0') != std::string::npos)
+      return;
+   int posix_options = get_posix_compile_options(test_info<char>::syntax_options());
+   if(posix_options < 0)
+      return;
+
+   // OK try and compile the expression:
+   boost::regex_tA re;
+   if(boost::regcompA(&re, expression.c_str(), posix_options) == 0)
+   {
+      boost::regfreeA(&re);
+      BOOST_REGEX_TEST_ERROR("Expression : \"" << expression.c_str() << "\" unexpectedly compiled with the POSIX C API.", char);
+   }
+   //
+   // now try the RegEx class:
+   //
+   if(test_info<char>::syntax_options() & ~boost::regex::icase)
+      return;
+   bool have_catch = false;
+   try{
+      boost::RegEx e(expression, test_info<char>::syntax_options() & boost::regex::icase);
+      if(e.error_code())
+         have_catch = true;
+   }
+   catch(const boost::bad_expression&)
+   {
+      have_catch = true;
+   }
+   catch(const std::runtime_error& r)
+   {
+      have_catch = true;
+      BOOST_REGEX_TEST_ERROR("Expected a bad_expression exception, but a std::runtime_error instead: " << r.what(), char);
+   }
+   catch(const std::exception& r)
+   {
+      have_catch = true;
+      BOOST_REGEX_TEST_ERROR("Expected a bad_expression exception, but a std::exception instead: " << r.what(), char);
+   }
+   catch(...)
+   {
+      have_catch = true;
+      BOOST_REGEX_TEST_ERROR("Expected a bad_expression exception, but got an exception of unknown type instead", char);
+   }
+   if(!have_catch)
+   {
+      // oops expected exception was not thrown:
+      BOOST_REGEX_TEST_ERROR("Expected an exception, but didn't find one.", char);
+   }
+}
+
+void test_deprecated(const wchar_t&, const test_invalid_regex_tag&)
+{
+#ifndef BOOST_NO_WREGEX
+   const std::wstring& expression = test_info<wchar_t>::expression();
+   if(expression.find(L'\0') != std::string::npos)
+      return;
+   int posix_options = get_posix_compile_options(test_info<wchar_t>::syntax_options());
+   if(posix_options < 0)
+      return;
+
+   // OK try and compile the expression:
+   boost::regex_tW re;
+   if(boost::regcompW(&re, expression.c_str(), posix_options) == 0)
+   {
+      boost::regfreeW(&re);
+      BOOST_REGEX_TEST_ERROR("Expression : \"" << expression.c_str() << "\" unexpectedly compiled with the POSIX C API.", wchar_t);
+   }
+#endif
+}
diff --git a/test/regress/test_deprecated.hpp b/test/regress/test_deprecated.hpp
new file mode 100644
index 00000000..cb4b8750
--- /dev/null
+++ b/test/regress/test_deprecated.hpp
@@ -0,0 +1,35 @@
+/*
+ *
+ * Copyright (c) 1998-2004
+ * Dr 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         test_deprecated.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Forward declare deprecated test functions.
+  */
+
+#ifndef BOOST_REGEX_TEST_DEPRECATED
+#define BOOST_REGEX_TEST_DEPRECATED
+
+template <class charT, class Tag>
+void test_deprecated(const charT&, const Tag&)
+{
+   // do nothing
+}
+
+void test_deprecated(const char&, const test_regex_search_tag&);
+void test_deprecated(const wchar_t&, const test_regex_search_tag&);
+void test_deprecated(const char&, const test_invalid_regex_tag&);
+void test_deprecated(const wchar_t&, const test_invalid_regex_tag&);
+
+
+#endif
+
diff --git a/test/regress/test_emacs.cpp b/test/regress/test_emacs.cpp
new file mode 100644
index 00000000..3b125731
--- /dev/null
+++ b/test/regress/test_emacs.cpp
@@ -0,0 +1,157 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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)
+ *
+ */
+
+#include "test.hpp"
+
+#ifdef BOOST_MSVC
+#pragma warning(disable:4127)
+#endif
+
+void test_emacs()
+{
+   using namespace boost::regex_constants;
+   // now try operator + :
+   TEST_REGEX_SEARCH("ab+", emacs, "a", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("ab+", emacs, "ab", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("ab+", emacs, "sssabbbbbbsss", match_default, make_array(3, 10, -2, -2));
+   TEST_REGEX_SEARCH("ab+c+", emacs, "abbb", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("ab+c+", emacs, "accc", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("ab+c+", emacs, "abbcc", match_default, make_array(0, 5, -2, -2));
+   TEST_INVALID_REGEX("\\<+", emacs);
+   TEST_INVALID_REGEX("\\>+", emacs);
+   TEST_REGEX_SEARCH("\n+", emacs, "\n\n", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("\\+", emacs, "+", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\+", emacs, "++", match_default, make_array(0, 1, -2, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("\\++", emacs, "++", match_default, make_array(0, 2, -2, -2));
+
+   // now try operator ?
+   TEST_REGEX_SEARCH("a?", emacs, "b", match_default, make_array(0, 0, -2, 1, 1, -2, -2));
+   TEST_REGEX_SEARCH("ab?", emacs, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("ab?", emacs, "ab", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("ab?", emacs, "sssabbbbbbsss", match_default, make_array(3, 5, -2, -2));
+   TEST_REGEX_SEARCH("ab?c?", emacs, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("ab?c?", emacs, "abbb", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("ab?c?", emacs, "accc", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("ab?c?", emacs, "abcc", match_default, make_array(0, 3, -2, -2));
+   TEST_INVALID_REGEX("\\<?", emacs);
+   TEST_INVALID_REGEX("\\>?", emacs);
+   TEST_REGEX_SEARCH("\n?", emacs, "\n\n", match_default, make_array(0, 1, -2, 1, 2, -2, 2, 2, -2, -2));
+   TEST_REGEX_SEARCH("\\?", emacs, "?", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\?", emacs, "?", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\??", emacs, "??", match_default, make_array(0, 1, -2, 1, 2, -2, 2, 2, -2, -2));
+
+   TEST_REGEX_SEARCH("a*?", emacs, "aa", match_default, make_array(0, 0, -2, 0, 1, -2, 1, 1, -2, 1, 2, -2, 2, 2, -2, -2));
+   TEST_REGEX_SEARCH("^a*?$", emacs, "aa", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("^.*?$", emacs, "aa", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("^\\(a\\)*?$", emacs, "aa", match_default, make_array(0, 2, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("^[ab]*?$", emacs, "aa", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("a??", emacs, "aa", match_default, make_array(0, 0, -2, 0, 1, -2, 1, 1, -2, 1, 2, -2, 2, 2, -2, -2));
+   TEST_REGEX_SEARCH("a+?", emacs, "aa", match_default, make_array(0, 1, -2, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a\\{1,3\\}?", emacs, "aaa", match_default, make_array(0, 1, -2, 1, 2, -2, 2, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\w+?w", emacs, "...ccccccwcccccw", match_default, make_array(3, 10, -2, 10, 16, -2, -2));
+   TEST_REGEX_SEARCH("\\W+\\w+?w", emacs, "...ccccccwcccccw", match_default, make_array(0, 10, -2, -2));
+   TEST_REGEX_SEARCH("abc\\|\\w+?", emacs, "abd", match_default, make_array(0, 1, -2, 1, 2, -2, 2, 3, -2, -2));
+   TEST_REGEX_SEARCH("abc\\|\\w+?", emacs, "abcd", match_default, make_array(0, 3, -2, 3, 4, -2, -2));
+   TEST_REGEX_SEARCH("<\\ss*tag[^>]*>\\(.*?\\)<\\ss*/tag\\ss*>", emacs, " <tag>here is some text</tag> <tag></tag>", match_default, make_array(1, 29, 6, 23, -2, 30, 41, 35, 35, -2, -2));
+   TEST_REGEX_SEARCH("<\\ss*tag[^>]*>\\(.*?\\)<\\ss*/tag\\ss*>", emacs, " < tag attr=\"something\">here is some text< /tag > <tag></tag>", match_default, make_array(1, 49, 24, 41, -2, 50, 61, 55, 55, -2, -2));
+   TEST_INVALID_REGEX("a\\{1,3\\}\\{1\\}", emacs);
+   TEST_INVALID_REGEX("a**", emacs);
+   TEST_INVALID_REGEX("a++", emacs);
+
+   TEST_REGEX_SEARCH("\\<abcd", emacs, "  abcd", match_default, make_array(2, 6, -2, -2));
+   TEST_REGEX_SEARCH("\\<ab", emacs, "cab", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("\\<ab", emacs, "\nab", match_default, make_array(1, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\<tag", emacs, "::tag", match_default, make_array(2, 5, -2, -2));
+   TEST_REGEX_SEARCH("\\<abcd", emacs, "abcd", match_default|match_not_bow, make_array(-2, -2));
+   TEST_REGEX_SEARCH("\\<abcd", emacs, "  abcd", match_default|match_not_bow, make_array(2, 6, -2, -2));
+   TEST_REGEX_SEARCH("\\<", emacs, "ab ", match_default|match_not_bow, make_array(-2, -2));
+   TEST_REGEX_SEARCH(".\\<.", emacs, "ab", match_default|match_not_bow, make_array(-2, -2));
+   TEST_REGEX_SEARCH(".\\<.", emacs, " b", match_default|match_not_bow, make_array(0, 2, -2, -2));
+   // word end:
+   TEST_REGEX_SEARCH("abc\\>", emacs, "abc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("abc\\>", emacs, "abcd", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("abc\\>", emacs, "abc\n", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("abc\\>", emacs, "abc::", match_default, make_array(0,3, -2, -2));
+   TEST_REGEX_SEARCH("abc\\(?:\\>..\\|$\\)", emacs, "abc::", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("\\>", emacs, "  ", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH(".\\>.", emacs, "  ", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("abc\\>", emacs, "abc", match_default|match_not_eow, make_array(-2, -2));
+   // word boundary:
+   TEST_REGEX_SEARCH("\\babcd", emacs, "  abcd", match_default, make_array(2, 6, -2, -2));
+   TEST_REGEX_SEARCH("\\bab", emacs, "cab", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("\\bab", emacs, "\nab", match_default, make_array(1, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\btag", emacs, "::tag", match_default, make_array(2, 5, -2, -2));
+   TEST_REGEX_SEARCH("abc\\b", emacs, "abc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("abc\\b", emacs, "abcd", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("abc\\b", emacs, "abc\n", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("abc\\b", emacs, "abc::", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\babcd", emacs, "abcd", match_default|match_not_bow, make_array(-2, -2));
+   // within word:
+   TEST_REGEX_SEARCH("\\B", emacs, "ab", match_default, make_array(1, 1, -2, -2));
+   TEST_REGEX_SEARCH("a\\Bb", emacs, "ab", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("a\\B", emacs, "ab", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("a\\B", emacs, "a", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("a\\B", emacs, "a ", match_default, make_array(-2, -2));
+   // buffer operators:
+   TEST_REGEX_SEARCH("\\`abc", emacs, "abc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\`abc", emacs, "\nabc", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("\\`abc", emacs, " abc", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("abc\\'", emacs, "abc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("abc\\'", emacs, "abc\n", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("abc\\'", emacs, "abc ", match_default, make_array(-2, -2));
+
+   TEST_REGEX_SEARCH("a\\|b", emacs, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("a\\|b", emacs, "b", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("a\\|b\\|c", emacs, "c", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("a\\|\\(b\\)\\|.", emacs, "b", match_default, make_array(0, 1, 0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\(a\\)\\|b\\|.", emacs, "a", match_default, make_array(0, 1, 0, 1, -2, -2));
+   TEST_REGEX_SEARCH("a\\(b\\|c\\)", emacs, "ab", match_default, make_array(0, 2, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a\\(b\\|c\\)", emacs, "ac", match_default, make_array(0, 2, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a\\(b\\|c\\)", emacs, "ad", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("\\(a\\|b\\|c\\)", emacs, "c", match_default, make_array(0, 1, 0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\(a\\|\\(b\\)\\|.\\)", emacs, "b", match_default, make_array(0, 1, 0, 1, 0, 1, -2, -2));
+   TEST_INVALID_REGEX("\\|c", emacs);
+   TEST_INVALID_REGEX("c\\|", emacs);
+   TEST_INVALID_REGEX("\\(\\|\\)", emacs);
+   TEST_INVALID_REGEX("\\(a\\|\\)", emacs);
+   TEST_INVALID_REGEX("\\(\\|a\\)", emacs);
+
+   TEST_REGEX_SEARCH("\\(?:abc\\)+", emacs, "xxabcabcxx", match_default, make_array(2, 8, -2, -2));
+   TEST_REGEX_SEARCH("\\(?:a+\\)\\(b+\\)", emacs, "xaaabbbx", match_default, make_array(1, 7, 4, 7, -2, -2));
+   TEST_REGEX_SEARCH("\\(a+\\)\\(?:b+\\)", emacs, "xaaabbba", match_default, make_array(1, 7, 1, 4, -2, -2));
+   TEST_REGEX_SEARCH("\\(?:\\(a+\\)b+\\)", emacs, "xaaabbba", match_default, make_array(1, 7, 1, 4, -2, -2));
+   TEST_REGEX_SEARCH("\\(?:a+\\(b+\\)\\)", emacs, "xaaabbba", match_default, make_array(1, 7, 4, 7, -2, -2));
+   TEST_REGEX_SEARCH("a+\\(?#b+\\)b+", emacs, "xaaabbba", match_default, make_array(1, 7, -2, -2));
+   TEST_REGEX_SEARCH("\\(a\\)\\(?:b\\|$\\)", emacs, "ab", match_default, make_array(0, 2, 0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\(a\\)\\(?:b\\|$\\)", emacs, "a", match_default, make_array(0, 1, 0, 1, -2, -2));
+
+   TEST_REGEX_SEARCH("\\ss+", emacs, "a  b", match_default, make_array(1, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\Ss+", emacs, " ab ", match_default, make_array(1, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\sw+", emacs, " ab ", match_default, make_array(1, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\Sw+", emacs, "a  b", match_default, make_array(1, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\s_+", emacs, " $&*+-_<> ", match_default, make_array(1, 9, -2, -2));
+   TEST_REGEX_SEARCH("\\S_+", emacs, "$&*+-_<>b", match_default, make_array(8, 9, -2, -2));
+   TEST_REGEX_SEARCH("\\s.+", emacs, " .,;!? ", match_default, make_array(1, 6, -2, -2));
+   TEST_REGEX_SEARCH("\\S.+", emacs, ".,;!?b", match_default, make_array(5, 6, -2, -2));
+   TEST_REGEX_SEARCH("\\s(+", emacs, "([{ ", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\S(+", emacs, "([{ ", match_default, make_array(3, 4, -2, -2));
+   TEST_REGEX_SEARCH("\\s)+", emacs, ")]} ", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\S)+", emacs, ")]} ", match_default, make_array(3, 4, -2, -2));
+   TEST_REGEX_SEARCH("\\s\"+", emacs, "\"'` ", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\S\"+", emacs, "\"'` ", match_default, make_array(3, 4, -2, -2));
+   TEST_REGEX_SEARCH("\\s'+", emacs, "',# ", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\S'+", emacs, "',# ", match_default, make_array(3, 4, -2, -2));
+   TEST_REGEX_SEARCH("\\s<+", emacs, "; ", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\S<+", emacs, "; ", match_default, make_array(1, 2, -2, -2));
+   TEST_REGEX_SEARCH("\\s>+", emacs, "\n\f ", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("\\S>+", emacs, "\n\f ", match_default, make_array(2, 3, -2, -2));
+}
+
diff --git a/test/regress/test_escapes.cpp b/test/regress/test_escapes.cpp
new file mode 100644
index 00000000..61b441d2
--- /dev/null
+++ b/test/regress/test_escapes.cpp
@@ -0,0 +1,145 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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)
+ *
+ */
+
+#include "test.hpp"
+
+#ifdef BOOST_MSVC
+#pragma warning(disable:4127)
+#endif
+
+void test_character_escapes()
+{
+   using namespace boost::regex_constants;
+   // characters by code
+   TEST_REGEX_SEARCH("\\0101", perl, "A", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\00", perl, "\0", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\0", perl, "\0", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\0172", perl, "z", match_default, make_array(0, 1, -2, -2));
+   // extra escape sequences:
+   TEST_REGEX_SEARCH("\\a", perl, "\a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\f", perl, "\f", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\n", perl, "\n", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\r", perl, "\r", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\v", perl, "\v", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\t", perl, "\t", match_default, make_array(0, 1, -2, -2));
+
+   // updated tests for version 2:
+   TEST_REGEX_SEARCH("\\x41", perl, "A", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\xff", perl, "\xff", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\xFF", perl, "\xff", match_default, make_array(0, 1, -2, -2));
+   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_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));
+   TEST_REGEX_SEARCH("\\x1b", perl, "\x1B", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\x{1b}", perl, "\x1B", match_default, make_array(0, 1, -2, -2));
+   TEST_INVALID_REGEX("\\x{}", perl);
+   TEST_INVALID_REGEX("\\x{", perl);
+   TEST_INVALID_REGEX("\\", perl);
+   TEST_INVALID_REGEX("\\c", perl);
+   TEST_INVALID_REGEX("\\x}", perl);
+   TEST_INVALID_REGEX("\\x", perl);
+   TEST_INVALID_REGEX("\\x{yy", perl);
+   TEST_INVALID_REGEX("\\x{1b", perl);
+   // \Q...\E sequences:
+   TEST_INVALID_REGEX("\\Qabc\\", perl);
+   TEST_REGEX_SEARCH("\\Qabc\\E", perl, "abcd", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\Qabc\\Ed", perl, "abcde", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("\\Q+*?\\\\E", perl, "+*?\\", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("a\\Q+*?\\\\Eb", perl, "a+*?\\b", match_default, make_array(0, 6, -2, -2));
+   TEST_REGEX_SEARCH("\\C+", perl, "abcde", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("\\X+", perl, "abcde", match_default, make_array(0, 5, -2, -2));
+#if !BOOST_WORKAROUND(__BORLANDC__, < 0x560)
+   TEST_REGEX_SEARCH_W(L"\\X", perl, L"a\x0300\x0301", match_default, make_array(0, 3, -2, -2));
+#endif
+   // 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));
+}
+
+void test_assertion_escapes()
+{
+   using namespace boost::regex_constants;
+   // word start:
+   TEST_REGEX_SEARCH("\\<abcd", perl, "  abcd", match_default, make_array(2, 6, -2, -2));
+   TEST_REGEX_SEARCH("\\<ab", perl, "cab", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("\\<ab", perl, "\nab", match_default, make_array(1, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\<tag", perl, "::tag", match_default, make_array(2, 5, -2, -2));
+   TEST_REGEX_SEARCH("\\<abcd", perl, "abcd", match_default|match_not_bow, make_array(-2, -2));
+   TEST_REGEX_SEARCH("\\<abcd", perl, "  abcd", match_default|match_not_bow, make_array(2, 6, -2, -2));
+   TEST_REGEX_SEARCH("\\<", perl, "ab ", match_default|match_not_bow, make_array(-2, -2));
+   TEST_REGEX_SEARCH(".\\<.", perl, "ab", match_default|match_not_bow, make_array(-2, -2));
+   TEST_REGEX_SEARCH(".\\<.", perl, " b", match_default|match_not_bow, make_array(0, 2, -2, -2));
+   // word end:
+   TEST_REGEX_SEARCH("abc\\>", perl, "abc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("abc\\>", perl, "abcd", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("abc\\>", perl, "abc\n", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("abc\\>", perl, "abc::", match_default, make_array(0,3, -2, -2));
+   TEST_REGEX_SEARCH("abc(?:\\>..|$)", perl, "abc::", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("\\>", perl, "  ", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH(".\\>.", perl, "  ", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("abc\\>", perl, "abc", match_default|match_not_eow, make_array(-2, -2));
+   // word boundary:
+   TEST_REGEX_SEARCH("\\babcd", perl, "  abcd", match_default, make_array(2, 6, -2, -2));
+   TEST_REGEX_SEARCH("\\bab", perl, "cab", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("\\bab", perl, "\nab", match_default, make_array(1, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\btag", perl, "::tag", match_default, make_array(2, 5, -2, -2));
+   TEST_REGEX_SEARCH("abc\\b", perl, "abc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("abc\\b", perl, "abcd", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("abc\\b", perl, "abc\n", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("abc\\b", perl, "abc::", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\babcd", perl, "abcd", match_default|match_not_bow, make_array(-2, -2));
+   // within word:
+   TEST_REGEX_SEARCH("\\B", perl, "ab", match_default, make_array(1, 1, -2, -2));
+   TEST_REGEX_SEARCH("a\\Bb", perl, "ab", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("a\\B", perl, "ab", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("a\\B", perl, "a", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("a\\B", perl, "a ", match_default, make_array(-2, -2));
+   // buffer operators:
+   TEST_REGEX_SEARCH("\\`abc", perl, "abc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\`abc", perl, "\nabc", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("\\`abc", perl, " abc", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("abc\\'", perl, "abc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("abc\\'", perl, "abc\n", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("abc\\'", perl, "abc ", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("abc(?:\\'|$)", perl, "abc", match_default, make_array(0, 3, -2, -2));
+
+   // word start:
+   TEST_REGEX_SEARCH("[[:<:]]abcd", perl, "  abcd", match_default, make_array(2, 6, -2, -2));
+   TEST_REGEX_SEARCH("[[:<:]]ab", perl, "cab", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("[[:<:]]ab", perl, "\nab", match_default, make_array(1, 3, -2, -2));
+   TEST_REGEX_SEARCH("[[:<:]]tag", perl, "::tag", match_default, make_array(2, 5, -2, -2));
+   // word end
+   TEST_REGEX_SEARCH("abc[[:>:]]", perl, "abc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("abc[[:>:]]", perl, "abcd", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("abc[[:>:]]", perl, "abc\n", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("abc[[:>:]]", perl, "abc::", match_default, make_array(0, 3, -2, -2));
+
+   TEST_REGEX_SEARCH("\\Aabc", perl, "abc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\Aabc", perl, "aabc", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("abc\\z", perl, "abc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("abc\\z", perl, "abcd", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("abc\\Z", perl, "abc\n\n", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("abc\\Z", perl, "abc\n\n", match_default|match_not_eob, make_array(-2, -2));
+   TEST_REGEX_SEARCH("abc\\Z", perl, "abc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\Gabc", perl, "abc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\Gabc", perl, "dabcd", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("a\\Gbc", perl, "abc", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("a\\Aab", perl, "abc", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("abc(?:\\Z|$)", perl, "abc\n\n", match_default, make_array(0, 3, -2, -2));
+}
+
diff --git a/test/regress/test_grep.cpp b/test/regress/test_grep.cpp
new file mode 100644
index 00000000..54dd62d7
--- /dev/null
+++ b/test/regress/test_grep.cpp
@@ -0,0 +1,54 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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)
+ *
+ */
+
+#include "test.hpp"
+
+#ifdef BOOST_MSVC
+#pragma warning(disable:4127)
+#endif
+
+void test_grep()
+{
+   //
+   // now test grep,
+   // basically check all our restart types - line, word, etc
+   // checking each one for null and non-null matches.
+   //
+   using namespace boost::regex_constants;
+   TEST_REGEX_SEARCH("a", perl|nosubs, " a a a aa", match_default, make_array(1, 2, -2, 3, 4, -2, 5, 6, -2, 7, 8, -2, 8, 9, -2, -2));
+   TEST_REGEX_SEARCH("a+b+", perl|nosubs, "aabaabbb ab", match_default, make_array(0, 3, -2, 3, 8, -2, 9, 11, -2, -2));
+   TEST_REGEX_SEARCH("a(b*|c|e)d", perl|nosubs, "adabbdacd", match_default, make_array(0, 2, -2, 2, 6, -2, 6, 9, -2, -2));
+   TEST_REGEX_SEARCH("a", perl|nosubs, "\na\na\na\naa", match_default, make_array(1, 2, -2, 3, 4, -2, 5, 6, -2, 7, 8, -2, 8, 9, -2, -2));
+   TEST_REGEX_SEARCH("^", perl|nosubs, "   \n\n  \n\n\n", match_default, make_array(0, 0, -2, 4, 4, -2, 5, 5, -2, 8, 8, -2, 9, 9, -2, 10, 10, -2, -2));
+   TEST_REGEX_SEARCH("^ab", perl|nosubs, "ab  \nab  ab\n", match_default, make_array(0, 2, -2, 5, 7, -2, -2));
+   TEST_REGEX_SEARCH("^[^\\n]*\n", perl|nosubs, "   \n  \n\n  \n", match_default, make_array(0, 4, -2, 4, 7, -2, 7, 8, -2, 8, 11, -2, -2));
+   TEST_REGEX_SEARCH("\\<abc", perl|nosubs, "abcabc abc\n\nabc", match_default, make_array(0, 3, -2, 7, 10, -2, 12, 15, -2, -2));
+   TEST_REGEX_SEARCH("\\<", perl|nosubs, "  ab a aaa  ", match_default, make_array(2, 2, -2, 5, 5, -2, 7, 7, -2, -2));
+   TEST_REGEX_SEARCH("\\<\\w+\\W+", perl|nosubs, " aa  aa  a ", match_default, make_array(1, 5, -2, 5, 9, -2, 9, 11, -2, -2));
+
+   TEST_REGEX_SEARCH("\\Aabc", perl|nosubs, "abc   abc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\G\\w+\\W+", perl|nosubs, "abc  abc a cbbb   ", match_default, make_array(0, 5, -2, 5, 9, -2, 9, 11, -2, 11, 18, -2, -2));
+   TEST_REGEX_SEARCH("\\Ga+b+", perl|nosubs, "aaababb  abb", match_default, make_array(0, 4, -2, 4, 7, -2, -2));
+   TEST_REGEX_SEARCH("abc", perl|nosubs, "abc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("abc", perl|nosubs, " abc abcabc", match_default, make_array(1, 4, -2, 5, 8, -2, 8, 11, -2, -2));
+   TEST_REGEX_SEARCH("\\n\\n", perl|nosubs, " \n\n\n       \n      \n\n\n\n  ", match_default, make_array(1, 3, -2, 18, 20, -2, 20, 22, -2, -2));
+   TEST_REGEX_SEARCH("$", perl|nosubs, "   \n\n  \n\n\n", match_default, make_array(3, 3, -2, 4, 4, -2, 7, 7, -2, 8, 8, -2, 9, 9, -2, 10, 10, -2, -2));
+   TEST_REGEX_SEARCH("\\b", perl|nosubs, "  abb a abbb ", match_default, make_array(2, 2, -2, 5, 5, -2, 6, 6, -2, 7, 7, -2, 8, 8, -2, 12, 12, -2, -2));
+   TEST_REGEX_SEARCH("A", perl|icase|nosubs, " a a a aa", match_default, make_array(1, 2, -2, 3, 4, -2, 5, 6, -2, 7, 8, -2, 8, 9, -2, -2));
+   TEST_REGEX_SEARCH("A+B+", perl|icase|nosubs, "aabaabbb ab", match_default, make_array(0, 3, -2, 3, 8, -2, 9, 11, -2, -2));
+   TEST_REGEX_SEARCH("A(B*|c|e)D", perl|icase|nosubs, "adabbdacd", match_default, make_array(0, 2, -2, 2, 6, -2, 6, 9, -2, -2));
+   TEST_REGEX_SEARCH("A", perl|icase|nosubs, "\na\na\na\naa", match_default, make_array(1, 2, -2, 3, 4, -2, 5, 6, -2, 7, 8, -2, 8, 9, -2, -2));
+   TEST_REGEX_SEARCH("^aB", perl|icase|nosubs, "Ab  \nab  Ab\n", match_default, make_array(0, 2, -2, 5, 7, -2, -2));
+   TEST_REGEX_SEARCH("\\<abc", perl|icase|nosubs, "Abcabc aBc\n\nabc", match_default, make_array(0, 3, -2, 7, 10, -2, 12, 15, -2, -2));
+   TEST_REGEX_SEARCH("ABC", perl|icase|nosubs, "abc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("abc", perl|icase|nosubs, " ABC ABCABC ", match_default, make_array(1, 4, -2, 5, 8, -2, 8, 11, -2, -2));
+}
+
diff --git a/test/regress/test_icu.cpp b/test/regress/test_icu.cpp
new file mode 100644
index 00000000..b6bae60b
--- /dev/null
+++ b/test/regress/test_icu.cpp
@@ -0,0 +1,513 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         test_icu.cpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Test code for Unicode regexes with ICU support.
+  */
+
+//
+// We can only build this if we have ICU support:
+//
+#include <boost/regex/config.hpp>
+#if defined(BOOST_HAS_ICU) && !defined(BOOST_NO_STD_WSTRING)
+
+#include <boost/regex/icu.hpp>
+#include "test.hpp"
+
+//
+// compare two match_results struct's for equality,
+// converting the iterator as needed:
+//
+template <class MR1, class MR2>
+void compare_result(const MR1& w1, const MR2& w2, boost::mpl::int_<2> const*)
+{
+   typedef boost::u16_to_u32_iterator<typename MR2::value_type::const_iterator> iterator_type;
+   typedef typename MR1::size_type size_type;
+   if(w1.size() != w2.size())
+   {
+      BOOST_REGEX_TEST_ERROR("Size mismatch in match_results class", UChar32);
+   }
+   for(int i = 0; i < (int)w1.size(); ++i)
+   {
+      if(w1[i].matched)
+      {
+         if(w2[i].matched == 0)
+         {
+            BOOST_REGEX_TEST_ERROR("Matched mismatch in match_results class", UChar32);
+         }
+         if((w1.position(i) != std::distance(iterator_type(w2.prefix().first), iterator_type(w2[i].first))) || (w1.length(i) != std::distance(iterator_type(w2[i].first), iterator_type(w2[i].second))))
+         {
+            BOOST_REGEX_TEST_ERROR("Iterator mismatch in match_results class", UChar32);
+         }
+      }
+      else if(w2[i].matched)
+      {
+         BOOST_REGEX_TEST_ERROR("Matched mismatch in match_results class", UChar32);
+      }
+   }
+}
+template <class MR1, class MR2>
+void compare_result(const MR1& w1, const MR2& w2, boost::mpl::int_<1> const*)
+{
+   typedef boost::u8_to_u32_iterator<typename MR2::value_type::const_iterator> iterator_type;
+   typedef typename MR1::size_type size_type;
+   if(w1.size() != w2.size())
+   {
+      BOOST_REGEX_TEST_ERROR("Size mismatch in match_results class", UChar32);
+   }
+   for(int i = 0; i < (int)w1.size(); ++i)
+   {
+      if(w1[i].matched)
+      {
+         if(w2[i].matched == 0)
+         {
+            BOOST_REGEX_TEST_ERROR("Matched mismatch in match_results class", UChar32);
+         }
+         if((w1.position(i) != std::distance(iterator_type(w2.prefix().first), iterator_type(w2[i].first))) || (w1.length(i) != std::distance(iterator_type(w2[i].first), iterator_type(w2[i].second))))
+         {
+            BOOST_REGEX_TEST_ERROR("Iterator mismatch in match_results class", UChar32);
+         }
+      }
+      else if(w2[i].matched)
+      {
+         BOOST_REGEX_TEST_ERROR("Matched mismatch in match_results class", UChar32);
+      }
+   }
+}
+
+void test_icu_grep(const boost::u32regex& r, const std::vector< ::UChar32>& search_text)
+{
+   typedef std::vector< ::UChar32>::const_iterator const_iterator;
+   typedef boost::u32regex_iterator<const_iterator> test_iterator;
+   boost::regex_constants::match_flag_type opts = test_info<wchar_t>::match_options();
+   const int* answer_table = test_info<wchar_t>::answer_table();
+   test_iterator start(search_text.begin(), search_text.end(), r, opts), end;
+   test_iterator copy(start);
+   const_iterator last_end = search_text.begin();
+   while(start != end)
+   {
+      if(start != copy)
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator != comparison.", wchar_t);
+      }
+      if(!(start == copy))
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator == comparison.", wchar_t);
+      }
+      test_result(*start, search_text.begin(), answer_table);
+      // test $` and $' :
+      if(start->prefix().first != last_end)
+      {
+         BOOST_REGEX_TEST_ERROR("Incorrect position for start of $`", wchar_t);
+      }
+      if(start->prefix().second != (*start)[0].first)
+      {
+         BOOST_REGEX_TEST_ERROR("Incorrect position for end of $`", wchar_t);
+      }
+      if(start->prefix().matched != (start->prefix().first != start->prefix().second))
+      {
+         BOOST_REGEX_TEST_ERROR("Incorrect position for matched member of $`", wchar_t);
+      }
+      if(start->suffix().first != (*start)[0].second)
+      {
+         BOOST_REGEX_TEST_ERROR("Incorrect position for start of $'", wchar_t);
+      }
+      if(start->suffix().second != search_text.end())
+      {
+         BOOST_REGEX_TEST_ERROR("Incorrect position for end of $'", wchar_t);
+      }
+      if(start->suffix().matched != (start->suffix().first != start->suffix().second))
+      {
+         BOOST_REGEX_TEST_ERROR("Incorrect position for matched member of $'", wchar_t);
+      }
+      last_end = (*start)[0].second;
+      ++start;
+      ++copy;
+      // move on the answer table to next set of answers;
+      if(*answer_table != -2)
+         while(*answer_table++ != -2){}
+   }
+   if(answer_table[0] >= 0)
+   {
+      // we should have had a match but didn't:
+      BOOST_REGEX_TEST_ERROR("Expected match was not found.", wchar_t);
+   }
+}
+
+void test_icu(const wchar_t&, const test_regex_search_tag& )
+{
+   boost::u32regex r;
+   if(*test_locale::c_str())
+   {
+      ::Locale l(test_locale::c_str());
+      if(l.isBogus())
+         return;
+      r.imbue(l);
+   }
+
+   std::vector< ::UChar32> expression;
+   expression.assign(test_info<wchar_t>::expression().begin(), test_info<wchar_t>::expression().end());
+   boost::regex_constants::syntax_option_type syntax_options = test_info<UChar32>::syntax_options();
+   try{
+      r.assign(expression.begin(), expression.end(), syntax_options);
+      if(r.status())
+      {
+         BOOST_REGEX_TEST_ERROR("Expression did not compile when it should have done, error code = " << r.status(), UChar32);
+      }
+      std::vector< ::UChar32> search_text;
+      search_text.assign(test_info<wchar_t>::search_text().begin(), test_info<wchar_t>::search_text().end());
+      boost::regex_constants::match_flag_type opts = test_info<wchar_t>::match_options();
+      const int* answer_table = test_info<wchar_t>::answer_table();
+      boost::match_results<std::vector< ::UChar32>::const_iterator> what;
+      if(boost::u32regex_search(
+         const_cast<std::vector< ::UChar32>const&>(search_text).begin(),
+         const_cast<std::vector< ::UChar32>const&>(search_text).end(),
+         what,
+         r,
+         opts))
+      {
+         test_result(what, const_cast<std::vector< ::UChar32>const&>(search_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.", UChar32);
+      }
+
+      if(0 == *test_locale::c_str())
+      {
+         //
+         // Now try UTF-16 construction:
+         //
+         typedef boost::u32_to_u16_iterator<std::vector<UChar32>::const_iterator> u16_conv;
+         std::vector<UChar> expression16, text16;
+         boost::match_results<std::vector<UChar>::const_iterator> what16;
+         boost::match_results<const UChar*> what16c;
+         expression16.assign(u16_conv(expression.begin()), u16_conv(expression.end()));
+         text16.assign(u16_conv(search_text.begin()), u16_conv(search_text.end()));
+         r = boost::make_u32regex(expression16.begin(), expression16.end(), syntax_options);
+         if(boost::u32regex_search(const_cast<const std::vector<UChar>&>(text16).begin(), const_cast<const std::vector<UChar>&>(text16).end(), what16, r, opts))
+         {
+            compare_result(what, what16, static_cast<boost::mpl::int_<2> const*>(0));
+         }
+         else if(answer_table[0] >= 0)
+         {
+            // we should have had a match but didn't:
+            BOOST_REGEX_TEST_ERROR("Expected match was not found.", UChar32);
+         }
+         if(std::find(expression16.begin(), expression16.end(), 0) == expression16.end())
+         {
+            expression16.push_back(0);
+            r = boost::make_u32regex(&*expression16.begin(), syntax_options);
+            if(std::find(text16.begin(), text16.end(), 0) == text16.end())
+            {
+               text16.push_back(0);
+               if(boost::u32regex_search((const UChar*)&*text16.begin(), what16c, r, opts))
+               {
+                  compare_result(what, what16c, static_cast<boost::mpl::int_<2> const*>(0));
+               }
+               else if(answer_table[0] >= 0)
+               {
+                  // we should have had a match but didn't:
+                  BOOST_REGEX_TEST_ERROR("Expected match was not found.", UChar32);
+               }
+            }
+         }
+         //
+         // Now try UTF-8 construction:
+         //
+         typedef boost::u32_to_u8_iterator<std::vector<UChar32>::const_iterator, unsigned char> u8_conv;
+         std::vector<unsigned char> expression8, text8;
+         boost::match_results<std::vector<unsigned char>::const_iterator> what8;
+         boost::match_results<const unsigned char*> what8c;
+         expression8.assign(u8_conv(expression.begin()), u8_conv(expression.end()));
+         text8.assign(u8_conv(search_text.begin()), u8_conv(search_text.end()));
+         r = boost::make_u32regex(expression8.begin(), expression8.end(), syntax_options);
+         if(boost::u32regex_search(const_cast<const std::vector<unsigned char>&>(text8).begin(), const_cast<const std::vector<unsigned char>&>(text8).end(), what8, r, opts))
+         {
+            compare_result(what, what8, static_cast<boost::mpl::int_<1> const*>(0));
+         }
+         else if(answer_table[0] >= 0)
+         {
+            // we should have had a match but didn't:
+            BOOST_REGEX_TEST_ERROR("Expected match was not found.", UChar32);
+         }
+         if(std::find(expression8.begin(), expression8.end(), 0) == expression8.end())
+         {
+            expression8.push_back(0);
+            r = boost::make_u32regex(&*expression8.begin(), syntax_options);
+            if(std::find(text8.begin(), text8.end(), 0) == text8.end())
+            {
+               text8.push_back(0);
+               if(boost::u32regex_search((const unsigned char*)&*text8.begin(), what8c, r, opts))
+               {
+                  compare_result(what, what8c, static_cast<boost::mpl::int_<1> const*>(0));
+               }
+               else if(answer_table[0] >= 0)
+               {
+                  // we should have had a match but didn't:
+                  BOOST_REGEX_TEST_ERROR("Expected match was not found.", UChar32);
+               }
+            }
+         }
+      }
+      //
+      // finally try a grep:
+      //
+      test_icu_grep(r, search_text);
+   }
+   catch(const boost::bad_expression& e)
+   {
+      BOOST_REGEX_TEST_ERROR("Expression did not compile when it should have done: " << e.what(), UChar32);
+   }
+   catch(const std::runtime_error& r)
+   {
+      BOOST_REGEX_TEST_ERROR("Received an unexpected std::runtime_error: " << r.what(), UChar32);
+   }
+   catch(const std::exception& r)
+   {
+      BOOST_REGEX_TEST_ERROR("Received an unexpected std::exception: " << r.what(), UChar32);
+   }
+   catch(...)
+   {
+      BOOST_REGEX_TEST_ERROR("Received an unexpected exception of unknown type", UChar32);
+   }
+}
+
+void test_icu(const wchar_t&, const test_invalid_regex_tag&)
+{
+   typedef boost::u16_to_u32_iterator<std::wstring::const_iterator, ::UChar32> conv_iterator;
+   std::vector< ::UChar32> expression;
+   expression.assign(test_info<wchar_t>::expression().begin(), test_info<wchar_t>::expression().end());
+   boost::regex_constants::syntax_option_type syntax_options = test_info<wchar_t>::syntax_options();
+   boost::u32regex r;
+   if(*test_locale::c_str())
+   {
+      ::Locale l(test_locale::c_str());
+      if(l.isBogus())
+         return;
+      r.imbue(l);
+   }
+   //
+   // try it with exceptions disabled first:
+   //
+   try
+   {
+      if(0 == r.assign(expression.begin(), expression.end(), syntax_options | boost::regex_constants::no_except).status())
+      {
+         BOOST_REGEX_TEST_ERROR("Expression compiled when it should not have done so.", wchar_t);
+      }
+   }
+   catch(...)
+   {
+      BOOST_REGEX_TEST_ERROR("Unexpected exception thrown.", wchar_t);
+   }
+   //
+   // now try again with exceptions:
+   //
+   bool have_catch = false;
+   try{
+      r.assign(expression.begin(), expression.end(), syntax_options);
+#ifdef BOOST_NO_EXCEPTIONS
+      if(r.status())
+         have_catch = true;
+#endif
+   }
+   catch(const boost::bad_expression&)
+   {
+      have_catch = true;
+   }
+   catch(const std::runtime_error& r)
+   {
+      have_catch = true;
+      BOOST_REGEX_TEST_ERROR("Expected a bad_expression exception, but a std::runtime_error instead: " << r.what(), wchar_t);
+   }
+   catch(const std::exception& r)
+   {
+      have_catch = true;
+      BOOST_REGEX_TEST_ERROR("Expected a bad_expression exception, but a std::exception instead: " << r.what(), wchar_t);
+   }
+   catch(...)
+   {
+      have_catch = true;
+      BOOST_REGEX_TEST_ERROR("Expected a bad_expression exception, but got an exception of unknown type instead", wchar_t);
+   }
+   if(!have_catch)
+   {
+      // oops expected exception was not thrown:
+      BOOST_REGEX_TEST_ERROR("Expected an exception, but didn't find one.", wchar_t);
+   }
+
+   if(0 == *test_locale::c_str())
+   {
+      //
+      // Now try UTF-16 construction:
+      //
+      typedef boost::u32_to_u16_iterator<std::vector<UChar32>::const_iterator> u16_conv;
+      std::vector<UChar> expression16;
+      expression16.assign(u16_conv(expression.begin()), u16_conv(expression.end()));
+      if(0 == boost::make_u32regex(expression16.begin(), expression16.end(), syntax_options | boost::regex_constants::no_except).status())
+      {
+         BOOST_REGEX_TEST_ERROR("Expression compiled when it should not have done so.", wchar_t);
+      }
+      if(std::find(expression16.begin(), expression16.end(), 0) == expression16.end())
+      {
+         expression16.push_back(0);
+         if(0 == boost::make_u32regex(&*expression16.begin(), syntax_options | boost::regex_constants::no_except).status())
+         {
+            BOOST_REGEX_TEST_ERROR("Expression compiled when it should not have done so.", wchar_t);
+         }
+      }
+      //
+      // Now try UTF-8 construction:
+      //
+      typedef boost::u32_to_u8_iterator<std::vector<UChar32>::const_iterator> u8_conv;
+      std::vector<unsigned char> expression8;
+      expression8.assign(u8_conv(expression.begin()), u8_conv(expression.end()));
+      if(0 == boost::make_u32regex(expression8.begin(), expression8.end(), syntax_options | boost::regex_constants::no_except).status())
+      {
+         BOOST_REGEX_TEST_ERROR("Expression compiled when it should not have done so.", wchar_t);
+      }
+      if(std::find(expression8.begin(), expression8.end(), 0) == expression8.end())
+      {
+         expression8.push_back(0);
+         if(0 == boost::make_u32regex(&*expression8.begin(), syntax_options | boost::regex_constants::no_except).status())
+         {
+            BOOST_REGEX_TEST_ERROR("Expression compiled when it should not have done so.", wchar_t);
+         }
+      }
+   }
+}
+
+void test_icu(const wchar_t&, const test_regex_replace_tag&)
+{
+   std::vector< ::UChar32> expression;
+   expression.assign(test_info<wchar_t>::expression().begin(), test_info<wchar_t>::expression().end());
+   boost::regex_constants::syntax_option_type syntax_options = test_info<UChar32>::syntax_options();
+   boost::u32regex r;
+   try{
+      r.assign(expression.begin(), expression.end(), syntax_options);
+      if(r.status())
+      {
+         BOOST_REGEX_TEST_ERROR("Expression did not compile when it should have done, error code = " << r.status(), UChar32);
+      }
+      typedef std::vector<UChar32> string_type;
+      string_type search_text;
+      search_text.assign(test_info<UChar32>::search_text().begin(), test_info<UChar32>::search_text().end());
+      boost::regex_constants::match_flag_type opts = test_info<UChar32>::match_options();
+      string_type format_string;
+      format_string.assign(test_info<UChar32>::format_string().begin(), test_info<UChar32>::format_string().end());
+      format_string.push_back(0);
+      string_type result_string;
+      result_string.assign(test_info<UChar32>::result_string().begin(), test_info<UChar32>::result_string().end());
+      string_type result;
+
+      boost::u32regex_replace(std::back_inserter(result), search_text.begin(), search_text.end(), r, &*format_string.begin(), opts);
+      if(result != result_string)
+      {
+         BOOST_REGEX_TEST_ERROR("regex_replace generated an incorrect string result", UChar32);
+      }
+      //
+      // Mixed mode character encoding:
+      //
+      if(0 == *test_locale::c_str())
+      {
+         //
+         // Now try UTF-16 construction:
+         //
+         typedef boost::u32_to_u16_iterator<std::vector<UChar32>::const_iterator> u16_conv;
+         std::vector<UChar> expression16, text16, format16, result16, found16;
+         expression16.assign(u16_conv(expression.begin()), u16_conv(expression.end()));
+         text16.assign(u16_conv(search_text.begin()), u16_conv(search_text.end()));
+         format16.assign(u16_conv(format_string.begin()), u16_conv(format_string.end()));
+         result16.assign(u16_conv(result_string.begin()), u16_conv(result_string.end()));
+         r = boost::make_u32regex(expression16.begin(), expression16.end(), syntax_options);
+         boost::u32regex_replace(std::back_inserter(found16), text16.begin(), text16.end(), r, &*format16.begin(), opts);
+         if(result16 != found16)
+         {
+            BOOST_REGEX_TEST_ERROR("u32regex_replace with UTF-16 string returned incorrect result", UChar32);
+         }
+         //
+         // Now with UnicodeString:
+         //
+         UnicodeString expression16u, text16u, format16u, result16u, found16u;
+         expression16u.setTo(&*expression16.begin(), expression16.size());
+         text16u.setTo(&*text16.begin(), text16.size());
+         format16u.setTo(&*format16.begin(), format16.size()-1);
+         result16u.setTo(&*result16.begin(), result16.size());
+         r = boost::make_u32regex(expression16.begin(), expression16.end(), syntax_options);
+         found16u = boost::u32regex_replace(text16u, r, format16u, opts);
+         if(result16u != found16u)
+         {
+            BOOST_REGEX_TEST_ERROR("u32regex_replace with UTF-16 string returned incorrect result", UChar32);
+         }
+
+         //
+         // Now try UTF-8 construction:
+         //
+         typedef boost::u32_to_u8_iterator<std::vector<UChar32>::const_iterator, unsigned char> u8_conv;
+         std::vector<char> expression8, text8, format8, result8, found8;
+         expression8.assign(u8_conv(expression.begin()), u8_conv(expression.end()));
+         text8.assign(u8_conv(search_text.begin()), u8_conv(search_text.end()));
+         format8.assign(u8_conv(format_string.begin()), u8_conv(format_string.end()));
+         result8.assign(u8_conv(result_string.begin()), u8_conv(result_string.end()));
+         r = boost::make_u32regex(expression8.begin(), expression8.end(), syntax_options);
+         boost::u32regex_replace(std::back_inserter(found8), text8.begin(), text8.end(), r, &*format8.begin(), opts);
+         if(result8 != found8)
+         {
+            BOOST_REGEX_TEST_ERROR("u32regex_replace with UTF-8 string returned incorrect result", UChar32);
+         }
+         //
+         // Now with std::string and UTF-8:
+         //
+         std::string expression8s, text8s, format8s, result8s, found8s;
+         expression8s.assign(&*expression8.begin(), expression8.size());
+         text8s.assign(&*text8.begin(), text8.size());
+         format8s.assign(&*format8.begin(), format8.size()-1);
+         result8s.assign(&*result8.begin(), result8.size());
+         r = boost::make_u32regex(expression8.begin(), expression8.end(), syntax_options);
+         found8s = boost::u32regex_replace(text8s, r, format8s, opts);
+         if(result8s != found8s)
+         {
+            BOOST_REGEX_TEST_ERROR("u32regex_replace with UTF-8 string returned incorrect result", UChar32);
+         }
+      }
+   }
+   catch(const boost::bad_expression& e)
+   {
+      BOOST_REGEX_TEST_ERROR("Expression did not compile when it should have done: " << e.what(), UChar32);
+   }
+   catch(const std::runtime_error& r)
+   {
+      BOOST_REGEX_TEST_ERROR("Received an unexpected std::runtime_error: " << r.what(), UChar32);
+   }
+   catch(const std::exception& r)
+   {
+      BOOST_REGEX_TEST_ERROR("Received an unexpected std::exception: " << r.what(), UChar32);
+   }
+   catch(...)
+   {
+      BOOST_REGEX_TEST_ERROR("Received an unexpected exception of unknown type", UChar32);
+   }
+}
+
+#else
+
+#include "test.hpp"
+
+void test_icu(const wchar_t&, const test_regex_search_tag&){}
+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_icu.hpp b/test/regress/test_icu.hpp
new file mode 100644
index 00000000..4e7f1491
--- /dev/null
+++ b/test/regress/test_icu.hpp
@@ -0,0 +1,33 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         test_icu.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: MFC/ATL test handlers.
+  */
+
+#ifndef TEST_ICU_HPP
+#define TEST_ICU_HPP
+
+template <class charT, class Tag>
+void test_icu(const charT&, const Tag&)
+{
+   // do nothing
+}
+
+void test_icu(const wchar_t&, const test_regex_search_tag&);
+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
new file mode 100644
index 00000000..43bb1680
--- /dev/null
+++ b/test/regress/test_locale.cpp
@@ -0,0 +1,161 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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)
+ *
+ */
+
+#include "test.hpp"
+#include <clocale>
+#if defined(BOOST_WINDOWS) && !defined(BOOST_DISABLE_WIN32)
+#include <boost/scoped_array.hpp>
+#include <windows.h>
+#endif
+
+#ifdef BOOST_MSVC
+#pragma warning(disable:4127)
+#endif
+
+#ifdef BOOST_NO_STDC_NAMESPACE
+namespace std{ using ::setlocale; }
+#endif
+
+test_locale::test_locale(const char* c_name, boost::uint32_t lcid)
+{
+   // store the name:
+   m_old_name = m_name;
+   m_name = c_name;
+   // back up C locale and then set it's new name:
+   const char* pl = std::setlocale(LC_ALL, 0);
+   m_old_c_locale = pl ? pl : "";
+   m_old_c_state = s_c_locale;
+   if(std::setlocale(LC_ALL, c_name))
+   {
+      s_c_locale = test_with_locale;
+      std::cout << "Testing the global C locale: " << c_name << std::endl;
+   }
+   else
+   {
+      s_c_locale = no_test;
+      std::cout << "The global C locale: " << c_name << " is not available and will not be tested." << std::endl;
+   }
+#ifndef BOOST_NO_STD_LOCALE
+   // back up the C++ locale and create the new one:
+   m_old_cpp_locale = s_cpp_locale_inst;
+   m_old_cpp_state = s_cpp_locale;
+   try{
+      s_cpp_locale_inst = std::locale(c_name);
+      s_cpp_locale = test_with_locale;
+      std::cout << "Testing the C++ locale: " << c_name << std::endl;
+   }catch(std::runtime_error const &)
+   {
+      s_cpp_locale = no_test;
+      std::cout << "The C++ locale: " << c_name << " is not available and will not be tested." << std::endl;
+   }
+#else
+   s_cpp_locale = no_test;
+#endif
+
+   // back up win locale and create the new one:
+   m_old_win_locale = s_win_locale_inst;
+   m_old_win_state = s_win_locale;
+   s_win_locale_inst = lcid;
+#if defined(BOOST_WINDOWS) && !defined(BOOST_DISABLE_WIN32)
+   //
+   // Start by geting the printable name of the locale.
+   // We use this for debugging purposes only:
+   //
+   boost::scoped_array<char> p;
+   int r = ::GetLocaleInfoA(
+               lcid,               // locale identifier
+               LOCALE_SCOUNTRY,    // information type
+               0,                  // information buffer
+               0                   // size of buffer
+            );
+   p.reset(new char[r+1]);
+   r = ::GetLocaleInfoA(
+               lcid,               // locale identifier
+               LOCALE_SCOUNTRY,    // information type
+               p.get(),            // information buffer
+               r+1                 // size of buffer
+            );
+   //
+   // now see if locale is installed and behave accordingly:
+   //
+   if(::IsValidLocale(lcid, LCID_INSTALLED))
+   {
+      s_win_locale = test_with_locale;
+      std::cout << "Testing the Win32 locale: \"" << p.get() << "\" (0x" << std::hex << lcid << ")" << std::endl;
+   }
+   else
+   {
+      s_win_locale = no_test;
+      std::cout << "The Win32 locale: \"" << p.get() << "\" (0x" << std::hex << lcid << ") is not available and will not be tested." << std::endl;
+   }
+#else
+   s_win_locale = no_test;
+#endif
+}
+
+test_locale::~test_locale()
+{
+   // restore to previous state:
+   std::setlocale(LC_ALL, m_old_c_locale.c_str());
+   s_c_locale = m_old_c_state;
+#ifndef BOOST_NO_STD_LOCALE
+   s_cpp_locale_inst = m_old_cpp_locale;
+#endif
+   s_cpp_locale = m_old_cpp_state;
+   s_win_locale_inst = m_old_win_locale;
+   s_win_locale = m_old_win_state;
+   m_name = m_old_name;
+}
+
+int test_locale::s_c_locale = test_no_locale;
+int test_locale::s_cpp_locale = test_no_locale;
+int test_locale::s_win_locale = test_no_locale;
+#ifndef BOOST_NO_STD_LOCALE
+std::locale test_locale::s_cpp_locale_inst;
+#endif
+boost::uint32_t test_locale::s_win_locale_inst = 0;
+std::string test_locale::m_name;
+
+
+void test_en_locale(const char* name, boost::uint32_t lcid)
+{
+   using namespace boost::regex_constants;
+   errors_as_warnings w;
+   test_locale l(name, lcid);
+   TEST_REGEX_SEARCH_L("[[:lower:]]+", perl, "\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xf7", match_default, make_array(1, 32, -2, -2));
+   TEST_REGEX_SEARCH_L("[[:upper:]]+", perl, "\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf", match_default, make_array(1, 31, -2, -2));
+//   TEST_REGEX_SEARCH_L("[[:punct:]]+", perl, "\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0", match_default, make_array(0, 31, -2, -2));
+   TEST_REGEX_SEARCH_L("[[:print:]]+", perl, "\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe", match_default, make_array(0, 93, -2, -2));
+   TEST_REGEX_SEARCH_L("[[:graph:]]+", perl, "\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe", match_default, make_array(0, 93, -2, -2));
+   TEST_REGEX_SEARCH_L("[[:word:]]+", perl, "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf8\xf9\xfa\xfb\xfc\xfd\xfe", match_default, make_array(0, 61, -2, -2));
+   // collation sensitive ranges:
+#if !BOOST_WORKAROUND(__BORLANDC__, < 0x600)
+   // these tests are disabled for Borland C++: a bug in std::collate<wchar_t>
+   // causes these tests to crash (pointer overrun in std::collate<wchar_t>::do_transform).
+   TEST_REGEX_SEARCH_L("[a-z]+", perl|collate, "\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf8\xf9\xfa\xfb\xfc", match_default, make_array(0, 28, -2, -2));
+   TEST_REGEX_SEARCH_L("[a-z]+", perl|collate, "\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd8\xd9\xda\xdb\xdc", match_default, make_array(1, 28, -2, -2));
+   // and equivalence classes:
+   TEST_REGEX_SEARCH_L("[[=a=]]+", perl, "aA\xe0\xe1\xe2\xe3\xe4\xe5\xc0\xc1\xc2\xc3\xc4\xc5", match_default, make_array(0, 14, -2, -2));
+   // case mapping:
+   TEST_REGEX_SEARCH_L("[A-Z]+", perl|icase|collate, "\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf8\xf9\xfa\xfb\xfc", match_default, make_array(0, 28, -2, -2));
+   TEST_REGEX_SEARCH_L("[a-z]+", perl|icase|collate, "\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd8\xd9\xda\xdb\xdc", match_default, make_array(1, 28, -2, -2));
+   TEST_REGEX_SEARCH_L("\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd8\xd9\xda\xdb\xdc\xdd", perl|icase, "\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf8\xf9\xfa\xfb\xfc\xfd\xfe", match_default, make_array(1, 30, -2, -2));
+#endif
+}
+
+void test_en_locale()
+{
+   test_en_locale("en_US", 0x09 | 0x01 << 10);
+   test_en_locale("en_UK", 0x09 | 0x02 << 10);
+   test_en_locale("en", 0x09);
+}
+
+
diff --git a/test/regress/test_locale.hpp b/test/regress/test_locale.hpp
new file mode 100644
index 00000000..3070643c
--- /dev/null
+++ b/test/regress/test_locale.hpp
@@ -0,0 +1,90 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         test_locale.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Helper classes for testing locale-specific expressions.
+  */
+
+
+#ifndef BOOST_REGEX_REGRESS_TEST_LOCALE_HPP
+#define BOOST_REGEX_REGRESS_TEST_LOCALE_HPP
+//
+// defines class test_locale that handles the locale used for testing:
+//
+class test_locale
+{
+public:
+   enum{
+      no_test,
+      test_no_locale,
+      test_with_locale
+   };
+
+   test_locale(const char* c_name, boost::uint32_t lcid);
+   ~test_locale();
+
+   static int c_locale_state()
+   {
+      return s_c_locale;
+   }
+   static int cpp_locale_state()
+   {
+      return s_cpp_locale;
+   }
+   static int win_locale_state()
+   {
+      return s_win_locale;
+   }
+   static const char* c_str()
+   {
+      return m_name.c_str();
+   }
+#ifndef BOOST_NO_STD_LOCALE
+   static std::locale cpp_locale()
+   {
+      return s_cpp_locale_inst;
+   }
+#endif
+   static boost::uint32_t win_locale()
+   {
+      return s_win_locale_inst;
+   }
+
+private:
+   // the actions to take for each locale type:
+   static int s_c_locale;
+   static int s_cpp_locale;
+   static int s_win_locale;
+   // current locales:
+#ifndef BOOST_NO_STD_LOCALE
+   static std::locale s_cpp_locale_inst;
+#endif
+   static boost::uint32_t s_win_locale_inst;
+   static std::string m_name;
+
+   // backed up versions of the previous locales and their action state:
+   std::string     m_old_c_locale;
+   std::string     m_old_name;
+   int             m_old_c_state;
+#ifndef BOOST_NO_STD_LOCALE
+   std::locale     m_old_cpp_locale;
+#endif
+   int             m_old_cpp_state;
+   boost::uint32_t m_old_win_locale;
+   int             m_old_win_state;
+
+};
+
+#endif
+
diff --git a/test/regress/test_mfc.cpp b/test/regress/test_mfc.cpp
new file mode 100644
index 00000000..a9c3a7bb
--- /dev/null
+++ b/test/regress/test_mfc.cpp
@@ -0,0 +1,551 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         test_mfc.cpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Test code for MFC/ATL strings with Boost.Regex.
+  */
+
+//
+// We can only build this if we have ATL support:
+//
+#include <boost/config.hpp>
+
+#ifdef TEST_MFC
+
+#include <boost/regex/mfc.hpp>
+#include "test.hpp"
+#include "atlstr.h"
+
+#pragma warning(disable:4267)
+
+void test_mfc(const char&, const test_regex_search_tag&)
+{
+   const std::string& ss = test_info<char>::search_text();
+   const std::string& ss2 = test_info<char>::expression();
+   CAtlStringA s(ss.c_str(), ss.size());
+   CAtlStringA s2(ss2.c_str(), ss2.size());
+   boost::regex_constants::match_flag_type opts = test_info<char>::match_options();
+   const int* answer_table = test_info<char>::answer_table();
+   boost::regex r = boost::make_regex(s2, test_info<char>::syntax_options());
+   boost::cmatch what;
+   if(boost::regex_search(
+      s,
+      what,
+      r,
+      opts))
+   {
+      test_result(what, s.GetString(), 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.", char);
+   }
+   //
+   // regex_match tests:
+   //
+   if(answer_table[0] < 0)
+   {
+      if(boost::regex_match(s, r, opts))
+      {
+         BOOST_REGEX_TEST_ERROR("boost::regex_match found a match when it should not have done so.", char);
+      }
+   }
+   else
+   {
+      if((answer_table[0] > 0) && boost::regex_match(s, r, opts))
+      {
+         BOOST_REGEX_TEST_ERROR("boost::regex_match found a match when it should not have done so.", char);
+      }
+      else if((answer_table[0] == 0) && (answer_table[1] == static_cast<int>(ss.size())))
+      {
+         if(boost::regex_match(
+            s,
+            what,
+            r,
+            opts))
+         {
+            test_result(what, s.GetString(), answer_table);
+            if(!boost::regex_match(s, r, opts))
+            {
+               // we should have had a match but didn't:
+               BOOST_REGEX_TEST_ERROR("Expected match was not found.", char);
+            }
+         }
+         else if(answer_table[0] >= 0)
+         {
+            // we should have had a match but didn't:
+            BOOST_REGEX_TEST_ERROR("Expected match was not found.", char);
+         }
+      }
+   }
+   //
+   // test regex_iterator:
+   //
+   boost::cregex_iterator start(boost::make_regex_iterator(s, r, opts)), end;
+   boost::cregex_iterator copy(start);
+   while(start != end)
+   {
+      if(start != copy)
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator != comparison.", char);
+      }
+      if(!(start == copy))
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator == comparison.", char);
+      }
+      test_result(*start, s.GetString(), answer_table);
+      ++start;
+      ++copy;
+      // move on the answer table to next set of answers;
+      if(*answer_table != -2)
+         while(*answer_table++ != -2){}
+   }
+   if(answer_table[0] >= 0)
+   {
+      // we should have had a match but didn't:
+      BOOST_REGEX_TEST_ERROR("Expected match was not found.", char);
+   }
+   //
+   // test regex_token_iterator:
+   //
+   typedef boost::regex_token_iterator<const char*> token_iterator;
+   answer_table = test_info<char>::answer_table();
+   //
+   // we start by testing sub-expression 0:
+   //
+   token_iterator tstart(boost::make_regex_token_iterator(s, r, 0, opts)), tend;
+   token_iterator tcopy(tstart);
+   while(tstart != tend)
+   {
+      if(tstart != tcopy)
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator != comparison.", char);
+      }
+      if(!(tstart == tcopy))
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator == comparison.", char);
+      }
+      test_sub_match(*tstart, s.GetString(), answer_table, 0);
+      ++tstart;
+      ++tcopy;
+      // move on the answer table to next set of answers;
+      if(*answer_table != -2)
+         while(*answer_table++ != -2){}
+   }
+   if(answer_table[0] >= 0)
+   {
+      // we should have had a match but didn't:
+      BOOST_REGEX_TEST_ERROR("Expected match was not found.", char);
+   }
+   //
+   // and now field spitting:
+   //
+   token_iterator tstart2(boost::make_regex_token_iterator(s, r, -1, opts)), tend2;
+   token_iterator tcopy2(tstart2);
+   int last_end2 = 0;
+   answer_table = test_info<char>::answer_table();
+   while(tstart2 != tend2)
+   {
+      if(tstart2 != tcopy2)
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator != comparison.", char);
+      }
+      if(!(tstart2 == tcopy2))
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator == comparison.", char);
+      }
+#ifdef BOOST_MSVC
+#pragma warning(push)
+#pragma warning(disable:4244)
+#endif
+      if(std::distance(s.GetString(), tstart2->first) != last_end2)
+      {
+         BOOST_REGEX_TEST_ERROR(
+            "Error in location of start of field split, found: " 
+            << std::distance(s.GetString(), tstart2->first)
+            << ", expected: "
+            << last_end2
+            << ".", char);
+      }
+      int expected_end = static_cast<int>(answer_table[0] < 0 ? s.GetLength() : answer_table[0]);
+      if(std::distance(s.GetString(), tstart2->second) != expected_end)
+      {
+         BOOST_REGEX_TEST_ERROR(
+            "Error in location of end2 of field split, found: "
+            << std::distance(s.GetString(), tstart2->second)
+            << ", expected: "
+            << expected_end
+            << ".", char);
+      }
+#ifdef BOOST_MSVC
+#pragma warning(pop)
+#endif
+      last_end2 = answer_table[1];
+      ++tstart2;
+      ++tcopy2;
+      // move on the answer table to next set of answers;
+      if(*answer_table != -2)
+         while(*answer_table++ != -2){}
+   }
+   if(answer_table[0] >= 0)
+   {
+      // we should have had a match but didn't:
+      BOOST_REGEX_TEST_ERROR("Expected match was not found.", char);
+   }
+
+}
+
+void test_mfc(const wchar_t&, const test_regex_search_tag&)
+{
+   const std::wstring& ss = test_info<wchar_t>::search_text();
+   const std::wstring& ss2 = test_info<wchar_t>::expression();
+   CAtlStringW s(ss.c_str(), ss.size());
+   CAtlStringW s2(ss2.c_str(), ss2.size());
+   boost::regex_constants::match_flag_type opts = test_info<wchar_t>::match_options();
+   const int* answer_table = test_info<wchar_t>::answer_table();
+   boost::wregex r = boost::make_regex(s2, test_info<wchar_t>::syntax_options());
+   boost::wcmatch what;
+   if(boost::regex_search(
+      s,
+      what,
+      r,
+      opts))
+   {
+      test_result(what, s.GetString(), 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.", wchar_t);
+   }
+   //
+   // regex_match tests:
+   //
+   if(answer_table[0] < 0)
+   {
+      if(boost::regex_match(s, r, opts))
+      {
+         BOOST_REGEX_TEST_ERROR("boost::regex_match found a match when it should not have done so.", wchar_t);
+      }
+   }
+   else
+   {
+      if((answer_table[0] > 0) && boost::regex_match(s, r, opts))
+      {
+         BOOST_REGEX_TEST_ERROR("boost::regex_match found a match when it should not have done so.", wchar_t);
+      }
+      else if((answer_table[0] == 0) && (answer_table[1] == static_cast<int>(ss.size())))
+      {
+         if(boost::regex_match(
+            s,
+            what,
+            r,
+            opts))
+         {
+            test_result(what, s.GetString(), answer_table);
+            if(!boost::regex_match(s, r, opts))
+            {
+               // we should have had a match but didn't:
+               BOOST_REGEX_TEST_ERROR("Expected match was not found.", wchar_t);
+            }
+         }
+         else if(answer_table[0] >= 0)
+         {
+            // we should have had a match but didn't:
+            BOOST_REGEX_TEST_ERROR("Expected match was not found.", wchar_t);
+         }
+      }
+   }
+   //
+   // test regex_iterator:
+   //
+   boost::wcregex_iterator start(boost::make_regex_iterator(s, r, opts)), end;
+   boost::wcregex_iterator copy(start);
+   while(start != end)
+   {
+      if(start != copy)
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator != comparison.", wchar_t);
+      }
+      if(!(start == copy))
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator == comparison.", wchar_t);
+      }
+      test_result(*start, s.GetString(), answer_table);
+      ++start;
+      ++copy;
+      // move on the answer table to next set of answers;
+      if(*answer_table != -2)
+         while(*answer_table++ != -2){}
+   }
+   if(answer_table[0] >= 0)
+   {
+      // we should have had a match but didn't:
+      BOOST_REGEX_TEST_ERROR("Expected match was not found.", wchar_t);
+   }
+   //
+   // test regex_token_iterator:
+   //
+   typedef boost::regex_token_iterator<const wchar_t*> token_iterator;
+   answer_table = test_info<wchar_t>::answer_table();
+   //
+   // we start by testing sub-expression 0:
+   //
+   token_iterator tstart(boost::make_regex_token_iterator(s, r, 0, opts)), tend;
+   token_iterator tcopy(tstart);
+   while(tstart != tend)
+   {
+      if(tstart != tcopy)
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator != comparison.", wchar_t);
+      }
+      if(!(tstart == tcopy))
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator == comparison.", wchar_t);
+      }
+      test_sub_match(*tstart, s.GetString(), answer_table, 0);
+      ++tstart;
+      ++tcopy;
+      // move on the answer table to next set of answers;
+      if(*answer_table != -2)
+         while(*answer_table++ != -2){}
+   }
+   if(answer_table[0] >= 0)
+   {
+      // we should have had a match but didn't:
+      BOOST_REGEX_TEST_ERROR("Expected match was not found.", wchar_t);
+   }
+   //
+   // and now field spitting:
+   //
+   token_iterator tstart2(boost::make_regex_token_iterator(s, r, -1, opts)), tend2;
+   token_iterator tcopy2(tstart2);
+   int last_end2 = 0;
+   answer_table = test_info<wchar_t>::answer_table();
+   while(tstart2 != tend2)
+   {
+      if(tstart2 != tcopy2)
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator != comparison.", wchar_t);
+      }
+      if(!(tstart2 == tcopy2))
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator == comparison.", wchar_t);
+      }
+#ifdef BOOST_MSVC
+#pragma warning(push)
+#pragma warning(disable:4244)
+#endif
+      if(std::distance(s.GetString(), tstart2->first) != last_end2)
+      {
+         BOOST_REGEX_TEST_ERROR(
+            "Error in location of start of field split, found: " 
+            << std::distance(s.GetString(), tstart2->first)
+            << ", expected: "
+            << last_end2
+            << ".", wchar_t);
+      }
+      int expected_end = static_cast<int>(answer_table[0] < 0 ? s.GetLength() : answer_table[0]);
+      if(std::distance(s.GetString(), tstart2->second) != expected_end)
+      {
+         BOOST_REGEX_TEST_ERROR(
+            "Error in location of end2 of field split, found: "
+            << std::distance(s.GetString(), tstart2->second)
+            << ", expected: "
+            << expected_end
+            << ".", wchar_t);
+      }
+#ifdef BOOST_MSVC
+#pragma warning(pop)
+#endif
+      last_end2 = answer_table[1];
+      ++tstart2;
+      ++tcopy2;
+      // move on the answer table to next set of answers;
+      if(*answer_table != -2)
+         while(*answer_table++ != -2){}
+   }
+   if(answer_table[0] >= 0)
+   {
+      // we should have had a match but didn't:
+      BOOST_REGEX_TEST_ERROR("Expected match was not found.", wchar_t);
+   }
+
+}
+
+void test_mfc(const char&, const test_invalid_regex_tag&)
+{
+   std::string ss = test_info<char>::expression();
+   CAtlStringA s(ss.c_str(), ss.size());
+   bool have_catch = false;
+   try{
+      boost::regex e = boost::make_regex(s, test_info<char>::syntax_options());
+      if(e.error_code())
+         have_catch = true;
+   }
+   catch(const boost::bad_expression&)
+   {
+      have_catch = true;
+   }
+   catch(const std::runtime_error& r)
+   {
+      have_catch = true;
+      BOOST_REGEX_TEST_ERROR("Expected a bad_expression exception, but a std::runtime_error instead: " << r.what(), char);
+   }
+   catch(const std::exception& r)
+   {
+      have_catch = true;
+      BOOST_REGEX_TEST_ERROR("Expected a bad_expression exception, but a std::exception instead: " << r.what(), char);
+   }
+   catch(...)
+   {
+      have_catch = true;
+      BOOST_REGEX_TEST_ERROR("Expected a bad_expression exception, but got an exception of unknown type instead", char);
+   }
+   if(!have_catch)
+   {
+      // oops expected exception was not thrown:
+      BOOST_REGEX_TEST_ERROR("Expected an exception, but didn't find one.", char);
+   }
+
+}
+
+void test_mfc(const wchar_t&, const test_invalid_regex_tag&)
+{
+   std::wstring ss = test_info<wchar_t>::expression();
+   CAtlStringW s(ss.c_str(), ss.size());
+   bool have_catch = false;
+   try{
+      boost::wregex e = boost::make_regex(s, test_info<wchar_t>::syntax_options());
+      if(e.error_code())
+         have_catch = true;
+   }
+   catch(const boost::bad_expression&)
+   {
+      have_catch = true;
+   }
+   catch(const std::runtime_error& r)
+   {
+      have_catch = true;
+      BOOST_REGEX_TEST_ERROR("Expected a bad_expression exception, but a std::runtime_error instead: " << r.what(), wchar_t);
+   }
+   catch(const std::exception& r)
+   {
+      have_catch = true;
+      BOOST_REGEX_TEST_ERROR("Expected a bad_expression exception, but a std::exception instead: " << r.what(), wchar_t);
+   }
+   catch(...)
+   {
+      have_catch = true;
+      BOOST_REGEX_TEST_ERROR("Expected a bad_expression exception, but got an exception of unknown type instead", wchar_t);
+   }
+   if(!have_catch)
+   {
+      // oops expected exception was not thrown:
+      BOOST_REGEX_TEST_ERROR("Expected an exception, but didn't find one.", wchar_t);
+   }
+}
+
+void test_mfc(const char&, const test_regex_replace_tag&)
+{
+   const CStringA expression(test_info<char>::expression().c_str(), test_info<char>::expression().size());
+   boost::regex_constants::syntax_option_type syntax_options = test_info<char>::syntax_options();
+   try{
+      boost::regex r = boost::make_regex(expression, syntax_options);
+      if(r.status())
+      {
+         BOOST_REGEX_TEST_ERROR("Expression did not compile when it should have done, error code = " << r.status(), char);
+      }
+      const CStringA search_text(test_info<char>::search_text().c_str(), test_info<char>::search_text().size());
+      boost::regex_constants::match_flag_type opts = test_info<char>::match_options();
+      const CStringA format_string(test_info<char>::format_string().c_str(), test_info<char>::format_string().size());
+      const CStringA result_string(test_info<char>::result_string().c_str(), test_info<char>::result_string().size());
+
+      CStringA result = boost::regex_replace(search_text, r, format_string, opts);
+      if(result != result_string)
+      {
+         BOOST_REGEX_TEST_ERROR("regex_replace generated an incorrect string result", char);
+      }
+   }
+   catch(const boost::bad_expression& e)
+   {
+      BOOST_REGEX_TEST_ERROR("Expression did not compile when it should have done: " << e.what(), char);
+   }
+   catch(const std::runtime_error& r)
+   {
+      BOOST_REGEX_TEST_ERROR("Received an unexpected std::runtime_error: " << r.what(), char);
+   }
+   catch(const std::exception& r)
+   {
+      BOOST_REGEX_TEST_ERROR("Received an unexpected std::exception: " << r.what(), char);
+   }
+   catch(...)
+   {
+      BOOST_REGEX_TEST_ERROR("Received an unexpected exception of unknown type", char);
+   }
+}
+
+void test_mfc(const wchar_t&, const test_regex_replace_tag&)
+{
+   const CStringW expression(test_info<wchar_t>::expression().c_str(), test_info<wchar_t>::expression().size());
+   boost::regex_constants::syntax_option_type syntax_options = test_info<wchar_t>::syntax_options();
+   try{
+      boost::wregex r = boost::make_regex(expression, syntax_options);
+      if(r.status())
+      {
+         BOOST_REGEX_TEST_ERROR("Expression did not compile when it should have done, error code = " << r.status(), wchar_t);
+      }
+      const CStringW search_text(test_info<wchar_t>::search_text().c_str(), test_info<wchar_t>::search_text().size());
+      boost::regex_constants::match_flag_type opts = test_info<wchar_t>::match_options();
+      const CStringW format_string(test_info<wchar_t>::format_string().c_str(), test_info<wchar_t>::format_string().size());
+      const CStringW result_string(test_info<wchar_t>::result_string().c_str(), test_info<wchar_t>::result_string().size());
+
+      CStringW result = boost::regex_replace(search_text, r, format_string, opts);
+      if(result != result_string)
+      {
+         BOOST_REGEX_TEST_ERROR("regex_replace generated an incorrect string result", wchar_t);
+      }
+   }
+   catch(const boost::bad_expression& e)
+   {
+      BOOST_REGEX_TEST_ERROR("Expression did not compile when it should have done: " << e.what(), wchar_t);
+   }
+   catch(const std::runtime_error& r)
+   {
+      BOOST_REGEX_TEST_ERROR("Received an unexpected std::runtime_error: " << r.what(), wchar_t);
+   }
+   catch(const std::exception& r)
+   {
+      BOOST_REGEX_TEST_ERROR("Received an unexpected std::exception: " << r.what(), wchar_t);
+   }
+   catch(...)
+   {
+      BOOST_REGEX_TEST_ERROR("Received an unexpected exception of unknown type", wchar_t);
+   }
+}
+
+#else
+
+#include "test.hpp"
+
+void test_mfc(const char&, const test_regex_search_tag&){}
+void test_mfc(const wchar_t&, const test_regex_search_tag&){}
+void test_mfc(const char&, const test_invalid_regex_tag&){}
+void test_mfc(const wchar_t&, const test_invalid_regex_tag&){}
+void test_mfc(const char&, const test_regex_replace_tag&){}
+void test_mfc(const wchar_t&, const test_regex_replace_tag&){}
+
+
+#endif
diff --git a/test/regress/test_mfc.hpp b/test/regress/test_mfc.hpp
new file mode 100644
index 00000000..80857364
--- /dev/null
+++ b/test/regress/test_mfc.hpp
@@ -0,0 +1,36 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         test_mfc.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: MFC/ATL test handlers.
+  */
+
+#ifndef TEST_MFC_HPP
+#define TEST_MFC_HPP
+
+template <class charT, class Tag>
+void test_mfc(const charT&, const Tag&)
+{
+   // do nothing
+}
+
+void test_mfc(const char&, const test_regex_search_tag&);
+void test_mfc(const wchar_t&, const test_regex_search_tag&);
+void test_mfc(const char&, const test_invalid_regex_tag&);
+void test_mfc(const wchar_t&, const test_invalid_regex_tag&);
+void test_mfc(const char&, const test_regex_replace_tag&);
+void test_mfc(const wchar_t&, const test_regex_replace_tag&);
+
+
+#endif
diff --git a/test/regress/test_non_greedy_repeats.cpp b/test/regress/test_non_greedy_repeats.cpp
new file mode 100644
index 00000000..7a073c2f
--- /dev/null
+++ b/test/regress/test_non_greedy_repeats.cpp
@@ -0,0 +1,42 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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)
+ *
+ */
+
+#include "test.hpp"
+
+#ifdef BOOST_MSVC
+#pragma warning(disable:4127)
+#endif
+
+void test_non_greedy_repeats()
+{
+   //
+   // non-greedy repeats added 21/04/00
+   //
+   using namespace boost::regex_constants;
+   TEST_REGEX_SEARCH("a*?", perl, "aa", match_default, make_array(0, 0, -2, 0, 1, -2, 1, 1, -2, 1, 2, -2, 2, 2, -2, -2));
+   TEST_REGEX_SEARCH("^a*?$", perl, "aa", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("^.*?$", perl, "aa", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("^(a)*?$", perl, "aa", match_default, make_array(0, 2, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("^[ab]*?$", perl, "aa", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("a??", perl, "aa", match_default, make_array(0, 0, -2, 0, 1, -2, 1, 1, -2, 1, 2, -2, 2, 2, -2, -2));
+   TEST_REGEX_SEARCH("a+?", perl, "aa", match_default, make_array(0, 1, -2, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a{1,3}?", perl, "aaa", match_default, make_array(0, 1, -2, 1, 2, -2, 2, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\w+?w", perl, "...ccccccwcccccw", match_default, make_array(3, 10, -2, 10, 16, -2, -2));
+   TEST_REGEX_SEARCH("\\W+\\w+?w", perl, "...ccccccwcccccw", match_default, make_array(0, 10, -2, -2));
+   TEST_REGEX_SEARCH("abc|\\w+?", perl, "abd", match_default, make_array(0, 1, -2, 1, 2, -2, 2, 3, -2, -2));
+   TEST_REGEX_SEARCH("abc|\\w+?", perl, "abcd", match_default, make_array(0, 3, -2, 3, 4, -2, -2));
+   TEST_REGEX_SEARCH("<\\s*tag[^>]*>(.*?)<\\s*/tag\\s*>", perl, " <tag>here is some text</tag> <tag></tag>", match_default, make_array(1, 29, 6, 23, -2, 30, 41, 35, 35, -2, -2));
+   TEST_REGEX_SEARCH("<\\s*tag[^>]*>(.*?)<\\s*/tag\\s*>", perl, " < tag attr=\"something\">here is some text< /tag > <tag></tag>", match_default, make_array(1, 49, 24, 41, -2, 50, 61, 55, 55, -2, -2));
+   TEST_INVALID_REGEX("a{1,3}{1}", perl);
+   TEST_INVALID_REGEX("a**", perl);
+   TEST_INVALID_REGEX("a++", perl);
+}
+
diff --git a/test/regress/test_not_regex.hpp b/test/regress/test_not_regex.hpp
new file mode 100644
index 00000000..ab78ca46
--- /dev/null
+++ b/test/regress/test_not_regex.hpp
@@ -0,0 +1,87 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         test_not_regex.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Declares tests for invalid regexes.
+  */
+
+
+#ifndef BOOST_REGEX_REGRESS_TEST_NOT_REGEX_HPP
+#define BOOST_REGEX_REGRESS_TEST_NOT_REGEX_HPP
+#include "info.hpp"
+//
+// this file implements a test for a regular expression that should not compile:
+//
+struct test_invalid_regex_tag{};
+
+template<class charT, class traits>
+void test(boost::basic_regex<charT, traits>& r, const test_invalid_regex_tag&)
+{
+   const std::basic_string<charT>& expression = test_info<charT>::expression();
+   boost::regex_constants::syntax_option_type syntax_options = test_info<charT>::syntax_options();
+   //
+   // try it with exceptions disabled first:
+   //
+   try
+   {
+      if(0 == r.assign(expression, syntax_options | boost::regex_constants::no_except).status())
+      {
+         BOOST_REGEX_TEST_ERROR("Expression compiled when it should not have done so.", charT);
+      }
+   }
+   catch(...)
+   {
+      BOOST_REGEX_TEST_ERROR("Unexpected exception thrown.", charT);
+   }
+   //
+   // now try again with exceptions:
+   //
+   bool have_catch = false;
+   try{
+      r.assign(expression, syntax_options);
+#ifdef BOOST_NO_EXCEPTIONS
+      if(r.status())
+         have_catch = true;
+#endif
+   }
+   catch(const boost::bad_expression&)
+   {
+      have_catch = true;
+   }
+   catch(const std::runtime_error& r)
+   {
+      have_catch = true;
+      BOOST_REGEX_TEST_ERROR("Expected a bad_expression exception, but a std::runtime_error instead: " << r.what(), charT);
+   }
+   catch(const std::exception& r)
+   {
+      have_catch = true;
+      BOOST_REGEX_TEST_ERROR("Expected a bad_expression exception, but a std::exception instead: " << r.what(), charT);
+   }
+   catch(...)
+   {
+      have_catch = true;
+      BOOST_REGEX_TEST_ERROR("Expected a bad_expression exception, but got an exception of unknown type instead", charT);
+   }
+   if(!have_catch)
+   {
+      // oops expected exception was not thrown:
+      BOOST_REGEX_TEST_ERROR("Expected an exception, but didn't find one.", charT);
+   }
+
+}
+
+
+
+#endif
diff --git a/test/regress/test_operators.cpp b/test/regress/test_operators.cpp
new file mode 100644
index 00000000..b32ebb05
--- /dev/null
+++ b/test/regress/test_operators.cpp
@@ -0,0 +1,166 @@
+
+#include "test.hpp"
+
+#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300)\
+   && !BOOST_WORKAROUND(__HP_aCC, BOOST_TESTED_AT(55500))\
+   && !(defined(__GNUC__) && !(defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)))
+
+template <class T1, class T2>
+void test_less(const T1& t1, const T2& t2)
+{
+   if(!(t1 < t2))
+   {
+      BOOST_REGEX_TEST_ERROR("Failed < comparison", char);
+   }
+   if(!(t1 <= t2))
+   {
+      BOOST_REGEX_TEST_ERROR("Failed <= comparison", char);
+   }
+   if(!(t1 != t2))
+   {
+      BOOST_REGEX_TEST_ERROR("Failed != comparison", char);
+   }
+   if(t1 == t2)
+   {
+      BOOST_REGEX_TEST_ERROR("Failed == comparison", char);
+   }
+   if(t1 >= t2)
+   {
+      BOOST_REGEX_TEST_ERROR("Failed >= comparison", char);
+   }
+   if(t1 > t2)
+   {
+      BOOST_REGEX_TEST_ERROR("Failed > comparison", char);
+   }
+}
+
+template <class T1, class T2>
+void test_greater(const T1& t1, const T2& t2)
+{
+   if(t1 < t2)
+   {
+      BOOST_REGEX_TEST_ERROR("Failed < comparison", char);
+   }
+   if(t1 <= t2)
+   {
+      BOOST_REGEX_TEST_ERROR("Failed <= comparison", char);
+   }
+   if(!(t1 != t2))
+   {
+      BOOST_REGEX_TEST_ERROR("Failed != comparison", char);
+   }
+   if(t1 == t2)
+   {
+      BOOST_REGEX_TEST_ERROR("Failed == comparison", char);
+   }
+   if(!(t1 >= t2))
+   {
+      BOOST_REGEX_TEST_ERROR("Failed >= comparison", char);
+   }
+   if(!(t1 > t2))
+   {
+      BOOST_REGEX_TEST_ERROR("Failed > comparison", char);
+   }
+}
+
+template <class T1, class T2>
+void test_equal(const T1& t1, const T2& t2)
+{
+   if(t1 < t2)
+   {
+      BOOST_REGEX_TEST_ERROR("Failed < comparison", char);
+   }
+   if(!(t1 <= t2))
+   {
+      BOOST_REGEX_TEST_ERROR("Failed <= comparison", char);
+   }
+   if(t1 != t2)
+   {
+      BOOST_REGEX_TEST_ERROR("Failed != comparison", char);
+   }
+   if(!(t1 == t2))
+   {
+      BOOST_REGEX_TEST_ERROR("Failed == comparison", char);
+   }
+   if(!(t1 >= t2))
+   {
+      BOOST_REGEX_TEST_ERROR("Failed >= comparison", char);
+   }
+   if(t1 > t2)
+   {
+      BOOST_REGEX_TEST_ERROR("Failed > comparison", char);
+   }
+}
+
+template <class T1, class T2, class T3>
+void test_plus(const T1& t1, const T2& t2, const T3& t3)
+{
+   if(t1 + t2 != t3)
+   {
+      BOOST_REGEX_TEST_ERROR("Failed addition", char);
+   }
+   if(t3 != t1 + t2)
+   {
+      BOOST_REGEX_TEST_ERROR("Failed addition", char);
+   }
+}
+
+void test_operators()
+{
+   test_info<char>::set_typename("sub_match operators");
+
+   std::string s1("a");
+   std::string s2("b");
+   boost::sub_match<std::string::const_iterator> sub1, sub2;
+   sub1.first = s1.begin();
+   sub1.second = s1.end();
+   sub1.matched = true;
+   sub2.first = s2.begin();
+   sub2.second = s2.end();
+   sub2.matched = true;
+
+   test_less(sub1, sub2);
+   test_less(sub1, s2.c_str());
+   test_less(s1.c_str(), sub2);
+   test_less(sub1, *s2.c_str());
+   test_less(*s1.c_str(), sub2);
+   test_less(sub1, s2);
+   test_less(s1, sub2);
+   test_greater(sub2, sub1);
+   test_greater(sub2, s1.c_str());
+   test_greater(s2.c_str(), sub1);
+   test_greater(sub2, *s1.c_str());
+   test_greater(*s2.c_str(), sub1);
+   test_greater(sub2, s1);
+   test_greater(s2, sub1);
+   test_equal(sub1, sub1);
+   test_equal(sub1, s1.c_str());
+   test_equal(s1.c_str(), sub1);
+   test_equal(sub1, *s1.c_str());
+   test_equal(*s1.c_str(), sub1);
+   test_equal(sub1, s1);
+   test_equal(s1, sub1);
+   test_plus(sub2, sub1, "ba");
+   test_plus(sub2, s1.c_str(), "ba");
+   test_plus(s2.c_str(), sub1, "ba");
+   test_plus(sub2, *s1.c_str(), "ba");
+   test_plus(*s2.c_str(), sub1, "ba");
+   test_plus(sub2, s1, "ba");
+   test_plus(s2, sub1, "ba");
+}
+
+#else
+
+#include <iostream>
+
+void test_operators()
+{
+   std::cout <<
+   "\n<note>\n"
+   "This compiler version does not support the sub_match comparison operators\n"
+   "tests for these operators are not carried out\n"
+   "</note>\n";
+}
+
+#endif
+
diff --git a/test/regress/test_overloads.cpp b/test/regress/test_overloads.cpp
new file mode 100644
index 00000000..1ac3c95b
--- /dev/null
+++ b/test/regress/test_overloads.cpp
@@ -0,0 +1,46 @@
+
+#include "test.hpp"
+
+#define BOOST_REGEX_TEST(x)\
+   if(!(x)){ BOOST_REGEX_TEST_ERROR("Error in: " BOOST_STRINGIZE(x), char); }
+
+void test_overloads()
+{
+   test_info<char>::set_typename("sub_match operators");
+
+   // test all the available overloads with *one* simple
+   // expression, doing all these tests with all the test
+   // cases would just take to long...
+
+   boost::regex e("abc");
+   std::string s("abc");
+   const std::string& cs = s;
+   boost::smatch sm;
+   boost::cmatch cm;
+   // regex_match:
+   BOOST_REGEX_TEST(boost::regex_match(cs.begin(), cs.end(), sm, e))
+   BOOST_REGEX_TEST(boost::regex_match(cs.begin(), cs.end(), sm, e, boost::regex_constants::match_default))
+   BOOST_REGEX_TEST(boost::regex_match(cs.begin(), cs.end(), e))
+   BOOST_REGEX_TEST(boost::regex_match(cs.begin(), cs.end(), e, boost::regex_constants::match_default))
+   BOOST_REGEX_TEST(boost::regex_match(s.c_str(), cm, e))
+   BOOST_REGEX_TEST(boost::regex_match(s.c_str(), cm, e, boost::regex_constants::match_default))
+   BOOST_REGEX_TEST(boost::regex_match(s.c_str(), e))
+   BOOST_REGEX_TEST(boost::regex_match(s.c_str(), e, boost::regex_constants::match_default))
+   BOOST_REGEX_TEST(boost::regex_match(s, sm, e))
+   BOOST_REGEX_TEST(boost::regex_match(s, sm, e, boost::regex_constants::match_default))
+   BOOST_REGEX_TEST(boost::regex_match(s, e))
+   BOOST_REGEX_TEST(boost::regex_match(s, e, boost::regex_constants::match_default))
+   // regex_search:
+   BOOST_REGEX_TEST(boost::regex_search(cs.begin(), cs.end(), sm, e))
+   BOOST_REGEX_TEST(boost::regex_search(cs.begin(), cs.end(), sm, e, boost::regex_constants::match_default))
+   BOOST_REGEX_TEST(boost::regex_search(cs.begin(), cs.end(), e))
+   BOOST_REGEX_TEST(boost::regex_search(cs.begin(), cs.end(), e, boost::regex_constants::match_default))
+   BOOST_REGEX_TEST(boost::regex_search(s.c_str(), cm, e))
+   BOOST_REGEX_TEST(boost::regex_search(s.c_str(), cm, e, boost::regex_constants::match_default))
+   BOOST_REGEX_TEST(boost::regex_search(s.c_str(), e))
+   BOOST_REGEX_TEST(boost::regex_search(s.c_str(), e, boost::regex_constants::match_default))
+   BOOST_REGEX_TEST(boost::regex_search(s, sm, e))
+   BOOST_REGEX_TEST(boost::regex_search(s, sm, e, boost::regex_constants::match_default))
+   BOOST_REGEX_TEST(boost::regex_search(s, e))
+   BOOST_REGEX_TEST(boost::regex_search(s, e, boost::regex_constants::match_default))
+}
\ No newline at end of file
diff --git a/test/regress/test_partial_match.hpp b/test/regress/test_partial_match.hpp
new file mode 100644
index 00000000..3854bbb5
--- /dev/null
+++ b/test/regress/test_partial_match.hpp
@@ -0,0 +1,388 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         test_regex_search.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Declares tests for regex search and iteration.
+  */
+
+#ifndef BOOST_REGEX_REGRESS_REGEX_SEARCH_HPP
+#define BOOST_REGEX_REGRESS_REGEX_SEARCH_HPP
+#include "info.hpp"
+//
+// this file implements a test for a regular expression that should compile,
+// followed by a search for that expression:
+//
+struct test_regex_search_tag{};
+
+template <class BidirectionalIterator>
+void test_sub_match(const boost::sub_match<BidirectionalIterator>& sub, BidirectionalIterator base, const int* answer_table, int i)
+{
+#ifdef BOOST_MSVC
+#pragma warning(push)
+#pragma warning(disable:4244)
+#endif
+   typedef typename boost::sub_match<BidirectionalIterator>::value_type charT;
+   if((sub.matched == 0) 
+      && 
+         !((i == 0)
+          && (test_info<charT>::match_options() & boost::match_partial)) )
+   {
+      if(answer_table[2*i] >= 0)
+      {
+         BOOST_REGEX_TEST_ERROR(
+            "Sub-expression " << i 
+            << " was not matched when it should have been.", charT);
+      }
+   }
+   else
+   {
+      if(std::distance(base, sub.first) != answer_table[2*i])
+      {
+         BOOST_REGEX_TEST_ERROR(
+            "Error in start location of sub-expression " 
+            << i << ", found " << std::distance(base, sub.first) 
+            << ", expected " << answer_table[2*i] << ".", charT);
+      }
+      if(std::distance(base, sub.second) != answer_table[1+ 2*i])
+      {
+         BOOST_REGEX_TEST_ERROR(
+            "Error in end location of sub-expression " 
+            << i << ", found " << std::distance(base, sub.second) 
+            << ", expected " << answer_table[1 + 2*i] << ".", charT);
+      }
+   }
+#ifdef BOOST_MSVC
+#pragma warning(pop)
+#endif
+}
+
+template <class BidirectionalIterator, class Allocator>
+void test_result(const boost::match_results<BidirectionalIterator, Allocator>& what, BidirectionalIterator base, const int* answer_table)
+{
+   for(unsigned i = 0; i < what.size(); ++i)
+   {
+      test_sub_match(what[i], base, answer_table, i);
+   }
+}
+
+template<class charT, class traits>
+void test_simple_search(boost::basic_regex<charT, traits>& r)
+{
+   typedef typename std::basic_string<charT>::const_iterator const_iterator;
+   const std::basic_string<charT>& search_text = test_info<charT>::search_text();
+   boost::regex_constants::match_flag_type opts = test_info<charT>::match_options();
+   const int* answer_table = test_info<charT>::answer_table();
+   boost::match_results<const_iterator> what;
+   if(boost::regex_search(
+      search_text.begin(),
+      search_text.end(),
+      what,
+      r,
+      opts))
+   {
+      test_result(what, search_text.begin(), answer_table);
+      // setting match_any should have no effect on the result returned:
+      if(!boost::regex_search(
+         search_text.begin(),
+         search_text.end(),
+         r,
+         opts|boost::regex_constants::match_any))
+      {
+         BOOST_REGEX_TEST_ERROR("Expected match was not found when using the match_any flag.", charT);
+      }
+   }
+   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);
+      }
+      // setting match_any should have no effect on the result returned:
+      else if(boost::regex_search(
+         search_text.begin(),
+         search_text.end(),
+         r,
+         opts|boost::regex_constants::match_any))
+      {
+         BOOST_REGEX_TEST_ERROR("Unexpected match was found when using the match_any flag.", charT);
+      }
+   }
+}
+
+template<class charT, class traits>
+void test_regex_iterator(boost::basic_regex<charT, traits>& r)
+{
+   typedef typename std::basic_string<charT>::const_iterator const_iterator;
+   typedef boost::regex_iterator<const_iterator, charT, traits> test_iterator;
+   const std::basic_string<charT>& search_text = test_info<charT>::search_text();
+   boost::regex_constants::match_flag_type opts = test_info<charT>::match_options();
+   const int* answer_table = test_info<charT>::answer_table();
+   test_iterator start(search_text.begin(), search_text.end(), r, opts), end;
+   test_iterator copy(start);
+   const_iterator last_end = search_text.begin();
+   while(start != end)
+   {
+      if(start != copy)
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator != comparison.", charT);
+      }
+      if(!(start == copy))
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator == comparison.", charT);
+      }
+      test_result(*start, search_text.begin(), answer_table);
+      // test $` and $' :
+      if(start->prefix().first != last_end)
+      {
+         BOOST_REGEX_TEST_ERROR("Incorrect position for start of $`", charT);
+      }
+      if(start->prefix().second != (*start)[0].first)
+      {
+         BOOST_REGEX_TEST_ERROR("Incorrect position for end of $`", charT);
+      }
+      if(start->prefix().matched != (start->prefix().first != start->prefix().second))
+      {
+         BOOST_REGEX_TEST_ERROR("Incorrect position for matched member of $`", charT);
+      }
+      if(start->suffix().first != (*start)[0].second)
+      {
+         BOOST_REGEX_TEST_ERROR("Incorrect position for start of $'", charT);
+      }
+      if(start->suffix().second != search_text.end())
+      {
+         BOOST_REGEX_TEST_ERROR("Incorrect position for end of $'", charT);
+      }
+      if(start->suffix().matched != (start->suffix().first != start->suffix().second))
+      {
+         BOOST_REGEX_TEST_ERROR("Incorrect position for matched member of $'", charT);
+      }
+      last_end = (*start)[0].second;
+      ++start;
+      ++copy;
+      // move on the answer table to next set of answers;
+      if(*answer_table != -2)
+         while(*answer_table++ != -2){}
+   }
+   if(answer_table[0] >= 0)
+   {
+      // we should have had a match but didn't:
+      BOOST_REGEX_TEST_ERROR("Expected match was not found.", charT);
+   }
+}
+
+template<class charT, class traits>
+void test_regex_token_iterator(boost::basic_regex<charT, traits>& r)
+{
+   typedef typename std::basic_string<charT>::const_iterator const_iterator;
+   typedef boost::regex_token_iterator<const_iterator, charT, traits> test_iterator;
+   const std::basic_string<charT>& search_text = test_info<charT>::search_text();
+   boost::regex_constants::match_flag_type opts = test_info<charT>::match_options();
+   const int* answer_table = test_info<charT>::answer_table();
+   //
+   // we start by testing sub-expression 0:
+   //
+   test_iterator start(search_text.begin(), search_text.end(), r, 0, opts), end;
+   test_iterator copy(start);
+   while(start != end)
+   {
+      if(start != copy)
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator != comparison.", charT);
+      }
+      if(!(start == copy))
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator == comparison.", charT);
+      }
+      test_sub_match(*start, search_text.begin(), answer_table, 0);
+      ++start;
+      ++copy;
+      // move on the answer table to next set of answers;
+      if(*answer_table != -2)
+         while(*answer_table++ != -2){}
+   }
+   if(answer_table[0] >= 0)
+   {
+      // we should have had a match but didn't:
+      BOOST_REGEX_TEST_ERROR("Expected match was not found.", charT);
+   }
+   //
+   // and now field spitting:
+   //
+   test_iterator start2(search_text.begin(), search_text.end(), r, -1, opts), end2;
+   test_iterator copy2(start2);
+   int last_end2 = 0;
+   answer_table = test_info<charT>::answer_table();
+   while(start2 != end2)
+   {
+      if(start2 != copy2)
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator != comparison.", charT);
+      }
+      if(!(start2 == copy2))
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator == comparison.", charT);
+      }
+#ifdef BOOST_MSVC
+#pragma warning(push)
+#pragma warning(disable:4244)
+#endif
+      if(std::distance(search_text.begin(), start2->first) != last_end2)
+      {
+         BOOST_REGEX_TEST_ERROR(
+            "Error in location of start of field split, found: " 
+            << std::distance(search_text.begin(), start2->first)
+            << ", expected: "
+            << last_end2
+            << ".", charT);
+      }
+      int expected_end = static_cast<int>(answer_table[0] < 0 ? search_text.size() : answer_table[0]);
+      if(std::distance(search_text.begin(), start2->second) != expected_end)
+      {
+         BOOST_REGEX_TEST_ERROR(
+            "Error in location of end2 of field split, found: "
+            << std::distance(search_text.begin(), start2->second)
+            << ", expected: "
+            << expected_end
+            << ".", charT);
+      }
+#ifdef BOOST_MSVC
+#pragma warning(pop)
+#endif
+      last_end2 = answer_table[1];
+      ++start2;
+      ++copy2;
+      // move on the answer table to next set of answers;
+      if(*answer_table != -2)
+         while(*answer_table++ != -2){}
+   }
+   if(answer_table[0] >= 0)
+   {
+      // we should have had a match but didn't:
+      BOOST_REGEX_TEST_ERROR("Expected match was not found.", charT);
+   }
+}
+
+template <class charT, class traits>
+struct grep_test_predicate
+{
+   typedef typename std::basic_string<charT>::const_iterator test_iter;
+
+   grep_test_predicate(test_iter b, const int* a)
+      : m_base(b), m_table(a)
+   {}
+   bool operator()(const boost::match_results<test_iter>& what)
+   {
+      test_result(what, m_base, m_table);
+      // move on the answer table to next set of answers;
+      if(*m_table != -2)
+         while(*m_table++ != -2){}
+      return true;
+   }
+private:
+   test_iter m_base;
+   const int* m_table;
+};
+
+template<class charT, class traits>
+void test_regex_grep(boost::basic_regex<charT, traits>& r)
+{
+   typedef typename std::basic_string<charT>::const_iterator const_iterator;
+   const std::basic_string<charT>& search_text = test_info<charT>::search_text();
+   boost::regex_constants::match_flag_type opts = test_info<charT>::match_options();
+   const int* answer_table = test_info<charT>::answer_table();
+   grep_test_predicate<charT, traits> pred(search_text.begin(), answer_table);
+   boost::regex_grep(pred, search_text.begin(), search_text.end(), r, opts);
+}
+
+template<class charT, class traits>
+void test_regex_match(boost::basic_regex<charT, traits>& r)
+{
+   typedef typename std::basic_string<charT>::const_iterator const_iterator;
+   const std::basic_string<charT>& search_text = test_info<charT>::search_text();
+   boost::regex_constants::match_flag_type opts = test_info<charT>::match_options();
+   const int* answer_table = test_info<charT>::answer_table();
+   boost::match_results<const_iterator> what;
+   if(answer_table[0] < 0)
+   {
+      if(boost::regex_match(search_text, r, opts))
+      {
+         BOOST_REGEX_TEST_ERROR("boost::regex_match found a match when it should not have done so.", charT);
+      }
+   }
+   else
+   {
+      if((answer_table[0] > 0) && boost::regex_match(search_text, r, opts))
+      {
+         BOOST_REGEX_TEST_ERROR("boost::regex_match found a match when it should not have done so.", charT);
+      }
+      else if((answer_table[0] == 0) && (answer_table[1] == static_cast<int>(search_text.size())))
+      {
+         if(boost::regex_match(
+            search_text.begin(),
+            search_text.end(),
+            what,
+            r,
+            opts))
+         {
+            test_result(what, search_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);
+         }
+      }
+   }
+}
+
+template<class charT, class traits>
+void test(boost::basic_regex<charT, traits>& r, const test_regex_search_tag&)
+{
+   const std::basic_string<charT>& expression = test_info<charT>::expression();
+   boost::regex_constants::syntax_option_type syntax_options = test_info<charT>::syntax_options();
+   try{
+      r.assign(expression, syntax_options);
+      if(r.status())
+      {
+         BOOST_REGEX_TEST_ERROR("Expression did not compile when it should have done, error code = " << r.status(), charT);
+      }
+      test_simple_search(r);
+      test_regex_iterator(r);
+      test_regex_token_iterator(r);
+      test_regex_grep(r);
+      test_regex_match(r);
+   }
+   catch(const boost::bad_expression& e)
+   {
+      BOOST_REGEX_TEST_ERROR("Expression did not compile when it should have done: " << e.what(), charT);
+   }
+   catch(const std::runtime_error& r)
+   {
+      BOOST_REGEX_TEST_ERROR("Received an unexpected std::runtime_error: " << r.what(), charT);
+   }
+   catch(const std::exception& r)
+   {
+      BOOST_REGEX_TEST_ERROR("Received an unexpected std::exception: " << r.what(), charT);
+   }
+   catch(...)
+   {
+      BOOST_REGEX_TEST_ERROR("Received an unexpected exception of unknown type", charT);
+   }
+
+}
+
+
+
+#endif
diff --git a/test/regress/test_perl_ex.cpp b/test/regress/test_perl_ex.cpp
new file mode 100644
index 00000000..a63f087c
--- /dev/null
+++ b/test/regress/test_perl_ex.cpp
@@ -0,0 +1,627 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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)
+ *
+ */
+
+#include "test.hpp"
+
+#ifdef BOOST_MSVC
+#pragma warning(disable:4127)
+#endif
+
+void test_independent_subs()
+{
+   using namespace boost::regex_constants;
+   TEST_REGEX_SEARCH("(?>^abc)", perl, "abc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("(?>^abc)", perl, "def\nabc", match_default, make_array(4, 7, -2, -2));
+   TEST_REGEX_SEARCH("(?>^abc)", perl, "defabc", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(?>.*/)foo", perl, "/this/is/a/very/long/line/in/deed/with/very/many/slashes/in/it/you/see/", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(?>.*/)foo", perl, "/this/is/a/very/long/line/in/deed/with/very/many/slashes/in/and/foo", match_default, make_array(0, 67, -2, -2));
+   TEST_REGEX_SEARCH("(?>(\\.\\d\\d[1-9]?))\\d+", perl, "1.230003938", match_default, make_array(1, 11, 1, 4, -2, -2));
+   TEST_REGEX_SEARCH("(?>(\\.\\d\\d[1-9]?))\\d+", perl, "1.875000282", match_default, make_array(1, 11, 1, 5, -2, -2));
+   TEST_REGEX_SEARCH("(?>(\\.\\d\\d[1-9]?))\\d+", perl, "1.235", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("^((?>\\w+)|(?>\\s+))*$", perl, "now is the time for all good men to come to the aid of the party", match_default, make_array(0, 64, 59, 64, -2, -2));
+   TEST_REGEX_SEARCH("^((?>\\w+)|(?>\\s+))*$", perl, "this is not a line with only words and spaces!", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("((?>\\d+))(\\w)", perl, "12345a", match_default, make_array(0, 6, 0, 5, 5, 6, -2, -2));
+   TEST_REGEX_SEARCH("((?>\\d+))(\\w)", perl, "12345+", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("((?>\\d+))(\\d)", perl, "12345", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(?>a+)b", perl, "aaab", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("((?>a+)b)", perl, "aaab", match_default, make_array(0, 4, 0, 4, -2, -2));
+   TEST_REGEX_SEARCH("(?>(a+))b", perl, "aaab", match_default, make_array(0, 4, 0, 3, -2, -2));
+   TEST_REGEX_SEARCH("(?>b)+", perl, "aaabbbccc", match_default, make_array(3, 6, -2, -2));
+   TEST_REGEX_SEARCH("(?>a+|b+|c+)*c", perl, "aaabbbbccccd", match_default, make_array(0, 8, -2, 8, 9, -2, 9, 10, -2, 10, 11, -2, -2));
+   TEST_REGEX_SEARCH("((?>[^()]+)|\\([^()]*\\))+", perl, "((abc(ade)ufh()()x", match_default, make_array(2, 18, 17, 18, -2, -2));
+   TEST_REGEX_SEARCH("\\(((?>[^()]+)|\\([^()]+\\))+\\)", perl, "(abc)", match_default, make_array(0, 5, 1, 4, -2, -2));
+   TEST_REGEX_SEARCH("\\(((?>[^()]+)|\\([^()]+\\))+\\)", perl, "(abc(def)xyz)", match_default, make_array(0, 13, 9, 12, -2, -2));
+   TEST_REGEX_SEARCH("\\(((?>[^()]+)|\\([^()]+\\))+\\)", perl, "((()aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", match_default, make_array(-2, -2));
+
+   TEST_REGEX_SEARCH("(?>a*)*", perl, "a", match_default, make_array(0, 1, -2, 1, 1, -2, -2));
+   TEST_REGEX_SEARCH("(?>a*)*", perl, "aa", match_default, make_array(0, 2, -2, 2, 2, -2, -2));
+   TEST_REGEX_SEARCH("(?>a*)*", perl, "aaaa", match_default, make_array(0, 4, -2, 4, 4, -2, -2));
+   TEST_REGEX_SEARCH("(?>a*)*", perl, "a", match_default, make_array(0, 1, -2, 1, 1, -2, -2));
+   TEST_REGEX_SEARCH("(?>a*)*", perl, "aaabcde", match_default, make_array(0, 3, -2, 3, 3, -2, 4, 4, -2, 5, 5, -2, 6, 6, -2, 7, 7, -2, -2));
+   TEST_REGEX_SEARCH("((?>a*))*", perl, "aaaaa", match_default, make_array(0, 5, 5, 5, -2, 5, 5, 5, 5, -2, -2));
+   TEST_REGEX_SEARCH("((?>a*))*", perl, "aabbaa", match_default, make_array(0, 2, 2, 2, -2, 2, 2, 2, 2, -2, 3, 3, 3, 3, -2, 4, 6, 6, 6, -2, 6, 6, 6, 6, -2, -2));
+   TEST_REGEX_SEARCH("((?>a*?))*", perl, "aaaaa", match_default, make_array(0, 0, 0, 0, -2, 1, 1, 1, 1, -2, 2, 2, 2, 2, -2, 3, 3, 3, 3, -2, 4, 4, 4, 4, -2, 5, 5, 5, 5, -2, -2));
+   TEST_REGEX_SEARCH("((?>a*?))*", perl, "aabbaa", match_default, make_array(0, 0, 0, 0, -2, 1, 1, 1, 1, -2, 2, 2, 2, 2, -2, 3, 3, 3, 3, -2, 4, 4, 4, 4, -2, 5, 5, 5, 5, -2, 6, 6, 6, 6, -2, -2));
+   TEST_REGEX_SEARCH("word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword", perl, "word cat dog elephant mussel cow horse canary baboon snake shark otherword", match_default, make_array(0, 74, -2, -2));
+   TEST_REGEX_SEARCH("word (?>(?:(?!otherword)[a-zA-Z0-9]+ ){0,30})otherword", perl, "word cat dog elephant mussel cow horse canary baboon snake shark", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("word (?>[a-zA-Z0-9]+ ){0,30}otherword", perl, "word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I hope", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("word (?>[a-zA-Z0-9]+ ){0,30}otherword", perl, "word cat dog elephant mussel cow horse canary baboon snake shark the quick brown fox and the lazy dog and several other words getting close to thirty by now I really really hope otherword", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("((?>Z)+|A)+", perl, "ZABCDEFG", match_default, make_array(0, 2, 1, 2, -2, -2));
+   TEST_INVALID_REGEX("((?>)+|A)+", perl);
+}
+
+void test_conditionals()
+{
+   using namespace boost::regex_constants;
+   TEST_REGEX_SEARCH("(?:(a)|b)(?(1)A|B)", perl, "aA", match_default, make_array(0, 2, 0, 1, -2, -2));
+   TEST_REGEX_SEARCH("(?:(a)|b)(?(1)A|B)", perl, "bB", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("(?:(a)|b)(?(1)A|B)", perl, "aB", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(?:(a)|b)(?(1)A|B)", perl, "bA", match_default, make_array(-2, -2));
+
+   TEST_REGEX_SEARCH("(a)?(?(1)A)B", perl, "aAB", match_default, make_array(0, 3, 0, 1, -2, -2));
+   TEST_REGEX_SEARCH("(a)?(?(1)A)B", perl, "B", match_default, make_array(0, 1, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("(a)?(?(1)|A)B", perl, "aB", match_default, make_array(0, 2, 0, 1, -2, -2));
+   TEST_REGEX_SEARCH("(a)?(?(1)|A)B", perl, "AB", match_default, make_array(0, 2, -1, -1, -2, -2));
+
+   TEST_REGEX_SEARCH("^(a)?(?(1)a|b)+$", perl, "aa", match_default, make_array(0, 2, 0, 1, -2, -2));
+   TEST_REGEX_SEARCH("^(a)?(?(1)a|b)+$", perl, "b", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("^(a)?(?(1)a|b)+$", perl, "bb", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("^(a)?(?(1)a|b)+$", perl, "ab", match_default, make_array(-2, -2));
+
+   TEST_REGEX_SEARCH("^(?(?=abc)\\w{3}:|\\d\\d)$", perl, "abc:", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("^(?(?=abc)\\w{3}:|\\d\\d)$", perl, "12", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("^(?(?=abc)\\w{3}:|\\d\\d)$", perl, "123", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("^(?(?=abc)\\w{3}:|\\d\\d)$", perl, "xyz", match_default, make_array(-2, -2));
+
+   TEST_REGEX_SEARCH("^(?(?!abc)\\d\\d|\\w{3}:)$", perl, "abc:", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("^(?(?!abc)\\d\\d|\\w{3}:)$", perl, "12", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("^(?(?!abc)\\d\\d|\\w{3}:)$", perl, "123", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("^(?(?!abc)\\d\\d|\\w{3}:)$", perl, "xyz", match_default, make_array(-2, -2));
+
+   TEST_REGEX_SEARCH("(?(?<=foo)bar|cat)", perl, "foobar", match_default, make_array(3, 6, -2, -2));
+   TEST_REGEX_SEARCH("(?(?<=foo)bar|cat)", perl, "cat", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("(?(?<=foo)bar|cat)", perl, "fcat", match_default, make_array(1, 4, -2, -2));
+   TEST_REGEX_SEARCH("(?(?<=foo)bar|cat)", perl, "focat", match_default, make_array(2, 5, -2, -2));
+   TEST_REGEX_SEARCH("(?(?<=foo)bar|cat)", perl, "foocat", match_default, make_array(-2, -2));
+
+   TEST_REGEX_SEARCH("(?(?<!foo)cat|bar)", perl, "foobar", match_default, make_array(3, 6, -2, -2));
+   TEST_REGEX_SEARCH("(?(?<!foo)cat|bar)", perl, "cat", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("(?(?<!foo)cat|bar)", perl, "fcat", match_default, make_array(1, 4, -2, -2));
+   TEST_REGEX_SEARCH("(?(?<!foo)cat|bar)", perl, "focat", match_default, make_array(2, 5, -2, -2));
+   TEST_REGEX_SEARCH("(?(?<!foo)cat|bar)", perl, "foocat", match_default, make_array(-2, -2));
+
+   TEST_REGEX_SEARCH("(\\()?[^()]+(?(1)\\))", perl, "abcd", match_default, make_array(0, 4, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("(\\()?[^()]+(?(1)\\))", perl, "(abcd)", match_default, make_array(0, 6, 0, 1, -2, -2));
+   TEST_REGEX_SEARCH("(\\()?[^()]+(?(1)\\))", perl, "the quick (abcd) fox", match_default, make_array(0, 10, -1, -1, -2, 10, 16, 10, 11, -2, 16, 20, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("(\\()?[^()]+(?(1)\\))", perl, "(abcd", match_default, make_array(1, 5, -1, -1, -2, -2));
+
+   TEST_REGEX_SEARCH("^(?(2)a|(1)(2))+$", perl, "12", match_default, make_array(0, 2, 0, 1, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("^(?(2)a|(1)(2))+$", perl, "12a", match_default, make_array(0, 3, 0, 1, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("^(?(2)a|(1)(2))+$", perl, "12aa", match_default, make_array(0, 4, 0, 1, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("^(?(2)a|(1)(2))+$", perl, "1234", match_default, make_array(-2, -2));
+
+   TEST_INVALID_REGEX("(a)(?(1)a|b|c)", perl);
+   TEST_INVALID_REGEX("(?(?=a)a|b|c)", perl);
+   TEST_INVALID_REGEX("(?(1a)", perl);
+   TEST_INVALID_REGEX("(?:(a)|b)(?(", perl);
+   TEST_INVALID_REGEX("(?:(a)|b)(?(1", perl);
+   TEST_INVALID_REGEX("(?:(a)|b)(?(1)", perl);
+   TEST_INVALID_REGEX("(?:(a)|b)(?(a", perl);
+   TEST_INVALID_REGEX("(?:(a)|b)(?(?", perl);
+   TEST_INVALID_REGEX("(?:(a)|b)(?(?:", perl);
+   TEST_INVALID_REGEX("(?:(a)|b)(?(?<", perl);
+   TEST_INVALID_REGEX("(?:(a)|b)(?(?<a", perl);
+}
+
+void test_options()
+{
+   // test the (?imsx) construct:
+   using namespace boost::regex_constants;
+   TEST_INVALID_REGEX("(?imsx", perl);
+   TEST_INVALID_REGEX("(?g", perl);
+   TEST_INVALID_REGEX("(?im-sx", perl);
+   TEST_INVALID_REGEX("(?im-sx:", perl);
+   TEST_INVALID_REGEX("(?-g)", perl);
+   TEST_REGEX_SEARCH("(?-m)^abc", perl, "abc\nabc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("(?m)^abc", perl|no_mod_m, "abc\nabc", match_default, make_array(0, 3, -2, 4, 7, -2, -2));
+   TEST_REGEX_SEARCH("(?-m)^abc", perl, "abc\nabc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("(?m)^abc", perl|no_mod_m, "abc\nabc", match_default, make_array(0, 3, -2, 4, 7, -2, -2));
+
+   TEST_REGEX_SEARCH("   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)", perl|mod_x, "ab c", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)", perl|mod_x, "abc", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)", perl|mod_x, "ab cde", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)", perl, "ab c", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)", perl, "abc", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(?x)   ^    a   (?# begins with a)  b\\sc (?# then b c) $ (?# then end)", perl, "ab cde", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("^   a\\ b[c ]d       $", perl|mod_x, "a bcd", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("^   a\\ b[c ]d       $", perl|mod_x, "a b d", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("^   a\\ b[c ]d       $", perl|mod_x, "abcd", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("^   a\\ b[c ]d       $", perl|mod_x, "ab d", match_default, make_array(-2, -2));
+
+   TEST_REGEX_SEARCH("^1234(?# test newlines\n  inside)", perl|mod_x, "1234", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("^1234 #comment in extended re\n", perl|mod_x, "1234", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("#rhubarb\n  abcd", perl|mod_x, "abcd", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("^1234 #comment in extended re\r\n", perl|mod_x, "1234", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("#rhubarb\r\n  abcd", perl|mod_x, "abcd", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("^abcd#rhubarb", perl|mod_x, "abcd", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("^abcd#rhubarb", perl, "abcd#rhubarb", match_default, make_array(0, 12, -2, -2));
+   TEST_REGEX_SEARCH("^a	b\n\n    c", perl|mod_x, "abc", match_default, make_array(0, 3, -2, -2));
+
+   TEST_REGEX_SEARCH("(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ", perl|mod_x, "12-sep-98", match_default, make_array(0, 9, -2, -2));
+   TEST_REGEX_SEARCH("(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ", perl|mod_x, "12-09-98", match_default, make_array(0, 8, -2, -2));
+   TEST_REGEX_SEARCH("(?(?=[^a-z]+[a-z])  \\d{2}-[a-z]{3}-\\d{2}  |  \\d{2}-\\d{2}-\\d{2} ) ", perl|mod_x, "sep-12-98", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("^a (?#xxx) (?#yyy) {3}c", perl|mod_x, "aaac", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab", perl|mod_x, "ab", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("   abc\\Q abc\\Eabc", perl|mod_x, "abc abcabc", match_default, make_array(0, 10, -2, -2));
+   TEST_REGEX_SEARCH("   abc\\Q abc\\Eabc", perl|mod_x, "abcabcabc", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("abc#comment\n    \\Q#not comment\n    literal\\E", perl|mod_x, "abc#not comment\n    literal", match_default, make_array(0, 27, -2, -2));
+   TEST_REGEX_SEARCH("abc#comment\n    \\Q#not comment\n    literal", perl|mod_x, "abc#not comment\n    literal", match_default, make_array(0, 27, -2, -2));
+   TEST_REGEX_SEARCH("abc#comment\n    \\Q#not comment\n    literal\\E #more comment\n    ", perl|mod_x, "abc#not comment\n    literal", match_default, make_array(0, 27, -2, -2));
+   TEST_REGEX_SEARCH("abc#comment\n    \\Q#not comment\n    literal\\E #more comment", perl|mod_x, "abc#not comment\n    literal", match_default, make_array(0, 27, -2, -2));
+   
+   TEST_REGEX_SEARCH("(a (?x)b c)d e", perl, "a bcd e", match_default, make_array(0, 7, 0, 4, -2, -2));
+   TEST_REGEX_SEARCH("(a (?x)b c)d e", perl, "a b cd e", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(a (?x)b c)d e", perl, "abcd e", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(a (?x)b c)d e", perl, "a bcde", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(a b(?x)c d (?-x)e f)", perl, "a bcde f", match_default, make_array(0, 8, 0, 8, -2, -2));
+   TEST_REGEX_SEARCH("(a b(?x)c d (?-x)e f)", perl, "abcdef", match_default, make_array(-2, -2));
+
+   TEST_REGEX_SEARCH("a(?x: b c )d", perl, "XabcdY", match_default, make_array(1, 5, -2, -2));
+   TEST_REGEX_SEARCH("a(?x: b c )d", perl, "Xa b c d Y", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("((?x)x y z | a b c)", perl, "XabcY", match_default, make_array(1, 4, 1, 4, -2, -2));
+   TEST_REGEX_SEARCH("((?x)x y z | a b c)", perl, "AxyzB", match_default, make_array(1, 4, 1, 4, -2, -2));
+
+   TEST_REGEX_SEARCH("(a (?x)b c)d e", perl, "a bcd e", match_default, make_array(0, 7, 0, 4, -2, -2));
+   TEST_REGEX_SEARCH("(a (?x)b c)d e", perl, "a b cd e", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(a (?x)b c)d e", perl, "abcd e", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(a (?x)b c)d e", perl, "a bcde", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(a b(?x)c d (?-x)e f)", perl, "a bcde f", match_default, make_array(0, 8, 0, 8, -2, -2));
+   TEST_REGEX_SEARCH("(a b(?x)c d (?-x)e f)", perl, "abcdef", match_default, make_array(-2, -2));
+}
+
+void test_options2()
+{
+   using namespace boost::regex_constants;
+   TEST_INVALID_REGEX("(?i-", perl);
+   TEST_INVALID_REGEX("(?i-s", perl);
+   TEST_INVALID_REGEX("(?i-sd)", perl);
+   TEST_REGEX_SEARCH("(a(?i)b)c", perl, "abc", match_default, make_array(0, 3, 0, 2, -2, -2));
+   TEST_REGEX_SEARCH("(a(?i)b)c", perl, "aBc", match_default, make_array(0, 3, 0, 2, -2, -2));
+   TEST_REGEX_SEARCH("(a(?i)b)c", perl, "abC", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(a(?i)b)c", perl, "aBC", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(a(?i)b)c", perl, "Abc", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(a(?i)b)c", perl, "ABc", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(a(?i)b)c", perl, "ABC", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(a(?i)b)c", perl, "AbC", match_default, make_array(-2, -2));
+   
+   TEST_REGEX_SEARCH("(a(?i)B)c", perl, "abc", match_default, make_array(0, 3, 0, 2, -2, -2));
+   TEST_REGEX_SEARCH("(a(?i)B)c", perl, "aBc", match_default, make_array(0, 3, 0, 2, -2, -2));
+   TEST_REGEX_SEARCH("(a(?i)B)c", perl, "abC", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(a(?i)B)c", perl, "aBC", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(a(?i)B)c", perl, "Abc", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(a(?i)B)c", perl, "ABc", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(a(?i)B)c", perl, "ABC", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(a(?i)B)c", perl, "AbC", match_default, make_array(-2, -2));
+   
+   TEST_REGEX_SEARCH("a(?i:b)c", perl, "abc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(?i:b)c", perl, "aBc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(?i:b)c", perl, "ABC", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("a(?i:b)c", perl, "abC", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("a(?i:b)c", perl, "aBC", match_default, make_array(-2, -2));
+
+   TEST_REGEX_SEARCH("a(?i:b)*c", perl, "aBc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(?i:b)*c", perl, "aBBc", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("a(?i:b)*c", perl, "aBC", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("a(?i:b)*c", perl, "aBBC", match_default, make_array(-2, -2));
+
+   TEST_REGEX_SEARCH("a(?=b(?i)c)\\w\\wd", perl, "abcd", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("a(?=b(?i)c)\\w\\wd", perl, "abCd", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("a(?=b(?i)c)\\w\\wd", perl, "aBCd", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("a(?=b(?i)c)\\w\\wd", perl, "abcD", match_default, make_array(-2, -2));
+
+   TEST_REGEX_SEARCH("(?s-i:more.*than).*million", perl|icase, "more than million", match_default, make_array(0, 17, -2, -2));
+   TEST_REGEX_SEARCH("(?s-i:more.*than).*million", perl|icase, "more than MILLION", match_default, make_array(0, 17, -2, -2));
+   TEST_REGEX_SEARCH("(?s-i:more.*than).*million", perl|icase, "more \n than Million", match_default, make_array(0, 19, -2, -2));
+   TEST_REGEX_SEARCH("(?s-i:more.*than).*million", perl|icase, "MORE THAN MILLION", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(?s-i:more.*than).*million", perl|icase|no_mod_s|no_mod_m, "more \n than \n million", match_default, make_array(-2, -2));
+
+   TEST_REGEX_SEARCH("(?:(?s-i)more.*than).*million", perl|icase, "more than million", match_default, make_array(0, 17, -2, -2));
+   TEST_REGEX_SEARCH("(?:(?s-i)more.*than).*million", perl|icase, "more than MILLION", match_default, make_array(0, 17, -2, -2));
+   TEST_REGEX_SEARCH("(?:(?s-i)more.*than).*million", perl|icase, "more \n than Million", match_default, make_array(0, 19, -2, -2));
+   TEST_REGEX_SEARCH("(?:(?s-i)more.*than).*million", perl|icase, "MORE THAN MILLION", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(?:(?s-i)more.*than).*million", perl|icase|no_mod_s|no_mod_m, "more \n than \n million", match_default, make_array(-2, -2));
+
+   TEST_REGEX_SEARCH("(?>a(?i)b+)+c", perl, "abc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("(?>a(?i)b+)+c", perl, "aBbc", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("(?>a(?i)b+)+c", perl, "aBBc", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("(?>a(?i)b+)+c", perl, "Abc", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(?>a(?i)b+)+c", perl, "abAb", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(?>a(?i)b+)+c", perl, "abbC", match_default, make_array(-2, -2));
+
+   TEST_REGEX_SEARCH("(?=a(?i)b)\\w\\wc", perl, "abc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("(?=a(?i)b)\\w\\wc", perl, "aBc", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("(?=a(?i)b)\\w\\wc", perl, "Ab", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(?=a(?i)b)\\w\\wc", perl, "abC", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(?=a(?i)b)\\w\\wc", perl, "aBC", match_default, make_array(-2, -2));
+
+   TEST_REGEX_SEARCH("(?<=a(?i)b)(\\w\\w)c", perl, "abxxc", match_default, make_array(2, 5, 2, 4, -2, -2));
+   TEST_REGEX_SEARCH("(?<=a(?i)b)(\\w\\w)c", perl, "aBxxc", match_default, make_array(2, 5, 2, 4, -2, -2));
+   TEST_REGEX_SEARCH("(?<=a(?i)b)(\\w\\w)c", perl, "Abxxc", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(?<=a(?i)b)(\\w\\w)c", perl, "ABxxc", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(?<=a(?i)b)(\\w\\w)c", perl, "abxxC", match_default, make_array(-2, -2));
+
+   TEST_REGEX_SEARCH("(?<=ab(?i)x(?-i)y|(?i)z|b)ZZ", perl, "abxyZZ", match_default, make_array(4, 6, -2, -2));
+   TEST_REGEX_SEARCH("(?<=ab(?i)x(?-i)y|(?i)z|b)ZZ", perl, "abXyZZ", match_default, make_array(4, 6, -2, -2));
+   TEST_REGEX_SEARCH("(?:ab(?i)x(?-i)y|(?i)z|b)ZZ", perl, "ZZZ", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("(?:ab(?i)x(?-i)y|(?i)z|b)ZZ", perl, "zZZ", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("(?:ab(?i)x(?-i)y|(?i)z|b)ZZ", perl, "bZZ", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("(?:ab(?i)x(?-i)y|(?i)z|b)ZZ", perl, "BZZ", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("(?:ab(?i)x(?-i)y|(?i)z|b)ZZ", perl, "ZZ", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(?:ab(?i)x(?-i)y|(?i)z|b)ZZ", perl, "abXYZZ", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(?:ab(?i)x(?-i)y|(?i)z|b)ZZ", perl, "zzz", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(?:ab(?i)x(?-i)y|(?i)z|b)ZZ", perl, "bzz", match_default, make_array(-2, -2));
+
+   TEST_REGEX_SEARCH("((?-i)[[:lower:]])[[:lower:]]", perl|icase, "ab", match_default, make_array(0, 2, 0, 1, -2, -2));
+   TEST_REGEX_SEARCH("((?-i)[[:lower:]])[[:lower:]]", perl|icase, "aB", match_default, make_array(0, 2, 0, 1, -2, -2));
+   TEST_REGEX_SEARCH("((?-i)[[:lower:]])[[:lower:]]", perl|icase, "Ab", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("((?-i)[[:lower:]])[[:lower:]]", perl|icase, "AB", match_default, make_array(-2, -2));
+
+   TEST_REGEX_SEARCH("a(?-i)b", perl|icase, "ab", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(?-i)b", perl|icase, "Ab", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(?-i)b", perl|icase, "aB", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("a(?-i)b", perl|icase, "AB", match_default, make_array(-2, -2));
+
+   TEST_REGEX_SEARCH("(?:(?-i)a)b", perl|icase, "ab", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("((?-i)a)b", perl|icase, "ab", match_default, make_array(0, 2, 0, 1, -2, -2));
+   TEST_REGEX_SEARCH("(?:(?-i)a)b", perl|icase, "aB", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("((?-i)a)b", perl|icase, "aB", match_default, make_array(0, 2, 0, 1, -2, -2));
+
+   TEST_REGEX_SEARCH("(?:(?-i)a)b", perl|icase, "Ab", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(?:(?-i)a)b", perl|icase, "aB", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("((?-i)a)b", perl|icase, "aB", match_default, make_array(0, 2, 0, 1, -2, -2));
+
+   TEST_REGEX_SEARCH("(?:(?-i)a)b", perl|icase, "Ab", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(?:(?-i)a)b", perl|icase, "AB", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(?-i:a)b", perl|icase, "ab", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("((?-i:a))b", perl|icase, "ab", match_default, make_array(0, 2, 0, 1, -2, -2));
+   TEST_REGEX_SEARCH("(?-i:a)b", perl|icase, "aB", match_default, make_array(0, 2, -2, -2));
+
+   TEST_REGEX_SEARCH("((?-i:a))b", perl|icase, "aB", match_default, make_array(0, 2, 0, 1, -2, -2));
+   TEST_REGEX_SEARCH("(?-i:a)b", perl|icase, "AB", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(?-i:a)b", perl|icase, "Ab", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(?-i:a)b", perl|icase, "aB", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("((?-i:a))b", perl|icase, "aB", match_default, make_array(0, 2, 0, 1, -2, -2));
+   TEST_REGEX_SEARCH("(?-i:a)b", perl|icase, "Ab", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(?-i:a)b", perl|icase, "AB", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("((?-i:a.))b", perl|icase, "AB", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("((?-i:a.))b", perl|icase, "A\nB", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("((?s-i:a.))b", perl|icase, "a\nB", match_default, make_array(0, 3, 0, 2, -2, -2));
+
+   TEST_REGEX_SEARCH(".", perl, "\n", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH(".", perl, "\n", match_default|match_not_dot_newline, make_array(-2, -2));
+   TEST_REGEX_SEARCH(".", perl|mod_s, "\n", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH(".", perl|mod_s, "\n", match_default|match_not_dot_newline, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH(".", perl|no_mod_s, "\n", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH(".", perl|no_mod_s, "\n", match_default|match_not_dot_newline, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(?s).", perl, "\n", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("(?s).", perl, "\n", match_default|match_not_dot_newline, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("(?-s).", perl, "\n", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(?-s).", perl, "\n", match_default|match_not_dot_newline, make_array(-2, -2));
+
+   TEST_REGEX_SEARCH(".+", perl, "  \n  ", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH(".+", perl, "  \n  ", match_default|match_not_dot_newline, make_array(0, 2, -2, 3, 5, -2, -2));
+   TEST_REGEX_SEARCH(".+", perl|mod_s, "  \n  ", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH(".+", perl|mod_s, "  \n  ", match_default|match_not_dot_newline, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH(".+", perl|no_mod_s, "  \n  ", match_default, make_array(0, 2, -2, 3, 5, -2, -2));
+   TEST_REGEX_SEARCH(".+", perl|no_mod_s, "  \n  ", match_default|match_not_dot_newline, make_array(0, 2, -2, 3, 5, -2, -2));
+   TEST_REGEX_SEARCH("(?s).+", perl, "  \n  ", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("(?s).+", perl, "  \n  ", match_default|match_not_dot_newline, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("(?-s).+", perl, "  \n  ", match_default, make_array(0, 2, -2, 3, 5, -2, -2));
+   TEST_REGEX_SEARCH("(?-s).+", perl, "  \n  ", match_default|match_not_dot_newline, make_array(0, 2, -2, 3, 5, -2, -2));
+
+   const char* big_expression = 
+"  (?: [\\040\\t] |  \\(\n"
+"(?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*\n"
+"\\)  )*                          # optional leading comment\n"
+"(?:    (?:\n"
+"[^(\\040)<>@,;:\".\\\\\\[\\]\\000-\\037\\x80-\\xff]+    # some number of atom characters...\n"
+"(?![^(\\040)<>@,;:\".\\\\\\[\\]\\000-\\037\\x80-\\xff]) # ..not followed by something that could be part of an atom\n"
+"|\n"
+"\" (?:                      # opening quote...\n"
+"[^\\\\\\x80-\\xff\\n\\015\"]                #   Anything except backslash and quote\n"
+"|                     #    or\n"
+"\\\\ [^\\x80-\\xff]           #   Escaped something (something != CR)\n"
+")* \"  # closing quote\n"
+")                    # initial word\n"
+"(?:  (?: [\\040\\t] |  \\(\n"
+"(?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*\n"
+"\\)  )*  \\.  (?: [\\040\\t] |  \\(\n"
+"(?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*\n"
+"\\)  )*   (?:\n"
+"[^(\\040)<>@,;:\".\\\\\\[\\]\\000-\\037\\x80-\\xff]+    # some number of atom characters...\n"
+"(?![^(\\040)<>@,;:\".\\\\\\[\\]\\000-\\037\\x80-\\xff]) # ..not followed by something that could be part of an atom\n"
+"|\n"
+"\" (?:                      # opening quote...\n"
+"[^\\\\\\x80-\\xff\\n\\015\"]                #   Anything except backslash and quote\n"
+"|                     #    or\n"
+"\\\\ [^\\x80-\\xff]           #   Escaped something (something != CR)\n"
+")* \"  # closing quote\n"
+")  )* # further okay, if led by a period\n"
+"(?: [\\040\\t] |  \\(\n"
+"(?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*\n"
+"\\)  )*  @  (?: [\\040\\t] |  \\(\n"
+"(?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*\n"
+"\\)  )*    (?:\n"
+"[^(\\040)<>@,;:\".\\\\\\[\\]\\000-\\037\\x80-\\xff]+    # some number of atom characters...\n"
+"(?![^(\\040)<>@,;:\".\\\\\\[\\]\\000-\\037\\x80-\\xff]) # ..not followed by something that could be part of an atom\n"
+"|   \\[                         # [\n"
+"(?: [^\\\\\\x80-\\xff\\n\\015\\[\\]] |  \\\\ [^\\x80-\\xff]  )*    #    stuff\n"
+"\\]                        #           ]\n"
+")                           # initial subdomain\n"
+"(?:                                  #\n"
+"(?: [\\040\\t] |  \\(\n"
+"(?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*\n"
+"\\)  )*  \\.                        # if led by a period...\n"
+"(?: [\\040\\t] |  \\(\n"
+"(?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*\n"
+"\\)  )*   (?:\n"
+"[^(\\040)<>@,;:\".\\\\\\[\\]\\000-\\037\\x80-\\xff]+    # some number of atom characters...\n"
+"(?![^(\\040)<>@,;:\".\\\\\\[\\]\\000-\\037\\x80-\\xff]) # ..not followed by something that could be part of an atom\n"
+"|   \\[                         # [\n"
+"(?: [^\\\\\\x80-\\xff\\n\\015\\[\\]] |  \\\\ [^\\x80-\\xff]  )*    #    stuff\n"
+"\\]                        #           ]\n"
+")                     #   ...further okay\n"
+")*\n"
+"# address\n"
+"|                     #  or\n"
+"(?:\n"
+"[^(\\040)<>@,;:\".\\\\\\[\\]\\000-\\037\\x80-\\xff]+    # some number of atom characters...\n"
+"(?![^(\\040)<>@,;:\".\\\\\\[\\]\\000-\\037\\x80-\\xff]) # ..not followed by something that could be part of an atom\n"
+"|\n"
+"\" (?:                      # opening quote...\n"
+"[^\\\\\\x80-\\xff\\n\\015\"]                #   Anything except backslash and quote\n"
+"|                     #    or\n"
+"\\\\ [^\\x80-\\xff]           #   Escaped something (something != CR)\n"
+")* \"  # closing quote\n"
+")             # one word, optionally followed by....\n"
+"(?:\n"
+"[^()<>@,;:\".\\\\\\[\\]\\x80-\\xff\\000-\\010\\012-\\037]  |  # atom and space parts, or...\n"
+"\\(\n"
+"(?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*\n"
+"\\)       |  # comments, or...\n"
+"\" (?:                      # opening quote...\n"
+"[^\\\\\\x80-\\xff\\n\\015\"]                #   Anything except backslash and quote\n"
+"|                     #    or\n"
+"\\\\ [^\\x80-\\xff]           #   Escaped something (something != CR)\n"
+")* \"  # closing quote\n"
+"# quoted strings\n"
+")*\n"
+"<  (?: [\\040\\t] |  \\(\n"
+"(?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*\n"
+"\\)  )*                     # leading <\n"
+"(?:  @  (?: [\\040\\t] |  \\(\n"
+"(?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*\n"
+"\\)  )*    (?:\n"
+"[^(\\040)<>@,;:\".\\\\\\[\\]\\000-\\037\\x80-\\xff]+    # some number of atom characters...\n"
+"(?![^(\\040)<>@,;:\".\\\\\\[\\]\\000-\\037\\x80-\\xff]) # ..not followed by something that could be part of an atom\n"
+"|   \\[                         # [\n"
+"(?: [^\\\\\\x80-\\xff\\n\\015\\[\\]] |  \\\\ [^\\x80-\\xff]  )*    #    stuff\n"
+"\\]                        #           ]\n"
+")                           # initial subdomain\n"
+"(?:                                  #\n"
+"(?: [\\040\\t] |  \\(\n"
+"(?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*\n"
+"\\)  )*  \\.                        # if led by a period...\n"
+"(?: [\\040\\t] |  \\(\n"
+"(?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*\n"
+"\\)  )*   (?:\n"
+"[^(\\040)<>@,;:\".\\\\\\[\\]\\000-\\037\\x80-\\xff]+    # some number of atom characters...\n"
+"(?![^(\\040)<>@,;:\".\\\\\\[\\]\\000-\\037\\x80-\\xff]) # ..not followed by something that could be part of an atom\n"
+"|   \\[                         # [\n"
+"(?: [^\\\\\\x80-\\xff\\n\\015\\[\\]] |  \\\\ [^\\x80-\\xff]  )*    #    stuff\n"
+"\\]                        #           ]\n"
+")                     #   ...further okay\n"
+")*\n"
+"(?:  (?: [\\040\\t] |  \\(\n"
+"(?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*\n"
+"\\)  )*  ,  (?: [\\040\\t] |  \\(\n"
+"(?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*\n"
+"\\)  )*  @  (?: [\\040\\t] |  \\(\n"
+"(?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*\n"
+"\\)  )*    (?:\n"
+"[^(\\040)<>@,;:\".\\\\\\[\\]\\000-\\037\\x80-\\xff]+    # some number of atom characters...\n"
+"(?![^(\\040)<>@,;:\".\\\\\\[\\]\\000-\\037\\x80-\\xff]) # ..not followed by something that could be part of an atom\n"
+"|   \\[                         # [\n"
+"(?: [^\\\\\\x80-\\xff\\n\\015\\[\\]] |  \\\\ [^\\x80-\\xff]  )*    #    stuff\n"
+"\\]                        #           ]\n"
+")                           # initial subdomain\n"
+"(?:                                  #\n"
+"(?: [\\040\\t] |  \\(\n"
+"(?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*\n"
+"\\)  )*  \\.                        # if led by a period...\n"
+"(?: [\\040\\t] |  \\(\n"
+"(?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*\n"
+"\\)  )*   (?:\n"
+"[^(\\040)<>@,;:\".\\\\\\[\\]\\000-\\037\\x80-\\xff]+    # some number of atom characters...\n"
+"(?![^(\\040)<>@,;:\".\\\\\\[\\]\\000-\\037\\x80-\\xff]) # ..not followed by something that could be part of an atom\n"
+"|   \\[                         # [\n"
+"(?: [^\\\\\\x80-\\xff\\n\\015\\[\\]] |  \\\\ [^\\x80-\\xff]  )*    #    stuff\n"
+"\\]                        #           ]\n"
+")                     #   ...further okay\n"
+")*\n"
+")* # further okay, if led by comma\n"
+":                                # closing colon\n"
+"(?: [\\040\\t] |  \\(\n"
+"(?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*\n"
+"\\)  )*  )? #       optional route\n"
+"(?:\n"
+"[^(\\040)<>@,;:\".\\\\\\[\\]\\000-\\037\\x80-\\xff]+    # some number of atom characters...\n"
+"(?![^(\\040)<>@,;:\".\\\\\\[\\]\\000-\\037\\x80-\\xff]) # ..not followed by something that could be part of an atom\n"
+"|\n"
+"\" (?:                      # opening quote...\n"
+"[^\\\\\\x80-\\xff\\n\\015\"]                #   Anything except backslash and quote\n"
+"|                     #    or\n"
+"\\\\ [^\\x80-\\xff]           #   Escaped something (something != CR)\n"
+")* \"  # closing quote\n"
+")                    # initial word\n"
+"(?:  (?: [\\040\\t] |  \\(\n"
+"(?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*\n"
+"\\)  )*  \\.  (?: [\\040\\t] |  \\(\n"
+"(?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*\n"
+"\\)  )*   (?:\n"
+"[^(\\040)<>@,;:\".\\\\\\[\\]\\000-\\037\\x80-\\xff]+    # some number of atom characters...\n"
+"(?![^(\\040)<>@,;:\".\\\\\\[\\]\\000-\\037\\x80-\\xff]) # ..not followed by something that could be part of an atom\n"
+"|\n"
+"\" (?:                      # opening quote...\n"
+"[^\\\\\\x80-\\xff\\n\\015\"]                #   Anything except backslash and quote\n"
+"|                     #    or\n"
+"\\\\ [^\\x80-\\xff]           #   Escaped something (something != CR)\n"
+")* \"  # closing quote\n"
+")  )* # further okay, if led by a period\n"
+"(?: [\\040\\t] |  \\(\n"
+"(?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*\n"
+"\\)  )*  @  (?: [\\040\\t] |  \\(\n"
+"(?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*\n"
+"\\)  )*    (?:\n"
+"[^(\\040)<>@,;:\".\\\\\\[\\]\\000-\\037\\x80-\\xff]+    # some number of atom characters...\n"
+"(?![^(\\040)<>@,;:\".\\\\\\[\\]\\000-\\037\\x80-\\xff]) # ..not followed by something that could be part of an atom\n"
+"|   \\[                         # [\n"
+"(?: [^\\\\\\x80-\\xff\\n\\015\\[\\]] |  \\\\ [^\\x80-\\xff]  )*    #    stuff\n"
+"\\]                        #           ]\n"
+")                           # initial subdomain\n"
+"(?:                                  #\n"
+"(?: [\\040\\t] |  \\(\n"
+"(?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*\n"
+"\\)  )*  \\.                        # if led by a period...\n"
+"(?: [\\040\\t] |  \\(\n"
+"(?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*\n"
+"\\)  )*   (?:\n"
+"[^(\\040)<>@,;:\".\\\\\\[\\]\\000-\\037\\x80-\\xff]+    # some number of atom characters...\n"
+"(?![^(\\040)<>@,;:\".\\\\\\[\\]\\000-\\037\\x80-\\xff]) # ..not followed by something that could be part of an atom\n"
+"|   \\[                         # [\n"
+"(?: [^\\\\\\x80-\\xff\\n\\015\\[\\]] |  \\\\ [^\\x80-\\xff]  )*    #    stuff\n"
+"\\]                        #           ]\n"
+")                     #   ...further okay\n"
+")*\n"
+"#       address spec\n"
+"(?: [\\040\\t] |  \\(\n"
+"(?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*\n"
+"\\)  )*  > #                  trailing >\n"
+"# name and address\n"
+")  (?: [\\040\\t] |  \\(\n"
+"(?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  |  \\( (?:  [^\\\\\\x80-\\xff\\n\\015()]  |  \\\\ [^\\x80-\\xff]  )* \\)  )*\n"
+"\\)  )*                       # optional trailing comment\n"
+"\n";
+
+   do{
+      test_info<char>::set_info(__FILE__, __LINE__, 
+         big_expression, 
+         perl|mod_x, "Alan Other <user@dom.ain>", match_default, 
+         make_array(0, 25, -2, -2));
+      test(char(0), test_regex_search_tag());
+   }while(0);
+#if !defined(BOOST_NO_WREGEX) && !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS) && !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+   do{
+      std::string st(big_expression);
+      test_info<wchar_t>::set_info(__FILE__, __LINE__, 
+         std::wstring(st.begin(), st.end()), 
+         perl|mod_x, L"Alan Other <user@dom.ain>", match_default, 
+         make_array(0, 25, -2, -2));
+      test(char(0), test_regex_search_tag());
+   }while(0);
+#endif
+   do{
+      test_info<char>::set_info(__FILE__, __LINE__, 
+         big_expression, 
+         perl|mod_x, "<user@dom.ain>", match_default, 
+         make_array(1, 13, -2, -2));
+      test(char(0), test_regex_search_tag());
+   }while(0);
+#if !defined(BOOST_NO_WREGEX) && !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS) && !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+   do{
+      std::string st(big_expression);
+      test_info<wchar_t>::set_info(__FILE__, __LINE__, 
+         std::wstring(st.begin(), st.end()), 
+         perl|mod_x, L"<user@dom.ain>", match_default, 
+         make_array(1, 13, -2, -2));
+      test(char(0), test_regex_search_tag());
+   }while(0);
+#endif
+   do{
+      test_info<char>::set_info(__FILE__, __LINE__, 
+         big_expression, 
+         perl|mod_x, "\"A. Other\" <user.1234@dom.ain> (a comment)", match_default, 
+         make_array(0, 42, -2, -2));
+      test(char(0), test_regex_search_tag());
+   }while(0);
+#if !defined(BOOST_NO_WREGEX) && !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS) && !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+   do{
+      std::string st(big_expression);
+      test_info<wchar_t>::set_info(__FILE__, __LINE__, 
+         std::wstring(st.begin(), st.end()), 
+         perl|mod_x, L"\"A. Other\" <user.1234@dom.ain> (a comment)", match_default, 
+         make_array(0, 42, -2, -2));
+      test(char(0), test_regex_search_tag());
+   }while(0);
+#endif
+   do{
+      test_info<char>::set_info(__FILE__, __LINE__, 
+         big_expression, 
+         perl|mod_x, "A. Other <user.1234@dom.ain> (a comment)", match_default, 
+         make_array(2, 40, -2, -2));
+      test(char(0), test_regex_search_tag());
+   }while(0);
+#if !defined(BOOST_NO_WREGEX) && !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS) && !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+   do{
+      std::string st(big_expression);
+      test_info<wchar_t>::set_info(__FILE__, __LINE__, 
+         std::wstring(st.begin(), st.end()), 
+         perl|mod_x, L"A. Other <user.1234@dom.ain> (a comment)", match_default, 
+         make_array(2, 40, -2, -2));
+      test(char(0), test_regex_search_tag());
+   }while(0);
+#endif
+   do{
+      test_info<char>::set_info(__FILE__, __LINE__, 
+         big_expression, 
+         perl|mod_x, "\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"@x400-re.lay", match_default, 
+         make_array(0, 61, -2, -2));
+      test(char(0), test_regex_search_tag());
+   }while(0);
+#if !defined(BOOST_NO_WREGEX) && !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS) && !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+   do{
+      std::string st(big_expression);
+      test_info<wchar_t>::set_info(__FILE__, __LINE__, 
+         std::wstring(st.begin(), st.end()), 
+         perl|mod_x, L"\"/s=user/ou=host/o=place/prmd=uu.yy/admd= /c=gb/\"@x400-re.lay", match_default, 
+         make_array(0, 61, -2, -2));
+      test(char(0), test_regex_search_tag());
+   }while(0);
+#endif
+   do{
+      test_info<char>::set_info(__FILE__, __LINE__, 
+         big_expression, 
+         perl|mod_x, "A missing angle <user@some.where", match_default, 
+         make_array(17, 32, -2, -2));
+      test(char(0), test_regex_search_tag());
+   }while(0);
+#if !defined(BOOST_NO_WREGEX) && !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS) && !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+   do{
+      std::string st(big_expression);
+      test_info<wchar_t>::set_info(__FILE__, __LINE__, 
+         std::wstring(st.begin(), st.end()), 
+         perl|mod_x, L"A missing angle <user@some.where", match_default, 
+         make_array(17, 32, -2, -2));
+      test(char(0), test_regex_search_tag());
+   }while(0);
+#endif
+}
+
diff --git a/test/regress/test_regex_replace.hpp b/test/regress/test_regex_replace.hpp
new file mode 100644
index 00000000..a6131ad2
--- /dev/null
+++ b/test/regress/test_regex_replace.hpp
@@ -0,0 +1,75 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         test_regex_replace.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Declares tests for regex search and replace.
+  */
+
+#ifndef BOOST_REGEX_REGRESS_REGEX_REPLACE_HPP
+#define BOOST_REGEX_REGRESS_REGEX_REPLACE_HPP
+#include "info.hpp"
+
+template<class charT, class traits>
+void test_regex_replace(boost::basic_regex<charT, traits>& r)
+{
+   typedef std::basic_string<charT> string_type;
+   const string_type& search_text = test_info<charT>::search_text();
+   boost::regex_constants::match_flag_type opts = test_info<charT>::match_options();
+   const string_type& format_string = test_info<charT>::format_string();
+   const string_type& result_string = test_info<charT>::result_string();
+
+   string_type result = boost::regex_replace(search_text, r, format_string, opts);
+   if(result != result_string)
+   {
+      BOOST_REGEX_TEST_ERROR("regex_replace generated an incorrect string result", charT);
+   }
+}
+
+
+struct test_regex_replace_tag{};
+
+template<class charT, class traits>
+void test(boost::basic_regex<charT, traits>& r, const test_regex_replace_tag&)
+{
+   const std::basic_string<charT>& expression = test_info<charT>::expression();
+   boost::regex_constants::syntax_option_type syntax_options = test_info<charT>::syntax_options();
+   try{
+      r.assign(expression, syntax_options);
+      if(r.status())
+      {
+         BOOST_REGEX_TEST_ERROR("Expression did not compile when it should have done, error code = " << r.status(), charT);
+      }
+      test_regex_replace(r);
+   }
+   catch(const boost::bad_expression& e)
+   {
+      BOOST_REGEX_TEST_ERROR("Expression did not compile when it should have done: " << e.what(), charT);
+   }
+   catch(const std::runtime_error& r)
+   {
+      BOOST_REGEX_TEST_ERROR("Received an unexpected std::runtime_error: " << r.what(), charT);
+   }
+   catch(const std::exception& r)
+   {
+      BOOST_REGEX_TEST_ERROR("Received an unexpected std::exception: " << r.what(), charT);
+   }
+   catch(...)
+   {
+      BOOST_REGEX_TEST_ERROR("Received an unexpected exception of unknown type", charT);
+   }
+
+}
+
+#endif
+
diff --git a/test/regress/test_regex_search.hpp b/test/regress/test_regex_search.hpp
new file mode 100644
index 00000000..3854bbb5
--- /dev/null
+++ b/test/regress/test_regex_search.hpp
@@ -0,0 +1,388 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         test_regex_search.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Declares tests for regex search and iteration.
+  */
+
+#ifndef BOOST_REGEX_REGRESS_REGEX_SEARCH_HPP
+#define BOOST_REGEX_REGRESS_REGEX_SEARCH_HPP
+#include "info.hpp"
+//
+// this file implements a test for a regular expression that should compile,
+// followed by a search for that expression:
+//
+struct test_regex_search_tag{};
+
+template <class BidirectionalIterator>
+void test_sub_match(const boost::sub_match<BidirectionalIterator>& sub, BidirectionalIterator base, const int* answer_table, int i)
+{
+#ifdef BOOST_MSVC
+#pragma warning(push)
+#pragma warning(disable:4244)
+#endif
+   typedef typename boost::sub_match<BidirectionalIterator>::value_type charT;
+   if((sub.matched == 0) 
+      && 
+         !((i == 0)
+          && (test_info<charT>::match_options() & boost::match_partial)) )
+   {
+      if(answer_table[2*i] >= 0)
+      {
+         BOOST_REGEX_TEST_ERROR(
+            "Sub-expression " << i 
+            << " was not matched when it should have been.", charT);
+      }
+   }
+   else
+   {
+      if(std::distance(base, sub.first) != answer_table[2*i])
+      {
+         BOOST_REGEX_TEST_ERROR(
+            "Error in start location of sub-expression " 
+            << i << ", found " << std::distance(base, sub.first) 
+            << ", expected " << answer_table[2*i] << ".", charT);
+      }
+      if(std::distance(base, sub.second) != answer_table[1+ 2*i])
+      {
+         BOOST_REGEX_TEST_ERROR(
+            "Error in end location of sub-expression " 
+            << i << ", found " << std::distance(base, sub.second) 
+            << ", expected " << answer_table[1 + 2*i] << ".", charT);
+      }
+   }
+#ifdef BOOST_MSVC
+#pragma warning(pop)
+#endif
+}
+
+template <class BidirectionalIterator, class Allocator>
+void test_result(const boost::match_results<BidirectionalIterator, Allocator>& what, BidirectionalIterator base, const int* answer_table)
+{
+   for(unsigned i = 0; i < what.size(); ++i)
+   {
+      test_sub_match(what[i], base, answer_table, i);
+   }
+}
+
+template<class charT, class traits>
+void test_simple_search(boost::basic_regex<charT, traits>& r)
+{
+   typedef typename std::basic_string<charT>::const_iterator const_iterator;
+   const std::basic_string<charT>& search_text = test_info<charT>::search_text();
+   boost::regex_constants::match_flag_type opts = test_info<charT>::match_options();
+   const int* answer_table = test_info<charT>::answer_table();
+   boost::match_results<const_iterator> what;
+   if(boost::regex_search(
+      search_text.begin(),
+      search_text.end(),
+      what,
+      r,
+      opts))
+   {
+      test_result(what, search_text.begin(), answer_table);
+      // setting match_any should have no effect on the result returned:
+      if(!boost::regex_search(
+         search_text.begin(),
+         search_text.end(),
+         r,
+         opts|boost::regex_constants::match_any))
+      {
+         BOOST_REGEX_TEST_ERROR("Expected match was not found when using the match_any flag.", charT);
+      }
+   }
+   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);
+      }
+      // setting match_any should have no effect on the result returned:
+      else if(boost::regex_search(
+         search_text.begin(),
+         search_text.end(),
+         r,
+         opts|boost::regex_constants::match_any))
+      {
+         BOOST_REGEX_TEST_ERROR("Unexpected match was found when using the match_any flag.", charT);
+      }
+   }
+}
+
+template<class charT, class traits>
+void test_regex_iterator(boost::basic_regex<charT, traits>& r)
+{
+   typedef typename std::basic_string<charT>::const_iterator const_iterator;
+   typedef boost::regex_iterator<const_iterator, charT, traits> test_iterator;
+   const std::basic_string<charT>& search_text = test_info<charT>::search_text();
+   boost::regex_constants::match_flag_type opts = test_info<charT>::match_options();
+   const int* answer_table = test_info<charT>::answer_table();
+   test_iterator start(search_text.begin(), search_text.end(), r, opts), end;
+   test_iterator copy(start);
+   const_iterator last_end = search_text.begin();
+   while(start != end)
+   {
+      if(start != copy)
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator != comparison.", charT);
+      }
+      if(!(start == copy))
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator == comparison.", charT);
+      }
+      test_result(*start, search_text.begin(), answer_table);
+      // test $` and $' :
+      if(start->prefix().first != last_end)
+      {
+         BOOST_REGEX_TEST_ERROR("Incorrect position for start of $`", charT);
+      }
+      if(start->prefix().second != (*start)[0].first)
+      {
+         BOOST_REGEX_TEST_ERROR("Incorrect position for end of $`", charT);
+      }
+      if(start->prefix().matched != (start->prefix().first != start->prefix().second))
+      {
+         BOOST_REGEX_TEST_ERROR("Incorrect position for matched member of $`", charT);
+      }
+      if(start->suffix().first != (*start)[0].second)
+      {
+         BOOST_REGEX_TEST_ERROR("Incorrect position for start of $'", charT);
+      }
+      if(start->suffix().second != search_text.end())
+      {
+         BOOST_REGEX_TEST_ERROR("Incorrect position for end of $'", charT);
+      }
+      if(start->suffix().matched != (start->suffix().first != start->suffix().second))
+      {
+         BOOST_REGEX_TEST_ERROR("Incorrect position for matched member of $'", charT);
+      }
+      last_end = (*start)[0].second;
+      ++start;
+      ++copy;
+      // move on the answer table to next set of answers;
+      if(*answer_table != -2)
+         while(*answer_table++ != -2){}
+   }
+   if(answer_table[0] >= 0)
+   {
+      // we should have had a match but didn't:
+      BOOST_REGEX_TEST_ERROR("Expected match was not found.", charT);
+   }
+}
+
+template<class charT, class traits>
+void test_regex_token_iterator(boost::basic_regex<charT, traits>& r)
+{
+   typedef typename std::basic_string<charT>::const_iterator const_iterator;
+   typedef boost::regex_token_iterator<const_iterator, charT, traits> test_iterator;
+   const std::basic_string<charT>& search_text = test_info<charT>::search_text();
+   boost::regex_constants::match_flag_type opts = test_info<charT>::match_options();
+   const int* answer_table = test_info<charT>::answer_table();
+   //
+   // we start by testing sub-expression 0:
+   //
+   test_iterator start(search_text.begin(), search_text.end(), r, 0, opts), end;
+   test_iterator copy(start);
+   while(start != end)
+   {
+      if(start != copy)
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator != comparison.", charT);
+      }
+      if(!(start == copy))
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator == comparison.", charT);
+      }
+      test_sub_match(*start, search_text.begin(), answer_table, 0);
+      ++start;
+      ++copy;
+      // move on the answer table to next set of answers;
+      if(*answer_table != -2)
+         while(*answer_table++ != -2){}
+   }
+   if(answer_table[0] >= 0)
+   {
+      // we should have had a match but didn't:
+      BOOST_REGEX_TEST_ERROR("Expected match was not found.", charT);
+   }
+   //
+   // and now field spitting:
+   //
+   test_iterator start2(search_text.begin(), search_text.end(), r, -1, opts), end2;
+   test_iterator copy2(start2);
+   int last_end2 = 0;
+   answer_table = test_info<charT>::answer_table();
+   while(start2 != end2)
+   {
+      if(start2 != copy2)
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator != comparison.", charT);
+      }
+      if(!(start2 == copy2))
+      {
+         BOOST_REGEX_TEST_ERROR("Failed iterator == comparison.", charT);
+      }
+#ifdef BOOST_MSVC
+#pragma warning(push)
+#pragma warning(disable:4244)
+#endif
+      if(std::distance(search_text.begin(), start2->first) != last_end2)
+      {
+         BOOST_REGEX_TEST_ERROR(
+            "Error in location of start of field split, found: " 
+            << std::distance(search_text.begin(), start2->first)
+            << ", expected: "
+            << last_end2
+            << ".", charT);
+      }
+      int expected_end = static_cast<int>(answer_table[0] < 0 ? search_text.size() : answer_table[0]);
+      if(std::distance(search_text.begin(), start2->second) != expected_end)
+      {
+         BOOST_REGEX_TEST_ERROR(
+            "Error in location of end2 of field split, found: "
+            << std::distance(search_text.begin(), start2->second)
+            << ", expected: "
+            << expected_end
+            << ".", charT);
+      }
+#ifdef BOOST_MSVC
+#pragma warning(pop)
+#endif
+      last_end2 = answer_table[1];
+      ++start2;
+      ++copy2;
+      // move on the answer table to next set of answers;
+      if(*answer_table != -2)
+         while(*answer_table++ != -2){}
+   }
+   if(answer_table[0] >= 0)
+   {
+      // we should have had a match but didn't:
+      BOOST_REGEX_TEST_ERROR("Expected match was not found.", charT);
+   }
+}
+
+template <class charT, class traits>
+struct grep_test_predicate
+{
+   typedef typename std::basic_string<charT>::const_iterator test_iter;
+
+   grep_test_predicate(test_iter b, const int* a)
+      : m_base(b), m_table(a)
+   {}
+   bool operator()(const boost::match_results<test_iter>& what)
+   {
+      test_result(what, m_base, m_table);
+      // move on the answer table to next set of answers;
+      if(*m_table != -2)
+         while(*m_table++ != -2){}
+      return true;
+   }
+private:
+   test_iter m_base;
+   const int* m_table;
+};
+
+template<class charT, class traits>
+void test_regex_grep(boost::basic_regex<charT, traits>& r)
+{
+   typedef typename std::basic_string<charT>::const_iterator const_iterator;
+   const std::basic_string<charT>& search_text = test_info<charT>::search_text();
+   boost::regex_constants::match_flag_type opts = test_info<charT>::match_options();
+   const int* answer_table = test_info<charT>::answer_table();
+   grep_test_predicate<charT, traits> pred(search_text.begin(), answer_table);
+   boost::regex_grep(pred, search_text.begin(), search_text.end(), r, opts);
+}
+
+template<class charT, class traits>
+void test_regex_match(boost::basic_regex<charT, traits>& r)
+{
+   typedef typename std::basic_string<charT>::const_iterator const_iterator;
+   const std::basic_string<charT>& search_text = test_info<charT>::search_text();
+   boost::regex_constants::match_flag_type opts = test_info<charT>::match_options();
+   const int* answer_table = test_info<charT>::answer_table();
+   boost::match_results<const_iterator> what;
+   if(answer_table[0] < 0)
+   {
+      if(boost::regex_match(search_text, r, opts))
+      {
+         BOOST_REGEX_TEST_ERROR("boost::regex_match found a match when it should not have done so.", charT);
+      }
+   }
+   else
+   {
+      if((answer_table[0] > 0) && boost::regex_match(search_text, r, opts))
+      {
+         BOOST_REGEX_TEST_ERROR("boost::regex_match found a match when it should not have done so.", charT);
+      }
+      else if((answer_table[0] == 0) && (answer_table[1] == static_cast<int>(search_text.size())))
+      {
+         if(boost::regex_match(
+            search_text.begin(),
+            search_text.end(),
+            what,
+            r,
+            opts))
+         {
+            test_result(what, search_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);
+         }
+      }
+   }
+}
+
+template<class charT, class traits>
+void test(boost::basic_regex<charT, traits>& r, const test_regex_search_tag&)
+{
+   const std::basic_string<charT>& expression = test_info<charT>::expression();
+   boost::regex_constants::syntax_option_type syntax_options = test_info<charT>::syntax_options();
+   try{
+      r.assign(expression, syntax_options);
+      if(r.status())
+      {
+         BOOST_REGEX_TEST_ERROR("Expression did not compile when it should have done, error code = " << r.status(), charT);
+      }
+      test_simple_search(r);
+      test_regex_iterator(r);
+      test_regex_token_iterator(r);
+      test_regex_grep(r);
+      test_regex_match(r);
+   }
+   catch(const boost::bad_expression& e)
+   {
+      BOOST_REGEX_TEST_ERROR("Expression did not compile when it should have done: " << e.what(), charT);
+   }
+   catch(const std::runtime_error& r)
+   {
+      BOOST_REGEX_TEST_ERROR("Received an unexpected std::runtime_error: " << r.what(), charT);
+   }
+   catch(const std::exception& r)
+   {
+      BOOST_REGEX_TEST_ERROR("Received an unexpected std::exception: " << r.what(), charT);
+   }
+   catch(...)
+   {
+      BOOST_REGEX_TEST_ERROR("Received an unexpected exception of unknown type", charT);
+   }
+
+}
+
+
+
+#endif
diff --git a/test/regress/test_replace.cpp b/test/regress/test_replace.cpp
new file mode 100644
index 00000000..efe712c6
--- /dev/null
+++ b/test/regress/test_replace.cpp
@@ -0,0 +1,119 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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)
+ *
+ */
+
+#include "test.hpp"
+
+#ifdef BOOST_MSVC
+#pragma warning(disable:4127)
+#endif
+
+void test_replace()
+{
+   using namespace boost::regex_constants;
+   // start by testing subs:
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "$`", "...");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "$'", ",,,");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "$&", "aaa");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "$0", "aaa");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "$1", "");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "$15", "");
+   TEST_REGEX_REPLACE("(a+)b+", perl, "...aaabbb,,,", match_default|format_no_copy, "$1", "aaa");
+   TEST_REGEX_REPLACE("[[:digit:]]*", perl, "123ab", match_default|format_no_copy, "<$0>", "<123><><><>");
+   TEST_REGEX_REPLACE("[[:digit:]]*", perl, "123ab1", match_default|format_no_copy, "<$0>", "<123><><><1><>");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "$`$", "...$");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "(?1x:y)", "(?1x:y)");
+   // and now escapes:
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "$x", "$x");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\a", "\a");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\f", "\f");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\n", "\n");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\r", "\r");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\t", "\t");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\v", "\v");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\", "\\");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\x21", "!");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\xz", "xz");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\x", "x");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\x{z}", "x{z}");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\x{12b", "x{12b");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\x{21}", "!");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\c@", "\0");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\c", "c");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\e", "\x1B");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_no_copy, "\\0101", "A");
+   TEST_REGEX_REPLACE("(a+)", perl, "...aaa,,,", match_default|format_no_copy, "\\u$1", "Aaa");
+   TEST_REGEX_REPLACE("(a+)", perl, "...aaa,,,", match_default|format_no_copy, "\\U$1", "AAA");
+   TEST_REGEX_REPLACE("(a+)", perl, "...aaa,,,", match_default|format_no_copy, "\\U$1\\E$1", "AAAaaa");
+   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");
+   // 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");
+   TEST_REGEX_REPLACE("(a+)(b+)", perl, " ...aabb,,", match_default|format_sed|format_no_copy, "\\2", "bb");
+   TEST_REGEX_REPLACE("(a+)(b+)", perl, " ...aabb,,", match_default|format_sed|format_no_copy, "&", "aabb");
+   TEST_REGEX_REPLACE("(a+)(b+)", perl, " ...aabb,,", match_default|format_sed|format_no_copy, "$", "$");
+   TEST_REGEX_REPLACE("(a+)(b+)", perl, " ...aabb,,", match_default|format_sed|format_no_copy, "$1", "$1");
+   TEST_REGEX_REPLACE("(a+)(b+)", perl, " ...aabb,,", match_default|format_sed|format_no_copy, "()?:", "()?:");
+   TEST_REGEX_REPLACE("(a+)(b+)", perl, " ...aabb,,", match_default|format_sed|format_no_copy, "\\\\", "\\");
+   TEST_REGEX_REPLACE("(a+)(b+)", perl, " ...aabb,,", match_default|format_sed|format_no_copy, "\\&", "&");
+   TEST_REGEX_REPLACE("(a+)(b+)", perl, " ...aabb,,", match_default|format_sed|format_no_copy, "\\l\\u\\L\\U\\E", "luLUE");
+
+   TEST_REGEX_REPLACE("(a+)(b+)", perl, " ...aabb,,", match_default|format_perl|format_no_copy, "$0", "aabb");
+   TEST_REGEX_REPLACE("(a+)(b+)", perl, " ...aabb,,", match_default|format_perl|format_no_copy, "$1", "aa");
+   TEST_REGEX_REPLACE("(a+)(b+)", perl, " ...aabb,,", match_default|format_perl|format_no_copy, "$2", "bb");
+   TEST_REGEX_REPLACE("(a+)(b+)", perl, " ...aabb,,", match_default|format_perl|format_no_copy, "$&", "aabb");
+   TEST_REGEX_REPLACE("(a+)(b+)", perl, " ...aabb,,", match_default|format_perl|format_no_copy, "$$", "$");
+   TEST_REGEX_REPLACE("(a+)(b+)", perl, " ...aabb,,", match_default|format_perl|format_no_copy, "&", "&");
+   TEST_REGEX_REPLACE("(a+)(b+)", perl, " ...aabb,,", match_default|format_perl|format_no_copy, "\\0", "\0");
+   TEST_REGEX_REPLACE("(a+)(b+)", perl, " ...aabb,,", match_default|format_perl|format_no_copy, "()?:", "()?:");
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,", match_default|format_perl|format_no_copy, "\\0101", "A");
+   TEST_REGEX_REPLACE("(a+)(b+)", perl, " ...aabb,,", match_default|format_perl|format_no_copy, "\\1", "aa");
+   TEST_REGEX_REPLACE("(a+)(b+)", perl, " ...aabb,,", match_default|format_perl|format_no_copy, "\\2", "bb");
+
+   // move to copying unmatched data:
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_all, "bbb", "...bbb,,,");
+   TEST_REGEX_REPLACE("a+(b+)", perl, "...aaabb,,,", match_default|format_all, "$1", "...bb,,,");
+   TEST_REGEX_REPLACE("a+(b+)", perl, "...aaabb,,,ab*abbb?", match_default|format_all, "$1", "...bb,,,b*bbb?");
+   TEST_REGEX_REPLACE("(a+)|(b+)", perl, "...aaabb,,,ab*abbb?", match_default|format_all, "(?1A)(?2B)", "...AB,,,AB*AB?");
+   TEST_REGEX_REPLACE("(a+)|(b+)", perl, "...aaabb,,,ab*abbb?", match_default|format_all, "?1A:B", "...AB,,,AB*AB?");
+   TEST_REGEX_REPLACE("(a+)|(b+)", perl, "...aaabb,,,ab*abbb?", match_default|format_all, "(?1A:B)C", "...ACBC,,,ACBC*ACBC?");
+   TEST_REGEX_REPLACE("(a+)|(b+)", perl, "...aaabb,,,ab*abbb?", match_default|format_all, "?1:B", "...B,,,B*B?");
+   // move to copying unmatched data, but replace first occurance only:
+   TEST_REGEX_REPLACE("a+", perl, "...aaa,,,", match_default|format_all|format_first_only, "bbb", "...bbb,,,");
+   TEST_REGEX_REPLACE("a+(b+)", perl, "...aaabb,,,", match_default|format_all|format_first_only, "$1", "...bb,,,");
+   TEST_REGEX_REPLACE("a+(b+)", perl, "...aaabb,,,ab*abbb?", match_default|format_all|format_first_only, "$1", "...bb,,,ab*abbb?");
+   TEST_REGEX_REPLACE("(a+)|(b+)", perl, "...aaabb,,,ab*abbb?", match_default|format_all|format_first_only, "(?1A)(?2B)", "...Abb,,,ab*abbb?");
+   TEST_REGEX_REPLACE("(a+)|(b+)", perl, "...aaabb,,,ab*abbb?", match_default|format_all, "?1A", "...A,,,A*A?");
+   TEST_REGEX_REPLACE("(a+)|(b+)", perl, "...aaabb,,,ab*abbb?", match_default|format_all, "?1:B", "...B,,,B*B?");
+   TEST_REGEX_REPLACE("(a+)|(b+)", perl, "...aaabb,,,ab*abbb?", match_default|format_all, "(?1A:(?2B))", "...AB,,,AB*AB?");
+   TEST_REGEX_REPLACE("X", literal, "XX", match_default, "Y", "YY");
+   TEST_REGEX_REPLACE("(a+)|(b+)", perl, "...aaabb,,,ab*abbb?", match_default|format_all, "(?", "...??,,,??*???");
+   TEST_REGEX_REPLACE("(a+)|(b+)", perl, "...aaabb,,,ab*abbb?", match_default|format_all, "(?a", "...?a?a,,,?a?a*?a?a?");
+   TEST_REGEX_REPLACE("(a+)|(b+)", perl, "...aaabb,,,ab*abbb?", match_default|format_all, "(?1A:(?2B))abc", "...AabcBabc,,,AabcBabc*AabcBabc?");
+   TEST_REGEX_REPLACE("a+(b+)", perl, "...aaabb,,,", match_default|format_all|format_no_copy, "(?2abc:def)", "def");
+   TEST_REGEX_REPLACE("a+(b+)", perl, "...aaabb,,,", match_default|format_all|format_no_copy, "(?1abc:def)", "abc");
+   TEST_REGEX_REPLACE("a+(b+)", perl, "...aaabb,,,", match_default|format_perl|format_no_copy, "(?1abc:def)", "(?1abc:def)");
+   TEST_REGEX_REPLACE("a+(b+)", perl, "...", match_default|format_perl, "(?1abc:def)", "...");
+   TEST_REGEX_REPLACE("a+(b+)", perl, "...", match_default|format_perl|format_no_copy, "(?1abc:def)", "");
+   // probe bug reports and other special cases:
+   TEST_REGEX_REPLACE("([^\\d]+).*", normal|icase, "tesd 999 test", match_default|format_all, "($1)replace", "tesd replace");
+   TEST_REGEX_REPLACE("(a)(b)", perl, "ab", match_default|format_all, "$1:$2", "a:b");
+   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", emacs|icase, "xx", match_default|format_all, "a", "aa");
+   TEST_REGEX_REPLACE("x", literal|icase, "xx", match_default|format_all, "a", "aa");
+   // literals:
+   TEST_REGEX_REPLACE("(a(c)?)|(b)", perl, "acab", match_default|format_literal, "\\&$", "\\&$\\&$\\&$");
+}
+
diff --git a/test/regress/test_sets.cpp b/test/regress/test_sets.cpp
new file mode 100644
index 00000000..64f08cd3
--- /dev/null
+++ b/test/regress/test_sets.cpp
@@ -0,0 +1,369 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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)
+ *
+ */
+
+#include "test.hpp"
+
+#ifdef BOOST_MSVC
+#pragma warning(disable:4127)
+#endif
+
+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_INVALID_REGEX("a[b", extended);
+   TEST_INVALID_REGEX("a[", extended);
+   TEST_INVALID_REGEX("a[]", 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);
+   TEST_INVALID_REGEX("a[1-3-5]c", extended);
+   TEST_INVALID_REGEX("a[1-", 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("[\\d]+", perl, "a019b", match_default, make_array(1, 4, -2, -2));
+
+   //
+   // escapes are supported in character classes if we have either
+   // perl or awk regular expressions:
+   //
+   TEST_REGEX_SEARCH("[\\n]", perl, "\n", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[\\b]", perl, "\b", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[\\n]", basic, "\n", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("[\\n]", basic, "\\", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[:class:]", basic|no_char_classes, ":", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[:class:]", basic|no_char_classes, "[", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[:class:]", basic|no_char_classes, "c", match_default, make_array(0, 1, -2, -2));
+   //
+   // test single character escapes:
+   //
+   TEST_REGEX_SEARCH("\\w", perl, "A", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\w", perl, "Z", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\w", perl, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\w", perl, "z", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\w", perl, "_", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\w", perl, "}", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("\\w", perl, "`", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("\\w", perl, "[", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("\\w", perl, "@", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("\\W", perl, "a", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("\\W", perl, "z", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("\\W", perl, "A", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("\\W", perl, "Z", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("\\W", perl, "_", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("\\W", perl, "}", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\W", perl, "`", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\W", perl, "[", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\W", perl, "@", match_default, make_array(0, 1, -2, -2));
+
+   TEST_REGEX_SEARCH("[[:lower:]]", perl|icase, "A", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[:upper:]]", perl|icase, "A", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[:alpha:]]", perl|icase, "A", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[:alnum:]]", perl|icase, "A", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[:lower:]]", perl|icase, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[:upper:]]", perl|icase, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[:alpha:]]", perl|icase, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[:alnum:]]", perl|icase, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[:lower:][:upper:]]", perl, "A", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[:lower:][:upper:]]", perl, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[:lower:][:alpha:]]", perl, "A", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[:lower:][:alpha:]]", perl, "a", match_default, make_array(0, 1, -2, -2));
+}
+
+void test_sets2()
+{
+   using namespace boost::regex_constants;
+   // collating elements
+   TEST_REGEX_SEARCH("[[.zero.]]", perl, "0", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[.one.]]", perl, "1", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[.two.]]", perl, "2", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[.three.]]", perl, "3", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[.a.]]", perl, "bac", match_default, make_array(1, 2, -2, -2));
+   TEST_REGEX_SEARCH("[[.\xf0.]]", perl, "b\xf0x", match_default, make_array(1, 2, -2, -2));
+   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_INVALID_REGEX("[[..]]", perl);
+   TEST_INVALID_REGEX("[[.not-a-collating-element.]]", perl);
+   TEST_INVALID_REGEX("[[.", perl);
+   TEST_INVALID_REGEX("[[.N", perl);
+   TEST_INVALID_REGEX("[[.NUL", perl);
+   TEST_INVALID_REGEX("[[.NUL.", perl);
+   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("[[.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));
+   TEST_REGEX_SEARCH("[[.Ae.]]", basic, "Ae", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("[[.ae.]-b]", basic, "a", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("[[.ae.]-b]", basic, "b", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[.ae.]-b]", basic, "ae", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("[a-[.ae.]]", basic, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[a-[.ae.]]", basic, "b", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("[a-[.ae.]]", basic, "ae", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("[[.ae.]]", basic|icase, "AE", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("[[.ae.]]", basic|icase, "Ae", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("[[.AE.]]", basic|icase, "Ae", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("[[.Ae.]]", basic|icase, "aE", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("[[.AE.]-B]", basic|icase, "a", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("[[.Ae.]-b]", basic|icase, "b", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[.Ae.]-b]", basic|icase, "B", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[.ae.]-b]", basic|icase, "AE", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("[[.ae.]]", perl, "ae", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("[[.ae.]]", perl, "aE", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("[[.AE.]]", perl, "AE", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("[[.Ae.]]", perl, "Ae", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("[[.ae.]-b]", perl, "a", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("[[.ae.]-b]", perl, "b", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[.ae.]-b]", perl, "ae", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("[a-[.ae.]]", perl, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[a-[.ae.]]", perl, "b", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("[a-[.ae.]]", perl, "ae", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("[[.ae.]]", perl|icase, "AE", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("[[.ae.]]", perl|icase, "Ae", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("[[.AE.]]", perl|icase, "Ae", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("[[.Ae.]]", perl|icase, "aE", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("[[.AE.]-B]", perl|icase, "a", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("[[.Ae.]-b]", perl|icase, "b", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[.Ae.]-b]", perl|icase, "B", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[.ae.]-b]", perl|icase, "AE", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("[[.ae.][:lower:]]", perl|icase, "AE", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("[[.ae.][:lower:]]", perl|icase, "A", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[.ae.][=a=]]+", perl, "zzaA", match_default, make_array(2, 4, -2, -2));
+   TEST_INVALID_REGEX("[d-[.ae.]]", perl);
+   //
+   // try some equivalence classes:
+   //
+   TEST_REGEX_SEARCH("[[=a=]]", basic, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[=a=]]", basic, "A", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[[=ae=]]", basic, "ae", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("[[=right-curly-bracket=]]", basic, "}", match_default, make_array(0, 1, -2, -2));
+   TEST_INVALID_REGEX("[[=", perl);
+   TEST_INVALID_REGEX("[[=a", perl);
+   TEST_INVALID_REGEX("[[=ae", perl);
+   TEST_INVALID_REGEX("[[=ae=", perl);
+   TEST_INVALID_REGEX("[[=ae=]", perl);
+   //
+   // now some perl style single character classes:
+   //
+   TEST_REGEX_SEARCH("\\l+", perl, "ABabcAB", match_default, make_array(2, 5, -2, -2));
+   TEST_REGEX_SEARCH("[\\l]+", perl, "ABabcAB", match_default, make_array(2, 5, -2, -2));
+   TEST_INVALID_REGEX("[\\l-a]", perl);
+   TEST_INVALID_REGEX("[\\L]", perl);
+   TEST_REGEX_SEARCH("\\L+", perl, "abABCab", match_default, make_array(2, 5, -2, -2));
+   TEST_REGEX_SEARCH("\\u+", perl, "abABCab", match_default, make_array(2, 5, -2, -2));
+   TEST_REGEX_SEARCH("[\\u]+", perl, "abABCab", match_default, make_array(2, 5, -2, -2));
+   TEST_INVALID_REGEX("[\\U]", perl);
+   TEST_REGEX_SEARCH("\\U+", perl, "ABabcAB", match_default, make_array(2, 5, -2, -2));
+   TEST_REGEX_SEARCH("\\d+", perl, "AB012AB", match_default, make_array(2, 5, -2, -2));
+   TEST_REGEX_SEARCH("[\\d]+", perl, "AB012AB", match_default, make_array(2, 5, -2, -2));
+   TEST_INVALID_REGEX("[\\D]", perl);
+   TEST_REGEX_SEARCH("\\D+", perl, "01abc01", match_default, make_array(2, 5, -2, -2));
+   TEST_REGEX_SEARCH("\\s+", perl, "AB   AB", match_default, make_array(2, 5, -2, -2));
+   TEST_REGEX_SEARCH("[\\s]+", perl, "AB   AB", match_default, make_array(2, 5, -2, -2));
+   TEST_INVALID_REGEX("[\\S]", perl);
+   TEST_REGEX_SEARCH("\\S+", perl, "  abc  ", match_default, make_array(2, 5, -2, -2));
+
+   // and some Perl style properties:
+   TEST_REGEX_SEARCH("\\pl+", perl, "ABabcAB", match_default, make_array(2, 5, -2, -2));
+   TEST_REGEX_SEARCH("\\Pl+", perl, "abABCab", match_default, make_array(2, 5, -2, -2));
+   TEST_REGEX_SEARCH("\\pu+", perl, "abABCab", match_default, make_array(2, 5, -2, -2));
+   TEST_REGEX_SEARCH("\\Pu+", perl, "ABabcAB", match_default, make_array(2, 5, -2, -2));
+   TEST_REGEX_SEARCH("\\pd+", perl, "AB012AB", match_default, make_array(2, 5, -2, -2));
+   TEST_REGEX_SEARCH("\\PD+", perl, "01abc01", match_default, make_array(2, 5, -2, -2));
+   TEST_REGEX_SEARCH("\\ps+", perl, "AB   AB", match_default, make_array(2, 5, -2, -2));
+   TEST_REGEX_SEARCH("\\PS+", perl, "  abc  ", match_default, make_array(2, 5, -2, -2));
+
+   TEST_REGEX_SEARCH("\\p{alnum}+", perl, "-%@a0X_-", match_default, make_array(3, 6, -2, -2));
+   TEST_REGEX_SEARCH("\\p{alpha}+", perl, " -%@aX_0-", match_default, make_array(4, 6, -2, -2));
+   TEST_REGEX_SEARCH("\\p{blank}+", perl, "a  \tb", match_default, make_array(1, 4, -2, -2));
+   TEST_REGEX_SEARCH("\\p{cntrl}+", perl, " a\n\tb", match_default, make_array(2, 4, -2, -2));
+   TEST_REGEX_SEARCH("\\p{digit}+", perl, "a019b", match_default, make_array(1, 4, -2, -2));
+   TEST_REGEX_SEARCH("\\p{graph}+", perl, " a%b ", match_default, make_array(1, 4, -2, -2));
+   TEST_REGEX_SEARCH("\\p{lower}+", perl, "AabC", match_default, make_array(1, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\p{print}+", perl, "AabC", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("\\p{punct}+", perl, " %-&\t", match_default, make_array(1, 4, -2, -2));
+   TEST_REGEX_SEARCH("\\p{space}+", perl, "a \n\t\rb", match_default, make_array(1, 5, -2, -2));
+   TEST_REGEX_SEARCH("\\p{upper}+", perl, "aBCd", match_default, make_array(1, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\p{xdigit}+", perl, "p0f3Cx", match_default, make_array(1, 5, -2, -2));
+   TEST_REGEX_SEARCH("\\P{alnum}+", perl, "-%@a", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("\\P{alpha}+", perl, " -%@a", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("\\P{blank}+", perl, "a  ", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\P{cntrl}+", perl, " a\n", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("\\P{digit}+", perl, "a0", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\P{graph}+", perl, " a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\P{lower}+", perl, "Aa", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\P{print}+", perl, "Absc", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("\\P{punct}+", perl, " %", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\P{space}+", perl, "a ", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\P{upper}+", perl, "aB", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\P{xdigit}+", perl, "pf", match_default, make_array(0, 1, -2, -2));
+
+   TEST_INVALID_REGEX("\\p{invalid class}", perl);
+   TEST_INVALID_REGEX("\\p{upper", perl);
+   TEST_INVALID_REGEX("\\p{", perl);
+   TEST_INVALID_REGEX("\\p", perl);
+   TEST_INVALID_REGEX("\\P{invalid class}", perl);
+   TEST_INVALID_REGEX("\\P{upper", perl);
+   TEST_INVALID_REGEX("\\P{", perl);
+   TEST_INVALID_REGEX("\\P", perl);
+
+   // try named characters:
+   TEST_REGEX_SEARCH("\\N{zero}", perl, "0", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\N{one}", perl, "1", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\N{two}", perl, "2", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\N{three}", perl, "3", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\N{a}", perl, "bac", match_default, make_array(1, 2, -2, -2));
+   TEST_REGEX_SEARCH("\\N{\xf0}", perl, "b\xf0x", match_default, make_array(1, 2, -2, -2));
+   TEST_REGEX_SEARCH("\\N{right-curly-bracket}", perl, "}", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\N{NUL}", perl, "\0", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("[\\N{zero}-\\N{nine}]+", perl, " 0123456789 ", match_default, make_array(1, 11, -2, -2));
+
+   TEST_INVALID_REGEX("\\N", perl);
+   TEST_INVALID_REGEX("\\N{", perl);
+   TEST_INVALID_REGEX("\\N{}", perl);
+   TEST_INVALID_REGEX("\\N{invalid-name}", perl);
+   TEST_INVALID_REGEX("\\N{zero", perl);
+
+   // 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));
+
+   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_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);
+
+   // 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_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);
+}
+
diff --git a/test/regress/test_simple_repeats.cpp b/test/regress/test_simple_repeats.cpp
new file mode 100644
index 00000000..8c8efee9
--- /dev/null
+++ b/test/regress/test_simple_repeats.cpp
@@ -0,0 +1,345 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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)
+ *
+ */
+
+#include "test.hpp"
+
+#ifdef BOOST_MSVC
+#pragma warning(disable:4127)
+#endif
+
+void test_simple_repeats()
+{
+   using namespace boost::regex_constants;
+   // simple repeats:
+   TEST_REGEX_SEARCH("a*", perl, "b", match_default, make_array(0, 0, -2, 1, 1, -2, -2));
+   TEST_REGEX_SEARCH("ab*", perl, "ab", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("ab*", basic, "ab", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("ab*", perl, "sssabbbbbbsss", match_default, make_array(3, 10, -2, -2));
+   TEST_REGEX_SEARCH("ab*c*", perl, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("ab*c*", perl, "abbb", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab*c*", perl, "accc", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab*c*", perl, "abbcc", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("*a", basic, "*a", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("^*a", basic, "*a", match_default, make_array(0, 2, -2, -2));
+   TEST_INVALID_REGEX("*a", perl);
+   TEST_INVALID_REGEX("\\<*", perl);
+   TEST_INVALID_REGEX("\\>*", perl);
+   TEST_REGEX_SEARCH("\n*", perl, "\n\n", match_default, make_array(0, 2, -2, 2, 2, -2, -2));
+   TEST_REGEX_SEARCH("\\**", perl, "**", match_default, make_array(0, 2, -2, 2, 2, -2, -2));
+   TEST_REGEX_SEARCH("\\*", perl, "*", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("(ab)*", perl, "abab", match_default, make_array(0, 4, 2, 4, -2, 4, 4, -2, -2));
+
+   // now try operator + :
+   TEST_REGEX_SEARCH("ab+", perl, "a", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("ab+", perl, "ab", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("ab+", perl, "sssabbbbbbsss", match_default, make_array(3, 10, -2, -2));
+   TEST_REGEX_SEARCH("ab+c+", perl, "abbb", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("ab+c+", perl, "accc", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("ab+c+", perl, "abbcc", match_default, make_array(0, 5, -2, -2));
+   TEST_INVALID_REGEX("+a", perl);
+   TEST_INVALID_REGEX("\\<+", perl);
+   TEST_INVALID_REGEX("\\>+", perl);
+   TEST_REGEX_SEARCH("\n+", perl, "\n\n", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("\\+", perl, "+", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\+", perl, "++", match_default, make_array(0, 1, -2, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("\\++", perl, "++", match_default, make_array(0, 2, -2, -2));
+
+   TEST_REGEX_SEARCH("+", basic|bk_plus_qm, "+", match_default, make_array(0, 1, -2, -2));
+   TEST_INVALID_REGEX("\\+", basic|bk_plus_qm);
+   TEST_REGEX_SEARCH("a\\+", basic|bk_plus_qm, "aa", match_default, make_array(0, 2, -2, -2));
+
+   // now try operator ?
+   TEST_REGEX_SEARCH("a?", perl, "b", match_default, make_array(0, 0, -2, 1, 1, -2, -2));
+   TEST_REGEX_SEARCH("ab?", perl, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("ab?", perl, "ab", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("ab?", perl, "sssabbbbbbsss", match_default, make_array(3, 5, -2, -2));
+   TEST_REGEX_SEARCH("ab?c?", perl, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("ab?c?", perl, "abbb", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("ab?c?", perl, "accc", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("ab?c?", perl, "abcc", match_default, make_array(0, 3, -2, -2));
+   TEST_INVALID_REGEX("?a", perl);
+   TEST_INVALID_REGEX("\\<?", perl);
+   TEST_INVALID_REGEX("\\>?", perl);
+   TEST_REGEX_SEARCH("\n?", perl, "\n\n", match_default, make_array(0, 1, -2, 1, 2, -2, 2, 2, -2, -2));
+   TEST_REGEX_SEARCH("\\?", perl, "?", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\?", perl, "?", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\??", perl, "??", match_default, make_array(0, 1, -2, 1, 2, -2, 2, 2, -2, -2));
+   TEST_REGEX_SEARCH("?", basic|bk_plus_qm, "?", match_default, make_array(0, 1, -2, -2));
+   TEST_INVALID_REGEX("\\?", basic|bk_plus_qm);
+   TEST_REGEX_SEARCH("a\\?", basic|bk_plus_qm, "aa", match_default, make_array(0, 1, -2, 1, 2, -2, 2, 2, -2, -2));
+   TEST_REGEX_SEARCH("a\\?", basic|bk_plus_qm, "b", match_default, make_array(0, 0, -2, 1, 1, -2, -2));
+
+   TEST_REGEX_SEARCH("a?", basic, "a?", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("a+", basic, "a+", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("a\\?", basic, "a?", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("a\\+", basic, "a+", match_default, make_array(0, 2, -2, -2));
+
+   // now try operator {}
+   TEST_REGEX_SEARCH("a{2}", perl, "a", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("a{2}", perl, "aa", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("a{2}", perl, "aaa", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("a{2,}", perl, "a", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("a{2,}", perl, "aa", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("a{2,}", perl, "aaaaa", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("a{2,4}", perl, "a", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("a{2,4}", perl, "aa", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("a{2,4}", perl, "aaa", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a{2,4}", perl, "aaaa", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("a{2,4}", perl, "aaaaa", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("a{ 2 , 4 }", perl, "aaaaa", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("a{ 2 , }", perl, "aaaaa", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("a{ 2 }", perl, "aaa", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("a\\{\\}", perl, "a{}", match_default, make_array(0, 3, -2, -2));
+   TEST_INVALID_REGEX("a{}", perl);
+   TEST_INVALID_REGEX("a{", perl);
+   TEST_INVALID_REGEX("a{1", perl);
+   TEST_INVALID_REGEX("a{1,", perl);
+   TEST_INVALID_REGEX("a{1,2", perl);
+   TEST_INVALID_REGEX("a{ 1 , 2 ", perl);
+   TEST_INVALID_REGEX("a{ }", perl);
+   TEST_INVALID_REGEX("a}", perl);
+   TEST_INVALID_REGEX("{1}", perl);
+   TEST_INVALID_REGEX("a{b}", perl);
+   TEST_INVALID_REGEX("a{1b}", perl);
+   TEST_INVALID_REGEX("a{1,b}", perl);
+   TEST_INVALID_REGEX("a{1,2v}", perl);
+   TEST_INVALID_REGEX("a{2,1}", perl);
+
+   // now try operator \\{\\} for POSIX basic regexes
+   TEST_REGEX_SEARCH("a\\{2\\}", basic, "a", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("a\\{2\\}", basic|no_intervals, "a{2}", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("a\\{2\\}", basic, "aa", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("a\\{2\\}", basic, "aaa", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("a\\{2,\\}", basic, "a", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("a\\{2,\\}", basic, "aa", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("a\\{2,\\}", basic, "aaaaa", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("a\\{2,4\\}", basic, "a", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("a\\{2,4\\}", basic, "aa", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("a\\{2,4\\}", basic, "aaa", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a\\{2,4\\}", basic, "aaaa", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("a\\{2,4\\}", basic, "aaaaa", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("a\\{ 2 , 4 \\}", basic, "aaaaa", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("a\\{ 2 , \\}", basic, "aaaaa", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("a\\{ 2 \\}", basic, "aaa", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("a{}", basic, "a{}", match_default, make_array(0, 3, -2, -2));
+   TEST_INVALID_REGEX("a\\{\\}", basic);
+   TEST_INVALID_REGEX("a\\{", basic);
+   TEST_INVALID_REGEX("a\\{1", basic);
+   TEST_INVALID_REGEX("a\\{1,", basic);
+   TEST_INVALID_REGEX("a\\{1,\\", basic);
+   TEST_INVALID_REGEX("a\\{ \\}", basic);
+   TEST_INVALID_REGEX("a\\}", basic);
+   TEST_INVALID_REGEX("\\{1\\}", basic);
+   TEST_INVALID_REGEX("a\\{b\\}", basic);
+   TEST_INVALID_REGEX("a\\{1b\\}", basic);
+   TEST_INVALID_REGEX("a\\{1,b\\}", basic);
+   TEST_INVALID_REGEX("a\\{1,2v\\}", basic);
+   TEST_INVALID_REGEX("a\\{3,1\\}", basic);
+
+}
+
+void test_fast_repeats()
+{
+   using namespace boost::regex_constants;
+   // extended repeat checking to exercise new algorithms:
+   TEST_REGEX_SEARCH("ab.*xy", perl, "abxy_", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab.*xy", perl, "ab_xy_", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("ab.*xy", perl, "abxy", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab.*xy", perl, "ab_xy", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("ab.*", perl, "ab", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("ab.*", perl, "ab__", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH(".*xy", perl, "abc", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH(".*?xy", perl, "abc", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("a+?xy", perl, "abc", match_default, make_array(-2, -2));
+
+   TEST_REGEX_SEARCH("ab.{2,5}xy", perl, "ab__xy_", match_default, make_array(0, 6, -2, -2));
+   TEST_REGEX_SEARCH("ab.{2,5}xy", perl, "ab____xy_", match_default, make_array(0, 8, -2, -2));
+   TEST_REGEX_SEARCH("ab.{2,5}xy", perl, "ab_____xy_", match_default, make_array(0, 9, -2, -2));
+   TEST_REGEX_SEARCH("ab.{2,5}xy", perl, "ab__xy", match_default, make_array(0, 6, -2, -2));
+   TEST_REGEX_SEARCH("ab.{2,5}xy", perl, "ab_____xy", match_default, make_array(0, 9, -2, -2));
+   TEST_REGEX_SEARCH("ab.{2,5}", perl, "ab__", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab.{2,5}", perl, "ab_______", match_default, make_array(0, 7, -2, -2));
+   TEST_REGEX_SEARCH("ab.{2,5}xy", perl, "ab______xy", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("ab.{2,5}xy", perl, "ab_xy", match_default, make_array(-2, -2));
+   
+   TEST_REGEX_SEARCH("ab.*?xy", perl, "abxy_", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab.*?xy", perl, "ab_xy_", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("ab.*?xy", perl, "abxy", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab.*?xy", perl, "ab_xy", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("ab.*?", perl, "ab", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("ab.*?", perl, "ab__", match_default, make_array(0, 2, -2, -2));
+   
+   TEST_REGEX_SEARCH("ab.{2,5}?xy", perl, "ab__xy_", match_default, make_array(0, 6, -2, -2));
+   TEST_REGEX_SEARCH("ab.{2,5}?xy", perl, "ab____xy_", match_default, make_array(0, 8, -2, -2));
+   TEST_REGEX_SEARCH("ab.{2,5}?xy", perl, "ab_____xy_", match_default, make_array(0, 9, -2, -2));
+   TEST_REGEX_SEARCH("ab.{2,5}?xy", perl, "ab__xy", match_default, make_array(0, 6, -2, -2));
+   TEST_REGEX_SEARCH("ab.{2,5}?xy", perl, "ab_____xy", match_default, make_array(0, 9, -2, -2));
+   TEST_REGEX_SEARCH("ab.{2,5}?", perl, "ab__", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab.{2,5}?", perl, "ab_______", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab.{2,5}?xy", perl, "ab______xy", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("ab.{2,5}xy", perl, "ab_xy", match_default, make_array(-2, -2));
+
+   // again but with slower algorithm variant:
+   TEST_REGEX_SEARCH("ab.*xy", perl, "abxy_", match_not_dot_newline|match_not_dot_null, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab.*xy", perl, "ab_xy_", match_not_dot_newline|match_not_dot_null, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("ab.*xy", perl, "abxy", match_not_dot_newline|match_not_dot_null, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab.*xy", perl, "ab_xy", match_not_dot_newline|match_not_dot_null, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("ab.*", perl, "ab", match_not_dot_newline|match_not_dot_null, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("ab.*", perl, "ab__", match_not_dot_newline|match_not_dot_null, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH(".*xy", perl, "abc", match_not_dot_newline|match_not_dot_null, make_array(-2, -2));
+   TEST_REGEX_SEARCH(".*?xy", perl, "abc", match_not_dot_newline|match_not_dot_null, make_array(-2, -2));
+   TEST_REGEX_SEARCH(".*xy", perl, "ab\nbc", match_not_dot_newline|match_not_dot_null, make_array(-2, -2));
+   TEST_REGEX_SEARCH(".*?xy", perl, "ax\nbc", match_not_dot_newline|match_not_dot_null, make_array(-2, -2));
+
+   TEST_REGEX_SEARCH("ab.{2,5}xy", perl, "ab__xy_", match_not_dot_newline|match_not_dot_null, make_array(0, 6, -2, -2));
+   TEST_REGEX_SEARCH("ab.{2,5}xy", perl, "ab____xy_", match_not_dot_newline|match_not_dot_null, make_array(0, 8, -2, -2));
+   TEST_REGEX_SEARCH("ab.{2,5}xy", perl, "ab_____xy_", match_not_dot_newline|match_not_dot_null, make_array(0, 9, -2, -2));
+   TEST_REGEX_SEARCH("ab.{2,5}xy", perl, "ab__xy", match_not_dot_newline|match_not_dot_null, make_array(0, 6, -2, -2));
+   TEST_REGEX_SEARCH("ab.{2,5}xy", perl, "ab_____xy", match_not_dot_newline|match_not_dot_null, make_array(0, 9, -2, -2));
+   TEST_REGEX_SEARCH("ab.{2,5}", perl, "ab__", match_not_dot_newline|match_not_dot_null, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab.{2,5}", perl, "ab_______", match_not_dot_newline|match_not_dot_null, make_array(0, 7, -2, -2));
+   TEST_REGEX_SEARCH("ab.{2,5}xy", perl, "ab______xy", match_not_dot_newline|match_not_dot_null, make_array(-2, -2));
+   TEST_REGEX_SEARCH("ab.{2,5}xy", perl, "ab_xy", match_not_dot_newline|match_not_dot_null, make_array(-2, -2));
+   
+   TEST_REGEX_SEARCH("ab.*?xy", perl, "abxy_", match_not_dot_newline|match_not_dot_null, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab.*?xy", perl, "ab_xy_", match_not_dot_newline|match_not_dot_null, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("ab.*?xy", perl, "abxy", match_not_dot_newline|match_not_dot_null, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab.*?xy", perl, "ab_xy", match_not_dot_newline|match_not_dot_null, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("ab.*?", perl, "ab", match_not_dot_newline|match_not_dot_null, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("ab.*?", perl, "ab__", match_not_dot_newline|match_not_dot_null, make_array(0, 2, -2, -2));
+   
+   TEST_REGEX_SEARCH("ab.{2,5}?xy", perl, "ab__xy_", match_not_dot_newline|match_not_dot_null, make_array(0, 6, -2, -2));
+   TEST_REGEX_SEARCH("ab.{2,5}?xy", perl, "ab____xy_", match_not_dot_newline|match_not_dot_null, make_array(0, 8, -2, -2));
+   TEST_REGEX_SEARCH("ab.{2,5}?xy", perl, "ab_____xy_", match_not_dot_newline|match_not_dot_null, make_array(0, 9, -2, -2));
+   TEST_REGEX_SEARCH("ab.{2,5}?xy", perl, "ab__xy", match_not_dot_newline|match_not_dot_null, make_array(0, 6, -2, -2));
+   TEST_REGEX_SEARCH("ab.{2,5}?xy", perl, "ab_____xy", match_not_dot_newline|match_not_dot_null, make_array(0, 9, -2, -2));
+   TEST_REGEX_SEARCH("ab.{2,5}?", perl, "ab__", match_not_dot_newline|match_not_dot_null, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab.{2,5}?", perl, "ab_______", match_not_dot_newline|match_not_dot_null, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab.{2,5}?xy", perl, "ab______xy", match_not_dot_newline|match_not_dot_null, make_array(-2, -2));
+   TEST_REGEX_SEARCH("ab.{2,5}xy", perl, "ab_xy", match_not_dot_newline|match_not_dot_null, make_array(-2, -2));
+
+   // now again for single character repeats:
+   TEST_REGEX_SEARCH("ab_*xy", perl, "abxy_", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab_*xy", perl, "ab_xy_", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("ab_*xy", perl, "abxy", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab_*xy", perl, "ab_xy", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("ab_*", perl, "ab", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("ab_*", perl, "ab__", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab_*?z", perl, "ab__", match_default, make_array(-2, -2));
+
+   TEST_REGEX_SEARCH("ab_{2,5}xy", perl, "ab__xy_", match_default, make_array(0, 6, -2, -2));
+   TEST_REGEX_SEARCH("ab_{2,5}xy", perl, "ab____xy_", match_default, make_array(0, 8, -2, -2));
+   TEST_REGEX_SEARCH("ab_{2,5}xy", perl, "ab_____xy_", match_default, make_array(0, 9, -2, -2));
+   TEST_REGEX_SEARCH("ab_{2,5}xy", perl, "ab__xy", match_default, make_array(0, 6, -2, -2));
+   TEST_REGEX_SEARCH("ab_{2,5}xy", perl, "ab_____xy", match_default, make_array(0, 9, -2, -2));
+   TEST_REGEX_SEARCH("ab_{2,5}", perl, "ab__", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab_{2,5}", perl, "ab_______", match_default, make_array(0, 7, -2, -2));
+   TEST_REGEX_SEARCH("ab_{2,5}xy", perl, "ab______xy", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("ab_{2,5}xy", perl, "ab_xy", match_default, make_array(-2, -2));
+   
+   TEST_REGEX_SEARCH("ab_*?xy", perl, "abxy_", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab_*?xy", perl, "ab_xy_", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("ab_*?xy", perl, "abxy", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab_*?xy", perl, "ab_xy", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("ab_*?", perl, "ab", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("ab_*?", perl, "ab__", match_default, make_array(0, 2, -2, -2));
+   
+   TEST_REGEX_SEARCH("ab_{2,5}?xy", perl, "ab__xy_", match_default, make_array(0, 6, -2, -2));
+   TEST_REGEX_SEARCH("ab_{2,5}?xy", perl, "ab____xy_", match_default, make_array(0, 8, -2, -2));
+   TEST_REGEX_SEARCH("ab_{2,5}?xy", perl, "ab_____xy_", match_default, make_array(0, 9, -2, -2));
+   TEST_REGEX_SEARCH("ab_{2,5}?xy", perl, "ab__xy", match_default, make_array(0, 6, -2, -2));
+   TEST_REGEX_SEARCH("ab_{2,5}?xy", perl, "ab_____xy", match_default, make_array(0, 9, -2, -2));
+   TEST_REGEX_SEARCH("ab_{2,5}?", perl, "ab__", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab_{2,5}?", perl, "ab_______", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab_{2,5}?xy", perl, "ab______xy", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("ab_{2,5}xy", perl, "ab_xy", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(5*?).somesite", perl, "//555.somesite", match_default, make_array(2, 14, 2, 5, -2, -2));
+}
+
+void test_fast_repeats2()
+{
+   using namespace boost::regex_constants;
+   // and again for sets:
+   TEST_REGEX_SEARCH("ab[_,;]*xy", perl, "abxy_", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]*xy", perl, "ab_xy_", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]*xy", perl, "abxy", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]*xy", perl, "ab_xy", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]*", perl, "ab", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]*", perl, "ab__", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]*?xy", perl, "ab__z", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]*?z", perl, "ab__", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]*?.z", perl, "ab__,;,__z", match_default, make_array(0, 10, -2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]*?.z", perl, "ab__,;,__y", match_default, make_array(-2, -2));
+
+   TEST_REGEX_SEARCH("ab[_,;]{2,5}xy", perl, "ab__xy_", match_default, make_array(0, 6, -2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]{2,5}xy", perl, "ab____xy_", match_default, make_array(0, 8, -2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]{2,5}xy", perl, "ab_____xy_", match_default, make_array(0, 9, -2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]{2,5}xy", perl, "ab__xy", match_default, make_array(0, 6, -2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]{2,5}xy", perl, "ab_____xy", match_default, make_array(0, 9, -2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]{2,5}", perl, "ab__", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]{2,5}", perl, "ab_______", match_default, make_array(0, 7, -2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]{2,5}xy", perl, "ab______xy", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]{2,5}xy", perl, "ab_xy", match_default, make_array(-2, -2));
+   
+   TEST_REGEX_SEARCH("ab[_,;]*?xy", perl, "abxy_", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]*?xy", perl, "ab_xy_", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]*?xy", perl, "abxy", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]*?xy", perl, "ab_xy", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]*?", perl, "ab", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]*?", perl, "ab__", match_default, make_array(0, 2, -2, -2));
+   
+   TEST_REGEX_SEARCH("ab[_,;]{2,5}?xy", perl, "ab__xy_", match_default, make_array(0, 6, -2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]{2,5}?xy", perl, "ab____xy_", match_default, make_array(0, 8, -2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]{2,5}?xy", perl, "ab_____xy_", match_default, make_array(0, 9, -2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]{2,5}?xy", perl, "ab__xy", match_default, make_array(0, 6, -2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]{2,5}?xy", perl, "ab_____xy", match_default, make_array(0, 9, -2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]{2,5}?", perl, "ab__", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]{2,5}?", perl, "ab_______", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]{2,5}?xy", perl, "ab______xy", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("ab[_,;]{2,5}xy", perl, "ab_xy", match_default, make_array(-2, -2));
+
+   // and again for tricky sets with digraphs:
+   TEST_REGEX_SEARCH("ab[_[.ae.]]*xy", perl, "abxy_", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab[_[.ae.]]*xy", perl, "ab_xy_", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("ab[_[.ae.]]*xy", perl, "abxy", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab[_[.ae.]]*xy", perl, "ab_xy", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("ab[_[.ae.]]*", perl, "ab", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("ab[_[.ae.]]*", perl, "ab__", match_default, make_array(0, 4, -2, -2));
+
+   TEST_REGEX_SEARCH("ab[_[.ae.]]{2,5}xy", perl, "ab__xy_", match_default, make_array(0, 6, -2, -2));
+   TEST_REGEX_SEARCH("ab[_[.ae.]]{2,5}xy", perl, "ab____xy_", match_default, make_array(0, 8, -2, -2));
+   TEST_REGEX_SEARCH("ab[_[.ae.]]{2,5}xy", perl, "ab_____xy_", match_default, make_array(0, 9, -2, -2));
+   TEST_REGEX_SEARCH("ab[_[.ae.]]{2,5}xy", perl, "ab__xy", match_default, make_array(0, 6, -2, -2));
+   TEST_REGEX_SEARCH("ab[_[.ae.]]{2,5}xy", perl, "ab_____xy", match_default, make_array(0, 9, -2, -2));
+   TEST_REGEX_SEARCH("ab[_[.ae.]]{2,5}", perl, "ab__", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab[_[.ae.]]{2,5}", perl, "ab_______", match_default, make_array(0, 7, -2, -2));
+   TEST_REGEX_SEARCH("ab[_[.ae.]]{2,5}xy", perl, "ab______xy", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("ab[_[.ae.]]{2,5}xy", perl, "ab_xy", match_default, make_array(-2, -2));
+   
+   TEST_REGEX_SEARCH("ab[_[.ae.]]*?xy", perl, "abxy_", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab[_[.ae.]]*?xy", perl, "ab_xy_", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("ab[_[.ae.]]*?xy", perl, "abxy", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab[_[.ae.]]*?xy", perl, "ab_xy", match_default, make_array(0, 5, -2, -2));
+   TEST_REGEX_SEARCH("ab[_[.ae.]]*?", perl, "ab", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("ab[_[.ae.]]*?", perl, "ab__", match_default, make_array(0, 2, -2, -2));
+   
+   TEST_REGEX_SEARCH("ab[_[.ae.]]{2,5}?xy", perl, "ab__xy_", match_default, make_array(0, 6, -2, -2));
+   TEST_REGEX_SEARCH("ab[_[.ae.]]{2,5}?xy", perl, "ab____xy_", match_default, make_array(0, 8, -2, -2));
+   TEST_REGEX_SEARCH("ab[_[.ae.]]{2,5}?xy", perl, "ab_____xy_", match_default, make_array(0, 9, -2, -2));
+   TEST_REGEX_SEARCH("ab[_[.ae.]]{2,5}?xy", perl, "ab__xy", match_default, make_array(0, 6, -2, -2));
+   TEST_REGEX_SEARCH("ab[_[.ae.]]{2,5}?xy", perl, "ab_____xy", match_default, make_array(0, 9, -2, -2));
+   TEST_REGEX_SEARCH("ab[_[.ae.]]{2,5}?", perl, "ab__", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab[_[.ae.]]{2,5}?", perl, "ab_______", match_default, make_array(0, 4, -2, -2));
+   TEST_REGEX_SEARCH("ab[_[.ae.]]{2,5}?xy", perl, "ab______xy", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("ab[_[.ae.]]{2,5}xy", perl, "ab_xy", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("([5[.ae.]]*?).somesite", perl, "//555.somesite", match_default, make_array(2, 14, 2, 5, -2, -2));
+}
+
diff --git a/test/regress/test_tricky_cases.cpp b/test/regress/test_tricky_cases.cpp
new file mode 100644
index 00000000..cdcdb6f8
--- /dev/null
+++ b/test/regress/test_tricky_cases.cpp
@@ -0,0 +1,296 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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)
+ *
+ */
+
+#include "test.hpp"
+
+#ifdef BOOST_MSVC
+#pragma warning(disable:4127)
+#endif
+
+void test_tricky_cases()
+{
+   using namespace boost::regex_constants;
+   //
+   // now follows various complex expressions designed to try and bust the matcher:
+   //
+   TEST_REGEX_SEARCH("a(((b)))c", perl, "abc", match_default, make_array(0, 3, 1, 2, 1, 2, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(b|(c))d", perl, "abd", match_default, make_array(0, 3, 1, 2, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("a(b|(c))d", perl, "acd", match_default, make_array(0, 3, 1, 2, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(b*|c)d", perl, "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}", perl, "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]", perl, "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)", perl, "aaaaabaaaabaaaabaaaabweeknights", match_default, make_array(0, 31, 21, 24, 24, 31, -2, -2));
+   // one really big one
+   TEST_REGEX_SEARCH("1234567890123456789012345678901234567890123456789012345678901234567890", perl, "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]", perl, "xacegikmoq", match_default, make_array(1, 8, -2, -2));
+   TEST_REGEX_SEARCH("[ab][cd][ef][gh][ij][kl][mn][op]", perl, "xacegikmoq", match_default, make_array(1, 9, -2, -2));
+   TEST_REGEX_SEARCH("[ab][cd][ef][gh][ij][kl][mn][op][qr]", perl, "xacegikmoqy", match_default, make_array(1, 10, -2, -2));
+   TEST_REGEX_SEARCH("[ab][cd][ef][gh][ij][kl][mn][op][q]", perl, "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)", perl, "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)", perl, "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)", perl, "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)", perl, "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", perl, "abc", match_default, make_array(1, 3, -1, -1, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("_+((www)|(ftp)|(mailto)):_*", perl, "_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", perl, "acd", match_default, make_array(0, 3, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("a(b?c)+d", perl, "accd", match_default, make_array(0, 4, 2, 3, -2, -2));
+   TEST_REGEX_SEARCH("(wee|week)(knights|night)", perl, "weeknights", match_default, make_array(0, 10, 0, 3, 3, 10, -2, -2));
+   TEST_REGEX_SEARCH(".*", perl, "abc", match_default, make_array(0, 3, -2, 3, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b|(c))d", perl, "abd", match_default, make_array(0, 3, 1, 2, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("a(b|(c))d", perl, "acd", match_default, make_array(0, 3, 1, 2, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(b*|c|e)d", perl, "abbd", match_default, make_array(0, 4, 1, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b*|c|e)d", perl, "acd", match_default, make_array(0, 3, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(b*|c|e)d", perl, "ad", match_default, make_array(0, 2, 1, 1, -2, -2));
+   TEST_REGEX_SEARCH("a(b?)c", perl, "abc", match_default, make_array(0, 3, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(b?)c", perl, "ac", match_default, make_array(0, 2, 1, 1, -2, -2));
+   TEST_REGEX_SEARCH("a(b+)c", perl, "abc", match_default, make_array(0, 3, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(b+)c", perl, "abbbc", match_default, make_array(0, 5, 1, 4, -2, -2));
+   TEST_REGEX_SEARCH("a(b*)c", perl, "ac", match_default, make_array(0, 2, 1, 1, -2, -2));
+   TEST_REGEX_SEARCH("(a|ab)(bc([de]+)f|cde)", perl, "abcdef", match_default, make_array(0, 6, 0, 1, 1, 6, 3, 5, -2, -2));
+   TEST_REGEX_SEARCH("a([bc]?)c", perl, "abc", match_default, make_array(0, 3, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a([bc]?)c", perl, "ac", match_default, make_array(0, 2, 1, 1, -2, -2));
+   TEST_REGEX_SEARCH("a([bc]+)c", perl, "abc", match_default, make_array(0, 3, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a([bc]+)c", perl, "abcc", match_default, make_array(0, 4, 1, 3, -2, -2));
+   TEST_REGEX_SEARCH("a([bc]+)bc", perl, "abcbc", match_default, make_array(0, 5, 1, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(bb+|b)b", perl, "abb", match_default, make_array(0, 3, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(bbb+|bb+|b)b", perl, "abb", match_default, make_array(0, 3, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(bbb+|bb+|b)b", perl, "abbb", match_default, make_array(0, 4, 1, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(bbb+|bb+|b)bb", perl, "abbb", match_default, make_array(0, 4, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("(.*).*", perl, "abcdef", match_default, make_array(0, 6, 0, 6, -2, 6, 6, 6, 6, -2, -2));
+   TEST_REGEX_SEARCH("(a*)*", perl, "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", perl, "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", perl, "ad", match_default, make_array(0, 2, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c)*d", perl, "abcd", match_default, make_array(0, 4, 2, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c)+d", perl, "abd", match_default, make_array(0, 3, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c)+d", perl, "abcd", match_default, make_array(0, 4, 2, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c?)+d", perl, "ad", match_default, make_array(0, 2, 1, 1, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){0,0}d", perl, "ad", match_default, make_array(0, 2, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){0,1}d", perl, "ad", match_default, make_array(0, 2, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){0,1}d", perl, "abd", match_default, make_array(0, 3, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){0,2}d", perl, "ad", match_default, make_array(0, 2, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){0,2}d", perl, "abcd", match_default, make_array(0, 4, 2, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){0,}d", perl, "ad", match_default, make_array(0, 2, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){0,}d", perl, "abcd", match_default, make_array(0, 4, 2, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){1,1}d", perl, "abd", match_default, make_array(0, 3, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){1,2}d", perl, "abd", match_default, make_array(0, 3, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){1,2}d", perl, "abcd", match_default, make_array(0, 4, 2, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){1,}d", perl, "abd", match_default, make_array(0, 3, 1, 2, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){1,}d", perl, "abcd", match_default, make_array(0, 4, 2, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){2,2}d", perl, "acbd", match_default, make_array(0, 4, 2, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){2,2}d", perl, "abcd", match_default, make_array(0, 4, 2, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){2,4}d", perl, "abcd", match_default, make_array(0, 4, 2, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){2,4}d", perl, "abcbd", match_default, make_array(0, 5, 3, 4, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){2,4}d", perl, "abcbcd", match_default, make_array(0, 6, 4, 5, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){2,}d", perl, "abcd", match_default, make_array(0, 4, 2, 3, -2, -2));
+   TEST_REGEX_SEARCH("a(b|c){2,}d", perl, "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));
+   // literals:
+   TEST_REGEX_SEARCH("\\**?/{}", literal, "\\**?/{}", match_default, make_array(0, 7, -2, -2));
+   TEST_REGEX_SEARCH("\\**?/{}", literal, "\\**?/{", match_default, make_array(-2, -2));
+   // try to match C++ syntax elements:
+   // line comment:
+   TEST_REGEX_SEARCH("//[^\\n]*", perl, "++i //here is a line comment\n", match_default, make_array(4, 28, -2, -2));
+   // block comment:
+   TEST_REGEX_SEARCH("/\\*([^*]|\\*+[^*/])*\\*+/", perl, "/* here is a block comment */", match_default, make_array(0, 29, 26, 27, -2, -2));
+   TEST_REGEX_SEARCH("/\\*([^*]|\\*+[^*/])*\\*+/", perl, "/**/", match_default, make_array(0, 4, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("/\\*([^*]|\\*+[^*/])*\\*+/", perl, "/***/", match_default, make_array(0, 5, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("/\\*([^*]|\\*+[^*/])*\\*+/", perl, "/****/", match_default, make_array(0, 6, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("/\\*([^*]|\\*+[^*/])*\\*+/", perl, "/*****/", match_default, make_array(0, 7, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("/\\*([^*]|\\*+[^*/])*\\*+/", perl, "/*****/*/", match_default, make_array(0, 7, -1, -1, -2, -2));
+   // preprossor directives:
+   TEST_REGEX_SEARCH("^[[:blank:]]*#([^\\n]*\\\\[[:space:]]+)*[^\\n]*", perl, "#define some_symbol", match_default, make_array(0, 19, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("^[[:blank:]]*#([^\\n]*\\\\[[:space:]]+)*[^\\n]*", perl, "#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));
+   // literals:
+}
+
+void test_tricky_cases2()
+{
+   using namespace boost::regex_constants;
+   TEST_REGEX_SEARCH("((0x[[:xdigit:]]+)|([[:digit:]]+))u?((int(8|16|32|64))|L)?", perl, "0xFF", match_default, make_array(0, 4, 0, 4,	0, 4,	-1, -1, -1, -1, -1, -1, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("((0x[[:xdigit:]]+)|([[:digit:]]+))u?((int(8|16|32|64))|L)?", perl, "35", match_default, make_array(0, 2, 0, 2, -1, -1, 0, 2, -1, -1, -1, -1, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("((0x[[:xdigit:]]+)|([[:digit:]]+))u?((int(8|16|32|64))|L)?", perl, "0xFFu", match_default, make_array(0, 5, 0, 4, 0, 4, -1, -1, -1, -1, -1, -1, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("((0x[[:xdigit:]]+)|([[:digit:]]+))u?((int(8|16|32|64))|L)?", perl, "0xFFL", match_default, make_array(0, 5, 0, 4, 0, 4, -1, -1, 4, 5, -1, -1, -1, -1, -2, -2));
+   TEST_REGEX_SEARCH("((0x[[:xdigit:]]+)|([[:digit:]]+))u?((int(8|16|32|64))|L)?", perl, "0xFFFFFFFFFFFFFFFFuint64", match_default, make_array(0, 24,	0, 18, 0, 18, -1, -1, 19, 24, 19, 24, 22, 24, -2, -2));
+   // strings:
+   TEST_REGEX_SEARCH("'([^\\\\']|\\\\.)*'", perl, "'\\x3A'", match_default, make_array(0, 6, 4, 5, -2, -2));
+   TEST_REGEX_SEARCH("'([^\\\\']|\\\\.)*'", perl, "'\\''", match_default, make_array(0, 4, 1, 3, -2, -2));
+   TEST_REGEX_SEARCH("'([^\\\\']|\\\\.)*'", perl, "'\\n'", match_default, make_array(0, 4, 1, 3, -2, -2));
+   // posix only:
+   TEST_REGEX_SEARCH("^[[:blank:]]*#([^\\n]*\\\\[[:space:]]+)*[^\\n]*", awk, "#define some_symbol(x) \\  \r\n  foo();\\\r\n   printf(#x);", match_default, make_array(0, 53, 28, 42, -2, -2));
+   // now try and test some unicode specific characters:
+#if !BOOST_WORKAROUND(__BORLANDC__, < 0x560)
+   TEST_REGEX_SEARCH_W(L"[[:unicode:]]+", perl, L"a\x0300\x0400z", match_default, make_array(1, 3, -2, -2));
+   TEST_REGEX_SEARCH_W(L"[\x10-\xff]", perl, L"\x0300\x0400", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH_W(L"[\01-\05]{5}", perl, L"\x0300\x0400\x0300\x0400\x0300\x0400", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH_W(L"[\x300-\x400]+", perl, L"\x0300\x0400\x0300\x0400\x0300\x0400", match_default, make_array(0, 6, -2, -2));
+   TEST_REGEX_SEARCH_W(L"[\\x{300}-\\x{400}]+", perl, L"\x0300\x0400\x0300\x0400\x0300\x0400", match_default, make_array(0, 6, -2, -2));
+   TEST_REGEX_SEARCH_W(L"\\x{300}\\x{400}+", perl, L"\x0300\x0400\x0400\x0400\x0400\x0400", match_default, make_array(0, 6, -2, -2));
+#endif
+   // finally try some case insensitive matches:
+   TEST_REGEX_SEARCH("0123456789@abcdefghijklmnopqrstuvwxyz\\[\\\\\\]\\^_`ABCDEFGHIJKLMNOPQRSTUVWXYZ\\{\\|\\}", perl|icase, "0123456789@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}", match_default, make_array(0, 72, -2, -2));
+   TEST_REGEX_SEARCH("a", perl|icase, "A", match_default, make_array(0, 1, -2, -2));   
+   TEST_REGEX_SEARCH("A", perl|icase, "a", match_default, make_array(0, 1, -2, -2));   
+   TEST_REGEX_SEARCH("[abc]+", perl|icase, "abcABC", match_default, make_array(0, 6, -2, -2));   
+   TEST_REGEX_SEARCH("[ABC]+", perl|icase, "abcABC", match_default, make_array(0, 6, -2, -2));   
+   TEST_REGEX_SEARCH("[a-z]+", perl|icase, "abcABC", match_default, make_array(0, 6, -2, -2));   
+   TEST_REGEX_SEARCH("[A-Z]+", perl|icase, "abzANZ", match_default, make_array(0, 6, -2, -2));   
+   TEST_REGEX_SEARCH("[a-Z]+", perl|icase, "abzABZ", match_default, make_array(0, 6, -2, -2));   
+   TEST_REGEX_SEARCH("[A-z]+", perl|icase, "abzABZ", match_default, make_array(0, 6, -2, -2));   
+   TEST_REGEX_SEARCH("[[:lower:]]+", perl|icase, "abyzABYZ", match_default, make_array(0, 8, -2, -2));   
+   TEST_REGEX_SEARCH("[[:upper:]]+", perl|icase, "abzABZ", match_default, make_array(0, 6, -2, -2));   
+   TEST_REGEX_SEARCH("[[:word:]]+", perl|icase, "abcZZZ", match_default, make_array(0, 6, -2, -2));   
+   TEST_REGEX_SEARCH("[[:alpha:]]+", perl|icase, "abyzABYZ", match_default, make_array(0, 8, -2, -2));   
+   TEST_REGEX_SEARCH("[[:alnum:]]+", perl|icase, "09abyzABYZ", match_default, make_array(0, 10, -2, -2));   
+
+   // known and suspected bugs:
+   TEST_REGEX_SEARCH("\\(", perl, "(", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\)", perl, ")", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\$", perl, "$", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\^", perl, "^", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\.", perl, ".", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\*", perl, "*", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\+", perl, "+", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\?", perl, "?", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\[", perl, "[", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\]", perl, "]", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\|", perl, "|", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\\\", perl, "\\", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("#", perl, "#", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\#", perl, "#", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("a-", perl, "a-", match_default, make_array(0, 2, -2, -2));
+   TEST_REGEX_SEARCH("\\-", perl, "-", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\{", perl, "{", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\}", perl, "}", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("0", perl, "0", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("1", perl, "1", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("9", perl, "9", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("b", perl, "b", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("B", perl, "B", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("<", perl, "<", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH(">", perl, ">", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("w", perl, "w", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("W", perl, "W", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("`", perl, "`", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH(" ", perl, " ", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\n", perl, "\n", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH(",", perl, ",", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("a", perl, "a", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("f", perl, "f", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("n", perl, "n", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("r", perl, "r", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("t", perl, "t", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("v", perl, "v", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("c", perl, "c", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("x", perl, "x", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH(":", perl, ":", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("(\\.[[:alnum:]]+){2}", perl, "w.a.b ", match_default, make_array(1, 5, 3, 5, -2, -2));
+
+   // new bugs detected in spring 2003:
+   TEST_REGEX_SEARCH("b", perl, "abc", match_default|match_continuous, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(?!foo)bar", perl, "foobar", match_default, make_array(3, 6, -2, -2));
+   TEST_REGEX_SEARCH("(?!foo)bar", perl, "??bar", match_default, make_array(2, 5, -2, -2));
+   TEST_REGEX_SEARCH("(?!foo)bar", perl, "barfoo", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("(?!foo)bar", perl, "bar??", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("(?!foo)bar", perl, "bar", match_default, make_array(0, 3, -2, -2));
+   TEST_REGEX_SEARCH("a\\Z", perl, "a\nb", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("()", perl, "abc", match_default, make_array(0, 0, 0, 0, -2, 1, 1, 1, 1, -2, 2, 2, 2, 2, -2, 3, 3, 3, 3, -2, -2));
+   TEST_REGEX_SEARCH("^()", perl, "abc", match_default, make_array(0, 0, 0, 0, -2, -2));
+   TEST_REGEX_SEARCH("^()+", perl, "abc", match_default, make_array(0, 0, 0, 0, -2, -2));
+   TEST_REGEX_SEARCH("^(){1}", perl, "abc", match_default, make_array(0, 0, 0, 0, -2, -2));
+   TEST_REGEX_SEARCH("^(){2}", perl, "abc", match_default, make_array(0, 0, 0, 0, -2, -2));
+   TEST_REGEX_SEARCH("^((){2})", perl, "abc", match_default, make_array(0, 0, 0, 0, 0, 0, -2, -2));
+   TEST_REGEX_SEARCH("()", perl, "", match_default, make_array(0, 0, 0, 0, -2, -2));
+   TEST_REGEX_SEARCH("()\\1", perl, "", match_default, make_array(0, 0, 0, 0, -2, -2));
+   TEST_REGEX_SEARCH("()\\1", perl, "a", match_default, make_array(0, 0, 0, 0, -2, 1, 1, 1, 1, -2, -2));
+   TEST_REGEX_SEARCH("a()\\1b", perl, "ab", match_default, make_array(0, 2, 1, 1, -2, -2));
+   TEST_REGEX_SEARCH("a()b\\1", perl, "ab", match_default, make_array(0, 2, 1, 1, -2, -2));
+   TEST_REGEX_SEARCH("([a-c]+)\\1", perl, "abcbc", match_default, make_array(1, 5, 1, 3, -2, -2));
+   TEST_REGEX_SEARCH(".+abc", perl, "xxxxxxxxyyyyyyyyab", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH("(.+)\\1", perl, "abcdxxxyyyxxxyyy", match_default, make_array(4, 16, 4, 10, -2, -2));
+   // this should not throw:
+   TEST_REGEX_SEARCH("[_]+$", perl, "___________________________________________x", match_default, make_array(-2, -2));
+   // bug in V4 code detected 2004/05/12:
+   TEST_REGEX_SEARCH("\\l+", perl|icase, "abcXYZ", match_default, make_array(0, 6, -2, -2));
+   TEST_REGEX_SEARCH("\\u+", perl|icase, "abcXYZ", match_default, make_array(0, 6, -2, -2));
+   TEST_REGEX_SEARCH("(a)(?:b)", perl|nosubs, "ab", match_default, make_array(0, 2, -2, -2));
+
+
+   //
+   // the strings in the next test case are too long for most compilers to cope with,
+   // we have to break them up and call the testing procs directly rather than rely on the macros:
+   //
+   static const char* big_text = "00001 01 \r\n00002 02 1         2         3         4         5         6"
+      "7         8         9         0\r\n00003 03 0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\r\n"
+      "00004 04 \r\n00005 05 \r\n00006 06                                                                      "
+      "Seite: 0001\r\n00007 07                                                             "
+      "StartSeitEEnde: 0001\r\n00008 08                                                             "
+      "StartSeiTe Ende: 0001\r\n00009 09                                                             "
+      "Start seiteEnde: 0001\r\n00010 10                                                             "
+      "28.2.03\r\n00011 11                                                             "
+      "Page: 0001\r\n00012 12                                                             "
+      "Juhu die Erste: 0001\r\n00013 13                                                             "
+      "Es war einmal! 0001\r\n00014 14                               ABCDEFGHIJKLMNOPQRSTUVWXYZ0001\r\n"
+      "00015 15                               abcdefghijklmnopqrstuvwxyz0001\r\n"
+      "00016 16                               lars.schmeiser@gft.com\r\n00017 17 \r\n"
+      "00018 18 \r\n00019 19 \r\n00020 20 \r\n00021 21 1         2         3         4         5         "
+      "6         7         8         9         0\r\n"
+      "00022 22 0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\r\n"
+      "00023 01 \r\n00024 02 1         2         3         4         5         6         7         8         9         0\r\n"
+      "00025 03 0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890\r\n"
+      "00026 04 \r\n00027 05 \r\n00028 06                                                             "
+      "Seite: 0002\r\n00029 07                                                             StartSeitEEnde: 0002\r\n"
+      "00030 08                                                             "
+      "StartSeiTe Ende: 0002\r\n00031 09                                                             "
+      "Start seiteEnde: 0002\r\n00032 10                                                             "
+      "28.02.2003\r\n00033 11                                                             "
+      "Page: 0002\r\n00034 12                                                             "
+      "Juhu die Erste: 0002\r\n00035 13                                                             "
+      "Es war einmal! 0002\r\n00036 14                               ABCDEFGHIJKLMNOPQRSTUVWXYZ0002\r\n00037 "
+      "15                               abcdefghijklmnopqrstuvwxyz0002\r\n00038 16                               "
+      "lars.schmeiser@194.1.12.111\r\n00039 17 \r\n00040 18 \r\n00041 19 \r\n"
+      "00042 20 \r\n00043 21 1         2         3         4         5         6         7         8         9         0\r\n";
+   
+   do{
+      test_info<char>::set_info(__FILE__, __LINE__, 
+         "(.*\\r\\n){3}.* abcdefghijklmnopqrstuvwxyz.*\\r\\n", 
+         perl, big_text, match_default|match_not_dot_newline, 
+         make_array(753, 1076, 934, 1005, -2, 2143, 2466, 2324, 2395, -2, -2));
+      test(char(0), test_regex_search_tag());
+   }while(0);
+#if !defined(BOOST_NO_WREGEX) && !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS) && !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+   do{
+      std::string st(big_text);
+      test_info<wchar_t>::set_info(__FILE__, __LINE__, 
+         L"(.*\\r\\n){3}.* abcdefghijklmnopqrstuvwxyz.*\\r\\n", 
+         perl, std::wstring(st.begin(), st.end()), match_default|match_not_dot_newline, 
+         make_array(753, 1076, 934, 1005, -2, 2143, 2466, 2324, 2395, -2, -2));
+      test(char(0), test_regex_search_tag());
+   }while(0);
+#endif
+}
+
diff --git a/test/regress/test_unicode.cpp b/test/regress/test_unicode.cpp
new file mode 100644
index 00000000..1f4fe3d6
--- /dev/null
+++ b/test/regress/test_unicode.cpp
@@ -0,0 +1,162 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         test_unicode.hpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Unicode specific tests (requires ICU).
+  */
+
+#include <boost/regex/config.hpp>
+#ifdef BOOST_HAS_ICU
+#include "test.hpp"
+
+#ifdef BOOST_MSVC
+#pragma warning(disable:4127)
+#endif
+
+#ifndef BOOST_NO_STD_WSTRING
+
+#define TEST_REGEX_SEARCH_U(s, f, t, m, a)\
+   do{\
+      const wchar_t e[] = { s };\
+      std::wstring se(e, (sizeof(e) / sizeof(wchar_t)) - 1);\
+      const wchar_t st[] = { t };\
+      std::wstring sst(st, (sizeof(st) / sizeof(wchar_t)) - 1);\
+      test_info<wchar_t>::set_info(__FILE__, __LINE__, se, f, sst, m, a);\
+      test_icu(wchar_t(0), test_regex_search_tag());\
+   }while(0)
+
+#define TEST_REGEX_CLASS_U(classname, character)\
+   TEST_REGEX_SEARCH_U(\
+      L"[[:" BOOST_JOIN(L, BOOST_STRINGIZE(classname)) L":]]",\
+      perl, \
+      BOOST_JOIN(L, \
+         BOOST_STRINGIZE(\
+            BOOST_JOIN(\x, character))), \
+      match_default, \
+      make_array(0, 1, -2, -2))
+
+#else
+
+#define TEST_REGEX_SEARCH_U(s, f, t, m, a)
+#define TEST_REGEX_CLASS_U(classname, character)
+
+#endif
+
+void test_unicode()
+{
+   using namespace boost::regex_constants;
+
+   TEST_REGEX_CLASS_U(L*, 3108);
+   TEST_REGEX_CLASS_U(Letter, 3108);
+   TEST_REGEX_CLASS_U(Lu, 2145);
+   TEST_REGEX_CLASS_U(Uppercase Letter, 2145);
+   TEST_REGEX_CLASS_U(Ll, 2146);
+   TEST_REGEX_CLASS_U(Lowercase Letter, 2146);
+   TEST_REGEX_CLASS_U(Lt, 1FFC);
+   TEST_REGEX_CLASS_U(Titlecase Letter, 1FFC);
+   TEST_REGEX_CLASS_U(Lm, 1D61);
+   TEST_REGEX_CLASS_U(Modifier Letter, 1D61);
+   TEST_REGEX_CLASS_U(Lo, 1974);
+   TEST_REGEX_CLASS_U(Other Letter, 1974);
+   TEST_REGEX_CLASS_U(M*, 20EA);
+   TEST_REGEX_CLASS_U(Mark, 20EA);
+   TEST_REGEX_CLASS_U(Mn, 20EA);
+   TEST_REGEX_CLASS_U(Non-Spacing Mark, 20EA);
+   TEST_REGEX_CLASS_U(Mc, 1938);
+   TEST_REGEX_CLASS_U(Spacing Combining Mark, 1938);
+   TEST_REGEX_CLASS_U(Me, 06DE);
+   TEST_REGEX_CLASS_U(Enclosing Mark, 06DE);
+   TEST_REGEX_CLASS_U(N*, 0669);
+   TEST_REGEX_CLASS_U(Number, 0669);
+   TEST_REGEX_CLASS_U(Nd, 0669);
+   TEST_REGEX_CLASS_U(Decimal Digit Number, 0669);
+   TEST_REGEX_CLASS_U(Nl, 303A);
+   TEST_REGEX_CLASS_U(Letter Number, 303A);
+   TEST_REGEX_CLASS_U(No, 2793);
+   TEST_REGEX_CLASS_U(Other Number, 2793);
+
+   TEST_REGEX_CLASS_U(S*, 2144);
+   TEST_REGEX_CLASS_U(Symbol, 2144);
+   TEST_REGEX_CLASS_U(Sm, 2144);
+   TEST_REGEX_CLASS_U(Math Symbol, 2144);
+   TEST_REGEX_CLASS_U(Sc, 20B1);
+   TEST_REGEX_CLASS_U(Currency Symbol, 20B1);
+   TEST_REGEX_CLASS_U(Sk, 1FFE);
+   TEST_REGEX_CLASS_U(Modifier Symbol, 1FFE);
+   TEST_REGEX_CLASS_U(So, 19FF);
+   TEST_REGEX_CLASS_U(Other Symbol, 19FF);
+
+   TEST_REGEX_CLASS_U(P*, 005F);
+   TEST_REGEX_CLASS_U(Punctuation, 005F);
+   TEST_REGEX_CLASS_U(Pc, 005F);
+   TEST_REGEX_CLASS_U(Connector Punctuation, 005F);
+   TEST_REGEX_CLASS_U(Pd, 002D);
+   TEST_REGEX_CLASS_U(Dash Punctuation, 002D);
+   TEST_REGEX_CLASS_U(Ps, 0028);
+   TEST_REGEX_CLASS_U(Open Punctuation, 0028);
+   TEST_REGEX_CLASS_U(Pe, FF63);
+   TEST_REGEX_CLASS_U(Close Punctuation, FF63);
+   TEST_REGEX_CLASS_U(Pi, 2039);
+   TEST_REGEX_CLASS_U(Initial Punctuation, 2039);
+   TEST_REGEX_CLASS_U(Pf, 203A);
+   TEST_REGEX_CLASS_U(Final Punctuation, 203A);
+   TEST_REGEX_CLASS_U(Po, 2038);
+   TEST_REGEX_CLASS_U(Other Punctuation, 2038);
+
+   TEST_REGEX_CLASS_U(Z*, 202F);
+   TEST_REGEX_CLASS_U(Separator, 202F);
+   TEST_REGEX_CLASS_U(Zs, 202F);
+   TEST_REGEX_CLASS_U(Space Separator, 202F);
+   TEST_REGEX_CLASS_U(Zl, 2028);
+   TEST_REGEX_CLASS_U(Line Separator, 2028);
+   TEST_REGEX_CLASS_U(Zp, 2029);
+   TEST_REGEX_CLASS_U(Paragraph Separator, 2029);
+   TEST_REGEX_CLASS_U(C*, 009F);
+   TEST_REGEX_CLASS_U(Other, 009F);
+   TEST_REGEX_CLASS_U(Cc, 009F);
+   TEST_REGEX_CLASS_U(Control, 009F);
+   TEST_REGEX_CLASS_U(Cf, FFFB);
+   TEST_REGEX_CLASS_U(Format, FFFB);
+   //TEST_REGEX_CLASS_U(Cs, DC00);
+   //TEST_REGEX_CLASS_U(Surrogate, DC00);
+   TEST_REGEX_CLASS_U(Co, F8FF);
+   TEST_REGEX_CLASS_U(Private Use, F8FF);
+   TEST_REGEX_CLASS_U(Cn, FFFF);
+   TEST_REGEX_CLASS_U(Not Assigned, FFFF);
+   TEST_REGEX_CLASS_U(Any, 2038);
+   TEST_REGEX_CLASS_U(Assigned, 2038);
+   TEST_REGEX_CLASS_U(ASCII, 7f);
+   TEST_REGEX_SEARCH_U(L"[[:Assigned:]]", perl, L"\xffff", match_default, make_array(-2, -2));
+   TEST_REGEX_SEARCH_U(L"[[:ASCII:]]", perl, L"\x80", match_default, make_array(-2, -2));
+
+   TEST_REGEX_SEARCH_U(L"\\N{KHMER DIGIT SIX}", perl, L"\x17E6", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH_U(L"\\N{MODIFIER LETTER LOW ACUTE ACCENT}", perl, L"\x02CF", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH_U(L"\\N{SUPERSCRIPT ONE}", perl, L"\x00B9", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH_U(L"[\\N{KHMER DIGIT SIX}]", perl, L"\x17E6", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH_U(L"[\\N{MODIFIER LETTER LOW ACUTE ACCENT}]", perl, L"\x02CF", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH_U(L"[\\N{SUPERSCRIPT ONE}]", perl, L"\x00B9", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH_U(L"\\N{CJK UNIFIED IDEOGRAPH-7FED}", perl, L"\x7FED", match_default, make_array(0, 1, -2, -2));
+   
+   TEST_REGEX_SEARCH_U(L"\\w+", perl, L" e\x301" L"coute ", match_default, make_array(1, 8, -2, -2));
+   TEST_REGEX_SEARCH_U(L"^", perl, L" \x2028 \x2029 \x000D\x000A \x000A \x000C \x000D \x0085 ", 
+      match_default | match_not_bol, make_array(2, 2, -2, 4, 4, -2, 7, 7, -2, 9, 9, -2, 11, 11, -2, 13, 13, -2, 15, 15, -2, -2));
+   TEST_REGEX_SEARCH_U(L"$", perl, L" \x2028 \x2029 \x000D\x000A \x000A \x000C \x000D \x0085 ", 
+      match_default | match_not_eol, make_array(1, 1, -2, 3, 3, -2, 5, 5, -2, 8, 8, -2, 10, 10, -2, 12, 12, -2, 14, 14, -2, -2));
+   TEST_REGEX_SEARCH_U(L".", perl, L" \x2028\x2029\x000D\x000A\x000A\x000C\x000D\x0085 ", 
+      match_default | match_not_dot_newline, make_array(0, 1, -2, 9, 10, -2, -2));
+}
+
+#else
+void test_unicode(){}
+#endif
diff --git a/test/regress/v3_tests.txt b/test/regress/v3_tests.txt
deleted file mode 100644
index 5ad00e7f..00000000
--- a/test/regress/v3_tests.txt
+++ /dev/null
@@ -1,908 +0,0 @@
-; 
-; 
-; this file contains a script of tests to run through regress.exe
-;
-; comments start with a semicolon and proceed to the end of the line
-;
-; changes to regular expression compile flags start with a "-" as the first
-; non-whitespace character and consist of a list of the printable names
-; of the flags, for example "match_default"
-;
-; Other lines contain a test to perform using the current flag status
-; the first token contains the expression to compile, the second the string
-; to match it against. If the second string is "!" then the expression should
-; not compile, that is the first string is an invalid regular expression.
-; This is then followed by a list of integers that specify what should match,
-; each pair represents the starting and ending positions of a subexpression
-; starting with the zeroth subexpression (the whole match).
-; A value of -1 indicates that the subexpression should not take part in the
-; match at all, if the first value is -1 then no part of the expression should
-; match the string.
-;
-
-- match_default normal REG_EXTENDED
-
-;
-; try some really simple literals:
-a a 0 1
-Z Z 0 1
-Z aaa -1 -1
-Z xxxxZZxxx 4 5
-
-; and some simple brackets:
-(a) zzzaazz 3 4 3 4
-() zzz 0 0 0 0
-() "" 0 0 0 0
-( !
-) !
-(aa !
-aa) !
-a b -1 -1
-\(\) () 0 2
-\(a\) (a) 0 3
-\() !
-(\) !
-p(a)rameter ABCparameterXYZ 3 12 4 5
-[pq](a)rameter ABCparameterXYZ 3 12 4 5
-
-; now try escaped brackets:
-- match_default bk_parens REG_BASIC
-\(a\) zzzaazz 3 4 3 4
-\(\) zzz 0 0 0 0
-\(\) "" 0 0 0 0
-\( !
-\) !
-\(aa !
-aa\) !
-() () 0 2
-(a) (a) 0 3
-(\) !
-\() !
-
-; now move on to "." wildcards
-- match_default normal REG_EXTENDED REG_STARTEND
-. a 0 1
-. \n 0 1
-. \r 0 1
-. \0 0 1
-- match_default normal match_not_dot_newline REG_EXTENDED REG_STARTEND REG_NEWLINE
-. a 0 1
-. \n -1 -1
-. \r -1 -1
-. \0 0 1
-- match_default normal match_not_dot_null match_not_dot_newline REG_EXTENDED REG_STARTEND REG_NEWLINE
-. \n -1 -1
-. \r -1 -1
-; this *WILL* produce an error from the POSIX API functions:
-- match_default normal match_not_dot_null match_not_dot_newline REG_EXTENDED REG_STARTEND REG_NEWLINE REG_NO_POSIX_TEST
-. \0 -1 -1
-
-
-;
-; now move on to the repetion ops,
-; starting with operator *
-- match_default normal REG_EXTENDED
-a* b 0 0
-ab* a 0 1
-ab* ab 0 2
-ab* sssabbbbbbsss 3 10
-ab*c* a 0 1
-ab*c* abbb 0 4
-ab*c* accc 0 4
-ab*c* abbcc 0 5
-*a !
-\<* !
-\>* !
-\n* \n\n 0 2
-\** ** 0 2
-\* * 0 1
-
-; now try operator +
-ab+ a -1 -1
-ab+ ab 0 2
-ab+ sssabbbbbbsss 3 10
-ab+c+ a -1 -1
-ab+c+ abbb -1 -1
-ab+c+ accc -1 -1
-ab+c+ abbcc 0 5
-+a !
-\<+ !
-\>+ !
-\n+ \n\n 0 2
-\+ + 0 1
-\+ ++ 0 1
-\++ ++ 0 2
-- match_default normal bk_plus_qm REG_EXTENDED REG_NO_POSIX_TEST
-+ + 0 1
-\+ !
-a\+ aa 0 2
-
-; now try operator ?
-- match_default normal REG_EXTENDED
-a? b 0 0
-ab? a 0 1
-ab? ab 0 2
-ab? sssabbbbbbsss 3 5
-ab?c? a 0 1
-ab?c? abbb 0 2
-ab?c? accc 0 2
-ab?c? abcc 0 3
-?a !
-\<? !
-\>? !
-\n? \n\n 0 1
-\? ? 0 1
-\? ?? 0 1
-\?? ?? 0 1
-- match_default normal bk_plus_qm REG_EXTENDED REG_NO_POSIX_TEST
-? ? 0 1
-\? !
-a\? aa 0 1
-a\? b 0 0
-
-- match_default normal limited_ops
-a? a? 0 2
-a+ a+ 0 2
-a\? a? 0 2
-a\+ a+ 0 2
-
-; now try operator {}
-- match_default normal REG_EXTENDED
-a{2} a -1 -1
-a{2} aa 0 2
-a{2} aaa 0 2
-a{2,} a -1 -1
-a{2,} aa 0 2
-a{2,} aaaaa 0 5
-a{2,4} a -1 -1
-a{2,4} aa 0 2
-a{2,4} aaa 0 3
-a{2,4} aaaa 0 4
-a{2,4} aaaaa 0 4
-; spaces are now allowed inside {}
-"a{ 2 , 4 }" aaaaa 0 4
-a{} !
-"a{ }" !
-a{2 !
-a} !
-\{\} {} 0 2
-
-- match_default normal bk_braces
-a\{2\} a -1 -1
-a\{2\} aa 0 2
-a\{2\} aaa 0 2
-a\{2,\} a -1 -1
-a\{2,\} aa 0 2
-a\{2,\} aaaaa 0 5
-a\{2,4\} a -1 -1
-a\{2,4\} aa 0 2
-a\{2,4\} aaa 0 3
-a\{2,4\} aaaa 0 4
-a\{2,4\} aaaaa 0 4
-"a\{ 2 , 4 \}" aaaaa 0 4
-{} {} 0 2
-
-; now test the alternation operator |
-- match_default normal REG_EXTENDED
-a|b a 0 1
-a|b b 0 1
-a(b|c) ab 0 2 1 2
-a(b|c) ac 0 2 1 2
-a(b|c) ad -1 -1 -1 -1
-|c !
-c| !
-(|) !
-(a|) !
-(|a) !
-a\| a| 0 2
-- match_default normal limited_ops
-a| a| 0 2
-a\| a| 0 2
-| | 0 1
-- match_default normal bk_vbar REG_NO_POSIX_TEST
-a| a| 0 2
-a\|b a 0 1
-a\|b b 0 1
-
-; now test the set operator []
-- match_default normal REG_EXTENDED
-; try some literals first
-[abc] a 0 1
-[abc] b 0 1
-[abc] c 0 1
-[abc] d -1 -1
-[^bcd] a 0 1
-[^bcd] b -1 -1
-[^bcd] d -1 -1
-[^bcd] e 0 1
-a[b]c abc 0 3
-a[ab]c abc 0 3
-a[^ab]c adc 0 3
-a[]b]c a]c 0 3
-a[[b]c a[c 0 3
-a[-b]c a-c 0 3
-a[^]b]c adc 0 3
-a[^-b]c adc 0 3
-a[b-]c a-c 0 3
-a[b !
-a[] !
-
-; then some ranges
-[b-e] a -1 -1
-[b-e] b 0 1
-[b-e] e 0 1
-[b-e] f -1 -1
-[^b-e] a 0 1
-[^b-e] b -1 -1
-[^b-e] e -1 -1
-[^b-e] f 0 1
-a[1-3]c a2c 0 3
-a[3-1]c !
-a[1-3-5]c !
-a[1- !
-
-; and some classes
-a[[:alpha:]]c abc 0 3
-a[[:unknown:]]c !
-a[[: !
-a[[:alpha !
-a[[:alpha:] !
-a[[:alpha,:] !
-a[[:]:]]b !
-a[[:-:]]b !
-a[[:alph:]] !
-a[[:alphabet:]] !
-[[:alnum:]]+ -%@a0X_- 3 6
-[[:alpha:]]+ -%@aX_0- 3 5
-[[:blank:]]+ "a  \tb" 1 4
-[[:cntrl:]]+ a\n\tb 1 3
-[[:digit:]]+ a019b 1 4
-[[:graph:]]+ " a%b " 1 4
-[[:lower:]]+ AabC 1 3
-; This test fails with STLPort, disable for now as this is a corner case anyway...
-;[[:print:]]+ "\na b\n" 1 4
-[[:punct:]]+ " %-&\t" 1 4
-[[:space:]]+ "a \n\t\rb" 1 5
-[[:upper:]]+ aBCd 1 3
-[[:xdigit:]]+ p0f3Cx 1 5
-
-; now test flag settings:
-- escape_in_lists REG_NO_POSIX_TEST
-[\n] \n 0 1
-- REG_NO_POSIX_TEST
-[\n] \n -1 -1
-[\n] \\ 0 1
-[[:class:] : 0 1
-[[:class:] [ 0 1
-[[:class:] c 0 1
-
-; line anchors
-- match_default normal REG_EXTENDED
-^ab ab 0 2
-^ab xxabxx -1 -1
-^ab xx\nabzz 3 5
-ab$ ab 0 2
-ab$ abxx -1 -1
-ab$ ab\nzz 0 2
-- match_default match_not_bol match_not_eol normal REG_EXTENDED REG_NOTBOL REG_NOTEOL
-^ab ab -1 -1
-^ab xxabxx -1 -1
-^ab xx\nabzz 3 5
-ab$ ab -1 -1
-ab$ abxx -1 -1
-ab$ ab\nzz 0 2
-
-; back references
-- match_default normal REG_EXTENDED
-a(b)\2c	!
-a(b\1)c	!
-a(b*)c\1d abbcbbd 0 7 1 3
-a(b*)c\1d abbcbd -1 -1
-a(b*)c\1d abbcbbbd -1 -1
-^(.)\1 abc -1 -1
-a([bc])\1d abcdabbd	4 8 5 6
-; strictly speaking this is at best ambiguous, at worst wrong, this is what most
-; re implimentations will match though.
-a(([bc])\2)*d abbccd 0 6 3 5 3 4
-
-a(([bc])\2)*d abbcbd -1 -1
-a((b)*\2)*d abbbd 0 5 1 4 2 3
-(ab*)[ab]*\1 ababaaa 0 7 0 1
-(a)\1bcd aabcd 0 5 0 1
-(a)\1bc*d aabcd 0 5 0 1
-(a)\1bc*d aabd 0 4 0 1
-(a)\1bc*d aabcccd 0 7 0 1
-(a)\1bc*[ce]d aabcccd 0 7 0 1
-^(a)\1b(c)*cd$ aabcccd 0 7 0 1 4 5
-
-;
-; characters by code:
-- match_default normal REG_EXTENDED REG_STARTEND
-\0101 A 0 1
-\00 \0 0 1
-\0 \0 0 1
-\0172 z 0 1
-
-;
-; word operators:
-\w a 0 1
-\w z 0 1
-\w A 0 1
-\w Z 0 1
-\w _ 0 1
-\w } -1 -1
-\w ` -1 -1
-\w [ -1 -1
-\w @ -1 -1
-; non-word:
-\W a -1 -1
-\W z -1 -1
-\W A -1 -1
-\W Z -1 -1
-\W _ -1 -1
-\W } 0 1
-\W ` 0 1
-\W [ 0 1
-\W @ 0 1
-; word start:
-\<abcd "  abcd" 2 6
-\<ab cab -1 -1
-\<ab "\nab" 1 3
-\<tag ::tag 2 5
-;word end:
-abc\> abc 0 3
-abc\> abcd -1 -1
-abc\> abc\n 0 3
-abc\> abc:: 0 3
-; word boundary:
-\babcd "  abcd" 2 6
-\bab cab -1 -1
-\bab "\nab" 1 3
-\btag ::tag 2 5
-abc\b abc 0 3
-abc\b abcd -1 -1
-abc\b abc\n 0 3
-abc\b abc:: 0 3
-; within word:
-\B ab 1 1
-a\Bb ab 0 2
-a\B ab 0 1
-a\B a -1 -1
-a\B "a " -1 -1
-
-;
-; buffer operators:
-\`abc abc 0 3
-\`abc \nabc -1 -1
-\`abc " abc" -1 -1
-abc\' abc 0 3
-abc\' abc\n -1 -1
-abc\' "abc " -1 -1
-
-;
-; extra escape sequences:
-\a \a 0 1
-\f \f 0 1
-\n \n 0 1
-\r \r 0 1
-\t \t 0 1
-\v \v 0 1
-
-
-;
-; now follows various complex expressions designed to try and bust the matcher:
-a(((b)))c abc 0 3 1 2 1 2 1 2
-a(b|(c))d abd 0 3 1 2 -1 -1
-a(b|(c))d acd 0 3 1 2 1 2
-a(b*|c)d abbd 0 4 1 3
-; just gotta have one DFA-buster, of course
-a[ab]{20} aaaaabaaaabaaaabaaaab 0 21
-; and an inline expansion in case somebody gets tricky
-a[ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab][ab] aaaaabaaaabaaaabaaaab 0 21
-; and in case somebody just slips in an NFA...
-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) aaaaabaaaabaaaabaaaabweeknights 0 31 21 24 24 31
-; one really big one
-1234567890123456789012345678901234567890123456789012345678901234567890 a1234567890123456789012345678901234567890123456789012345678901234567890b 1 71
-; fish for problems as brackets go past 8
-[ab][cd][ef][gh][ij][kl][mn] xacegikmoq 1 8
-[ab][cd][ef][gh][ij][kl][mn][op] xacegikmoq 1 9
-[ab][cd][ef][gh][ij][kl][mn][op][qr] xacegikmoqy 1 10
-[ab][cd][ef][gh][ij][kl][mn][op][q] xacegikmoqy 1 10
-; and as parenthesis go past 9:
-(a)(b)(c)(d)(e)(f)(g)(h) zabcdefghi 1 9 1 2 2 3 3 4 4 5 5 6 6 7 7 8 8 9
-(a)(b)(c)(d)(e)(f)(g)(h)(i) zabcdefghij 1 10 1 2 2 3 3 4 4 5 5 6 6 7 7 8 8 9 9 10
-(a)(b)(c)(d)(e)(f)(g)(h)(i)(j) zabcdefghijk 1 11 1 2 2 3 3 4 4 5 5 6 6 7 7 8 8 9 9 10 10 11
-(a)(b)(c)(d)(e)(f)(g)(h)(i)(j)(k) zabcdefghijkl 1 12 1 2 2 3 3 4 4 5 5 6 6 7 7 8 8 9 9 10 10 11 11 12
-(a)d|(b)c abc 1 3 -1 -1 1 2
-"_+((www)|(ftp)|(mailto)):_*" "_wwwnocolon _mailto:" 12 20 13 19 -1 -1 -1 -1 13 19
-
-; subtleties of matching
-a(b)?c\1d acd 0 3 -1 -1
-a(b?c)+d accd 0 4 2 3
-(wee|week)(knights|night) weeknights 0 10 0 3 3 10
-.* abc 0 3
-a(b|(c))d abd 0 3 1 2 -1 -1
-a(b|(c))d acd 0 3 1 2 1 2
-a(b*|c|e)d abbd 0 4 1 3
-a(b*|c|e)d acd 0 3 1 2
-a(b*|c|e)d ad 0 2 1 1
-a(b?)c abc 0 3 1 2
-a(b?)c ac 0 2 1 1
-a(b+)c abc 0 3 1 2
-a(b+)c abbbc 0 5 1 4 
-a(b*)c ac 0 2 1 1 
-(a|ab)(bc([de]+)f|cde) abcdef 0 6 0 1 1 6 3 5
-a([bc]?)c abc 0 3 1 2
-a([bc]?)c ac 0 2 1 1 
-a([bc]+)c abc 0 3 1 2
-a([bc]+)c abcc 0 4 1 3
-a([bc]+)bc abcbc 0 5 1 3
-a(bb+|b)b abb 0 3 1 2
-a(bbb+|bb+|b)b abb 0 3 1 2
-a(bbb+|bb+|b)b abbb 0 4 1 3
-a(bbb+|bb+|b)bb abbb 0 4 1 2
-(.*).* abcdef 0 6 0 6
-(a*)* bc 0 0 0 0
-
-; do we get the right subexpression when it is used more than once?
-a(b|c)*d ad 0 2 -1 -1
-a(b|c)*d abcd 0 4 2 3
-a(b|c)+d abd 0 3 1 2
-a(b|c)+d abcd 0 4 2 3
-a(b|c?)+d ad 0 2 1 1
-a(b|c?)+d abcd 0 4 2 3
-a(b|c){0,0}d ad 0 2 -1 -1
-a(b|c){0,1}d ad 0 2 -1 -1
-a(b|c){0,1}d abd 0 3 1 2
-a(b|c){0,2}d ad 0 2 -1 -1
-a(b|c){0,2}d abcd 0 4 2 3
-a(b|c){0,}d ad 0 2 -1 -1
-a(b|c){0,}d abcd 0 4 2 3
-a(b|c){1,1}d abd 0 3 1 2
-a(b|c){1,2}d abd 0 3 1 2
-a(b|c){1,2}d abcd 0 4 2 3
-a(b|c){1,}d abd 0 3 1 2
-a(b|c){1,}d abcd 0 4 2 3
-a(b|c){2,2}d acbd 0 4 2 3
-a(b|c){2,2}d abcd 0 4 2 3
-a(b|c){2,4}d abcd 0 4 2 3
-a(b|c){2,4}d abcbd 0 5 3 4
-a(b|c){2,4}d abcbcd 0 6 4 5
-a(b|c){2,}d abcd 0 4 2 3
-a(b|c){2,}d abcbd 0 5 3 4
-a(b+|((c)*))+d abd 0 3 1 2 -1 -1 -1 -1
-a(b+|((c)*))+d abcd 0 4 2 3 2 3 2 3
-
-- match_default normal REG_EXTENDED REG_STARTEND REG_NOSPEC literal
-\**?/{} \\**?/{} 0 7
-
-- match_default normal REG_EXTENDED REG_NO_POSIX_TEST ; we disable POSIX testing because it can't handle escapes in sets
-; try to match C++ syntax elements:
-; line comment:
-//[^\n]* "++i //here is a line comment\n" 4 28
-; block comment:
-/\*([^*]|\*+[^*/])*\*+/ "/* here is a block comment */" 0 29 26 27
-/\*([^*]|\*+[^*/])*\*+/ "/**/" 0 4 -1 -1
-/\*([^*]|\*+[^*/])*\*+/ "/***/" 0 5 -1 -1
-/\*([^*]|\*+[^*/])*\*+/ "/****/" 0 6 -1 -1
-/\*([^*]|\*+[^*/])*\*+/ "/*****/" 0 7 -1 -1
-/\*([^*]|\*+[^*/])*\*+/ "/*****/*/" 0 7 -1 -1
-; preprossor directives:
-^[[:blank:]]*#([^\n]*\\[[:space:]]+)*[^\n]* "#define some_symbol" 0 19 -1 -1
-^[[:blank:]]*#([^\n]*\\[[:space:]]+)*[^\n]* "#define some_symbol(x) #x" 0 25 -1 -1
-^[[:blank:]]*#([^\n]*\\[[:space:]]+)*[^\n]* "#define some_symbol(x) \\  \r\n  foo();\\\r\n   printf(#x);" 0 53 28 42
-; literals:
-((0x[[:xdigit:]]+)|([[:digit:]]+))u?((int(8|16|32|64))|L)? 0xFF         						0 4		0 4		0 4 	-1 -1 	-1 -1 	-1 -1 	-1 -1
-((0x[[:xdigit:]]+)|([[:digit:]]+))u?((int(8|16|32|64))|L)? 35 									0 2 	0 2		-1 -1 	0 2 	-1 -1 	-1 -1 	-1 -1
-((0x[[:xdigit:]]+)|([[:digit:]]+))u?((int(8|16|32|64))|L)? 0xFFu 								0 5		0 4		0 4 	-1 -1 	-1 -1 	-1 -1 	-1 -1
-((0x[[:xdigit:]]+)|([[:digit:]]+))u?((int(8|16|32|64))|L)? 0xFFL 								0 5		0 4		0 4 	-1 -1 	4 5 	-1 -1 	-1 -1
-((0x[[:xdigit:]]+)|([[:digit:]]+))u?((int(8|16|32|64))|L)? 0xFFFFFFFFFFFFFFFFuint64 			0 24	0 18	0 18 	-1 -1 	19 24 	19 24 	22 24
-; strings:
-'([^\\']|\\.)*' '\\x3A' 0 6 4 5
-'([^\\']|\\.)*' '\\'' 0 4 1 3
-'([^\\']|\\.)*' '\\n' 0 4 1 3
-
-; now try and test some unicode specific characters:
-- match_default normal REG_PERL REG_UNICODE_ONLY
-[[:unicode:]]+  a\0300\0400z 1 3
-[\x10-\xff] \39135\12409 -1 -1
-[\01-\05]{5} \36865\36865\36865\36865\36865 -1 -1
-
-; finally try some case insensitive matches:
-- match_default normal REG_EXTENDED REG_ICASE
-; upper and lower have no meaning here so they fail, however these
-; may compile with other libraries...
-;[[:lower:]] !
-;[[:upper:]] !
-0123456789@abcdefghijklmnopqrstuvwxyz\[\\\]\^_`ABCDEFGHIJKLMNOPQRSTUVWXYZ\{\|\} 0123456789@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]\^_`abcdefghijklmnopqrstuvwxyz\{\|\} 0 72
-
-; known and suspected bugs:
-- match_default normal REG_EXTENDED
-\( ( 0 1
-\) ) 0 1
-\$ $ 0 1
-\^ ^ 0 1
-\. . 0 1
-\* * 0 1
-\+ + 0 1
-\? ? 0 1
-\[ [ 0 1
-\] ] 0 1
-\| | 0 1
-\\ \\ 0 1
-# # 0 1
-\# # 0 1
-a- a- 0 2
-\- - 0 1
-\{ { 0 1
-\} } 0 1
-0 0 0 1
-1 1 0 1
-9 9 0 1
-b b 0 1
-B B 0 1
-< < 0 1
-> > 0 1
-w w 0 1
-W W 0 1
-` ` 0 1
-' ' 0 1
-\n \n 0 1
-, , 0 1
-a a 0 1
-f f 0 1
-n n 0 1
-r r 0 1
-t t 0 1
-v v 0 1
-c c 0 1
-x x 0 1
-: : 0 1
-(\.[[:alnum:]]+){2} "w.a.b " 1 5 3 5
-
-- match_default normal REG_EXTENDED REG_ICASE
-a A 0 1
-A a 0 1
-[abc]+ abcABC 0 6
-[ABC]+ abcABC 0 6
-[a-z]+ abcABC 0 6
-[A-Z]+ abzANZ 0 6
-[a-Z]+ abzABZ 0 6
-[A-z]+ abzABZ 0 6
-[[:lower:]]+ abyzABYZ 0 8
-[[:upper:]]+ abzABZ 0 6
-[[:word:]]+ abcZZZ 0 6
-[[:alpha:]]+ abyzABYZ 0 8
-[[:alnum:]]+ 09abyzABYZ 0 10
-
-; updated tests for version 2:
-- match_default normal REG_EXTENDED
-\x41 A 0 1
-\xff \255 0 1
-\xFF \255 0 1
-- match_default normal REG_EXTENDED REG_NO_POSIX_TEST
-\c@ \0 0 1
-- match_default normal REG_EXTENDED
-\cA \1 0 1
-\cz \58 0 1
-\c= !
-\c? !
-=: =: 0 2
-
-; word start:
-[[:<:]]abcd "  abcd" 2 6
-[[:<:]]ab cab -1 -1
-[[:<:]]ab "\nab" 1 3
-[[:<:]]tag ::tag 2 5
-;word end:
-abc[[:>:]] abc 0 3
-abc[[:>:]] abcd -1 -1
-abc[[:>:]] abc\n 0 3
-abc[[:>:]] abc:: 0 3
-
-; collating elements and rewritten set code:
-- match_default normal REG_EXTENDED REG_STARTEND
-[[.zero.]] 0 0 1
-[[.one.]] 1 0 1
-[[.two.]] 2 0 1
-[[.three.]] 3 0 1
-[[.a.]] baa 1 2
-[[.right-curly-bracket.]] } 0 1
-[[.NUL.]] \0 0 1
-[[:<:]z] !
-[a[:>:]] !
-[[=a=]] a 0 1
-[[=right-curly-bracket=]] } 0 1
-- match_default normal REG_EXTENDED REG_STARTEND REG_ICASE
-[[.A.]] A 0 1
-[[.A.]] a 0 1
-[[.A.]-b]+ AaBb 0 4
-[A-[.b.]]+ AaBb 0 4
-[[.a.]-B]+ AaBb 0 4
-[a-[.B.]]+ AaBb 0 4
-- match_default normal REG_EXTENDED REG_NO_POSIX_TEST
-[\x61] a 0 1
-[\x61-c]+ abcd 0 3
-[a-\x63]+ abcd 0 3
-- match_default normal REG_EXTENDED REG_STARTEND
-[[.a.]-c]+ abcd 0 3
-[a-[.c.]]+ abcd 0 3
-[[:alpha:]-a] !
-[a-[:alpha:]] !
-
-; try mutli-character ligatures:
-[[.ae.]] ae 0 2
-[[.ae.]] aE -1 -1
-[[.AE.]] AE 0 2
-[[.Ae.]] Ae 0 2
-[[.ae.]-b] a -1 -1
-[[.ae.]-b] b 0 1
-[[.ae.]-b] ae 0 2
-[a-[.ae.]] a 0 1
-[a-[.ae.]] b -1 -1
-[a-[.ae.]] ae 0 2
-- match_default normal REG_EXTENDED REG_STARTEND REG_ICASE
-[[.ae.]] AE 0 2
-[[.ae.]] Ae 0 2
-[[.AE.]] Ae 0 2
-[[.Ae.]] aE 0 2
-[[.AE.]-B] a -1 -1
-[[.Ae.]-b] b 0 1
-[[.Ae.]-b] B 0 1
-[[.ae.]-b] AE 0 2
-
-- match_default normal REG_EXTENDED REG_STARTEND
-;extended perl style escape sequences:
-\e \27 0 1
-\x1b \27 0 1
-\x{1b} \27 0 1
-\x{} !
-\x{ !
-\x} !
-\x !
-\x{yy !
-\x{1b !
-
-- match_default normal REG_EXTENDED REG_STARTEND REG_NO_POSIX_TEST
-\l+ ABabcAB 2 5
-[\l]+ ABabcAB 2 5
-[a-\l] !
-[\l-a] !
-[\L] !
-\L+ abABCab 2 5
-\u+ abABCab 2 5
-[\u]+ abABCab 2 5
-[\U] !
-\U+ ABabcAB 2 5
-\d+ ab012ab 2 5
-[\d]+ ab012ab 2 5
-[\D] !
-\D+ 01abc01 2 5
-\s+ "ab   ab" 2 5
-[\s]+ "ab   ab" 2 5
-[\S] !
-\S+ "  abc  " 2 5
-- match_default normal REG_EXTENDED REG_STARTEND
-\Qabc !
-\Qabc\E abcd 0 3
-\Qabc\Ed abcde 0 4
-\Q+*?\\E +*?\\ 0 4
-
-\C+ abcde 0 5
-\X+ abcde 0 5
-
-- match_default normal REG_EXTENDED REG_STARTEND REG_UNICODE_ONLY
-\X+ a\768\769 0 3
-\X+ \2309\2307 0 2   ;DEVANAGARI script
-\X+ \2489\2494 0 2   ;BENGALI script
-
-- match_default normal REG_EXTENDED REG_STARTEND
-\Aabc abc 0 3
-\Aabc aabc -1 -1
-abc\z abc 0 3
-abc\z abcd -1 -1
-abc\Z abc\n\n 0 3
-abc\Z abc 0 3
-
-
-\Gabc abc 0 3
-\Gabc dabcd -1 -1
-a\Gbc abc -1 -1
-a\Aab abc -1 -1
-
-;
-; now test grep,
-; basically check all our restart types - line, word, etc
-; checking each one for null and non-null matches.
-;
-- match_default normal REG_EXTENDED REG_STARTEND REG_GREP
-a " a a a aa" 1 2 3 4 5 6 7 8 8 9
-a+b+ "aabaabbb ab" 0 3 3 8 9 11
-a(b*|c|e)d adabbdacd 0 2 2 6 6 9
-a "\na\na\na\naa" 1 2 3 4 5 6 7 8 8 9
-
-^ "   \n\n  \n\n\n" 0 0 4 4 5 5 8 8 9 9 10 10
-^ab  "ab  \nab  ab\n" 0 2 5 7
-^[^\n]*\n "   \n  \n\n  \n" 0 4 4 7 7 8 8 11
-\<abc "abcabc abc\n\nabc" 0 3 7 10 12 15
-\< "  ab a aaa  "  2 2 5 5 7 7
-\<\w+\W+ " aa  aa  a " 1 5 5 9 9 11
-
-\Aabc "abc   abc"  0 3
-\G\w+\W+ "abc  abc a cbbb   " 0 5 5 9 9 11 11 18
-\Ga+b+ "aaababb  abb" 0 4 4 7
-
-abc abc 0 3
-abc " abc abcabc " 1 4 5 8 8 11
-\n\n " \n\n\n       \n      \n\n\n\n  " 1 3 18 20 20 22
-
-$ "   \n\n  \n\n\n" 3 3 4 4 7 7 8 8 9 9 10 10
-\b "  abb a abbb " 2 2 5 5 6 6 7 7 8 8 12 12
-
-- match_default normal REG_EXTENDED REG_STARTEND REG_GREP REG_ICASE
-A " a a a aa" 1 2 3 4 5 6 7 8 8 9
-A+B+ "aabaabbb ab" 0 3 3 8 9 11
-A(B*|c|e)D adabbdacd 0 2 2 6 6 9
-A "\na\na\na\naa" 1 2 3 4 5 6 7 8 8 9
-
-^aB  "Ab  \nab  Ab\n" 0 2 5 7
-\<abc "Abcabc aBc\n\nabc" 0 3 7 10 12 15
-
-ABC abc 0 3
-abc " ABC ABCABC " 1 4 5 8 8 11
-
-
-;
-; now test merge,
-;
-- match_default normal REG_EXTENDED REG_STARTEND REG_MERGE format_no_copy
-; start by testing subs:
-a+ "...aaa,,," $` "..." 
-a+ "...aaa,,," $' ",,," 
-a+ "...aaa,,," $& "aaa" 
-a+ "...aaa,,," $0 aaa
-a+ "...aaa,,," $1 ""
-a+ "...aaa,,," $15 ""
-(a+)b+ "...aaabbb,,," $1 aaa
-[[:digit:]]* 123ab <$0> <123><><><>
-[[:digit:]]* 123ab1 <$0> <123><><><1>
-
-; and now escapes:
-a+ "...aaa,,," $x "$x" 
-a+ "...aaa,,," \a "\a" 
-a+ "...aaa,,," \f "\f" 
-a+ "...aaa,,," \n "\n" 
-a+ "...aaa,,," \r "\r" 
-a+ "...aaa,,," \t "\t" 
-a+ "...aaa,,," \v "\v" 
-
-a+ "...aaa,,," \x21 "!" 
-a+ "...aaa,,," \x{21} "!" 
-a+ "...aaa,,," \c@ \0
-a+ "...aaa,,," \e \27
-a+ "...aaa,,," \0101 A
-a+ "...aaa,,," (\0101) A
-
-- match_default normal REG_EXTENDED REG_STARTEND REG_MERGE format_sed format_no_copy
-(a+)(b+) ...aabb,, \0 aabb
-(a+)(b+) ...aabb,, \1 aa
-(a+)(b+) ...aabb,, \2 bb
-(a+)(b+) ...aabb,, & aabb
-(a+)(b+) ...aabb,, $ $
-(a+)(b+) ...aabb,, $1 $1
-(a+)(b+) ...aabb,, ()?: ()?:
-(a+)(b+) ...aabb,, \\ \\
-(a+)(b+) ...aabb,, \& &
-
-
-- match_default normal REG_EXTENDED REG_STARTEND REG_MERGE format_perl format_no_copy
-(a+)(b+) ...aabb,, $0 aabb
-(a+)(b+) ...aabb,, $1 aa
-(a+)(b+) ...aabb,, $2 bb
-(a+)(b+) ...aabb,, $& aabb
-(a+)(b+) ...aabb,, & &
-(a+)(b+) ...aabb,, \0 \0
-(a+)(b+) ...aabb,, ()?: ()?:
-
-- match_default normal REG_EXTENDED REG_STARTEND REG_MERGE
-; move to copying unmatched data:
-a+ "...aaa,,," bbb "...bbb,,," 
-a+(b+) "...aaabb,,," $1 "...bb,,," 
-a+(b+) "...aaabb,,,ab*abbb?" $1 "...bb,,,b*bbb?" 
-
-(a+)|(b+) "...aaabb,,,ab*abbb?" (?1A)(?2B) "...AB,,,AB*AB?" 
-(a+)|(b+) "...aaabb,,,ab*abbb?" ?1A:B "...AB,,,AB*AB?" 
-(a+)|(b+) "...aaabb,,,ab*abbb?" (?1A:B)C "...ACBC,,,ACBC*ACBC?" 
-(a+)|(b+) "...aaabb,,,ab*abbb?" ?1:B "...B,,,B*B?" 
-
-- match_default normal REG_EXTENDED REG_STARTEND REG_MERGE format_first_only
-; move to copying unmatched data, but replace first occurance only:
-a+ "...aaa,,," bbb "...bbb,,," 
-a+(b+) "...aaabb,,," $1 "...bb,,," 
-a+(b+) "...aaabb,,,ab*abbb?" $1 "...bb,,,ab*abbb?" 
-(a+)|(b+) "...aaabb,,,ab*abbb?" (?1A)(?2B) "...Abb,,,ab*abbb?" 
-
-;
-; changes to newline handling with 2.11:
-;
-
-- match_default normal REG_EXTENDED REG_STARTEND REG_GREP
-
-^. "  \n  \r\n  " 0 1 3 4 7 8
-.$ "  \n  \r\n  " 1 2 4 5 8 9
-
-- match_default normal REG_EXTENDED REG_STARTEND REG_GREP REG_UNICODE_ONLY
-^. "  \8232 \8233  " 0 1 3 4 5 6
-.$ "  \8232 \8233  " 1 2 3 4 6 7
-
-;
-; non-greedy repeats added 21/04/00
-- match_default normal REG_EXTENDED
-a** !
-a*? aa 0 0
-a?? aa 0 0
-a++ !
-a+? aa 0 1
-a{1,3}{1} !
-a{1,3}? aaa 0 1
-\w+?w ...ccccccwcccccw 3 10
-\W+\w+?w ...ccccccwcccccw 0 10
-abc|\w+? abd 0 1
-abc|\w+? abcd 0 3
-<\s*tag[^>]*>(.*?)<\s*/tag\s*> " <tag>here is some text</tag> <tag></tag>" 1 29 6 23
-<\s*tag[^>]*>(.*?)<\s*/tag\s*> " < tag attr=\"something\">here is some text< /tag > <tag></tag>" 1 49 24 41
-
-;
-; non-marking parenthesis added 25/04/00
-- match_default normal REG_EXTENDED
-(?:abc)+ xxabcabcxx 2 8
-(?:a+)(b+) xaaabbbx 1 7 4 7
-(a+)(?:b+) xaaabbba 1 7 1 4
-(?:(a+)b+) xaaabbba 1 7 1 4
-(?:a+(b+)) xaaabbba 1 7 4 7
-a+(?#b+)b+ xaaabbba 1 7
-(a)(?:b|$) ab 0 2 0 1
-(a)(?:b|$) a 0 1 0 1
-
-
-;
-; try some partial matches:
-- match_partial match_default normal REG_EXTENDED REG_NO_POSIX_TEST
-(xyz)(.*)abc xyzaaab -1 -1 0 3 3 7
-(xyz)(.*)abc xyz -1 -1 0 3 3 3
-(xyz)(.*)abc xy -1 -1 -1 -1 -1 -1
-
-;
-; forward lookahead asserts added 21/01/02
-- match_default normal REG_EXTENDED REG_NO_POSIX_TEST
-((?:(?!a|b)\w)+)(\w+) "  xxxabaxxx  " 2 11 2 5 5 11
-
-/\*(?:(?!\*/).)*\*/ "  /**/  " 2 6
-/\*(?:(?!\*/).)*\*/ "  /***/  " 2 7
-/\*(?:(?!\*/).)*\*/ "  /********/  " 2 12
-/\*(?:(?!\*/).)*\*/ "  /* comment */  " 2 15
-
-<\s*a[^>]*>((?:(?!<\s*/\s*a\s*>).)*)<\s*/\s*a\s*> " <a href=\"here\">here</a> " 1 24 16 20
-<\s*a[^>]*>((?:(?!<\s*/\s*a\s*>).)*)<\s*/\s*a\s*> " <a href=\"here\">here< /  a > " 1 28 16 20
-
-<\s*a[^>]*>((?:(?!<\s*/\s*a\s*>).)*)(?=<\s*/\s*a\s*>) " <a href=\"here\">here</a> " 1 20 16 20
-<\s*a[^>]*>((?:(?!<\s*/\s*a\s*>).)*)(?=<\s*/\s*a\s*>) " <a href=\"here\">here< /  a > " 1 20 16 20
-
-; filename matching:
-^(?!^(?:PRN|AUX|CLOCK\$|NUL|CON|COM\d|LPT\d|\..*)(?:\..+)?$)[^\x00-\x1f\\?*:\"|/]+$ command.com 0 11
-^(?!^(?:PRN|AUX|CLOCK\$|NUL|CON|COM\d|LPT\d|\..*)(?:\..+)?$)[^\x00-\x1f\\?*:\"|/]+$ PRN -1 -1
-^(?!^(?:PRN|AUX|CLOCK\$|NUL|CON|COM\d|LPT\d|\..*)(?:\..+)?$)[^\x00-\x1f\\?*:\"|/]+$ COM2 -1 -1
-
-; password checking:
-^(?=.*\d).{4,8}$ abc3 0 4
-^(?=.*\d).{4,8}$ abc3def4 0 8
-^(?=.*\d).{4,8}$ ab2 -1 -1
-^(?=.*\d).{4,8}$ abcdefg -1 -1
-^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{4,8}$ abc3 -1 -1
-^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{4,8}$ abC3 0 4
-^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{4,8}$ ABCD3 -1 -1
-
-
-
-
-
diff --git a/test/regress/vc6-stlport.mak b/test/regress/vc6-stlport.mak
index b8fb913b..858daf15 100644
--- a/test/regress/vc6-stlport.mak
+++ b/test/regress/vc6-stlport.mak
@@ -24,7 +24,7 @@ XLFLAGS=
 #
 # sources to compile for each test:
 #
-SOURCES=tests.cpp parse.cpp regress.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
+SOURCES=*.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
 
 !IF "$(MSVCDIR)" == ""
 !ERROR Variable MSVCDIR not set.
@@ -218,3 +218,5 @@ r6mdd.exe : $(SOURCES)
 
 
 
+
+
diff --git a/test/regress/vc6.mak b/test/regress/vc6.mak
index 39901832..5f450ac9 100644
--- a/test/regress/vc6.mak
+++ b/test/regress/vc6.mak
@@ -18,7 +18,7 @@ XLFLAGS=
 #
 # sources to compile for each test:
 #
-SOURCES=tests.cpp parse.cpp regress.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
+SOURCES=*.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
 
 CFLAGS= $(INCLUDES) /O2 /GB /GF /Gy -GX -GR -I..\..\..\..\ $(CXXFLAGS)
 
@@ -225,6 +225,8 @@ r6lmd.exe : $(SOURCES)
 
 
 
+
+
 
 
 
diff --git a/test/regress/vc7.mak b/test/regress/vc7.mak
index 5fb9282e..6a3d1e22 100644
--- a/test/regress/vc7.mak
+++ b/test/regress/vc7.mak
@@ -18,7 +18,7 @@ XLFLAGS=
 #
 # sources to compile for each test:
 #
-SOURCES=tests.cpp parse.cpp regress.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
+SOURCES=*.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
 
 CFLAGS= $(INCLUDES) /O2 /GB /GF /Gy -GX -GR -I..\..\..\..\ $(CXXFLAGS) /DBOOST_LIB_DIAGNOSTIC=1 /Zc:wchar_t
 
@@ -227,6 +227,8 @@ r6lmd.exe : $(SOURCES)
 
 
 
+
+
 
 
 
diff --git a/test/regress/vc71.mak b/test/regress/vc71.mak
index 9db1aa1c..0a4521c6 100644
--- a/test/regress/vc71.mak
+++ b/test/regress/vc71.mak
@@ -18,7 +18,7 @@ XLFLAGS=
 #
 # sources to compile for each test:
 #
-SOURCES=tests.cpp parse.cpp regress.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
+SOURCES=*.cpp ../../../test/src/cpp_main.cpp ../../../test/src/execution_monitor.cpp
 
 CFLAGS= $(INCLUDES) /GB /GF /Gy -GX -GR -I..\..\..\..\ $(CXXFLAGS) /DBOOST_LIB_DIAGNOSTIC=1 /Zc:wchar_t
 
@@ -238,6 +238,8 @@ r6lmd.exe : $(SOURCES)
 
 
 
+
+
 
 
 
diff --git a/test/regress/wregex_test.cpp b/test/regress/wregex_test.cpp
deleted file mode 100644
index bae13370..00000000
--- a/test/regress/wregex_test.cpp
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- *
- * Copyright (c) 1998-2002
- * Dr 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         regex_test.cpp
-  *   VERSION      see <boost/version.hpp>
-  *   DESCRIPTION: Builds regression test program with default
-  *                locale and wide character tests.  Also
-  *                instantiates all the templates in the library
-  *                as a sanity check.
-  */
-
-// disable automatic selection of support library:
-#define BOOST_REGEX_NO_LIB
-#define BOOST_REGEX_STATIC_LINK
-#define BOOST_REGEX_NO_EXTERNAL_TEMPLATES
-
-#if defined(_MSC_VER) && defined(__STL_DEBUG) && defined(_DLL)
-//
-// Ugly hack:
-// when this file is built with VC6 + STLPort 4 we get unresolved externals
-// from std::wstring if __STL_DEBUG is defined.  As a workaround disable
-// STL debugging support in this case.  This weakens the regression tests
-// but is still better than not being able to run them at all.  This should be
-// removed once STLPort gets fixed.
-//
-#undef __STL_DEBUG
-#endif
-
-#include <boost/regex.hpp>
-#include <boost/regex/src.cpp>
-
-#ifdef BOOST_NO_WREGEX
-#error The regex library is not configured for wide character support
-#endif
-
-//
-// instantiate templates used:
-//
-namespace boost{
-
-typedef const wchar_t* ra_it;
-typedef wchar_t char_type;
-typedef std::basic_string<char_type> test_string_type;
-
-bool pred1(const match_results<ra_it>&)
-{ return true; }
-
-typedef bool (*pred1_type)(const match_results<ra_it>&);
-typedef bool (*pred2_type)(const match_results<test_string_type::const_iterator>&);
-
-//check that all the defined flags are available:
-wregex::flag_type f = wregex::escape_in_lists | wregex::char_classes | wregex::intervals | wregex::limited_ops
-                       | wregex::newline_alt | wregex::bk_plus_qm | wregex::bk_braces
-                       | wregex::bk_parens | wregex::bk_refs | wregex::bk_vbar | wregex::use_except
-                       | wregex::failbit | wregex::literal | wregex::icase | wregex::nocollate | wregex::basic
-                       | wregex::extended | wregex::normal | wregex::emacs | wregex::awk | wregex::grep | wregex::egrep | wregex::sed;
-
-template class reg_expression<char_type>;
-template struct sub_match<ra_it>;
-template class match_results<ra_it>;
-
-template bool regex_match(ra_it,
-                 ra_it,
-                 match_results<ra_it>& m,
-                 const reg_expression<char_type>& e,
-                 unsigned flags);
-template bool regex_match(ra_it,
-                 ra_it,
-                 const reg_expression<char_type>& e,
-                 unsigned flags);
-template bool regex_search(ra_it,
-                ra_it,
-                match_results<ra_it>& m,
-                const reg_expression<char_type>& e,
-                unsigned flags);
-template unsigned int regex_grep(pred1_type,
-                        ra_it,
-                        ra_it,
-                        const reg_expression<char_type>& e,
-                        unsigned flags);
-template char_type* regex_format(char_type*,
-                            const match_results<ra_it>& m,
-                            const char_type* fmt,
-                            unsigned flags);
-template char_type* regex_format(char_type*,
-                            const match_results<ra_it>& m,
-                            const test_string_type& fmt,
-                            unsigned flags);
-template char_type* regex_replace(char_type*,
-                          ra_it,
-                          ra_it,
-                          const reg_expression<char_type>&,
-                          const char_type*,
-                          unsigned int flags);
-template char_type* regex_replace(char_type*,
-                           ra_it,
-                           ra_it,
-                           const reg_expression<char_type>& e,
-                           const test_string_type&,
-                           unsigned int flags);
-template std::size_t regex_split(test_string_type*,
-                        test_string_type&,
-                        const reg_expression<char_type>&,
-                        unsigned flags,
-                        std::size_t);
-template std::size_t regex_split(test_string_type*,
-                        test_string_type& s,
-                        const reg_expression<char_type>& e,
-                        unsigned flags);
-
-template std::size_t regex_split(test_string_type*, test_string_type&);
-
-#ifndef BOOST_NO_FUNCTION_TEMPLATE_ORDERING
-//
-// the following prototypes are only available if partial ordering
-// of template functions is supported:
-//
-template bool regex_match(const char_type*,
-                 match_results<const char_type*>& m,
-                 const reg_expression<char_type>& e,
-                 unsigned flags);
-template bool regex_match(const test_string_type&,
-                 match_results<test_string_type::const_iterator>&,
-                 const reg_expression<char_type>&,
-                 unsigned flags);
-template bool regex_match(const char_type*,
-                 const reg_expression<char_type>&,
-                 unsigned flags);
-template bool regex_match(const test_string_type&,
-                 const reg_expression<char_type>&,
-                 unsigned flags);
-template bool regex_search(const char_type*,
-                match_results<const char_type*>&,
-                const reg_expression<char_type>&,
-                unsigned flags);
-template bool regex_search(const test_string_type&,
-                match_results<test_string_type::const_iterator>&,
-                const reg_expression<char_type>&,
-                unsigned flags);
-template unsigned int regex_grep(pred1_type,
-              const char_type*,
-              const reg_expression<char_type>&,
-              unsigned flags);
-template unsigned int regex_grep(pred2_type,
-              const test_string_type&,
-              const reg_expression<char_type>&,
-              unsigned flags);
-template test_string_type regex_format
-                                 (const match_results<test_string_type::const_iterator>& m,
-                                  const char_type*,
-                                  unsigned flags);
-template test_string_type regex_format
-                                 (const match_results<test_string_type::const_iterator>&,
-                                  const test_string_type&,
-                                  unsigned flags);
-template test_string_type regex_replace(const test_string_type&,
-                                     const reg_expression<char_type>&,
-                                     const char_type*,
-                                     unsigned int flags);
-template test_string_type regex_replace(const test_string_type&,
-                                     const reg_expression<char_type>&,
-                                     const test_string_type&,
-                                     unsigned int flags);
-
-#endif
-
-} // namespace boost
-
-//
-// include regression test source files:
-//
-#ifdef BOOST_REGEX_USE_WIN32_LOCALE
-#define BOOST_RE_TEST_LOCALE_W32
-#elif !defined(BOOST_REGEX_USE_C_LOCALE)
-#define BOOST_RE_TEST_LOCALE_CPP
-#endif
-#define TEST_UNICODE
-#include "tests.cpp"
-#include "parse.cpp"
-#include "regress.cpp"
-
-//
-// Como goes into an infinite loop trying to link this,
-// just have it fail for now:
-//
-#if defined(__COMO__) && defined(_MSC_VER)
-#error "Comeau in VC6 mode goes into an infinite loop trying to link this program!!!"
-#endif
-
-
-
diff --git a/test/static_mutex/static_mutex_test.cpp b/test/static_mutex/static_mutex_test.cpp
new file mode 100644
index 00000000..2899ca4d
--- /dev/null
+++ b/test/static_mutex/static_mutex_test.cpp
@@ -0,0 +1,181 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         static_mutex_test.cpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: test program for boost::static_mutex.
+  */
+
+#include <iostream>
+#include <boost/regex/pending/static_mutex.hpp>
+#include <boost/thread/thread.hpp>
+#include <boost/timer.hpp>
+
+//
+// we cannot use the regular Boost.Test in here: it is not thread safe
+// and calls to BOOST_TEST will eventually crash on some compilers 
+// (Borland certainly) due to race conditions inside the Boost.Test lib.
+//
+#define BOOST_TEST(pred) if(!(pred)) failed_test(__FILE__, __LINE__, BOOST_STRINGIZE(pred));
+
+int total_failures = 0;
+void failed_test(const char* file, int line, const char* pred)
+{
+   static boost::static_mutex mut = BOOST_STATIC_MUTEX_INIT ;
+   boost::static_mutex::scoped_lock guard(mut);
+   ++total_failures;
+   std::cout << "Failed test in \"" << file << "\" at line " << line << ": " << pred << std::endl;
+}
+
+void print_cycles(int c)
+{
+   static boost::static_mutex mut = BOOST_STATIC_MUTEX_INIT ;
+   boost::static_mutex::scoped_lock guard(mut);
+   std::cout << "Thread exited after " << c << " cycles." << std::endl;
+}
+
+bool sufficient_time()
+{
+   // return true if enough time has passed since the tests began:
+   static boost::static_mutex mut = BOOST_STATIC_MUTEX_INIT ;
+   boost::static_mutex::scoped_lock guard(mut);
+   static boost::timer t;
+   // is 10 seconds enough?
+   return t.elapsed() >= 10.0;
+}
+
+// define three trivial test proceedures:
+bool t1()
+{
+   static boost::static_mutex mut = BOOST_STATIC_MUTEX_INIT ;
+   static int has_lock = 0;
+   static int data = 10000;
+
+   boost::static_mutex::scoped_lock guard(mut);
+   BOOST_TEST(++has_lock == 1);
+   BOOST_TEST(guard.locked());
+   BOOST_TEST(guard);
+   bool result = (--data > 0) ? true : false;
+   BOOST_TEST(--has_lock == 0);
+   return result;
+}
+
+bool t2()
+{
+   static boost::static_mutex mut = BOOST_STATIC_MUTEX_INIT ;
+   static int has_lock = 0;
+   static int data = 10000;
+
+   boost::static_mutex::scoped_lock guard(mut, false);
+   BOOST_TEST(0 == guard.locked());
+   BOOST_TEST(!guard);
+   guard.lock();
+   BOOST_TEST(++has_lock == 1);
+   BOOST_TEST(guard.locked());
+   BOOST_TEST(guard);
+   bool result = (--data > 0) ? true : false;
+   BOOST_TEST(--has_lock == 0);
+   guard.unlock();
+   BOOST_TEST(0 == guard.locked());
+   BOOST_TEST(!guard);
+   return result;
+}
+
+bool t3()
+{
+   static boost::static_mutex mut = BOOST_STATIC_MUTEX_INIT ;
+   static int has_lock = 0;
+   static int data = 10000;
+
+   boost::static_mutex::scoped_lock guard(mut);
+   BOOST_TEST(++has_lock == 1);
+   BOOST_TEST(guard.locked());
+   BOOST_TEST(guard);
+   bool result = (--data > 0) ? true : false;
+   BOOST_TEST(--has_lock == 0);
+   return result;
+}
+
+// define their thread procs:
+void thread1_proc()
+{
+   int cycles = 0;
+   while(!sufficient_time())
+   {
+      t1();
+      t2();
+      ++cycles;
+   }
+   print_cycles(cycles);
+}
+
+void thread2_proc()
+{
+   int cycles = 0;
+   while(!sufficient_time())
+   {
+      t2();
+      t3();
+      ++cycles;
+   }
+   print_cycles(cycles);
+}
+
+void thread3_proc()
+{
+   int cycles = 0;
+   while(!sufficient_time())
+   {
+      t1();
+      t3();
+      ++cycles;
+   }
+   print_cycles(cycles);
+}
+
+// make sure that at least one of our test proceedures 
+// is called during program startup:
+struct startup1
+{
+   startup1()
+   {
+      t1();
+   }
+   ~startup1()
+   {
+      t1();
+   }
+};
+
+startup1 up1;
+
+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);
+
+   thrd1.join();
+   thrd2.join();
+   thrd3.join();
+   thrd4.join();
+   thrd5.join();
+   thrd6.join();
+
+   return total_failures;
+}
diff --git a/test/unicode/unicode_iterator_test.cpp b/test/unicode/unicode_iterator_test.cpp
new file mode 100644
index 00000000..1c16c464
--- /dev/null
+++ b/test/unicode/unicode_iterator_test.cpp
@@ -0,0 +1,203 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         unicode_iterator_test.cpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Simple test suite for Unicode interconversions.
+  */
+
+#include <boost/regex/pending/unicode_iterator.hpp>
+#include <boost/test/included/test_exec_monitor.hpp>
+#include <vector>
+#include <iterator>
+#include <algorithm>
+
+void spot_checks()
+{
+   // test specific values ripped straight out of the Unicode standard
+   // to verify that our encoding is the same as theirs, as well as 
+   // self-consistent:
+   ::boost::uint32_t spot16[] = { 0x10302u, };
+   typedef boost::u32_to_u16_iterator<const ::boost::uint32_t*> u32to16type;
+
+   u32to16type it(spot16);
+   BOOST_CHECK_EQUAL(*it++, 0xD800u);
+   BOOST_CHECK_EQUAL(*it++, 0xDF02u);
+   BOOST_CHECK_EQUAL(*--it, 0xDF02u);
+   BOOST_CHECK_EQUAL(*--it, 0xD800u);
+
+   ::boost::uint32_t spot8[] = { 0x004Du, 0x0430u, 0x4E8Cu, 0x10302u, };
+   typedef boost::u32_to_u8_iterator<const ::boost::uint32_t*> u32to8type;
+
+   u32to8type it8(spot8);
+   BOOST_CHECK_EQUAL(*it8++, 0x4Du);
+   BOOST_CHECK_EQUAL(*it8++, 0xD0u);
+   BOOST_CHECK_EQUAL(*it8++, 0xB0u);
+   BOOST_CHECK_EQUAL(*it8++, 0xE4u);
+   BOOST_CHECK_EQUAL(*it8++, 0xBAu);
+   BOOST_CHECK_EQUAL(*it8++, 0x8Cu);
+   BOOST_CHECK_EQUAL(*it8++, 0xF0u);
+   BOOST_CHECK_EQUAL(*it8++, 0x90u);
+   BOOST_CHECK_EQUAL(*it8++, 0x8Cu);
+   BOOST_CHECK_EQUAL(*it8++, 0x82u);
+
+   BOOST_CHECK_EQUAL(*--it8, 0x82u);
+   BOOST_CHECK_EQUAL(*--it8, 0x8Cu);
+   BOOST_CHECK_EQUAL(*--it8, 0x90u);
+   BOOST_CHECK_EQUAL(*--it8, 0xF0u);
+   BOOST_CHECK_EQUAL(*--it8, 0x8Cu);
+   BOOST_CHECK_EQUAL(*--it8, 0xBAu);
+   BOOST_CHECK_EQUAL(*--it8, 0xE4u);
+   BOOST_CHECK_EQUAL(*--it8, 0xB0u);
+   BOOST_CHECK_EQUAL(*--it8, 0xD0u);
+   BOOST_CHECK_EQUAL(*--it8, 0x4Du);
+}
+
+void test(const std::vector< ::boost::uint32_t>& v)
+{
+   typedef std::vector< ::boost::uint32_t> vector32_type;
+   typedef std::vector< ::boost::uint16_t> vector16_type;
+   typedef std::vector< ::boost::uint8_t>  vector8_type;
+   typedef boost::u32_to_u16_iterator<vector32_type::const_iterator, ::boost::uint16_t> u32to16type;
+   typedef boost::u16_to_u32_iterator<vector16_type::const_iterator, ::boost::uint32_t> u16to32type;
+#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !defined(BOOST_NO_STD_ITERATOR)
+   typedef std::reverse_iterator<u32to16type> ru32to16type;
+   typedef std::reverse_iterator<u16to32type> ru16to32type;
+#endif
+   typedef boost::u32_to_u8_iterator<vector32_type::const_iterator, ::boost::uint8_t> u32to8type;
+   typedef boost::u8_to_u32_iterator<vector8_type::const_iterator, ::boost::uint32_t> u8to32type;
+#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !defined(BOOST_NO_STD_ITERATOR)
+   typedef std::reverse_iterator<u32to8type> ru32to8type;
+   typedef std::reverse_iterator<u8to32type> ru8to32type;
+#endif
+   vector8_type  v8;
+   vector16_type v16;
+   vector32_type v32;
+   vector32_type::const_iterator i, j, k;
+   //
+   // begin by testing forward iteration, of 32-16 bit interconversions:
+   //
+#if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS)
+   v16.assign(u32to16type(v.begin()), u32to16type(v.end()));
+#else
+   v16.clear();
+   std::copy(u32to16type(v.begin()), u32to16type(v.end()), std::back_inserter(v16));
+#endif
+   BOOST_CHECK_EQUAL(std::distance(u32to16type(v.begin()), u32to16type(v.end())), v16.size());
+#if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS)
+   v32.assign(u16to32type(v16.begin()), u16to32type(v16.end()));
+#else
+   v32.clear();
+   std::copy(u16to32type(v16.begin()), u16to32type(v16.end()), std::back_inserter(v32));
+#endif
+   BOOST_CHECK_EQUAL(std::distance(u16to32type(v16.begin()), u16to32type(v16.end())), v32.size());
+   BOOST_CHECK_EQUAL(v.size(), v32.size());
+   i = v.begin();
+   j = i;
+   std::advance(j, (std::min)(v.size(), v32.size()));
+   k = v32.begin();
+   BOOST_CHECK_EQUAL_COLLECTIONS(
+      i, 
+      j, 
+      k);
+   //
+   // test backward iteration, of 32-16 bit interconversions:
+   //
+#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !defined(BOOST_NO_STD_ITERATOR)
+   v16.assign(ru32to16type(u32to16type(v.end())), ru32to16type(u32to16type(v.begin())));
+   BOOST_CHECK_EQUAL(std::distance(ru32to16type(u32to16type(v.end())), ru32to16type(u32to16type(v.begin()))), v16.size());
+   std::reverse(v16.begin(), v16.end());
+   v32.assign(ru16to32type(u16to32type(v16.end())), ru16to32type(u16to32type(v16.begin())));
+   BOOST_CHECK_EQUAL(std::distance(ru16to32type(u16to32type(v16.end())), ru16to32type(u16to32type(v16.begin()))), v32.size());
+   BOOST_CHECK_EQUAL(v.size(), v32.size());
+   std::reverse(v32.begin(), v32.end());
+   i = v.begin();
+   j = i;
+   std::advance(j, (std::min)(v.size(), v32.size()));
+   k = v32.begin();
+   BOOST_CHECK_EQUAL_COLLECTIONS(
+      i, 
+      j, 
+      k);
+#endif
+   //
+   // Test forward iteration, of 32-8 bit interconversions:
+   //
+#if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS)
+   v8.assign(u32to8type(v.begin()), u32to8type(v.end()));
+#else
+   v8.clear();
+   std::copy(u32to8type(v.begin()), u32to8type(v.end()), std::back_inserter(v8));
+#endif
+   BOOST_CHECK_EQUAL(std::distance(u32to8type(v.begin()), u32to8type(v.end())), v8.size());
+#if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS)
+   v32.assign(u8to32type(v8.begin()), u8to32type(v8.end()));
+#else
+   v32.clear();
+   std::copy(u8to32type(v8.begin()), u8to32type(v8.end()), std::back_inserter(v32));
+#endif
+   BOOST_CHECK_EQUAL(std::distance(u8to32type(v8.begin()), u8to32type(v8.end())), v32.size());
+   BOOST_CHECK_EQUAL(v.size(), v32.size());
+   i = v.begin();
+   j = i;
+   std::advance(j, (std::min)(v.size(), v32.size()));
+   k = v32.begin();
+   BOOST_CHECK_EQUAL_COLLECTIONS(
+      i, 
+      j, 
+      k);
+   //
+   // test backward iteration, of 32-8 bit interconversions:
+   //
+#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !defined(BOOST_NO_STD_ITERATOR)
+   v8.assign(ru32to8type(u32to8type(v.end())), ru32to8type(u32to8type(v.begin())));
+   BOOST_CHECK_EQUAL(std::distance(ru32to8type(u32to8type(v.end())), ru32to8type(u32to8type(v.begin()))), v8.size());
+   std::reverse(v8.begin(), v8.end());
+   v32.assign(ru8to32type(u8to32type(v8.end())), ru8to32type(u8to32type(v8.begin())));
+   BOOST_CHECK_EQUAL(std::distance(ru8to32type(u8to32type(v8.end())), ru8to32type(u8to32type(v8.begin()))), v32.size());
+   BOOST_CHECK_EQUAL(v.size(), v32.size());
+   std::reverse(v32.begin(), v32.end());
+   i = v.begin();
+   j = i;
+   std::advance(j, (std::min)(v.size(), v32.size()));
+   k = v32.begin();
+   BOOST_CHECK_EQUAL_COLLECTIONS(
+      i, 
+      j, 
+      k);
+#endif
+}
+
+int test_main( int, char* [] ) 
+{
+   // test specific value points from the standard:
+   spot_checks();
+   // now test a bunch of values for self-consistency and round-tripping:
+   std::vector< ::boost::uint32_t> v;
+   // start with boundary conditions:
+   v.push_back(0);
+   v.push_back(0xD7FF);
+   v.push_back(0xE000);
+   v.push_back(0xFFFF);
+   v.push_back(0x10000);
+   v.push_back(0x10FFFF);
+   v.push_back(0x80u);
+   v.push_back(0x80u - 1);
+   v.push_back(0x800u);
+   v.push_back(0x800u - 1);
+   v.push_back(0x10000u);
+   v.push_back(0x10000u - 1);
+   test(v);
+   return 0;
+}
+
diff --git a/tools/generate/tables.cpp b/tools/generate/tables.cpp
new file mode 100644
index 00000000..e7db2e41
--- /dev/null
+++ b/tools/generate/tables.cpp
@@ -0,0 +1,217 @@
+/*
+ *
+ * Copyright (c) 2004
+ * Dr 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         tables.cpp
+  *   VERSION      see <boost/version.hpp>
+  *   DESCRIPTION: Generates code snippets programatically, for cut-and
+  *                paste into regex source.
+  */
+
+#include <map>
+#include <vector>
+#include <string>
+#include <iostream>
+#include <algorithm>
+#include <cctype>
+#include <boost/config.hpp>
+
+std::string g_char_type;
+std::string g_data_type;
+std::map<std::string, std::string> g_table;
+std::map<std::string, std::pair<std::string, std::string> > g_help_table;
+
+void add(std::string key, std::string data)
+{
+   g_table[key] = data;
+   if(key.size() <= 2)
+      g_help_table[data].first = key;
+   else
+      g_help_table[data].second = key;
+
+   std::string::size_type i = 0;
+   while(i < key.size())
+   {
+      if(std::isspace(key[i]) || (key[i] == '-') || (key[i] == '_'))
+         key.erase(i, 1);
+      else
+      {
+         key[i] = std::tolower(key[i]);
+         ++i;
+      }
+   }
+}
+
+#define ADD(x, y) add(BOOST_STRINGIZE(x), BOOST_STRINGIZE(y))
+
+void generate_code()
+{
+   std::map<std::string, std::string>::const_iterator i, j;
+
+   // begin with the character tables:
+   std::cout << "static const " << g_char_type << " prop_name_table[] = {\n";
+   for(i = g_table.begin(), j = g_table.end(); i != j; ++i)
+   {
+      std::cout << "   /* " << i->first << " */  ";
+      for(std::string::size_type n = 0; n < i->first.size(); ++n)
+      {
+         std::cout.put('\'');
+         std::cout.put((i->first)[n]);
+         std::cout.put('\'');
+         std::cout.put(',');
+         std::cout.put(' ');
+      }
+      std::cout << std::endl;;
+   }
+   std::cout << "};\n\n";
+
+   // now the iterator table:
+   std::cout << "static const re_detail::character_pointer_range<" << g_char_type << "> range_data[] = {\n";
+   std::size_t index = 0;
+   for(i = g_table.begin(), j = g_table.end(); i != j; ++i)
+   {
+      std::cout << "   { prop_name_table+" << index << ", prop_name_table+";
+      index += i->first.size();
+      std::cout << index << ", }, // " << i->first << std::endl;
+   }
+   std::cout << "};\n\n";
+
+   // now the value table:
+   std::cout << "static const " << g_data_type << " icu_class_map[] = {\n";
+   for(i = g_table.begin(), j = g_table.end(); i != j; ++i)
+   {
+      std::cout << "   " << i->second << ", // " << i->first << std::endl;
+   }
+   std::cout << "};\n\n" << std::flush;
+   g_table.clear();
+}
+
+void generate_html()
+{
+   // start by producing a sorted list:
+   std::vector<std::pair<std::string, std::string> > v;
+   std::map<std::string, std::pair<std::string, std::string> >::const_iterator i, j;
+   i = g_help_table.begin();
+   j = g_help_table.end();
+   while(i != j)
+   {
+      v.push_back(i->second);
+      ++i;
+   }
+   std::sort(v.begin(), v.end());
+
+   std::vector<std::pair<std::string, std::string> >::const_iterator h, k;
+   h = v.begin();
+   k = v.end();
+
+   std::cout << "<table width=\"100%\"><tr><td><b>Short Name</b></td><td><b>Long Name</b></td></tr>\n";
+   while(h != k)
+   {
+      std::cout << "<tr><td>" << (h->first.size() ? h->first : std::string(" ")) << "</td><td>" << h->second << "</td></tr>\n";
+      ++h;
+   }
+   std::cout << "</table>\n\n";
+}
+
+int main()
+{
+   g_char_type = "::UChar32";
+   g_data_type = "icu_regex_traits::char_class_type";
+   ADD(L*, U_GC_L_MASK); 
+   ADD(Letter, U_GC_L_MASK); 
+   ADD(Lu, U_GC_LU_MASK); 
+   ADD(Ll, U_GC_LL_MASK); 
+   ADD(Lt, U_GC_LT_MASK); 
+   ADD(Lm, U_GC_LM_MASK); 
+   ADD(Lo, U_GC_LO_MASK); 
+   ADD(Uppercase Letter, U_GC_LU_MASK); 
+   ADD(Lowercase Letter, U_GC_LL_MASK); 
+   ADD(Titlecase Letter, U_GC_LT_MASK); 
+   ADD(Modifier Letter, U_GC_LM_MASK); 
+   ADD(Other Letter, U_GC_LO_MASK); 
+
+   ADD(M*, U_GC_M_MASK); 
+   ADD(Mn, U_GC_MN_MASK); 
+   ADD(Mc, U_GC_MC_MASK); 
+   ADD(Me, U_GC_ME_MASK); 
+   ADD(Mark, U_GC_M_MASK); 
+   ADD(Non-Spacing Mark, U_GC_MN_MASK); 
+   ADD(Spacing Combining Mark, U_GC_MC_MASK); 
+   ADD(Enclosing Mark, U_GC_ME_MASK); 
+
+   ADD(N*, U_GC_N_MASK); 
+   ADD(Nd, U_GC_ND_MASK); 
+   ADD(Nl, U_GC_NL_MASK); 
+   ADD(No, U_GC_NO_MASK);
+   ADD(Number, U_GC_N_MASK); 
+   ADD(Decimal Digit Number, U_GC_ND_MASK); 
+   ADD(Letter Number, U_GC_NL_MASK); 
+   ADD(Other Number, U_GC_NO_MASK);
+
+   ADD(S*, U_GC_S_MASK); 
+   ADD(Sm, U_GC_SM_MASK); 
+   ADD(Sc, U_GC_SC_MASK); 
+   ADD(Sk, U_GC_SK_MASK); 
+   ADD(So, U_GC_SO_MASK); 
+   ADD(Symbol, U_GC_S_MASK); 
+   ADD(Math Symbol, U_GC_SM_MASK); 
+   ADD(Currency Symbol, U_GC_SC_MASK); 
+   ADD(Modifier Symbol, U_GC_SK_MASK); 
+   ADD(Other Symbol, U_GC_SO_MASK); 
+
+   ADD(P*, U_GC_P_MASK); 
+   ADD(Pc, U_GC_PC_MASK); 
+   ADD(Pd, U_GC_PD_MASK); 
+   ADD(Ps, U_GC_PS_MASK); 
+   ADD(Pe, U_GC_PE_MASK); 
+   ADD(Pi, U_GC_PI_MASK); 
+   ADD(Pf, U_GC_PF_MASK); 
+   ADD(Po, U_GC_PO_MASK); 
+   ADD(Punctuation, U_GC_P_MASK); 
+   ADD(Connector Punctuation, U_GC_PC_MASK); 
+   ADD(Dash Punctuation, U_GC_PD_MASK); 
+   ADD(Open Punctuation, U_GC_PS_MASK); 
+   ADD(Close Punctuation, U_GC_PE_MASK); 
+   ADD(Initial Punctuation, U_GC_PI_MASK); 
+   ADD(Final Punctuation, U_GC_PF_MASK); 
+   ADD(Other Punctuation, U_GC_PO_MASK); 
+
+   ADD(Z*, U_GC_Z_MASK); 
+   ADD(Zs, U_GC_ZS_MASK); 
+   ADD(Zl, U_GC_ZL_MASK); 
+   ADD(Zp, U_GC_ZP_MASK); 
+   ADD(Separator, U_GC_Z_MASK); 
+   ADD(Space Separator, U_GC_ZS_MASK); 
+   ADD(Line Separator, U_GC_ZL_MASK); 
+   ADD(Paragraph Separator, U_GC_ZP_MASK); 
+
+   ADD(C*, U_GC_C_MASK); 
+   ADD(Cc, U_GC_CC_MASK); 
+   ADD(Cf, U_GC_CF_MASK); 
+   ADD(Cs, U_GC_CS_MASK); 
+   ADD(Co, U_GC_CO_MASK); 
+   ADD(Cn, U_GC_CN_MASK); 
+   ADD(Other, U_GC_C_MASK); 
+   ADD(Control, U_GC_CC_MASK); 
+   ADD(Format, U_GC_CF_MASK); 
+   ADD(Surrogate, U_GC_CS_MASK); 
+   ADD(Private Use, U_GC_CO_MASK); 
+   ADD(Not Assigned, U_GC_CN_MASK); 
+   ADD(Any, icu_regex_traits::mask_any); 
+   ADD(Assigned, (0x3FFFFFFFu) & ~(U_GC_CN_MASK)); 
+   ADD(ASCII, icu_regex_traits::mask_ascii); 
+   ADD(Titlecase, U_GC_LT_MASK); 
+
+   generate_code();
+   generate_html();
+   return 0;
+}