Save state before 1.36 merges.

[SVN r47337]
Fixes #2097 .
2008-07-12 09:06:42 +00:00 · 2008-07-11 18:00:15 +00:00 · 2008-07-01 09:58:27 +00:00 · 2008-06-05 17:07:42 +00:00 · 2008-06-03 12:52:55 +00:00 · 2008-05-14 11:19:58 +00:00
99 changed files with 1476 additions and 148 deletions
--- a/doc/gcc-performance.html
+++ b/doc/gcc-performance.html
@ -0,0 +1,543 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
+<html>
+   <head>
+      <title>Regular Expression Performance Comparison (gcc 3.2)</title>
+      <meta name="generator" content="HTML Tidy, see www.w3.org">
+      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+      <meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5">
+      <META content="C:\PROGRAM FILES\MICROSOFT OFFICE\OFFICE\html.dot" name="Template">
+      <meta name="GENERATOR" content="Microsoft FrontPage Express 2.0">
+   </head>
+   <body bgcolor="#ffffff" link="#0000ff" vlink="#800080">
+      <h2>Regular Expression Performance Comparison</h2>
+      <p>The following tables provide comparisons between the following regular 
+         expression libraries:</p>
+      <p><a href="http://www.boost.org/">The Boost regex library</a>.</p>
+      <p><a href="http://www.gnu.org">The GNU regular expression library</a>.</p>
+      <p>Philip Hazel's <a href="http://www.pcre.org">PCRE</a> library.</p>
+      <h3>Details</h3>
+      <p>Machine: Intel Pentium 4 2.8GHz PC.</p>
+      <p>Compiler: GNU C++ version 3.2 20020927 (prerelease).</p>
+      <p>C++ Standard Library: GNU libstdc++ version 20020927.</p>
+      <p>OS: Cygwin.</p>
+      <p>Boost version: 1.31.0.</p>
+      <p>PCRE version: 4.1.</p>
+      <p>As ever care should be taken in interpreting the results, only sensible regular 
+         expressions (rather than pathological cases) are given, most are taken from the 
+         Boost regex examples, or from the <a href="http://www.regxlib.com/">Library of 
+            Regular Expressions</a>. In addition, some variation in the relative 
+         performance of these libraries can be expected on other machines - as memory 
+         access and processor caching effects can be quite large for most finite state 
+         machine algorithms. In each case the first figure given is the relative time 
+         taken (so a value of 1.0 is as good as it gets), while the second figure is the 
+         actual time taken.</p>
+      <h3>Averages</h3>
+      <p>The following are the average relative scores for all the tests: the perfect 
+         regular expression library&nbsp;would score 1, in practice anything less than 2 
+         is pretty good.</p>
+      <table border="1" cellspacing="1">
+         <tr>
+            <td><strong>Boost</strong></td>
+            <td><strong>Boost + C++ locale</strong></td>
+            <td><strong>POSIX</strong></td>
+            <td><strong>PCRE</strong></td>
+         </tr>
+         <tr>
+            <td>1.4503</td>
+            <td>1.49124</td>
+            <td>108.372</td>
+            <td>1.56255</td>
+         </tr>
+      </table>
+      <br>
+      <br>
+      <h3>Comparison 1: Long Search</h3>
+      <p>For each of the following regular expressions the time taken to find all 
+         occurrences of the expression within a long English language text was measured 
+         (<a href="http://www.gutenberg.org/files/3200/old/mtent12.zip">mtent12.txt</a>
+         from <a href="http://promo.net/pg/">Project Gutenberg</a>, 19Mb).&nbsp;</p>
+      <table border="1" cellspacing="1">
+         <tr>
+            <td><strong>Expression</strong></td>
+            <td><strong>Boost</strong></td>
+            <td><strong>Boost + C++ locale</strong></td>
+            <td><strong>POSIX</strong></td>
+            <td><strong>PCRE</strong></td>
+         </tr>
+         <tr>
+            <td><code>Twain</code></td>
+            <td>3.49<br>
+               (0.205s)</td>
+            <td>4.09<br>
+               (0.24s)</td>
+            <td>65.2<br>
+               (3.83s)</td>
+            <td><font color="#008000">1<br>
+                  (0.0588s)</font></td>
+         </tr>
+         <tr>
+            <td><code>Huck[[:alpha:]]+</code></td>
+            <td>3.86<br>
+               (0.203s)</td>
+            <td>4.52<br>
+               (0.238s)</td>
+            <td>100<br>
+               (5.26s)</td>
+            <td><font color="#008000">1<br>
+                  (0.0526s)</font></td>
+         </tr>
+         <tr>
+            <td><code>[[:alpha:]]+ing</code></td>
+            <td><font color="#008000">1.01<br>
+                  (1.23s)</font></td>
+            <td><font color="#008000">1<br>
+                  (1.22s)</font></td>
+            <td>4.95<br>
+               (6.04s)</td>
+            <td>4.67<br>
+               (5.71s)</td>
+         </tr>
+         <tr>
+            <td><code>^[^ ]*?Twain</code></td>
+            <td><font color="#008000">1<br>
+                  (0.31s)</font></td>
+            <td><font color="#008000">1.05<br>
+                  (0.326s)</font></td>
+            <td>NA</td>
+            <td>3.32<br>
+               (1.03s)</td>
+         </tr>
+         <tr>
+            <td><code>Tom|Sawyer|Huckleberry|Finn</code></td>
+            <td><font color="#008000">1.02<br>
+                  (0.125s)</font></td>
+            <td><font color="#008000">1<br>
+                  (0.123s)</font></td>
+            <td>165<br>
+               (20.3s)</td>
+            <td><font color="#008000">1.08<br>
+                  (0.133s)</font></td>
+         </tr>
+         <tr>
+            <td><code> (Tom|Sawyer|Huckleberry|Finn).{0,30}river|river.{0,30}(Tom|Sawyer|Huckleberry|Finn)</code></td>
+            <td><font color="#008000">1<br>
+                  (0.345s)</font></td>
+            <td><font color="#008000">1.03<br>
+                  (0.355s)</font></td>
+            <td>NA</td>
+            <td>1.71<br>
+               (0.59s)</td>
+         </tr>
+      </table>
+      <br>
+      <br>
+      <h3>Comparison 2: Medium Sized Search</h3>
+      <p>For each of the following regular expressions the time taken to find all 
+         occurrences of the expression within a medium sized English language text was 
+         measured (the first 50K from mtent12.txt).&nbsp;</p>
+      <table border="1" cellspacing="1">
+         <tr>
+            <td><strong>Expression</strong></td>
+            <td><strong>Boost</strong></td>
+            <td><strong>Boost + C++ locale</strong></td>
+            <td><strong>POSIX</strong></td>
+            <td><strong>PCRE</strong></td>
+         </tr>
+         <tr>
+            <td><code>Twain</code></td>
+            <td>1.8<br>
+               (0.000519s)</td>
+            <td>2.14<br>
+               (0.000616s)</td>
+            <td>9.08<br>
+               (0.00262s)</td>
+            <td><font color="#008000">1<br>
+                  (0.000289s)</font></td>
+         </tr>
+         <tr>
+            <td><code>Huck[[:alpha:]]+</code></td>
+            <td>3.65<br>
+               (0.000499s)</td>
+            <td>4.36<br>
+               (0.000597s)</td>
+            <td><font color="#008000">1<br>
+                  (0.000137s)</font></td>
+            <td>1.43<br>
+               (0.000196s)</td>
+         </tr>
+         <tr>
+            <td><code>[[:alpha:]]+ing</code></td>
+            <td><font color="#008000">1<br>
+                  (0.00258s)</font></td>
+            <td><font color="#008000">1<br>
+                  (0.00258s)</font></td>
+            <td>5.28<br>
+               (0.0136s)</td>
+            <td>5.63<br>
+               (0.0145s)</td>
+         </tr>
+         <tr>
+            <td><code>^[^ ]*?Twain</code></td>
+            <td><font color="#008000">1<br>
+                  (0.000929s)</font></td>
+            <td><font color="#008000">1.03<br>
+                  (0.000957s)</font></td>
+            <td>NA</td>
+            <td>2.82<br>
+               (0.00262s)</td>
+         </tr>
+         <tr>
+            <td><code>Tom|Sawyer|Huckleberry|Finn</code></td>
+            <td><font color="#008000">1<br>
+                  (0.000812s)</font></td>
+            <td><font color="#008000">1<br>
+                  (0.000812s)</font></td>
+            <td>60.1<br>
+               (0.0488s)</td>
+            <td>1.28<br>
+               (0.00104s)</td>
+         </tr>
+         <tr>
+            <td><code> (Tom|Sawyer|Huckleberry|Finn).{0,30}river|river.{0,30}(Tom|Sawyer|Huckleberry|Finn)</code></td>
+            <td><font color="#008000">1.02<br>
+                  (0.00178s)</font></td>
+            <td><font color="#008000">1<br>
+                  (0.00174s)</font></td>
+            <td>242<br>
+               (0.421s)</td>
+            <td>1.3<br>
+               (0.00227s)</td>
+         </tr>
+      </table>
+      <br>
+      <br>
+      <h3>Comparison 3:&nbsp;C++ Code&nbsp;Search</h3>
+      <p>For each of the following regular expressions the time taken to find all 
+         occurrences of the expression within the C++ source file <a href="../../../boost/crc.hpp">
+            boost/crc.hpp</a>&nbsp;was measured.&nbsp;</p>
+      <table border="1" cellspacing="1">
+         <tr>
+            <td><strong>Expression</strong></td>
+            <td><strong>Boost</strong></td>
+            <td><strong>Boost + C++ locale</strong></td>
+            <td><strong>POSIX</strong></td>
+            <td><strong>PCRE</strong></td>
+         </tr>
+         <tr>
+            <td><code> ^(template[[:space:]]*&lt;[^;:{]+&gt;[[:space:]]*)?(class|struct)[[:space:]]*(\&lt;\w+\&gt;([ 
+                  ]*\([^)]*\))?[[:space:]]*)*(\&lt;\w*\&gt;)[[:space:]]*(&lt;[^;:{]+&gt;[[:space:]]*)?(\{|:[^;\{()]*\{)</code></td>
+            <td><font color="#008000">1.04<br>
+                  (0.000144s)</font></td>
+            <td><font color="#008000">1<br>
+                  (0.000139s)</font></td>
+            <td>862<br>
+               (0.12s)</td>
+            <td>4.56<br>
+               (0.000636s)</td>
+         </tr>
+         <tr>
+            <td><code>(^[ 
+                  ]*#(?:[^\\\n]|\\[^\n_[:punct:][:alnum:]]*[\n[:punct:][:word:]])*)|(//[^\n]*|/\*.*?\*/)|\&lt;([+-]?(?:(?:0x[[:xdigit:]]+)|(?:(?:[[:digit:]]*\.)?[[:digit:]]+(?:[eE][+-]?[[:digit:]]+)?))u?(?:(?:int(?:8|16|32|64))|L)?)\&gt;|('(?:[^\\']|\\.)*'|"(?:[^\\"]|\\.)*")|\&lt;(__asm|__cdecl|__declspec|__export|__far16|__fastcall|__fortran|__import|__pascal|__rtti|__stdcall|_asm|_cdecl|__except|_export|_far16|_fastcall|__finally|_fortran|_import|_pascal|_stdcall|__thread|__try|asm|auto|bool|break|case|catch|cdecl|char|class|const|const_cast|continue|default|delete|do|double|dynamic_cast|else|enum|explicit|extern|false|float|for|friend|goto|if|inline|int|long|mutable|namespace|new|operator|pascal|private|protected|public|register|reinterpret_cast|return|short|signed|sizeof|static|static_cast|struct|switch|template|this|throw|true|try|typedef|typeid|typename|union|unsigned|using|virtual|void|volatile|wchar_t|while)\&gt;</code></td>
+            <td><font color="#008000">1<br>
+                  (0.0139s)</font></td>
+            <td><font color="#008000">1.01<br>
+                  (0.0141s)</font></td>
+            <td>NA</td>
+            <td>1.55<br>
+               (0.0216s)</td>
+         </tr>
+         <tr>
+            <td><code>^[ ]*#[ ]*include[ ]+("[^"]+"|&lt;[^&gt;]+&gt;)</code></td>
+            <td><font color="#008000">1.04<br>
+                  (0.000332s)</font></td>
+            <td><font color="#008000">1<br>
+                  (0.000318s)</font></td>
+            <td>130<br>
+               (0.0413s)</td>
+            <td>1.72<br>
+               (0.000547s)</td>
+         </tr>
+         <tr>
+            <td><code>^[ ]*#[ ]*include[ ]+("boost/[^"]+"|&lt;boost/[^&gt;]+&gt;)</code></td>
+            <td><font color="#008000">1.02<br>
+                  (0.000323s)</font></td>
+            <td><font color="#008000">1<br>
+                  (0.000318s)</font></td>
+            <td>150<br>
+               (0.0476s)</td>
+            <td>1.72<br>
+               (0.000547s)</td>
+         </tr>
+      </table>
+      <br>
+      <h3></h3>
+      <H3>Comparison 4: HTML Document Search
+      </H3>
+      <p>For each of the following regular expressions the time taken to find all 
+         occurrences of the expression within the html file <a href="../../libraries.htm">libs/libraries.htm</a>
+         was measured.&nbsp;</p>
+      <table border="1" cellspacing="1">
+         <tr>
+            <td><strong>Expression</strong></td>
+            <td><strong>Boost</strong></td>
+            <td><strong>Boost + C++ locale</strong></td>
+            <td><strong>POSIX</strong></td>
+            <td><strong>PCRE</strong></td>
+         </tr>
+         <tr>
+            <td><code>beman|john|dave</code></td>
+            <td><font color="#008000">1.03<br>
+                  (0.000367s)</font></td>
+            <td><font color="#008000">1<br>
+                  (0.000357s)</font></td>
+            <td>47.4<br>
+               (0.0169s)</td>
+            <td>1.16<br>
+               (0.000416s)</td>
+         </tr>
+         <tr>
+            <td><code>&lt;p&gt;.*?&lt;/p&gt;</code></td>
+            <td>1.25<br>
+               (0.000459s)</td>
+            <td><font color="#008000">1<br>
+                  (0.000367s)</font></td>
+            <td>NA</td>
+            <td><font color="#008000">1.03<br>
+                  (0.000376s)</font></td>
+         </tr>
+         <tr>
+            <td><code> &lt;a[^&gt;]+href=("[^"]*"|[^[:space:]]+)[^&gt;]*&gt;</code></td>
+            <td><font color="#008000">1<br>
+                  (0.000509s)</font></td>
+            <td><font color="#008000">1.02<br>
+                  (0.000518s)</font></td>
+            <td>305<br>
+               (0.155s)</td>
+            <td><font color="#008000">1.1<br>
+                  (0.000558s)</font></td>
+         </tr>
+         <tr>
+            <td><code> &lt;h[12345678][^&gt;]*&gt;.*?&lt;/h[12345678]&gt;</code></td>
+            <td><font color="#008000">1.04<br>
+                  (0.00025s)</font></td>
+            <td><font color="#008000">1<br>
+                  (0.00024s)</font></td>
+            <td>NA</td>
+            <td>1.16<br>
+               (0.000279s)</td>
+         </tr>
+         <tr>
+            <td><code> &lt;img[^&gt;]+src=("[^"]*"|[^[:space:]]+)[^&gt;]*&gt;</code></td>
+            <td>2.22<br>
+               (0.000489s)</td>
+            <td>1.69<br>
+               (0.000372s)</td>
+            <td>148<br>
+               (0.0326s)</td>
+            <td><font color="#008000">1<br>
+                  (0.00022s)</font></td>
+         </tr>
+         <tr>
+            <td><code> &lt;font[^&gt;]+face=("[^"]*"|[^[:space:]]+)[^&gt;]*&gt;.*?&lt;/font&gt;</code></td>
+            <td>1.71<br>
+               (0.000371s)</td>
+            <td>1.75<br>
+               (0.000381s)</td>
+            <td>NA</td>
+            <td><font color="#008000">1<br>
+                  (0.000218s)</font></td>
+         </tr>
+      </table>
+      <br>
+      <br>
+      <h3>Comparison 3: Simple Matches</h3>
+      <p>For each of the following regular expressions the time taken to match against 
+         the text indicated was measured.&nbsp;</p>
+      <table border="1" cellspacing="1">
+         <tr>
+            <td><strong>Expression</strong></td>
+            <td><strong>Text</strong></td>
+            <td><strong>Boost</strong></td>
+            <td><strong>Boost + C++ locale</strong></td>
+            <td><strong>POSIX</strong></td>
+            <td><strong>PCRE</strong></td>
+         </tr>
+         <tr>
+            <td><code>abc</code></td>
+            <td>abc</td>
+            <td>1.36<br>
+               (2.15e-07s)</td>
+            <td>1.36<br>
+               (2.15e-07s)</td>
+            <td>2.76<br>
+               (4.34e-07s)</td>
+            <td><font color="#008000">1<br>
+                  (1.58e-07s)</font></td>
+         </tr>
+         <tr>
+            <td><code>^([0-9]+)(\-| |$)(.*)$</code></td>
+            <td>100- this is a line of ftp response which contains a message string</td>
+            <td>1.55<br>
+               (7.26e-07s)</td>
+            <td>1.51<br>
+               (7.07e-07s)</td>
+            <td>319<br>
+               (0.000149s)</td>
+            <td><font color="#008000">1<br>
+                  (4.67e-07s)</font></td>
+         </tr>
+         <tr>
+            <td><code>([[:digit:]]{4}[- ]){3}[[:digit:]]{3,4}</code></td>
+            <td>1234-5678-1234-456</td>
+            <td>1.96<br>
+               (9.54e-07s)</td>
+            <td>1.96<br>
+               (9.54e-07s)</td>
+            <td>44.5<br>
+               (2.17e-05s)</td>
+            <td><font color="#008000">1<br>
+                  (4.87e-07s)</font></td>
+         </tr>
+         <tr>
+            <td><code> ^([a-zA-Z0-9_\-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$</code></td>
+            <td>john@johnmaddock.co.uk</td>
+            <td>1.22<br>
+               (1.51e-06s)</td>
+            <td>1.23<br>
+               (1.53e-06s)</td>
+            <td>162<br>
+               (0.000201s)</td>
+            <td><font color="#008000">1<br>
+                  (1.24e-06s)</font></td>
+         </tr>
+         <tr>
+            <td><code> ^([a-zA-Z0-9_\-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$</code></td>
+            <td>foo12@foo.edu</td>
+            <td>1.28<br>
+               (1.47e-06s)</td>
+            <td>1.3<br>
+               (1.49e-06s)</td>
+            <td>104<br>
+               (0.00012s)</td>
+            <td><font color="#008000">1<br>
+                  (1.15e-06s)</font></td>
+         </tr>
+         <tr>
+            <td><code> ^([a-zA-Z0-9_\-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$</code></td>
+            <td>bob.smith@foo.tv</td>
+            <td>1.28<br>
+               (1.47e-06s)</td>
+            <td>1.3<br>
+               (1.49e-06s)</td>
+            <td>113<br>
+               (0.00013s)</td>
+            <td><font color="#008000">1<br>
+                  (1.15e-06s)</font></td>
+         </tr>
+         <tr>
+            <td><code>^[a-zA-Z]{1,2}[0-9][0-9A-Za-z]{0,1} {0,1}[0-9][A-Za-z]{2}$</code></td>
+            <td>EH10 2QQ</td>
+            <td>1.38<br>
+               (4.68e-07s)</td>
+            <td>1.41<br>
+               (4.77e-07s)</td>
+            <td>13.5<br>
+               (4.59e-06s)</td>
+            <td><font color="#008000">1<br>
+                  (3.39e-07s)</font></td>
+         </tr>
+         <tr>
+            <td><code>^[a-zA-Z]{1,2}[0-9][0-9A-Za-z]{0,1} {0,1}[0-9][A-Za-z]{2}$</code></td>
+            <td>G1 1AA</td>
+            <td>1.28<br>
+               (4.35e-07s)</td>
+            <td>1.25<br>
+               (4.25e-07s)</td>
+            <td>11.7<br>
+               (3.97e-06s)</td>
+            <td><font color="#008000">1<br>
+                  (3.39e-07s)</font></td>
+         </tr>
+         <tr>
+            <td><code>^[a-zA-Z]{1,2}[0-9][0-9A-Za-z]{0,1} {0,1}[0-9][A-Za-z]{2}$</code></td>
+            <td>SW1 1ZZ</td>
+            <td>1.32<br>
+               (4.53e-07s)</td>
+            <td>1.31<br>
+               (4.49e-07s)</td>
+            <td>12.2<br>
+               (4.2e-06s)</td>
+            <td><font color="#008000">1<br>
+                  (3.44e-07s)</font></td>
+         </tr>
+         <tr>
+            <td><code> ^[[:digit:]]{1,2}/[[:digit:]]{1,2}/[[:digit:]]{4}$</code></td>
+            <td>4/1/2001</td>
+            <td>1.16<br>
+               (3.82e-07s)</td>
+            <td>1.2<br>
+               (3.96e-07s)</td>
+            <td>13.9<br>
+               (4.59e-06s)</td>
+            <td><font color="#008000">1<br>
+                  (3.29e-07s)</font></td>
+         </tr>
+         <tr>
+            <td><code> ^[[:digit:]]{1,2}/[[:digit:]]{1,2}/[[:digit:]]{4}$</code></td>
+            <td>12/12/2001</td>
+            <td>1.38<br>
+               (4.49e-07s)</td>
+            <td>1.38<br>
+               (4.49e-07s)</td>
+            <td>16<br>
+               (5.2e-06s)</td>
+            <td><font color="#008000">1<br>
+                  (3.25e-07s)</font></td>
+         </tr>
+         <tr>
+            <td><code>^[-+]?[[:digit:]]*\.?[[:digit:]]*$</code></td>
+            <td>123</td>
+            <td>1.19<br>
+               (7.64e-07s)</td>
+            <td>1.16<br>
+               (7.45e-07s)</td>
+            <td>7.51<br>
+               (4.81e-06s)</td>
+            <td><font color="#008000">1<br>
+                  (6.4e-07s)</font></td>
+         </tr>
+         <tr>
+            <td><code>^[-+]?[[:digit:]]*\.?[[:digit:]]*$</code></td>
+            <td>+3.14159</td>
+            <td>1.32<br>
+               (8.97e-07s)</td>
+            <td>1.31<br>
+               (8.88e-07s)</td>
+            <td>14<br>
+               (9.48e-06s)</td>
+            <td><font color="#008000">1<br>
+                  (6.78e-07s)</font></td>
+         </tr>
+         <tr>
+            <td><code>^[-+]?[[:digit:]]*\.?[[:digit:]]*$</code></td>
+            <td>-3.14159</td>
+            <td>1.32<br>
+               (8.97e-07s)</td>
+            <td>1.31<br>
+               (8.88e-07s)</td>
+            <td>14<br>
+               (9.48e-06s)</td>
+            <td><font color="#008000">1<br>
+                  (6.78e-07s)</font></td>
+         </tr>
+      </table>
+      <br>
+      <br>
+      <hr>
+      <p><i><EFBFBD> Copyright John Maddock&nbsp;2003</i></p>
+      <P><I>Use, modification and distribution are subject to the Boost Software License, 
+            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
+            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
+   </body>
+</html>
+
--- a/doc/html/boost_regex/background_information.html
+++ b/doc/html/boost_regex/background_information.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/background_information/acknowledgements.html
+++ b/doc/html/boost_regex/background_information/acknowledgements.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/background_information/examples.html
+++ b/doc/html/boost_regex/background_information/examples.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/background_information/faq.html
+++ b/doc/html/boost_regex/background_information/faq.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/background_information/futher.html
+++ b/doc/html/boost_regex/background_information/futher.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/background_information/headers.html
+++ b/doc/html/boost_regex/background_information/headers.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/background_information/history.html
+++ b/doc/html/boost_regex/background_information/history.html
@ -11,7 +11,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
@ -26,7 +26,7 @@
 <a name="boost_regex.background_information.history"></a><a href="history.html" title="History"> History</a>
 </h3></div></div></div>
 <a name="boost_regex.background_information.history.boost_1_34"></a><h5>
-<a name="id649708"></a>
+<a name="id649714"></a>
        <a href="history.html#boost_regex.background_information.history.boost_1_34">Boost
        1.34</a>
      </h5>
@ -49,7 +49,7 @@
        </li>
 </ul></div>
 <a name="boost_regex.background_information.history.boost_1_33_1"></a><h5>
-<a name="id649759"></a>
+<a name="id649765"></a>
        <a href="history.html#boost_regex.background_information.history.boost_1_33_1">Boost
        1.33.1</a>
      </h5>
@ -119,7 +119,7 @@
        </li>
 </ul></div>
 <a name="boost_regex.background_information.history.boost_1_33_0"></a><h5>
-<a name="id649888"></a>
+<a name="id649895"></a>
        <a href="history.html#boost_regex.background_information.history.boost_1_33_0">Boost
        1.33.0</a>
      </h5>
@ -174,7 +174,7 @@
        </li>
 </ul></div>
 <a name="boost_regex.background_information.history.boost_1_32_1"></a><h5>
-<a name="id649995"></a>
+<a name="id649992"></a>
        <a href="history.html#boost_regex.background_information.history.boost_1_32_1">Boost
        1.32.1</a>
      </h5>
@ -182,7 +182,7 @@
          Fixed bug in partial matches of bounded repeats of '.'.
        </li></ul></div>
 <a name="boost_regex.background_information.history.boost_1_31_0"></a><h5>
-<a name="id650028"></a>
+<a name="id650025"></a>
        <a href="history.html#boost_regex.background_information.history.boost_1_31_0">Boost
        1.31.0</a>
      </h5>
--- a/doc/html/boost_regex/background_information/locale.html
+++ b/doc/html/boost_regex/background_information/locale.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/background_information/performance.html
+++ b/doc/html/boost_regex/background_information/performance.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/background_information/redist.html
+++ b/doc/html/boost_regex/background_information/redist.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/background_information/standards.html
+++ b/doc/html/boost_regex/background_information/standards.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
@ -82,7 +82,7 @@
        a custom traits class.
      </p>
 <a name="boost_regex.background_information.standards.unicode"></a><h5>
-<a name="id648709"></a>
+<a name="id648715"></a>
        <a href="standards.html#boost_regex.background_information.standards.unicode">Unicode</a>
      </h5>
 <p>
--- a/doc/html/boost_regex/background_information/thread_safety.html
+++ b/doc/html/boost_regex/background_information/thread_safety.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/captures.html
+++ b/doc/html/boost_regex/captures.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
@ -35,7 +35,7 @@
      accessed.
    </p>
 <a name="boost_regex.captures.marked_sub_expressions"></a><h5>
-<a name="id493039"></a>
+<a name="id493056"></a>
      <a href="captures.html#boost_regex.captures.marked_sub_expressions">Marked sub-expressions</a>
    </h5>
 <p>
@ -218,7 +218,7 @@
      output stream.
    </p>
 <a name="boost_regex.captures.unmatched_sub_expressions"></a><h5>
-<a name="id493666"></a>
+<a name="id493679"></a>
      <a href="captures.html#boost_regex.captures.unmatched_sub_expressions">Unmatched Sub-Expressions</a>
    </h5>
 <p>
@ -231,7 +231,7 @@
      you can determine which sub-expressions matched by accessing the <code class="computeroutput"><span class="identifier">sub_match</span><span class="special">::</span><span class="identifier">matched</span></code> data member.
    </p>
 <a name="boost_regex.captures.repeated_captures"></a><h5>
-<a name="id493729"></a>
+<a name="id493741"></a>
      <a href="captures.html#boost_regex.captures.repeated_captures">Repeated Captures</a>
    </h5>
 <p>
--- a/doc/html/boost_regex/configuration.html
+++ b/doc/html/boost_regex/configuration.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/configuration/algorithm.html
+++ b/doc/html/boost_regex/configuration/algorithm.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/configuration/compiler.html
+++ b/doc/html/boost_regex/configuration/compiler.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/configuration/linkage.html
+++ b/doc/html/boost_regex/configuration/linkage.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/configuration/locale.html
+++ b/doc/html/boost_regex/configuration/locale.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/configuration/tuning.html
+++ b/doc/html/boost_regex/configuration/tuning.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/format.html
+++ b/doc/html/boost_regex/format.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/format/boost_format_syntax.html
+++ b/doc/html/boost_regex/format/boost_format_syntax.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/format/perl_format.html
+++ b/doc/html/boost_regex/format/perl_format.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/format/sed_format.html
+++ b/doc/html/boost_regex/format/sed_format.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/install.html
+++ b/doc/html/boost_regex/install.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
@ -49,7 +49,7 @@
      file before you can use it, instructions for specific platforms are as follows:
    </p>
 <a name="boost_regex.install.building_with_bjam"></a><h5>
-<a name="id436190"></a>
+<a name="id436188"></a>
      <a href="install.html#boost_regex.install.building_with_bjam">Building with bjam</a>
    </h5>
 <p>
@ -58,7 +58,7 @@
      started guide</a> for more information.
    </p>
 <a name="boost_regex.install.building_with_unicode_and_icu_support"></a><h5>
-<a name="id440462"></a>
+<a name="id436222"></a>
      <a href="install.html#boost_regex.install.building_with_unicode_and_icu_support">Building
      With Unicode and ICU Support</a>
    </h5>
@ -96,11 +96,11 @@
      ICU you are using is binary compatible with the toolset you use to build Boost.
    </p>
 <a name="boost_regex.install.building_via_makefiles"></a><h5>
-<a name="id435815"></a>
+<a name="id435695"></a>
      <a href="install.html#boost_regex.install.building_via_makefiles">Building via makefiles</a>
    </h5>
 <a name="boost_regex.install.borland_c___builder_"></a><h6>
-<a name="id489883"></a>
+<a name="id435718"></a>
      <a href="install.html#boost_regex.install.borland_c___builder_">Borland C++ Builder:</a>
    </h6>
 <div class="itemizedlist"><ul type="disc">
@ -166,7 +166,7 @@
      a lot in compile times!
    </p>
 <a name="boost_regex.install.microsoft_visual_c___6__7__7_1_and_8"></a><h5>
-<a name="id490273"></a>
+<a name="id490291"></a>
      <a href="install.html#boost_regex.install.microsoft_visual_c___6__7__7_1_and_8">Microsoft
      Visual C++ 6, 7, 7.1 and 8</a>
    </h5>
@ -253,7 +253,7 @@
      </li>
 </ul></div>
 <a name="boost_regex.install.gcc_2_95_and_later_"></a><h6>
-<a name="id490586"></a>
+<a name="id490603"></a>
      <a href="install.html#boost_regex.install.gcc_2_95_and_later_">GCC(2.95 and later)</a>
    </h6>
 <p>
@ -302,7 +302,7 @@
      see the <a href="../../../../config/index.html" target="_top">config library documentation</a>.
    </p>
 <a name="boost_regex.install.sun_workshop_6_1"></a><h6>
-<a name="id490787"></a>
+<a name="id490804"></a>
      <a href="install.html#boost_regex.install.sun_workshop_6_1">Sun Workshop 6.1</a>
    </h6>
 <p>
@ -347,7 +347,7 @@
      will build v9 variants of the regex library named libboost_regex_v9.a etc.
    </p>
 <a name="boost_regex.install.makefiles_for_other_compilers"></a><h6>
-<a name="id491009"></a>
+<a name="id491026"></a>
      <a href="install.html#boost_regex.install.makefiles_for_other_compilers">Makefiles
      for Other compilers</a>
    </h6>
--- a/doc/html/boost_regex/introduction_and_overview.html
+++ b/doc/html/boost_regex/introduction_and_overview.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/partial_matches.html
+++ b/doc/html/boost_regex/partial_matches.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref.html
+++ b/doc/html/boost_regex/ref.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/bad_expression.html
+++ b/doc/html/boost_regex/ref/bad_expression.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/basic_regex.html
+++ b/doc/html/boost_regex/ref/basic_regex.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/concepts.html
+++ b/doc/html/boost_regex/ref/concepts.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/concepts/charT_concept.html
+++ b/doc/html/boost_regex/ref/concepts/charT_concept.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/concepts/iterator_concepts.html
+++ b/doc/html/boost_regex/ref/concepts/iterator_concepts.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/concepts/traits_concept.html
+++ b/doc/html/boost_regex/ref/concepts/traits_concept.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/deprecated_interfaces.html
+++ b/doc/html/boost_regex/ref/deprecated_interfaces.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/deprecated_interfaces/old_regex.html
+++ b/doc/html/boost_regex/ref/deprecated_interfaces/old_regex.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/deprecated_interfaces/regex_format.html
+++ b/doc/html/boost_regex/ref/deprecated_interfaces/regex_format.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/deprecated_interfaces/regex_grep.html
+++ b/doc/html/boost_regex/ref/deprecated_interfaces/regex_grep.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/deprecated_interfaces/regex_split.html
+++ b/doc/html/boost_regex/ref/deprecated_interfaces/regex_split.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/error_type.html
+++ b/doc/html/boost_regex/ref/error_type.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/match_flag_type.html
+++ b/doc/html/boost_regex/ref/match_flag_type.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/match_results.html
+++ b/doc/html/boost_regex/ref/match_results.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/non_std_strings.html
+++ b/doc/html/boost_regex/ref/non_std_strings.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/non_std_strings/icu.html
+++ b/doc/html/boost_regex/ref/non_std_strings/icu.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/non_std_strings/icu/intro.html
+++ b/doc/html/boost_regex/ref/non_std_strings/icu/intro.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/non_std_strings/icu/unicode_algo.html
+++ b/doc/html/boost_regex/ref/non_std_strings/icu/unicode_algo.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/non_std_strings/icu/unicode_iter.html
+++ b/doc/html/boost_regex/ref/non_std_strings/icu/unicode_iter.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/non_std_strings/icu/unicode_types.html
+++ b/doc/html/boost_regex/ref/non_std_strings/icu/unicode_types.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/non_std_strings/mfc_strings.html
+++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_algo.html
+++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_algo.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_intro.html
+++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_intro.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_iter.html
+++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_iter.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_create.html
+++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_create.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_types.html
+++ b/doc/html/boost_regex/ref/non_std_strings/mfc_strings/mfc_regex_types.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/posix.html
+++ b/doc/html/boost_regex/ref/posix.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/regex_iterator.html
+++ b/doc/html/boost_regex/ref/regex_iterator.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/regex_match.html
+++ b/doc/html/boost_regex/ref/regex_match.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/regex_replace.html
+++ b/doc/html/boost_regex/ref/regex_replace.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/regex_search.html
+++ b/doc/html/boost_regex/ref/regex_search.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/regex_token_iterator.html
+++ b/doc/html/boost_regex/ref/regex_token_iterator.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/regex_traits.html
+++ b/doc/html/boost_regex/ref/regex_traits.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/sub_match.html
+++ b/doc/html/boost_regex/ref/sub_match.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/syntax_option_type.html
+++ b/doc/html/boost_regex/ref/syntax_option_type.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_basic.html
+++ b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_basic.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_extended.html
+++ b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_extended.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_literal.html
+++ b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_literal.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_overview.html
+++ b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_overview.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_perl.html
+++ b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_perl.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_synopsis.html
+++ b/doc/html/boost_regex/ref/syntax_option_type/syntax_option_type_synopsis.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/syntax.html
+++ b/doc/html/boost_regex/syntax.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/syntax/basic_extended.html
+++ b/doc/html/boost_regex/syntax/basic_extended.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/syntax/basic_syntax.html
+++ b/doc/html/boost_regex/syntax/basic_syntax.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/syntax/character_classes.html
+++ b/doc/html/boost_regex/syntax/character_classes.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/syntax/character_classes/optional_char_class_names.html
+++ b/doc/html/boost_regex/syntax/character_classes/optional_char_class_names.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/syntax/character_classes/std_char_clases.html
+++ b/doc/html/boost_regex/syntax/character_classes/std_char_clases.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/syntax/collating_names.html
+++ b/doc/html/boost_regex/syntax/collating_names.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/syntax/collating_names/digraphs.html
+++ b/doc/html/boost_regex/syntax/collating_names/digraphs.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/syntax/collating_names/named_unicode.html
+++ b/doc/html/boost_regex/syntax/collating_names/named_unicode.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/syntax/collating_names/posix_symbolic_names.html
+++ b/doc/html/boost_regex/syntax/collating_names/posix_symbolic_names.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/syntax/leftmost_longest_rule.html
+++ b/doc/html/boost_regex/syntax/leftmost_longest_rule.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
--- a/doc/html/boost_regex/syntax/perl_syntax.html
+++ b/doc/html/boost_regex/syntax/perl_syntax.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
@ -28,7 +28,7 @@
      Syntax</a>
 </h3></div></div></div>
 <a name="boost_regex.syntax.perl_syntax.synopsis"></a><h4>
-<a name="id497765"></a>
+<a name="id497764"></a>
        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.synopsis">Synopsis</a>
      </h4>
 <p>
@ -45,7 +45,7 @@
 </span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span> <span class="identifier">e2</span><span class="special">(</span><span class="identifier">my_expression</span><span class="special">,</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span><span class="special">::</span><span class="identifier">perl</span><span class="special">|</span><span class="identifier">boost</span><span class="special">::</span><span class="identifier">regex</span><span class="special">::</span><span class="identifier">icase</span><span class="special">);</span>
 </pre>
 <a name="boost_regex.syntax.perl_syntax.perl_regular_expression_syntax"></a><h4>
-<a name="id497986"></a>
+<a name="id497985"></a>
        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.perl_regular_expression_syntax">Perl
        Regular Expression Syntax</a>
      </h4>
@ -55,7 +55,7 @@
      </p>
 <pre class="programlisting">.[{()\*+?|^$</pre>
 <a name="boost_regex.syntax.perl_syntax.wildcard"></a><h5>
-<a name="id498024"></a>
+<a name="id498023"></a>
        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.wildcard">Wildcard</a>
      </h5>
 <p>
@ -65,7 +65,7 @@
 <div class="itemizedlist"><ul type="disc">
 <li>
          The NULL character when the <a href="../ref/match_flag_type.html" title="match_flag_type">flag
-          <code class="computeroutput"><span class="identifier">match_no_dot_null</span></code></a>
+          <code class="computeroutput"><span class="identifier">match_not_dot_null</span></code></a>
          is passed to the matching algorithms.
        </li>
 <li>
@ -75,7 +75,7 @@
        </li>
 </ul></div>
 <a name="boost_regex.syntax.perl_syntax.anchors"></a><h5>
-<a name="id498105"></a>
+<a name="id498104"></a>
        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.anchors">Anchors</a>
      </h5>
 <p>
@ -85,7 +85,7 @@
        A '$' character shall match the end of a line.
      </p>
 <a name="boost_regex.syntax.perl_syntax.marked_sub_expressions"></a><h5>
-<a name="id498139"></a>
+<a name="id498138"></a>
        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.marked_sub_expressions">Marked
        sub-expressions</a>
      </h5>
@ -97,7 +97,7 @@
        to by a back-reference.
      </p>
 <a name="boost_regex.syntax.perl_syntax.non_marking_grouping"></a><h5>
-<a name="id498194"></a>
+<a name="id498193"></a>
        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.non_marking_grouping">Non-marking
        grouping</a>
      </h5>
@ -111,7 +111,7 @@
        out any separate sub-expressions.
      </p>
 <a name="boost_regex.syntax.perl_syntax.repeats"></a><h5>
-<a name="id498283"></a>
+<a name="id498282"></a>
        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.repeats">Repeats</a>
      </h5>
 <p>
@ -197,7 +197,7 @@
        operator to be applied to.
      </p>
 <a name="boost_regex.syntax.perl_syntax.non_greedy_repeats"></a><h5>
-<a name="id498756"></a>
+<a name="id498755"></a>
        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.non_greedy_repeats">Non greedy
        repeats</a>
      </h5>
@ -228,7 +228,7 @@
        input as possible.
      </p>
 <a name="boost_regex.syntax.perl_syntax.back_references"></a><h5>
-<a name="id498897"></a>
+<a name="id498900"></a>
        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.back_references">Back references</a>
      </h5>
 <p>
@ -248,7 +248,7 @@
 <pre class="programlisting"><span class="identifier">aaabba</span>
 </pre>
 <a name="boost_regex.syntax.perl_syntax.alternation"></a><h5>
-<a name="id498980"></a>
+<a name="id498983"></a>
        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.alternation">Alternation</a>
      </h5>
 <p>
@ -277,7 +277,7 @@
        <code class="computeroutput"><span class="special">(?:</span><span class="identifier">abc</span><span class="special">)??</span></code> has exactly the same effect.
      </p>
 <a name="boost_regex.syntax.perl_syntax.character_sets"></a><h5>
-<a name="id499168"></a>
+<a name="id499172"></a>
        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.character_sets">Character sets</a>
      </h5>
 <p>
@ -290,7 +290,7 @@
        A bracket expression may contain any combination of the following:
      </p>
 <a name="boost_regex.syntax.perl_syntax.single_characters"></a><h6>
-<a name="id499227"></a>
+<a name="id499230"></a>
        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.single_characters">Single characters</a>
      </h6>
 <p>
@ -298,7 +298,7 @@
        or 'c'.
      </p>
 <a name="boost_regex.syntax.perl_syntax.character_ranges"></a><h6>
-<a name="id499277"></a>
+<a name="id499281"></a>
        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.character_ranges">Character
        ranges</a>
      </h6>
@ -311,7 +311,7 @@
        regular expression, then ranges are locale sensitive.
      </p>
 <a name="boost_regex.syntax.perl_syntax.negation"></a><h6>
-<a name="id499358"></a>
+<a name="id499361"></a>
        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.negation">Negation</a>
      </h6>
 <p>
@ -320,7 +320,7 @@
        range <code class="computeroutput"><span class="identifier">a</span><span class="special">-</span><span class="identifier">c</span></code>.
      </p>
 <a name="boost_regex.syntax.perl_syntax.character_classes"></a><h6>
-<a name="id499440"></a>
+<a name="id499444"></a>
        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.character_classes">Character
        classes</a>
      </h6>
@ -330,7 +330,7 @@
        <a href="character_classes.html" title="Character Class Names">character class names</a>.
      </p>
 <a name="boost_regex.syntax.perl_syntax.collating_elements"></a><h6>
-<a name="id499523"></a>
+<a name="id499527"></a>
        <a href="perl_syntax.html#boost_regex.syntax.perl_syntax.collating_elements">Collating
        Elements</a>
      </h6>
--- a/doc/html/boost_regex/unicode.html
+++ b/doc/html/boost_regex/unicode.html
@ -12,7 +12,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../../boost.png"></td>
-<td align="center"><a href="../../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
@ -30,7 +30,7 @@
      There are two ways to use Boost.Regex with Unicode strings:
    </p>
 <a name="boost_regex.unicode.rely_on_wchar_t"></a><h5>
-<a name="id492766"></a>
+<a name="id492782"></a>
      <a href="unicode.html#boost_regex.unicode.rely_on_wchar_t">Rely on wchar_t</a>
    </h5>
 <p>
@ -56,7 +56,7 @@
      </li>
 </ul></div>
 <a name="boost_regex.unicode.use_a_unicode_aware_regular_expression_type_"></a><h5>
-<a name="id492949"></a>
+<a name="id492966"></a>
      <a href="unicode.html#boost_regex.unicode.use_a_unicode_aware_regular_expression_type_">Use
      a Unicode Aware Regular Expression Type.</a>
    </h5>
--- a/doc/html/index.html
+++ b/doc/html/index.html
@ -10,7 +10,7 @@
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table cellpadding="2" width="100%"><tr>
 <td valign="top"><img alt="Boost C++ Libraries" width="277" height="86" src="../../../../boost.png"></td>
-<td align="center"><a href="../../../../index.htm">Home</a></td>
+<td align="center"><a href="../../../../index.html">Home</a></td>
 <td align="center"><a href="../../../../libs/libraries.htm">Libraries</a></td>
 <td align="center"><a href="http://www.boost.org/people/people.htm">People</a></td>
 <td align="center"><a href="http://www.boost.org/more/faq.htm">FAQ</a></td>
@ -28,7 +28,7 @@
 </h3></div></div></div>
 <div><p class="copyright">Copyright <20> 1998 -2007 John Maddock</p></div>
 <div><div class="legalnotice">
-<a name="id437578"></a><p>
+<a name="id435844"></a><p>
        Distributed under the Boost Software License, Version 1.0. (See accompanying
        file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt" target="_top">http://www.boost.org/LICENSE_1_0.txt</a>)
      </p>
@ -196,7 +196,7 @@
  </p>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: February 21, 2008 at 12:52:05 GMT</small></p></td>
+<td align="left"><p><small>Last revised: April 11, 2008 at 08:50:33 GMT</small></p></td>
 <td align="right"><div class="copyright-footer"></div></td>
 </tr></table>
 <hr>
--- a/doc/syntax_perl.qbk
+++ b/doc/syntax_perl.qbk
@ -34,7 +34,7 @@ The single character '.' when used outside of a character set will match
 any single character except:

 * The NULL character when the [link boost_regex.ref.match_flag_type flag 
-   `match_no_dot_null`] is passed to the matching algorithms.
+   `match_not_dot_null`] is passed to the matching algorithms.
 * The newline character when the [link boost_regex.ref.match_flag_type 
   flag `match_not_dot_newline`] is passed to 
   the matching algorithms.
--- a/doc/vc71-performance.html
+++ b/doc/vc71-performance.html
@ -0,0 +1,703 @@
+<html>
+   <head>
+      <title>Regular Expression Performance Comparison</title>
+      <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+      <meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5">
+      <meta name="Template" content="C:\PROGRAM FILES\MICROSOFT OFFICE\OFFICE\html.dot">
+      <meta name="GENERATOR" content="Microsoft FrontPage Express 2.0">
+   </head>
+   <body bgcolor="#ffffff" link="#0000ff" vlink="#800080">
+      <h2>Regular Expression Performance Comparison</h2>
+      <p>
+         The following tables provide comparisons between the following regular 
+         expression libraries:</p>
+      <p><a href="http://research.microsoft.com/projects/greta">GRETA</a>.</p>
+      <p><a href="http://www.boost.org/">The Boost regex library</a>.</p>
+      <p><a href="http://arglist.com/regex/">Henry Spencer's regular expression library</a>
+         - this is provided for comparison as a typical non-backtracking implementation.</p>
+      <P>Philip Hazel's <A href="http://www.pcre.org">PCRE</A> library.</P>
+      <H3>Details</H3>
+      <P>Machine: Intel Pentium 4 2.8GHz PC.</P>
+      <P>Compiler: Microsoft Visual C++ version 7.1.</P>
+      <P>C++ Standard Library: Dinkumware standard library version 313.</P>
+      <P>OS: Win32.</P>
+      <P>Boost version: 1.31.0.</P>
+      <P>PCRE version: 3.9.</P>
+      <P>
+         As ever care should be taken in interpreting the results, only sensible regular 
+         expressions (rather than pathological cases) are given, most are taken from the 
+         Boost regex examples, or from the <a href="http://www.regxlib.com/">Library of 
+            Regular Expressions</a>. In addition, some variation in the relative 
+         performance of these libraries can be expected on other machines - as memory 
+         access and processor caching effects can be quite large for most finite state 
+         machine algorithms.</P>
+      <H3>Averages</H3>
+      <P>The following are the average relative scores for all the tests: the perfect 
+         regular expression library&nbsp;would score 1, in practice any small number 
+         (say less that 4 or 5) is pretty good.</P>
+      <P><table border="1" cellspacing="1">
+            <tr>
+               <td><strong>GRETA</strong></td>
+               <td><strong>GRETA<BR>
+                     (non-recursive mode)</strong></td>
+               <td><strong>Boost</strong></td>
+               <td><strong>Boost + C++ locale</strong></td>
+               <td><strong>POSIX</strong></td>
+               <td><strong>PCRE</strong></td>
+            </tr>
+            <tr>
+               <td>2.31619</td>
+               <td>6.14203</td>
+               <td>2.30668</td>
+               <td>1.94363</td>
+               <td>124.752</td>
+               <td>2.09365</td>
+            </tr>
+         </table>
+      </P>
+      <h3>Comparison 1: Long Search</h3>
+      <p>For each of the following regular expressions the time taken to find all 
+         occurrences of the expression within a long English language text was measured 
+         (<a href="http://www.gutenberg.org/files/3200/old/mtent12.zip">mtent12.txt</a>
+         from <a href="http://promo.net/pg/">Project Gutenberg</a>, 19Mb).&nbsp;</p>
+      <P><table border="1" cellspacing="1">
+            <tr>
+               <td><strong>Expression</strong></td>
+               <td><strong>GRETA</strong></td>
+               <td><strong>GRETA<BR>
+                     (non-recursive mode)</strong></td>
+               <td><strong>Boost</strong></td>
+               <td><strong>Boost + C++ locale</strong></td>
+               <td><strong>POSIX</strong></td>
+               <td><strong>PCRE</strong></td>
+            </tr>
+            <tr>
+               <td><code>Twain</code></td>
+               <td><font color="#008000">1<BR>
+                     (0.0407s)</font></td>
+               <td><font color="#008000">1<BR>
+                     (0.0407s)</font></td>
+               <td>4.18<BR>
+                  (0.17s)</td>
+               <td>4.18<BR>
+                  (0.17s)</td>
+               <td>135<BR>
+                  (5.48s)</td>
+               <td>1.37<BR>
+                  (0.0557s)</td>
+            </tr>
+            <tr>
+               <td><code>Huck[[:alpha:]]+</code></td>
+               <td><font color="#008000">1.02<BR>
+                     (0.0381s)</font></td>
+               <td><font color="#008000">1<BR>
+                     (0.0375s)</font></td>
+               <td>4.53<BR>
+                  (0.17s)</td>
+               <td>4.54<BR>
+                  (0.17s)</td>
+               <td>166<BR>
+                  (6.23s)</td>
+               <td>1.34<BR>
+                  (0.0501s)</td>
+            </tr>
+            <tr>
+               <td><code>[[:alpha:]]+ing</code></td>
+               <td>4.3<BR>
+                  (4.18s)</td>
+               <td>9.93<BR>
+                  (9.65s)</td>
+               <td>1.15<BR>
+                  (1.12s)</td>
+               <td><font color="#008000">1<BR>
+                     (0.972s)</font></td>
+               <td>8.15<BR>
+                  (7.92s)</td>
+               <td>5.85<BR>
+                  (5.69s)</td>
+            </tr>
+            <tr>
+               <td><code>^[^ ]*?Twain</code></td>
+               <td>6.25<BR>
+                  (1.84s)</td>
+               <td>20.9<BR>
+                  (6.16s)</td>
+               <td>1.56<BR>
+                  (0.461s)</td>
+               <td><font color="#008000">1<BR>
+                     (0.295s)</font></td>
+               <td>NA</td>
+               <td>2.58<BR>
+                  (0.761s)</td>
+            </tr>
+            <tr>
+               <td><code>Tom|Sawyer|Huckleberry|Finn</code></td>
+               <td>6.53<BR>
+                  (0.711s)</td>
+               <td>11.5<BR>
+                  (1.25s)</td>
+               <td>2.3<BR>
+                  (0.251s)</td>
+               <td><font color="#008000">1<BR>
+                     (0.109s)</font></td>
+               <td>196<BR>
+                  (21.4s)</td>
+               <td>1.77<BR>
+                  (0.193s)</td>
+            </tr>
+            <tr>
+               <td><code>(Tom|Sawyer|Huckleberry|Finn).{0,30}river|river.{0,30}(Tom|Sawyer|Huckleberry|Finn)</code></td>
+               <td>3.88<BR>
+                  (0.972s)</td>
+               <td>6.48<BR>
+                  (1.62s)</td>
+               <td>1.66<BR>
+                  (0.416s)</td>
+               <td><font color="#008000">1<BR>
+                     (0.251s)</font></td>
+               <td>NA</td>
+               <td>2.48<BR>
+                  (0.62s)</td>
+            </tr>
+         </table>
+      </P>
+      <h3>Comparison 2: Medium Sized Search</h3>
+      <p>For each of the following regular expressions the time taken to find all 
+         occurrences of the expression within a medium sized English language text was 
+         measured (the first 50K from mtent12.txt).&nbsp;</p>
+      <P><table border="1" cellspacing="1">
+            <tr>
+               <td><strong>Expression</strong></td>
+               <td><strong>GRETA</strong></td>
+               <td><strong>GRETA<BR>
+                     (non-recursive mode)</strong></td>
+               <td><strong>Boost</strong></td>
+               <td><strong>Boost + C++ locale</strong></td>
+               <td><strong>POSIX</strong></td>
+               <td><strong>PCRE</strong></td>
+            </tr>
+            <tr>
+               <td><code>Twain</code></td>
+               <td><font color="#008000">1<BR>
+                     (9.05e-005s)</font></td>
+               <td><font color="#008000">1.03<BR>
+                     (9.29e-005s)</font></td>
+               <td>4.92<BR>
+                  (0.000445s)</td>
+               <td>4.92<BR>
+                  (0.000445s)</td>
+               <td>43.2<BR>
+                  (0.00391s)</td>
+               <td>3.18<BR>
+                  (0.000288s)</td>
+            </tr>
+            <tr>
+               <td><code>Huck[[:alpha:]]+</code></td>
+               <td><font color="#008000">1<BR>
+                     (8.56e-005s)</font></td>
+               <td><font color="#008000">1<BR>
+                     (8.56e-005s)</font></td>
+               <td>4.97<BR>
+                  (0.000425s)</td>
+               <td>4.98<BR>
+                  (0.000426s)</td>
+               <td>2.8<BR>
+                  (0.000239s)</td>
+               <td>2.2<BR>
+                  (0.000188s)</td>
+            </tr>
+            <tr>
+               <td><code>[[:alpha:]]+ing</code></td>
+               <td>5.29<BR>
+                  (0.011s)</td>
+               <td>11.8<BR>
+                  (0.0244s)</td>
+               <td>1.19<BR>
+                  (0.00246s)</td>
+               <td><font color="#008000">1<BR>
+                     (0.00207s)</font></td>
+               <td>8.77<BR>
+                  (0.0182s)</td>
+               <td>6.88<BR>
+                  (0.0142s)</td>
+            </tr>
+            <tr>
+               <td><code>^[^ ]*?Twain</code></td>
+               <td>5.98<BR>
+                  (0.00462s)</td>
+               <td>20.2<BR>
+                  (0.0156s)</td>
+               <td>1.54<BR>
+                  (0.00119s)</td>
+               <td><font color="#008000">1<BR>
+                     (0.000772s)</font></td>
+               <td>NA</td>
+               <td>2.53<BR>
+                  (0.00195s)</td>
+            </tr>
+            <tr>
+               <td><code>Tom|Sawyer|Huckleberry|Finn</code></td>
+               <td>3.42<BR>
+                  (0.00207s)</td>
+               <td>6.31<BR>
+                  (0.00383s)</td>
+               <td>1.71<BR>
+                  (0.00104s)</td>
+               <td><font color="#008000">1<BR>
+                     (0.000606s)</font></td>
+               <td>81.5<BR>
+                  (0.0494s)</td>
+               <td>1.96<BR>
+                  (0.00119s)</td>
+            </tr>
+            <tr>
+               <td><code>(Tom|Sawyer|Huckleberry|Finn).{0,30}river|river.{0,30}(Tom|Sawyer|Huckleberry|Finn)</code></td>
+               <td>1.97<BR>
+                  (0.00266s)</td>
+               <td>3.77<BR>
+                  (0.00509s)</td>
+               <td>1.38<BR>
+                  (0.00186s)</td>
+               <td><font color="#008000">1<BR>
+                     (0.00135s)</font></td>
+               <td>297<BR>
+                  (0.401s)</td>
+               <td>1.77<BR>
+                  (0.00238s)</td>
+            </tr>
+         </table>
+      </P>
+      <H3>Comparison 3:&nbsp;C++ Code&nbsp;Search</H3>
+      <P>For each of the following regular expressions the time taken to find all 
+         occurrences of the expression within the C++ source file <A href="../../../boost/crc.hpp">
+            boost/crc.hpp</A>&nbsp;was measured.&nbsp;</P>
+      <P><table border="1" cellspacing="1">
+            <tr>
+               <td><strong>Expression</strong></td>
+               <td><strong>GRETA</strong></td>
+               <td><strong>GRETA<BR>
+                     (non-recursive mode)</strong></td>
+               <td><strong>Boost</strong></td>
+               <td><strong>Boost + C++ locale</strong></td>
+               <td><strong>POSIX</strong></td>
+               <td><strong>PCRE</strong></td>
+            </tr>
+            <tr>
+               <td><code>^(template[[:space:]]*&lt;[^;:{]+&gt;[[:space:]]*)?(class|struct)[[:space:]]*(\&lt;\w+\&gt;([ 
+                     ]*\([^)]*\))?[[:space:]]*)*(\&lt;\w*\&gt;)[[:space:]]*(&lt;[^;:{]+&gt;[[:space:]]*)?(\{|:[^;\{()]*\{)</code></td>
+               <td>6.67<BR>
+                  (0.00147s)</td>
+               <td>36.9<BR>
+                  (0.00813s)</td>
+               <td><font color="#008000">1.03<BR>
+                     (0.000227s)</font></td>
+               <td><font color="#008000">1<BR>
+                     (0.00022s)</font></td>
+               <td>557<BR>
+                  (0.123s)</td>
+               <td>2.57<BR>
+                  (0.000566s)</td>
+            </tr>
+            <tr>
+               <td><code>(^[ 
+                     ]*#(?:[^\\\n]|\\[^\n_[:punct:][:alnum:]]*[\n[:punct:][:word:]])*)|(//[^\n]*|/\*.*?\*/)|\&lt;([+-]?(?:(?:0x[[:xdigit:]]+)|(?:(?:[[:digit:]]*\.)?[[:digit:]]+(?:[eE][+-]?[[:digit:]]+)?))u?(?:(?:int(?:8|16|32|64))|L)?)\&gt;|('(?:[^\\']|\\.)*'|"(?:[^\\"]|\\.)*")|\&lt;(__asm|__cdecl|__declspec|__export|__far16|__fastcall|__fortran|__import|__pascal|__rtti|__stdcall|_asm|_cdecl|__except|_export|_far16|_fastcall|__finally|_fortran|_import|_pascal|_stdcall|__thread|__try|asm|auto|bool|break|case|catch|cdecl|char|class|const|const_cast|continue|default|delete|do|double|dynamic_cast|else|enum|explicit|extern|false|float|for|friend|goto|if|inline|int|long|mutable|namespace|new|operator|pascal|private|protected|public|register|reinterpret_cast|return|short|signed|sizeof|static|static_cast|struct|switch|template|this|throw|true|try|typedef|typeid|typename|union|unsigned|using|virtual|void|volatile|wchar_t|while)\&gt;</code></td>
+               <td><font color="#008000">1<BR>
+                     (0.00555s)</font></td>
+               <td>3.32<BR>
+                  (0.0185s)</td>
+               <td>2.53<BR>
+                  (0.0141s)</td>
+               <td>1.94<BR>
+                  (0.0108s)</td>
+               <td>NA</td>
+               <td>3.38<BR>
+                  (0.0188s)</td>
+            </tr>
+            <tr>
+               <td><code>^[ ]*#[ ]*include[ ]+("[^"]+"|&lt;[^&gt;]+&gt;)</code></td>
+               <td>4.77<BR>
+                  (0.00156s)</td>
+               <td>24.8<BR>
+                  (0.00814s)</td>
+               <td>1.13<BR>
+                  (0.000372s)</td>
+               <td><font color="#008000">1<BR>
+                     (0.000328s)</font></td>
+               <td>120<BR>
+                  (0.0394s)</td>
+               <td>1.58<BR>
+                  (0.000518s)</td>
+            </tr>
+            <tr>
+               <td><code>^[ ]*#[ ]*include[ ]+("boost/[^"]+"|&lt;boost/[^&gt;]+&gt;)</code></td>
+               <td>4.72<BR>
+                  (0.00154s)</td>
+               <td>24.8<BR>
+                  (0.00813s)</td>
+               <td>1.12<BR>
+                  (0.000367s)</td>
+               <td><font color="#008000">1<BR>
+                     (0.000328s)</font></td>
+               <td>143<BR>
+                  (0.0469s)</td>
+               <td>1.58<BR>
+                  (0.000518s)</td>
+            </tr>
+         </table>
+      </P>
+      <H3>
+         <H3>Comparison 4: HTML Document Search</H3>
+      </H3>
+      <P>For each of the following regular expressions the time taken to find all 
+         occurrences of the expression within the html file <A href="../../libraries.htm">libs/libraries.htm</A>
+         was measured.&nbsp;</P>
+      <P><table border="1" cellspacing="1">
+            <tr>
+               <td><strong>Expression</strong></td>
+               <td><strong>GRETA</strong></td>
+               <td><strong>GRETA<BR>
+                     (non-recursive mode)</strong></td>
+               <td><strong>Boost</strong></td>
+               <td><strong>Boost + C++ locale</strong></td>
+               <td><strong>POSIX</strong></td>
+               <td><strong>PCRE</strong></td>
+            </tr>
+            <tr>
+               <td><code>beman|john|dave</code></td>
+               <td>4.07<BR>
+                  (0.00111s)</td>
+               <td>7.14<BR>
+                  (0.00195s)</td>
+               <td>1.75<BR>
+                  (0.000479s)</td>
+               <td><font color="#008000">1<BR>
+                     (0.000273s)</font></td>
+               <td>54.3<BR>
+                  (0.0149s)</td>
+               <td>1.83<BR>
+                  (0.000499s)</td>
+            </tr>
+            <tr>
+               <td><code>&lt;p&gt;.*?&lt;/p&gt;</code></td>
+               <td><font color="#008000">1<BR>
+                     (6.59e-005s)</font></td>
+               <td><font color="#008000">1.04<BR>
+                     (6.84e-005s)</font></td>
+               <td>4.15<BR>
+                  (0.000273s)</td>
+               <td>4.23<BR>
+                  (0.000279s)</td>
+               <td>NA</td>
+               <td>4.23<BR>
+                  (0.000279s)</td>
+            </tr>
+            <tr>
+               <td><code>&lt;a[^&gt;]+href=("[^"]*"|[^[:space:]]+)[^&gt;]*&gt;</code></td>
+               <td>1.39<BR>
+                  (0.000626s)</td>
+               <td>1.83<BR>
+                  (0.000821s)</td>
+               <td>1.41<BR>
+                  (0.000636s)</td>
+               <td><font color="#008000">1<BR>
+                     (0.00045s)</font></td>
+               <td>351<BR>
+                  (0.158s)</td>
+               <td>1.13<BR>
+                  (0.000509s)</td>
+            </tr>
+            <tr>
+               <td><code>&lt;h[12345678][^&gt;]*&gt;.*?&lt;/h[12345678]&gt;</code></td>
+               <td><font color="#008000">1<BR>
+                     (0.000142s)</font></td>
+               <td>1.21<BR>
+                  (0.000171s)</td>
+               <td>2.62<BR>
+                  (0.000372s)</td>
+               <td>1.48<BR>
+                  (0.00021s)</td>
+               <td>NA</td>
+               <td>1.73<BR>
+                  (0.000245s)</td>
+            </tr>
+            <tr>
+               <td><code>&lt;img[^&gt;]+src=("[^"]*"|[^[:space:]]+)[^&gt;]*&gt;</code></td>
+               <td><font color="#008000">1<BR>
+                     (5.38e-005s)</font></td>
+               <td><font color="#008000">1.05<BR>
+                     (5.63e-005s)</font></td>
+               <td>5<BR>
+                  (0.000269s)</td>
+               <td>5.18<BR>
+                  (0.000278s)</td>
+               <td>604<BR>
+                  (0.0325s)</td>
+               <td>4.05<BR>
+                  (0.000218s)</td>
+            </tr>
+            <tr>
+               <td><code>&lt;font[^&gt;]+face=("[^"]*"|[^[:space:]]+)[^&gt;]*&gt;.*?&lt;/font&gt;</code></td>
+               <td><font color="#008000">1<BR>
+                     (6.05e-005s)</font></td>
+               <td><font color="#008000">1.09<BR>
+                     (6.59e-005s)</font></td>
+               <td>4.45<BR>
+                  (0.000269s)</td>
+               <td>4.69<BR>
+                  (0.000284s)</td>
+               <td>NA</td>
+               <td>3.64<BR>
+                  (0.00022s)</td>
+            </tr>
+         </table>
+      </P>
+      <H3>Comparison 3: Simple Matches</H3>
+      <p>
+         For each of the following regular expressions the time taken to match against 
+         the text indicated was measured.&nbsp;</p>
+      <P><table border="1" cellspacing="1">
+            <tr>
+               <td><strong>Expression</strong></td>
+               <td><strong>Text</strong></td>
+               <td><strong>GRETA</strong></td>
+               <td><strong>GRETA<BR>
+                     (non-recursive mode)</strong></td>
+               <td><strong>Boost</strong></td>
+               <td><strong>Boost + C++ locale</strong></td>
+               <td><strong>POSIX</strong></td>
+               <td><strong>PCRE</strong></td>
+            </tr>
+            <tr>
+               <td><code>abc</code></td>
+               <td>abc</td>
+               <td>1.32<BR>
+                  (2.24e-007s)</td>
+               <td>1.86<BR>
+                  (3.15e-007s)</td>
+               <td>1.25<BR>
+                  (2.12e-007s)</td>
+               <td>1.24<BR>
+                  (2.1e-007s)</td>
+               <td>2.98<BR>
+                  (5.05e-007s)</td>
+               <td><font color="#008000">1<BR>
+                     (1.7e-007s)</font></td>
+            </tr>
+            <tr>
+               <td><code>^([0-9]+)(\-| |$)(.*)$</code></td>
+               <td>100- this is a line of ftp response which contains a message string</td>
+               <td>1.32<BR>
+                  (5.91e-007s)</td>
+               <td>1.96<BR>
+                  (8.78e-007s)</td>
+               <td>2.68<BR>
+                  (1.2e-006s)</td>
+               <td>1.53<BR>
+                  (6.88e-007s)</td>
+               <td>332<BR>
+                  (0.000149s)</td>
+               <td><font color="#008000">1<BR>
+                     (4.49e-007s)</font></td>
+            </tr>
+            <tr>
+               <td><code>([[:digit:]]{4}[- ]){3}[[:digit:]]{3,4}</code></td>
+               <td>1234-5678-1234-456</td>
+               <td>1.44<BR>
+                  (7.16e-007s)</td>
+               <td>2.04<BR>
+                  (1.01e-006s)</td>
+               <td>3.35<BR>
+                  (1.66e-006s)</td>
+               <td>2.15<BR>
+                  (1.07e-006s)</td>
+               <td>31.4<BR>
+                  (1.56e-005s)</td>
+               <td><font color="#008000">1<BR>
+                     (4.96e-007s)</font></td>
+            </tr>
+            <tr>
+               <td><code>^([a-zA-Z0-9_\-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$</code></td>
+               <td>john@johnmaddock.co.uk</td>
+               <td><font color="#008000">1<BR>
+                     (1.18e-006s)</font></td>
+               <td>1.42<BR>
+                  (1.68e-006s)</td>
+               <td>2.06<BR>
+                  (2.44e-006s)</td>
+               <td>1.35<BR>
+                  (1.6e-006s)</td>
+               <td>165<BR>
+                  (0.000196s)</td>
+               <td><font color="#008000">1.06<BR>
+                     (1.26e-006s)</font></td>
+            </tr>
+            <tr>
+               <td><code>^([a-zA-Z0-9_\-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$</code></td>
+               <td>foo12@foo.edu</td>
+               <td><font color="#008000">1<BR>
+                     (1.09e-006s)</font></td>
+               <td>1.44<BR>
+                  (1.57e-006s)</td>
+               <td>2.21<BR>
+                  (2.4e-006s)</td>
+               <td>1.41<BR>
+                  (1.53e-006s)</td>
+               <td>108<BR>
+                  (0.000117s)</td>
+               <td><font color="#008000">1.04<BR>
+                     (1.13e-006s)</font></td>
+            </tr>
+            <tr>
+               <td><code>^([a-zA-Z0-9_\-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$</code></td>
+               <td>bob.smith@foo.tv</td>
+               <td><font color="#008000">1<BR>
+                     (1.07e-006s)</font></td>
+               <td>1.43<BR>
+                  (1.53e-006s)</td>
+               <td>2.21<BR>
+                  (2.37e-006s)</td>
+               <td>1.45<BR>
+                  (1.55e-006s)</td>
+               <td>123<BR>
+                  (0.000132s)</td>
+               <td><font color="#008000">1.05<BR>
+                     (1.13e-006s)</font></td>
+            </tr>
+            <tr>
+               <td><code>^[a-zA-Z]{1,2}[0-9][0-9A-Za-z]{0,1} {0,1}[0-9][A-Za-z]{2}$</code></td>
+               <td>EH10 2QQ</td>
+               <td><font color="#008000">1<BR>
+                     (3.19e-007s)</font></td>
+               <td>1.67<BR>
+                  (5.34e-007s)</td>
+               <td>1.58<BR>
+                  (5.05e-007s)</td>
+               <td>1.4<BR>
+                  (4.49e-007s)</td>
+               <td>10.4<BR>
+                  (3.32e-006s)</td>
+               <td>1.15<BR>
+                  (3.68e-007s)</td>
+            </tr>
+            <tr>
+               <td><code>^[a-zA-Z]{1,2}[0-9][0-9A-Za-z]{0,1} {0,1}[0-9][A-Za-z]{2}$</code></td>
+               <td>G1 1AA</td>
+               <td><font color="#008000">1<BR>
+                     (3.29e-007s)</font></td>
+               <td>1.65<BR>
+                  (5.44e-007s)</td>
+               <td>1.51<BR>
+                  (4.96e-007s)</td>
+               <td>1.36<BR>
+                  (4.49e-007s)</td>
+               <td>8.46<BR>
+                  (2.79e-006s)</td>
+               <td>1.1<BR>
+                  (3.63e-007s)</td>
+            </tr>
+            <tr>
+               <td><code>^[a-zA-Z]{1,2}[0-9][0-9A-Za-z]{0,1} {0,1}[0-9][A-Za-z]{2}$</code></td>
+               <td>SW1 1ZZ</td>
+               <td><font color="#008000">1<BR>
+                     (3.25e-007s)</font></td>
+               <td>1.64<BR>
+                  (5.34e-007s)</td>
+               <td>1.56<BR>
+                  (5.05e-007s)</td>
+               <td>1.38<BR>
+                  (4.49e-007s)</td>
+               <td>9.29<BR>
+                  (3.02e-006s)</td>
+               <td>1.13<BR>
+                  (3.68e-007s)</td>
+            </tr>
+            <tr>
+               <td><code>^[[:digit:]]{1,2}/[[:digit:]]{1,2}/[[:digit:]]{4}$</code></td>
+               <td>4/1/2001</td>
+               <td><font color="#008000">1<BR>
+                     (3.44e-007s)</font></td>
+               <td>1.55<BR>
+                  (5.34e-007s)</td>
+               <td>2.36<BR>
+                  (8.12e-007s)</td>
+               <td>2.2<BR>
+                  (7.55e-007s)</td>
+               <td>19.6<BR>
+                  (6.72e-006s)</td>
+               <td>1.81<BR>
+                  (6.21e-007s)</td>
+            </tr>
+            <tr>
+               <td><code>^[[:digit:]]{1,2}/[[:digit:]]{1,2}/[[:digit:]]{4}$</code></td>
+               <td>12/12/2001</td>
+               <td><font color="#008000">1.05<BR>
+                     (6.59e-007s)</font></td>
+               <td>1.66<BR>
+                  (1.05e-006s)</td>
+               <td>1.44<BR>
+                  (9.07e-007s)</td>
+               <td>1.23<BR>
+                  (7.73e-007s)</td>
+               <td>11.6<BR>
+                  (7.34e-006s)</td>
+               <td><font color="#008000">1<BR>
+                     (6.3e-007s)</font></td>
+            </tr>
+            <tr>
+               <td><code>^[-+]?[[:digit:]]*\.?[[:digit:]]*$</code></td>
+               <td>123</td>
+               <td><font color="#008000">1<BR>
+                     (5.72e-007s)</font></td>
+               <td>1.59<BR>
+                  (9.07e-007s)</td>
+               <td>1.6<BR>
+                  (9.16e-007s)</td>
+               <td>1.49<BR>
+                  (8.5e-007s)</td>
+               <td>6.14<BR>
+                  (3.51e-006s)</td>
+               <td>1.22<BR>
+                  (6.97e-007s)</td>
+            </tr>
+            <tr>
+               <td><code>^[-+]?[[:digit:]]*\.?[[:digit:]]*$</code></td>
+               <td>+3.14159</td>
+               <td><font color="#008000">1<BR>
+                     (6.78e-007s)</font></td>
+               <td>1.52<BR>
+                  (1.03e-006s)</td>
+               <td>1.47<BR>
+                  (9.94e-007s)</td>
+               <td>1.31<BR>
+                  (8.88e-007s)</td>
+               <td>10.8<BR>
+                  (7.34e-006s)</td>
+               <td><font color="#008000">1.08<BR>
+                     (7.35e-007s)</font></td>
+            </tr>
+            <tr>
+               <td><code>^[-+]?[[:digit:]]*\.?[[:digit:]]*$</code></td>
+               <td>-3.14159</td>
+               <td><font color="#008000">1<BR>
+                     (6.78e-007s)</font></td>
+               <td>1.52<BR>
+                  (1.03e-006s)</td>
+               <td>1.46<BR>
+                  (9.92e-007s)</td>
+               <td>1.32<BR>
+                  (8.98e-007s)</td>
+               <td>10.5<BR>
+                  (7.11e-006s)</td>
+               <td>1.11<BR>
+                  (7.54e-007s)</td>
+            </tr>
+         </table>
+      </P>
+      <hr>
+      <p><i><EFBFBD> Copyright John Maddock&nbsp;2003</i></p>
+      <P><I>Use, modification and distribution are subject to the Boost Software License, 
+            Version 1.0. (See accompanying file <A href="../../../LICENSE_1_0.txt">LICENSE_1_0.txt</A>
+            or copy at <A href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</A>)</I></P>
+   </body>
+</html>
+
--- a/example/snippets/icu_example.cpp
+++ b/example/snippets/icu_example.cpp
@ -157,7 +157,7 @@ int main()
   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 <EFBFBD> sign encoded in UTF-8
+   std::string text2 = " $100.23 or \xC2\xA3""198.12 "; // \xC2\xA3 is the pound sign encoded in UTF-8
   enumerate_currencies(text2);
   enumerate_currencies2(text2);

--- a/include/boost/regex/concepts.hpp
+++ b/include/boost/regex/concepts.hpp
@ -368,8 +368,6 @@ struct BaseRegexConcept

      // access:
      const Regex ce;
-      bool b = ce.empty();
-      ignore_unused_variable_warning(b);
      unsigned i = ce.mark_count();
      ignore_unused_variable_warning(i);
      m_flags = ce.flags();
@ -385,7 +383,7 @@ struct BaseRegexConcept
      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;
+      bool b = m_sub.matched;
      ignore_unused_variable_warning(b);
      BidiIterator bi = m_sub.first;
      ignore_unused_variable_warning(bi);
@ -806,6 +804,8 @@ struct BoostRegexConcept
      ignore_unused_variable_warning(i2);
      bool b = ce == ce2;
      ignore_unused_variable_warning(b);
+      b = ce.empty();
+      ignore_unused_variable_warning(b);
      b = ce != ce2;
      ignore_unused_variable_warning(b);
      b = ce < ce2;
--- a/include/boost/regex/pending/object_cache.hpp
+++ b/include/boost/regex/pending/object_cache.hpp
@ -119,7 +119,7 @@ boost::shared_ptr<Object const> object_cache<Key, Object>::do_get(const Key& k,
   //
   // Add it to the list, and index it:
   //
-   s_data.cont.push_back(value_type(result, 0));
+   s_data.cont.push_back(value_type(result, static_cast<Key const*>(0)));
   s_data.index.insert(std::make_pair(k, --(s_data.cont.end())));
   s_data.cont.back().second = &(s_data.index.find(k)->first);
   map_size_type s = s_data.index.size();
--- a/include/boost/regex/pending/unicode_iterator.hpp
+++ b/include/boost/regex/pending/unicode_iterator.hpp
@ -68,6 +68,7 @@ Accepts UTF-32 code points and forwards them on as UTF-16 code points.
 #include <stdexcept>
 #ifndef BOOST_NO_STD_LOCALE
 #include <sstream>
+#include <ios>
 #endif
 #include <limits.h> // CHAR_BIT

--- a/include/boost/regex/v4/basic_regex_creator.hpp
+++ b/include/boost/regex/v4/basic_regex_creator.hpp
@ -1270,6 +1270,19 @@ void basic_regex_creator<charT, traits>::probe_leading_repeat(re_syntax_base* st
            state = state->next.p;
            continue;
         }
+         if((static_cast<re_brace*>(state)->index == -1)
+            || (static_cast<re_brace*>(state)->index == -2))
+         {
+            // skip past the zero width assertion:
+            state = static_cast<const re_jump*>(state->next.p)->alt.p->next.p;
+            continue;
+         }
+         if(static_cast<re_brace*>(state)->index == -3)
+         {
+            // Have to skip the leading jump state:
+            state = state->next.p->next.p;
+            continue;
+         }
         return;
      case syntax_element_endmark:
      case syntax_element_start_line:
--- a/include/boost/regex/v4/cpp_regex_traits.hpp
+++ b/include/boost/regex/v4/cpp_regex_traits.hpp
@ -293,7 +293,9 @@ void cpp_regex_traits_char_layer<charT>::init()
   //
   if((int)cat >= 0)
   {
+#ifndef BOOST_NO_EXCEPTIONS
      try{
+#endif
         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));
@ -303,12 +305,14 @@ void cpp_regex_traits_char_layer<charT>::init()
            }
         }
         this->m_pmessages->close(cat);
+#ifndef BOOST_NO_EXCEPTIONS
      }
      catch(...)
      {
         this->m_pmessages->close(cat);
         throw;
      }
+#endif
   }
   else
   {
@ -1055,3 +1059,4 @@ static_mutex& cpp_regex_traits<charT>::get_mutex_inst()

 #endif

+
--- a/include/boost/regex/v4/instances.hpp
+++ b/include/boost/regex/v4/instances.hpp
@ -71,32 +71,39 @@ template class BOOST_REGEX_DECL ::boost::re_detail::perl_matcher<BOOST_REGEX_CHA
 #     ifdef __GNUC__
 #        define template __extension__ extern template
 #     else
+#        if BOOST_MSVC > 1310
+#           define BOOST_REGEX_TEMPLATE_DECL
+#        endif
 #        define template extern template
 #     endif
 #  endif

+#ifndef BOOST_REGEX_TEMPLATE_DECL
+#  define BOOST_REGEX_TEMPLATE_DECL BOOST_REGEX_DECL
+#endif
+
 #  ifdef BOOST_MSVC
 #     pragma warning(push)
 #     pragma warning(disable : 4251 4231 4660)
 #  endif

-template class BOOST_REGEX_DECL basic_regex< BOOST_REGEX_CHAR_T BOOST_REGEX_TRAITS_T >;
+template class BOOST_REGEX_TEMPLATE_DECL basic_regex< BOOST_REGEX_CHAR_T BOOST_REGEX_TRAITS_T >;

 #if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-template class BOOST_REGEX_DECL match_results< const BOOST_REGEX_CHAR_T* >;
+template class BOOST_REGEX_TEMPLATE_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_T >;
+template class BOOST_REGEX_TEMPLATE_DECL ::boost::re_detail::perl_matcher<BOOST_REGEX_CHAR_T const *, match_results< const BOOST_REGEX_CHAR_T* >::allocator_type BOOST_REGEX_TRAITS_T >;
 #endif
 #if !(defined(BOOST_DINKUMWARE_STDLIB) && (BOOST_DINKUMWARE_STDLIB <= 1))\
   && !(defined(BOOST_INTEL_CXX_VERSION) && (BOOST_INTEL_CXX_VERSION <= 800))\
   && !(defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION))\
   && !defined(BOOST_REGEX_ICU_INSTANCES)
 #if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-template class BOOST_REGEX_DECL match_results< std::basic_string<BOOST_REGEX_CHAR_T>::const_iterator >;
+template class BOOST_REGEX_TEMPLATE_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 > >;
+template class BOOST_REGEX_TEMPLATE_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

@ -109,6 +116,8 @@ template class BOOST_REGEX_DECL ::boost::re_detail::perl_matcher< std::basic_str
 #     undef template
 #  endif

+#undef BOOST_REGEX_TEMPLATE_DECL
+
 #elif (defined(__GNUC__) && (__GNUC__ >= 3))

 #  ifndef BOOST_REGEX_INSTANTIATE
--- a/include/boost/regex/v4/perl_matcher_common.hpp
+++ b/include/boost/regex/v4/perl_matcher_common.hpp
@ -535,7 +535,7 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_within_word()
   if(position == last)
      return false;
   // both prev and this character must be m_word_mask:
-   if(traits_inst.isctype(*position, m_word_mask))
+   bool prev = traits_inst.isctype(*position, m_word_mask);
   {
      bool b;
      if((position == backstop) && ((m_match_flags & match_prev_avail) == 0)) 
@ -546,7 +546,7 @@ bool perl_matcher<BidiIterator, Allocator, traits>::match_within_word()
         b = traits_inst.isctype(*position, m_word_mask);
         ++position;
      }
-      if(b)
+      if(b == prev)
      {
         pstate = pstate->next.p;
         return true;
--- a/include/boost/regex/v4/perl_matcher_non_recursive.hpp
+++ b/include/boost/regex/v4/perl_matcher_non_recursive.hpp
@ -1193,6 +1193,9 @@ bool perl_matcher<BidiIterator, Allocator, traits>::unwind_char_repeat(bool r)
         pstate = rep->next.p;
      }while((count < rep->max) && (position != last) && !can_start(*position, rep->_map, mask_skip));
   }   
+   // remember where we got to if this is a leading repeat:
+   if((rep->leading) && (count < rep->max))
+      restart = position;
   if(position == last)
   {
      // can't repeat any more, remove the pushed state: 
@ -1259,6 +1262,9 @@ bool perl_matcher<BidiIterator, Allocator, traits>::unwind_short_set_repeat(bool
         pstate = rep->next.p;
      }while((count < rep->max) && (position != last) && !can_start(*position, rep->_map, mask_skip));
   }   
+   // remember where we got to if this is a leading repeat:
+   if((rep->leading) && (count < rep->max))
+      restart = position;
   if(position == last)
   {
      // can't repeat any more, remove the pushed state: 
@ -1326,6 +1332,9 @@ bool perl_matcher<BidiIterator, Allocator, traits>::unwind_long_set_repeat(bool
         pstate = rep->next.p;
      }while((count < rep->max) && (position != last) && !can_start(*position, rep->_map, mask_skip));
   }   
+   // remember where we got to if this is a leading repeat:
+   if((rep->leading) && (count < rep->max))
+      restart = position;
   if(position == last)
   {
      // can't repeat any more, remove the pushed state:
--- a/src/posix_api.cpp
+++ b/src/posix_api.cpp
@ -62,6 +62,8 @@ const char* names[] = {
 };
 } // namespace

+typedef boost::basic_regex<char, c_regex_traits<char> > c_regex_type;
+
 BOOST_REGEX_DECL int BOOST_REGEX_CCALL regcompA(regex_tA* expression, const char* ptr, int f)
 {
   if(expression->re_magic != magic_value)
@ -70,7 +72,7 @@ BOOST_REGEX_DECL int BOOST_REGEX_CCALL regcompA(regex_tA* expression, const char
 #ifndef BOOST_NO_EXCEPTIONS
      try{
 #endif
-      expression->guts = new regex();
+      expression->guts = new c_regex_type();
 #ifndef BOOST_NO_EXCEPTIONS
      } catch(...)
      {
@ -120,9 +122,9 @@ BOOST_REGEX_DECL int BOOST_REGEX_CCALL regcompA(regex_tA* expression, const char
   try{
 #endif
      expression->re_magic = magic_value;
-      static_cast<regex*>(expression->guts)->set_expression(ptr, p2, flags);
-      expression->re_nsub = static_cast<regex*>(expression->guts)->mark_count() - 1;
-      result = static_cast<regex*>(expression->guts)->error_code();
+      static_cast<c_regex_type*>(expression->guts)->set_expression(ptr, p2, flags);
+      expression->re_nsub = static_cast<c_regex_type*>(expression->guts)->mark_count() - 1;
+      result = static_cast<c_regex_type*>(expression->guts)->error_code();
 #ifndef BOOST_NO_EXCEPTIONS
   } 
   catch(const boost::regex_error& be)
@ -187,7 +189,7 @@ BOOST_REGEX_DECL regsize_t BOOST_REGEX_CCALL regerrorA(int code, const regex_tA*
   {
      std::string p;
      if((e) && (e->re_magic == magic_value))
-         p = static_cast<regex*>(e->guts)->get_traits().error_string(static_cast< ::boost::regex_constants::error_type>(code));
+         p = static_cast<c_regex_type*>(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));
@ -236,7 +238,7 @@ BOOST_REGEX_DECL int BOOST_REGEX_CCALL regexecA(const regex_tA* expression, cons
 #endif
   if(expression->re_magic == magic_value)
   {
-      result = regex_search(start, end, m, *static_cast<regex*>(expression->guts), flags);
+      result = regex_search(start, end, m, *static_cast<c_regex_type*>(expression->guts), flags);
   }
   else
      return result;
@ -274,7 +276,7 @@ BOOST_REGEX_DECL void BOOST_REGEX_CCALL regfreeA(regex_tA* expression)
 {
   if(expression->re_magic == magic_value)
   {
-      delete static_cast<regex*>(expression->guts);
+      delete static_cast<c_regex_type*>(expression->guts);
   }
   expression->re_magic = 0;
 }
--- a/src/usinstances.cpp
+++ b/src/usinstances.cpp
@ -25,6 +25,8 @@

 #ifdef _DLL_CPPLIB
 #include <boost/detail/workaround.hpp>
+#include <memory>
+#include <string>
 //
 // This is a horrible workaround, without declaring these symbols extern we get
 // duplicate symbol errors when linking if the application is built without
@ -49,6 +51,9 @@ template _CRTIMP2 bool __cdecl operator>(
 #if BOOST_WORKAROUND(BOOST_MSVC, > 1300) && BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1400))
 template<> _CRTIMP2 std::size_t __cdecl char_traits<unsigned short>::length(unsigned short const*);
 #endif
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
+template _CRTIMP2 allocator<unsigned short>::allocator();
+#endif
 }
 #endif

--- a/src/wc_regex_traits.cpp
+++ b/src/wc_regex_traits.cpp
@ -19,9 +19,42 @@

 #define BOOST_REGEX_SOURCE

-#include <boost/config.hpp>
+#include <boost/regex/config.hpp>
 #include <boost/detail/workaround.hpp>

+#ifdef _DLL_CPPLIB
+#include <memory>
+#include <string>
+//
+// This is a horrible workaround, without declaring these symbols extern we get
+// duplicate symbol errors when linking if the application is built without
+// /Zc:wchar_t
+//
+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> >&);
+#if BOOST_WORKAROUND(BOOST_MSVC, > 1300) && BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1400))
+template<> _CRTIMP2 std::size_t __cdecl char_traits<unsigned short>::length(unsigned short const*);
+#endif
+#if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
+template _CRTIMP2 allocator<unsigned short>::allocator();
+#endif
+}
+#endif
+
 #if !BOOST_WORKAROUND(__BORLANDC__, < 0x560)

 #include <boost/regex/v4/c_regex_traits.hpp>
--- a/src/wide_posix_api.cpp
+++ b/src/wide_posix_api.cpp
@ -69,6 +69,8 @@ const wchar_t* wnames[] = {
 };
 }

+typedef boost::basic_regex<wchar_t, c_regex_traits<wchar_t> > c_regex_type;
+
 BOOST_REGEX_DECL int BOOST_REGEX_CCALL regcompW(regex_tW* expression, const wchar_t* ptr, int f)
 {
   if(expression->re_magic != wmagic_value)
@ -77,7 +79,7 @@ BOOST_REGEX_DECL int BOOST_REGEX_CCALL regcompW(regex_tW* expression, const wcha
 #ifndef BOOST_NO_EXCEPTIONS
      try{
 #endif
-      expression->guts = new wregex();
+      expression->guts = new c_regex_type();
 #ifndef BOOST_NO_EXCEPTIONS
      } catch(...)
      {
@ -127,9 +129,9 @@ BOOST_REGEX_DECL int BOOST_REGEX_CCALL regcompW(regex_tW* expression, const wcha
   try{
 #endif
      expression->re_magic = wmagic_value;
-      static_cast<wregex*>(expression->guts)->set_expression(ptr, p2, flags);
-      expression->re_nsub = static_cast<wregex*>(expression->guts)->mark_count() - 1;
-      result = static_cast<wregex*>(expression->guts)->error_code();
+      static_cast<c_regex_type*>(expression->guts)->set_expression(ptr, p2, flags);
+      expression->re_nsub = static_cast<c_regex_type*>(expression->guts)->mark_count() - 1;
+      result = static_cast<c_regex_type*>(expression->guts)->error_code();
 #ifndef BOOST_NO_EXCEPTIONS
   } 
   catch(const boost::regex_error& be)
@ -208,7 +210,7 @@ BOOST_REGEX_DECL regsize_t BOOST_REGEX_CCALL regerrorW(int code, const regex_tW*
   {
      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));
+         p = static_cast<c_regex_type*>(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));
@ -257,7 +259,7 @@ BOOST_REGEX_DECL int BOOST_REGEX_CCALL regexecW(const regex_tW* expression, cons
 #endif
   if(expression->re_magic == wmagic_value)
   {
-      result = regex_search(start, end, m, *static_cast<wregex*>(expression->guts), flags);
+      result = regex_search(start, end, m, *static_cast<c_regex_type*>(expression->guts), flags);
   }
   else
      return result;
@ -294,7 +296,7 @@ BOOST_REGEX_DECL void BOOST_REGEX_CCALL regfreeW(regex_tW* expression)
 {
   if(expression->re_magic == wmagic_value)
   {
-      delete static_cast<wregex*>(expression->guts);
+      delete static_cast<c_regex_type*>(expression->guts);
   }
   expression->re_magic = 0;
 }
--- a/test/regress/test_escapes.cpp
+++ b/test/regress/test_escapes.cpp
@ -109,6 +109,9 @@ void test_assertion_escapes()
   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));
+   TEST_REGEX_SEARCH("\\By\\b", perl, "xy", match_default, make_array(1, 2, -2, -2));
+   TEST_REGEX_SEARCH("\\by\\B", perl, "yz", match_default, make_array(0, 1, -2, -2));
+   TEST_REGEX_SEARCH("\\B\\*\\B", perl, " * ", match_default, make_array(1, 2, -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));
Author	SHA1	Message	Date
Peter Dimov	8811d5d9af	Save state before 1.36 merges. [SVN r47337]	2008-07-12 09:06:42 +00:00
John Maddock	6eb35e2cf1	Fixes #2097 . [SVN r47319]	2008-07-11 18:00:15 +00:00
Daniel James	831156d759	Replace a couple of non-ascii symbols. [SVN r46943]	2008-07-01 09:58:27 +00:00
John Maddock	d7d38da27f	Changed POSIX API functions to use the global C locale. Fixes #1446. [SVN r46170]	2008-06-05 17:07:42 +00:00
John Maddock	31b68369ae	Patch for VC9 explicit template instantiation. Fixes #1959. [SVN r46077]	2008-06-03 12:52:55 +00:00
John Maddock	4c105a90a1	Changed behaviour of \B so that it succeeds when the neither adjacent character is a word character. [SVN r45354]	2008-05-14 11:19:58 +00:00
John Maddock	8928c7737e	Added needed #includes to source files. [SVN r45353]	2008-05-14 11:14:30 +00:00
John Maddock	3704b9c595	Fixes for issue #1871 that prevents duplicate symbol errors with VC++ compilers, when building with /Zc:wchar_t-. [SVN r44842]	2008-04-28 11:07:14 +00:00
John Maddock	5fdf2752ae	Add explicit type cast to fix GCC-C++0X mode error. [SVN r44437]	2008-04-15 17:50:11 +00:00
John Maddock	c7dda1b549	Fix doc typo from issue #1794 . [SVN r44169]	2008-04-11 08:53:54 +00:00
John Maddock	6e9b9a7995	Doh! Changes to code should actually compile! A fix for the last change. [SVN r44145]	2008-04-10 12:46:41 +00:00
John Maddock	e5bc36d7c9	Fix for bug #1790 . [SVN r44128]	2008-04-09 15:32:08 +00:00
John Maddock	c9d1a42e05	Added missing files. [SVN r43632]	2008-03-15 18:19:11 +00:00
John Maddock	e32c5d0888	Added link to PDF docs, and regenerated. [SVN r43351]	2008-02-21 12:58:15 +00:00
John Maddock	370c429bd6	Added comment to suppress inspect warning. [SVN r43148]	2008-02-07 10:24:29 +00:00
John Maddock	0915f19c03	Extended leading repeat optimization to more cases. [SVN r42992]	2008-01-27 18:43:35 +00:00
John Maddock	37040f4bfd	Applies fix for issue #1598 : added missing #include. [SVN r42929]	2008-01-23 16:08:44 +00:00
John Maddock	2cbd1c8882	Patch regex concept checks and TR1 library to work with VC9 + MS TR1 feature pack. [SVN r42751]	2008-01-14 13:17:09 +00:00
John Maddock	37cd93fc82	Fix documentation typos. [SVN r42747]	2008-01-14 09:58:36 +00:00
John Maddock	b1af72fd23	Ooops, fix broken escape sequence. [SVN r42745]	2008-01-14 09:46:12 +00:00
John Maddock	299086b99c	Fix bugs reported by Will Drewry: certain invalid regexes can cause the library to access invalid memory, changed to ensure that the correct exception is thrown long before this happens. [SVN r42674]	2008-01-11 09:55:43 +00:00
John Maddock	07eaac9e0e	Fix typos. [SVN r42455]	2008-01-04 16:54:35 +00:00
John Maddock	71fdd5eb44	Fix typos reported by Sebastian Pipping. [SVN r42025]	2007-12-14 10:11:21 +00:00
John Maddock	31668ed4be	Fixes #1471 . [SVN r41973]	2007-12-11 17:28:15 +00:00
John Maddock	f72c7518be	Fixes #1455 . [SVN r41970]	2007-12-11 17:19:03 +00:00
John Maddock	2995393609	Oops, previous commit messed up POSIX timing code, now fixed. [SVN r41359]	2007-11-25 15:47:58 +00:00