Implement PCRE2_EXTENDED_MORE and friends.

git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@758 6239d852-aaf2-0410-a92c-79f79f948069

5 files changed, 38 insertions, 25 deletions

diff --git a/doc/html/pcre2api.html b/doc/html/pcre2api.html
index a8a4638..74ef04c 100644
--- a/doc/html/pcre2api.html
+++ b/doc/html/pcre2api.html
@@ -1378,6 +1378,13 @@ sequence at the start of the pattern, as described in the section entitled
 in the <b>pcre2pattern</b> documentation. A default is defined when PCRE2 is
 built.
 <pre>
+  PCRE2_EXTENDED_MORE
+</pre>
+This option has the effect of PCRE2_EXTENDED, but, in addition, space and
+horizontal tab characters are also ignored inside a character class.
+PCRE2_EXTENDED_MORE is equivalent to Perl's 5.26 /xx option, and it can be
+changed within a pattern by a (?xx) option setting.
+<pre>
   PCRE2_FIRSTLINE
 </pre>
 If this option is set, an unanchored pattern is required to match before or at
@@ -3344,7 +3351,7 @@ Cambridge, England.
 </P>
 <br><a name="SEC42" href="#TOC1">REVISION</a><br>
 <P>
-Last updated: 14 April 2017
+Last updated: 17 April 2017
 <br>
 Copyright &copy; 1997-2017 University of Cambridge.
 <br>
diff --git a/doc/html/pcre2compat.html b/doc/html/pcre2compat.html
index df8c9d2..5c890b0 100644
--- a/doc/html/pcre2compat.html
+++ b/doc/html/pcre2compat.html
@@ -200,16 +200,13 @@ different way and is not Perl-compatible.
 (l) PCRE2 recognizes some special sequences such as (*CR) or (*NO_JIT) at
 the start of a pattern that set overall options that cannot be changed within
 the pattern.
-<br>
-<br>
-18. The following new Perl 5.26 constructs are not yet supported in PCRE2:
-<br>
-<br>
-(a) The Perl /a modifier restricts /d numbers to pure ascii, the new /aa
-modifier restricts /i case-insensitive matching to pure ascii also, ignoring
-unicode rules. This separation cannot be represented with PCRE2_UTF.
-<br>
-<br>
+</P>
+<P>
+18. The Perl /a modifier restricts /d numbers to pure ascii, and the /aa
+modifier restricts /i case-insensitive matching to pure ascii, ignoring Unicode
+rules. This separation cannot be represented with PCRE2_UCP.
+</P>
+<P>
 19. Perl has different limits than PCRE2. See the
 <a href="pcre2limit.html"><b>pcre2limit</b></a>
 documentation for details. Perl went with 5.10 from recursion to iteration
@@ -232,7 +229,7 @@ Cambridge, England.
 REVISION
 </b><br>
 <P>
-Last updated: 17 April 2017
+Last updated: 18 April 2017
 <br>
 Copyright &copy; 1997-2017 University of Cambridge.
 <br>
diff --git a/doc/html/pcre2pattern.html b/doc/html/pcre2pattern.html
index 66500c1..b8e9d73 100644
--- a/doc/html/pcre2pattern.html
+++ b/doc/html/pcre2pattern.html
@@ -1544,20 +1544,25 @@ alternative in the subpattern.
 </P>
 <br><a name="SEC13" href="#TOC1">INTERNAL OPTION SETTING</a><br>
 <P>
-The settings of the PCRE2_CASELESS, PCRE2_MULTILINE, PCRE2_DOTALL, and
-PCRE2_EXTENDED options (which are Perl-compatible) can be changed from within
-the pattern by a sequence of Perl option letters enclosed between "(?" and ")".
-The option letters are
+The settings of the PCRE2_CASELESS, PCRE2_MULTILINE, PCRE2_DOTALL,
+PCRE2_EXTENDED, and PCRE2_EXTENDED_MORE options (which are Perl-compatible) can
+be changed from within the pattern by a sequence of Perl option letters
+enclosed between "(?" and ")". The option letters are
 <pre>
   i  for PCRE2_CASELESS
   m  for PCRE2_MULTILINE
   s  for PCRE2_DOTALL
   x  for PCRE2_EXTENDED
+  xx for PCRE2_EXTENDED_MORE
 </pre>
 For example, (?im) sets caseless, multiline matching. It is also possible to
-unset these options by preceding the letter with a hyphen, and a combined
-setting and unsetting such as (?im-sx), which sets PCRE2_CASELESS and
-PCRE2_MULTILINE while unsetting PCRE2_DOTALL and PCRE2_EXTENDED, is also
+unset these options by preceding the letter with a hyphen. The two "extended" 
+options are not independent; unsetting either one cancels the effects of both 
+of them. 
+</P>
+<P>
+A combined setting and unsetting such as (?im-sx), which sets PCRE2_CASELESS
+and PCRE2_MULTILINE while unsetting PCRE2_DOTALL and PCRE2_EXTENDED, is also
 permitted. If a letter appears both before and after the hyphen, the option is
 unset. An empty options setting "(?)" is allowed. Needless to say, it has no
 effect.
@@ -3438,7 +3443,7 @@ Cambridge, England.
 </P>
 <br><a name="SEC30" href="#TOC1">REVISION</a><br>
 <P>
-Last updated: 11 April 2017
+Last updated: 18 April 2017
 <br>
 Copyright &copy; 1997-2017 University of Cambridge.
 <br>
diff --git a/doc/html/pcre2syntax.html b/doc/html/pcre2syntax.html
index 0241002..ee58070 100644
--- a/doc/html/pcre2syntax.html
+++ b/doc/html/pcre2syntax.html
@@ -432,7 +432,8 @@ but some of them use Unicode properties if PCRE2_UCP is set. You can use
   (?m)            multiline
   (?s)            single line (dotall)
   (?U)            default ungreedy (lazy)
-  (?x)            extended (ignore white space)
+  (?x)            extended: ignore white space except in classes
+  (?xx)           as (?x) but also ignore space and tab in classes 
   (?-...)         unset option(s)
 </pre>
 The following are recognized only at the very start of a pattern or after one
@@ -596,7 +597,7 @@ Cambridge, England.
 </P>
 <br><a name="SEC27" href="#TOC1">REVISION</a><br>
 <P>
-Last updated: 31 March 2017
+Last updated: 18 April 2017
 <br>
 Copyright &copy; 1997-2017 University of Cambridge.
 <br>
diff --git a/doc/html/pcre2test.html b/doc/html/pcre2test.html
index 2e8a0b8..d24548d 100644
--- a/doc/html/pcre2test.html
+++ b/doc/html/pcre2test.html
@@ -560,9 +560,11 @@ Setting compilation options
 </b><br>
 <P>
 The following modifiers set options for <b>pcre2_compile()</b>. The most common
-ones have single-letter abbreviations. See
+ones have single-letter abbreviations, with special handling for /x (to make
+it like Perl). If a second x is present, PCRE2_EXTENDED is converted into
+PCRE2_EXTENDED_MORE. A third appearance adds PCRE2_EXTENDED as well. See
 <a href="pcre2api.html"><b>pcre2api</b></a>
-for a description of their effects.
+for a description of the effects of these options.
 <pre>
       allow_empty_class         set PCRE2_ALLOW_EMPTY_CLASS
       alt_bsux                  set PCRE2_ALT_BSUX
@@ -576,6 +578,7 @@ for a description of their effects.
       dupnames                  set PCRE2_DUPNAMES
       endanchored               set PCRE2_ENDANCHORED
   /x  extended                  set PCRE2_EXTENDED
+  /xx extended_more             set PCRE2_EXTENDED_MORE 
       firstline                 set PCRE2_FIRSTLINE
       match_unset_backref       set PCRE2_MATCH_UNSET_BACKREF
   /m  multiline                 set PCRE2_MULTILINE
@@ -1807,7 +1810,7 @@ Cambridge, England.
 </P>
 <br><a name="SEC21" href="#TOC1">REVISION</a><br>
 <P>
-Last updated: 11 April 2017
+Last updated: 17 April 2017
 <br>
 Copyright &copy; 1997-2017 University of Cambridge.
 <br>