Code tidies for 10.30-RC1 release candidate.

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

18 files changed, 88 insertions, 77 deletions

diff --git a/doc/html/NON-AUTOTOOLS-BUILD.txt b/doc/html/NON-AUTOTOOLS-BUILD.txt
index fe20152..f8c6359 100644
--- a/doc/html/NON-AUTOTOOLS-BUILD.txt
+++ b/doc/html/NON-AUTOTOOLS-BUILD.txt
@@ -179,8 +179,8 @@ can skip ahead to the CMake section.
 
 STACK SIZE IN WINDOWS ENVIRONMENTS
 
-Prior to release 10.30 the default system stack size of 1Mb in some Windows 
-environments caused issues with some tests. This should no longer be the case 
+Prior to release 10.30 the default system stack size of 1Mb in some Windows
+environments caused issues with some tests. This should no longer be the case
 for 10.30 and later releases.
 
 
diff --git a/doc/html/README.txt b/doc/html/README.txt
index 6bf5b46..bed0513 100644
--- a/doc/html/README.txt
+++ b/doc/html/README.txt
@@ -173,7 +173,7 @@ library. They are also documented in the pcre2build man page.
   architectures. If you try to enable it on an unsupported architecture, there
   will be a compile time error. If you are running under SELinux you may also
   want to add --enable-jit-sealloc, which enables the use of an execmem
-  allocator in JIT that is compatible with SELinux. This has no effect if JIT 
+  allocator in JIT that is compatible with SELinux. This has no effect if JIT
   is not enabled.
 
 . If you do not want to make use of the default support for UTF-8 Unicode
@@ -198,13 +198,14 @@ library. They are also documented in the pcre2build man page.
   or starting a pattern with (*UCP).
 
 . You can build PCRE2 to recognize either CR or LF or the sequence CRLF, or any
-  of the preceding, or any of the Unicode newline sequences, as indicating the
-  end of a line. Whatever you specify at build time is the default; the caller
-  of PCRE2 can change the selection at run time. The default newline indicator
-  is a single LF character (the Unix standard). You can specify the default
-  newline indicator by adding --enable-newline-is-cr, --enable-newline-is-lf,
-  --enable-newline-is-crlf, --enable-newline-is-anycrlf, or
-  --enable-newline-is-any to the "configure" command, respectively.
+  of the preceding, or any of the Unicode newline sequences, or the NUL (zero)
+  character as indicating the end of a line. Whatever you specify at build time
+  is the default; the caller of PCRE2 can change the selection at run time. The
+  default newline indicator is a single LF character (the Unix standard). You
+  can specify the default newline indicator by adding --enable-newline-is-cr,
+  --enable-newline-is-lf, --enable-newline-is-crlf,
+  --enable-newline-is-anycrlf, --enable-newline-is-any, or
+  --enable-newline-is-nul to the "configure" command, respectively.
 
 . By default, the sequence \R in a pattern matches any Unicode line ending
   sequence. This is independent of the option specifying what PCRE2 considers
@@ -227,15 +228,15 @@ library. They are also documented in the pcre2build man page.
   --with-parens-nest-limit=500
 
 . PCRE2 has a counter that can be set to limit the amount of computing resource
-  it uses when matching a pattern with the Perl-compatible matching function.
-  If the limit is exceeded during a match, the match fails. The default is ten
-  million. You can change the default by setting, for example,
+  it uses when matching a pattern. If the limit is exceeded during a match, the
+  match fails. The default is ten million. You can change the default by
+  setting, for example,
 
   --with-match-limit=500000
 
   on the "configure" command. This is just the default; individual calls to
-  pcre2_match() can supply their own value. There is more discussion in the
-  pcre2api man page (search for pcre2_set_match_limit).
+  pcre2_match() or pcre2_dfa_match() can supply their own value. There is more
+  discussion in the pcre2api man page (search for pcre2_set_match_limit).
 
 . There is a separate counter that limits the depth of nested backtracking
   during a matching process, which indirectly limits the amount of heap memory
@@ -246,15 +247,15 @@ library. They are also documented in the pcre2build man page.
 
   There is more discussion in the pcre2api man page (search for
   pcre2_set_depth_limit).
-  
-. You can also set an explicit limit on the amount of heap memory used by 
+
+. You can also set an explicit limit on the amount of heap memory used by
   the pcre2_match() interpreter:
-  
+
   --with-heap-limit=500
-  
-  The units are kilobytes. This limit does not apply when the JIT optimization 
-  (which has its own memory control features) is used. There is more discussion 
-  on the pcre2api man page (search for pcre2_set_heap_limit).  
+
+  The units are kilobytes. This limit does not apply when the JIT optimization
+  (which has its own memory control features) is used. There is more discussion
+  on the pcre2api man page (search for pcre2_set_heap_limit).
 
 . In the 8-bit library, the default maximum compiled pattern size is around
   64K bytes. You can increase this by adding --with-link-size=3 to the
@@ -659,9 +660,10 @@ with the perltest.sh script, and test 5 checking PCRE2-specific things.
 Tests 6 and 7 check the pcre2_dfa_match() alternative matching function, in
 non-UTF mode and UTF-mode with Unicode property support, respectively.
 
-Test 8 checks some internal offsets and code size features; it is run only when
-the default "link size" of 2 is set (in other cases the sizes change) and when
-Unicode support is enabled.
+Test 8 checks some internal offsets and code size features, but it is run only
+when Unicode support is enabled. The output is different in 8-bit, 16-bit, and
+32-bit modes and for different link sizes, so there are different output files
+for each mode and link size.
 
 Tests 9 and 10 are run only in 8-bit mode, and tests 11 and 12 are run only in
 16-bit and 32-bit modes. These are tests that generate different output in
@@ -671,7 +673,7 @@ Test 13 checks the handling of non-UTF characters greater than 255 by
 pcre2_dfa_match() in 16-bit and 32-bit modes.
 
 Test 14 contains some special UTF and UCP tests that give different output for
-the different widths.
+different code unit widths.
 
 Test 15 contains a number of tests that must not be run with JIT. They check,
 among other non-JIT things, the match-limiting features of the intepretive
@@ -692,6 +694,9 @@ patterns to a file, and then reloading and checking them.
 Tests 21 and 22 test \C support when the use of \C is not locked out, without
 and with UTF support, respectively. Test 23 tests \C when it is locked out.
 
+Tests 24 and 25 test the experimental pattern conversion functions, without and
+with UTF support, respectively.
+
 
 Character tables
 ----------------
@@ -710,7 +715,7 @@ specified for ./configure, a different version of pcre2_chartables.c is built
 by the program dftables (compiled from dftables.c), which uses the ANSI C
 character handling functions such as isalnum(), isalpha(), isupper(),
 islower(), etc. to build the table sources. This means that the default C
-locale which is set for your system will control the contents of these default
+locale that is set for your system will control the contents of these default
 tables. You can change the default tables by editing pcre2_chartables.c and
 then re-building PCRE2. If you do this, you should take care to ensure that the
 file does not get automatically re-generated. The best way to do this is to
@@ -765,6 +770,7 @@ The distribution should contain the files listed below.
   src/pcre2_compile.c      )
   src/pcre2_config.c       )
   src/pcre2_context.c      )
+  src/pcre2_convert.c      )
   src/pcre2_dfa_match.c    )
   src/pcre2_error.c        )
   src/pcre2_find_bracket.c )
@@ -804,7 +810,6 @@ The distribution should contain the files listed below.
   src/pcre2demo.c          simple demonstration of coding calls to PCRE2
   src/pcre2grep.c          source of a grep utility that uses PCRE2
   src/pcre2test.c          comprehensive test program
-  src/pcre2_printint.c     part of pcre2test
   src/pcre2_jit_test.c     JIT test program
 
 (C) Auxiliary files:
@@ -869,12 +874,12 @@ The distribution should contain the files listed below.
 
 (E) Auxiliary files for building PCRE2 "by hand"
 
-  pcre2.h.generic         ) a version of the public PCRE2 header file
+  src/pcre2.h.generic     ) a version of the public PCRE2 header file
                           )   for use in non-"configure" environments
-  config.h.generic        ) a version of config.h for use in non-"configure"
+  src/config.h.generic    ) a version of config.h for use in non-"configure"
                           )   environments
 
 Philip Hazel
 Email local part: ph10
 Email domain: cam.ac.uk
-Last updated: 17 June 2017
+Last updated: 18 July 2017
diff --git a/doc/html/pcre2.html b/doc/html/pcre2.html
index 7a60d28..b61c579 100644
--- a/doc/html/pcre2.html
+++ b/doc/html/pcre2.html
@@ -137,7 +137,7 @@ large search tree against a string that will never match. Nested unlimited
 repeats in a pattern are a common example. PCRE2 provides some protection
 against this: see the <b>pcre2_set_match_limit()</b> function in the
 <a href="pcre2api.html"><b>pcre2api</b></a>
-page. There is a similar function called <b>pcre2_set_depth_limit()</b> that can 
+page. There is a similar function called <b>pcre2_set_depth_limit()</b> that can
 be used to restrict the amount of memory that is used.
 </P>
 <br><a name="SEC3" href="#TOC1">USER DOCUMENTATION</a><br>
diff --git a/doc/html/pcre2_code_free.html b/doc/html/pcre2_code_free.html
index e464a04..5fce3c5 100644
--- a/doc/html/pcre2_code_free.html
+++ b/doc/html/pcre2_code_free.html
@@ -26,8 +26,8 @@ DESCRIPTION
 </b><br>
 <P>
 This function frees the memory used for a compiled pattern, including any
-memory used by the JIT compiler. If the compiled pattern was created by a call 
-to <b>pcre2_code_copy_with_tables()</b>, the memory for the character tables is 
+memory used by the JIT compiler. If the compiled pattern was created by a call
+to <b>pcre2_code_copy_with_tables()</b>, the memory for the character tables is
 also freed.
 </P>
 <P>
diff --git a/doc/html/pcre2_compile.html b/doc/html/pcre2_compile.html
index da103cd..0a9eafa 100644
--- a/doc/html/pcre2_compile.html
+++ b/doc/html/pcre2_compile.html
@@ -64,7 +64,7 @@ The option bits are:
   PCRE2_ENDANCHORED        Pattern can match only at end of subject
   PCRE2_EXTENDED           Ignore white space and # comments
   PCRE2_FIRSTLINE          Force matching to be before newline
-  PCRE2_LITERAL            Pattern characters are all literal 
+  PCRE2_LITERAL            Pattern characters are all literal
   PCRE2_MATCH_UNSET_BACKREF  Match unset back references
   PCRE2_MULTILINE          ^ and $ match newlines within data
   PCRE2_NEVER_BACKSLASH_C  Lock out the use of \C in patterns
diff --git a/doc/html/pcre2_config.html b/doc/html/pcre2_config.html
index 7929d62..465f6a1 100644
--- a/doc/html/pcre2_config.html
+++ b/doc/html/pcre2_config.html
@@ -45,7 +45,7 @@ point to a uint32_t integer variable. The available codes are:
   PCRE2_CONFIG_BSR             Indicates what \R matches by default:
                                  PCRE2_BSR_UNICODE
                                  PCRE2_BSR_ANYCRLF
-  PCRE2_CONFIG_HEAPLIMIT       Default heap memory limit                                
+  PCRE2_CONFIG_HEAPLIMIT       Default heap memory limit
   PCRE2_CONFIG_DEPTHLIMIT      Default backtracking depth limit
   PCRE2_CONFIG_JIT             Availability of just-in-time compiler support (1=yes 0=no)
   PCRE2_CONFIG_JITTARGET       Information (a string) about the target architecture for the JIT compiler
@@ -57,7 +57,7 @@ point to a uint32_t integer variable. The available codes are:
                                  PCRE2_NEWLINE_CRLF
                                  PCRE2_NEWLINE_ANY
                                  PCRE2_NEWLINE_ANYCRLF
-                                 PCRE2_NEWLINE_NUL 
+                                 PCRE2_NEWLINE_NUL
   PCRE2_CONFIG_PARENSLIMIT     Default parentheses nesting limit
   PCRE2_CONFIG_RECURSIONLIMIT  Obsolete: use PCRE2_CONFIG_DEPTHLIMIT
   PCRE2_CONFIG_STACKRECURSE    Obsolete: always returns 0
diff --git a/doc/html/pcre2_converted_pattern_free.html b/doc/html/pcre2_converted_pattern_free.html
index 961f04f..11adefd 100644
--- a/doc/html/pcre2_converted_pattern_free.html
+++ b/doc/html/pcre2_converted_pattern_free.html
@@ -26,8 +26,8 @@ DESCRIPTION
 </b><br>
 <P>
 This function is part of an experimental set of pattern conversion functions.
-It frees the memory occupied by a converted pattern that was obtained by 
-calling <b>pcre2_pattern_convert()</b> with arguments that caused it to place 
+It frees the memory occupied by a converted pattern that was obtained by
+calling <b>pcre2_pattern_convert()</b> with arguments that caused it to place
 the converted pattern into newly obtained heap memory.
 </P>
 <P>
diff --git a/doc/html/pcre2_maketables.html b/doc/html/pcre2_maketables.html
index 995c23a..6d240e3 100644
--- a/doc/html/pcre2_maketables.html
+++ b/doc/html/pcre2_maketables.html
@@ -25,7 +25,7 @@ SYNOPSIS
 DESCRIPTION
 </b><br>
 <P>
-This function builds a set of character tables for character code points that 
+This function builds a set of character tables for character code points that
 are less than 256. These can be passed to <b>pcre2_compile()</b> in a compile
 context in order to override the internal, built-in tables (which were either
 defaulted or made by <b>pcre2_maketables()</b> when PCRE2 was compiled). See the
diff --git a/doc/html/pcre2_match.html b/doc/html/pcre2_match.html
index 724a39f..5f6f0b1 100644
--- a/doc/html/pcre2_match.html
+++ b/doc/html/pcre2_match.html
@@ -43,14 +43,14 @@ offsets to captured substrings. Its arguments are:
 A match context is needed only if you want to:
 <pre>
   Set up a callout function
-  Set a matching offset limit 
-  Change the heap memory limit 
-  Change the backtracking match limit 
+  Set a matching offset limit
+  Change the heap memory limit
+  Change the backtracking match limit
   Change the backtracking depth limit
   Set custom memory management specifically for the match
 </pre>
 The <i>length</i> and <i>startoffset</i> values are code
-units, not characters. The length may be given as PCRE2_ZERO_TERMINATE for a 
+units, not characters. The length may be given as PCRE2_ZERO_TERMINATE for a
 subject that is terminated by a binary zero code unit. The options are:
 <pre>
   PCRE2_ANCHORED          Match only at the first position
@@ -59,7 +59,7 @@ subject that is terminated by a binary zero code unit. The options are:
   PCRE2_NOTEOL            Subject string is not the end of a line
   PCRE2_NOTEMPTY          An empty string is not a valid match
   PCRE2_NOTEMPTY_ATSTART  An empty string at the start of the subject is not a valid match
-  PCRE2_NO_JIT            Do not use JIT matching                          
+  PCRE2_NO_JIT            Do not use JIT matching
   PCRE2_NO_UTF_CHECK      Do not check the subject for UTF validity (only relevant if PCRE2_UTF
                            was set at compile time)
   PCRE2_PARTIAL_HARD      Return PCRE2_ERROR_PARTIAL for a partial match even if there is a full match
diff --git a/doc/html/pcre2_pattern_info.html b/doc/html/pcre2_pattern_info.html
index d07f9ed..ae3e7ff 100644
--- a/doc/html/pcre2_pattern_info.html
+++ b/doc/html/pcre2_pattern_info.html
@@ -48,7 +48,7 @@ request are as follows:
                                1 first code unit is set
                                2 start of string or after newline
   PCRE2_INFO_FIRSTCODEUNIT   First code unit when type is 1
-  PCRE2_INFO_FRAMESIZE       Size of backtracking frame 
+  PCRE2_INFO_FRAMESIZE       Size of backtracking frame
   PCRE2_INFO_HASBACKSLASHC   Return 1 if pattern contains \C
   PCRE2_INFO_HASCRORLF       Return 1 if explicit CR or LF matches exist in the pattern
   PCRE2_INFO_HEAPLIMIT       Heap memory limit if set, otherwise PCRE2_ERROR_UNSET
@@ -71,7 +71,7 @@ request are as follows:
                                PCRE2_NEWLINE_CRLF
                                PCRE2_NEWLINE_ANY
                                PCRE2_NEWLINE_ANYCRLF
-                               PCRE2_NEWLINE_NUL 
+                               PCRE2_NEWLINE_NUL
   PCRE2_INFO_RECURSIONLIMIT  Obsolete synonym for PCRE2_INFO_DEPTHLIMIT
   PCRE2_INFO_SIZE            Size of compiled pattern
 </pre>
diff --git a/doc/html/pcre2_set_newline.html b/doc/html/pcre2_set_newline.html
index a078f69..ba81300 100644
--- a/doc/html/pcre2_set_newline.html
+++ b/doc/html/pcre2_set_newline.html
@@ -35,7 +35,7 @@ matching patterns. The second argument must be one of:
   PCRE2_NEWLINE_CRLF      CR followed by LF only
   PCRE2_NEWLINE_ANYCRLF   Any of the above
   PCRE2_NEWLINE_ANY       Any Unicode newline sequence
-  PCRE2_NEWLINE_NUL       The NUL character (binary zero) 
+  PCRE2_NEWLINE_NUL       The NUL character (binary zero)
 </pre>
 The result is zero for success or PCRE2_ERROR_BADDATA if the second argument is
 invalid.
diff --git a/doc/html/pcre2_set_recursion_limit.html b/doc/html/pcre2_set_recursion_limit.html
index c415aa3..9ff68c2 100644
--- a/doc/html/pcre2_set_recursion_limit.html
+++ b/doc/html/pcre2_set_recursion_limit.html
@@ -26,7 +26,7 @@ SYNOPSIS
 DESCRIPTION
 </b><br>
 <P>
-This function is obsolete and should not be used in new code. Use 
+This function is obsolete and should not be used in new code. Use
 <b>pcre2_set_depth_limit()</b> instead.
 </P>
 <P>
diff --git a/doc/html/pcre2_substitute.html b/doc/html/pcre2_substitute.html
index c937802..2215ce9 100644
--- a/doc/html/pcre2_substitute.html
+++ b/doc/html/pcre2_substitute.html
@@ -60,7 +60,7 @@ want to:
 The <i>length</i>, <i>startoffset</i> and <i>rlength</i> values are code
 units, not characters, as is the contents of the variable pointed at by
 <i>outlengthptr</i>, which is updated to the actual length of the new string.
-The subject and replacement lengths can be given as PCRE2_ZERO_TERMINATED for 
+The subject and replacement lengths can be given as PCRE2_ZERO_TERMINATED for
 zero-terminated strings. The options are:
 <pre>
   PCRE2_ANCHORED             Match only at the first position
diff --git a/doc/html/pcre2build.html b/doc/html/pcre2build.html
index 3dfe07f..823e605 100644
--- a/doc/html/pcre2build.html
+++ b/doc/html/pcre2build.html
@@ -87,10 +87,10 @@ Options that specify values have names that start with --with.
 <br><a name="SEC3" href="#TOC1">BUILDING 8-BIT, 16-BIT AND 32-BIT LIBRARIES</a><br>
 <P>
 By default, a library called <b>libpcre2-8</b> is built, containing functions
-that take string arguments contained in vectors of bytes, interpreted either as
+that take string arguments contained in arrays of bytes, interpreted either as
 single-byte characters, or UTF-8 strings. You can also build two other
 libraries, called <b>libpcre2-16</b> and <b>libpcre2-32</b>, which process
-strings that are contained in vectors of 16-bit and 32-bit code units,
+strings that are contained in arrays of 16-bit and 32-bit code units,
 respectively. These can be interpreted either as single-unit characters or
 UTF-16/UTF-32 strings. To build these additional libraries, add one or both of
 the following to the <b>configure</b> command:
@@ -208,19 +208,23 @@ to the <b>configure</b> command. There is a fourth option, specified by
   --enable-newline-is-anycrlf
 </pre>
 which causes PCRE2 to recognize any of the three sequences CR, LF, or CRLF as
-indicating a line ending. Finally, a fifth option, specified by
+indicating a line ending. A fifth option, specified by
 <pre>
   --enable-newline-is-any
 </pre>
 causes PCRE2 to recognize any Unicode newline sequence. The Unicode newline
 sequences are the three just mentioned, plus the single characters VT (vertical
 tab, U+000B), FF (form feed, U+000C), NEL (next line, U+0085), LS (line
-separator, U+2028), and PS (paragraph separator, U+2029).
+separator, U+2028), and PS (paragraph separator, U+2029). The final option is
+<pre>
+  --enable-newline-is-nul
+</pre>
+which causes NUL (binary zero) is set as the default line-ending character.
 </P>
 <P>
 Whatever default line ending convention is selected when PCRE2 is built can be
 overridden by applications that use the library. At build time it is
-conventional to use the standard for your operating system.
+recommended to use the standard for your operating system.
 </P>
 <br><a name="SEC9" href="#TOC1">WHAT \R MATCHES</a><br>
 <P>
@@ -301,7 +305,9 @@ because the size of each backtracking "frame" depends on the number of
 capturing parentheses in a pattern, the amount of heap that is used before the
 limit is reached varies from pattern to pattern. This limit was more useful in
 versions before 10.30, where function recursion was used for backtracking.
-However, as well as applying to <b>pcre2_match()</b>, this limit also controls
+</P>
+<P>
+As well as applying to <b>pcre2_match()</b>, the depth limit also controls
 the depth of recursive function calls in <b>pcre2_dfa_match()</b>. These are
 used for lookaround assertions, atomic groups, and recursion within patterns.
 The limit does not apply to JIT matching.
@@ -559,7 +565,7 @@ Cambridge, England.
 </P>
 <br><a name="SEC25" href="#TOC1">REVISION</a><br>
 <P>
-Last updated: 17 June 2017
+Last updated: 18 July 2017
 <br>
 Copyright &copy; 1997-2017 University of Cambridge.
 <br>
diff --git a/doc/html/pcre2compat.html b/doc/html/pcre2compat.html
index 5c890b0..e6d2e7e 100644
--- a/doc/html/pcre2compat.html
+++ b/doc/html/pcre2compat.html
@@ -85,7 +85,7 @@ documentation for details.
 <P>
 8. Subroutine calls (whether recursive or not) were treated as atomic groups up
 to PCRE2 release 10.23, but from release 10.30 this changed, and backtracking
-into subroutine calls is now supported, as in Perl. 
+into subroutine calls is now supported, as in Perl.
 </P>
 <P>
 9. If any of the backtracking control verbs are used in a subpattern that is
diff --git a/doc/html/pcre2grep.html b/doc/html/pcre2grep.html
index 0a028a0..b5565a8 100644
--- a/doc/html/pcre2grep.html
+++ b/doc/html/pcre2grep.html
@@ -517,20 +517,20 @@ memory. There are three options that set resource limits for matching.
 The <b>--match-limit</b> option provides a means of limiting computing resource
 usage when processing patterns that are not going to match, but which have a
 very large number of possibilities in their search trees. The classic example
-is a pattern that uses nested unlimited repeats. Internally, PCRE2 has a 
-counter that is incremented each time around its main processing loop. If the 
+is a pattern that uses nested unlimited repeats. Internally, PCRE2 has a
+counter that is incremented each time around its main processing loop. If the
 value set by <b>--match-limit</b> is reached, an error occurs.
 <br>
 <br>
 The <b>--heap-limit</b> option specifies, as a number of kilobytes, the amount
 of heap memory that may be used for matching. Heap memory is needed only if
 matching the pattern requires a significant number of nested backtracking
-points to be remembered. This parameter can be set to zero to forbid the use of 
+points to be remembered. This parameter can be set to zero to forbid the use of
 heap memory altogether.
 <br>
 <br>
 The <b>--depth-limit</b> option limits the depth of nested backtracking points,
-which indirectly limits the amount of memory that is used. The amount of memory 
+which indirectly limits the amount of memory that is used. The amount of memory
 needed for each backtracking point depends on the number of capturing
 parentheses in the pattern, so the amount of memory that is used before this
 limit acts varies from pattern to pattern. This limit is of use only if it is
@@ -538,7 +538,7 @@ set smaller than <b>--match-limit</b>.
 <br>
 <br>
 There are no short forms for these options. The default settings are specified
-when the PCRE2 library is compiled, with the default defaults being very large 
+when the PCRE2 library is compiled, with the default defaults being very large
 and so effectively unlimited.
 </P>
 <P>
@@ -841,7 +841,7 @@ patterns are ignored by <b>pcre2grep</b>.
 A callout in a PCRE2 pattern is of the form (?C&#60;arg&#62;) where the argument is
 either a number or a quoted string (see the
 <a href="pcre2callout.html"><b>pcre2callout</b></a>
-documentation for details). Numbered callouts are ignored by <b>pcre2grep</b>; 
+documentation for details). Numbered callouts are ignored by <b>pcre2grep</b>;
 only callouts with string arguments are useful.
 </P>
 <br><b>
@@ -892,10 +892,10 @@ Echoing a specific string
 If the callout string starts with a pipe (vertical bar) character, the rest of
 the string is written to the output, having been passed through the same escape
 processing as text from the --output option. This provides a simple echoing
-facility that avoids calling an external program or script. No terminator is 
+facility that avoids calling an external program or script. No terminator is
 added to the string, so if you want a newline, you must include it explicitly.
-Matching continues normally after the string is output. If you want to see only 
-the callout output but not any output from an actual match, you should end the 
+Matching continues normally after the string is output. If you want to see only
+the callout output but not any output from an actual match, you should end the
 relevant pattern with (*FAIL).
 </P>
 <br><a name="SEC11" href="#TOC1">MATCHING ERRORS</a><br>
@@ -910,8 +910,8 @@ there are more than 20 such errors, <b>pcre2grep</b> gives up.
 </P>
 <P>
 The <b>--match-limit</b> option of <b>pcre2grep</b> can be used to set the
-overall resource limit. There are also other limits that affect the amount of 
-memory used during matching; see the discussion of <b>--heap-limit</b> and 
+overall resource limit. There are also other limits that affect the amount of
+memory used during matching; see the discussion of <b>--heap-limit</b> and
 <b>--depth-limit</b> above.
 </P>
 <br><a name="SEC12" href="#TOC1">DIAGNOSTICS</a><br>
diff --git a/doc/html/pcre2perform.html b/doc/html/pcre2perform.html
index 1a53493..28f4f73 100644
--- a/doc/html/pcre2perform.html
+++ b/doc/html/pcre2perform.html
@@ -29,7 +29,7 @@ of them.
 <br><a name="SEC2" href="#TOC1">COMPILED PATTERN MEMORY USAGE</a><br>
 <P>
 Patterns are compiled by PCRE2 into a reasonably efficient interpretive code,
-so that most simple patterns do not use much memory for storing the compiled 
+so that most simple patterns do not use much memory for storing the compiled
 version. However, there is one case where the memory usage of a compiled
 pattern can be unexpectedly large. If a parenthesized subpattern has a
 quantifier with a minimum greater than 1 and/or a limited maximum, the whole
@@ -91,7 +91,7 @@ vector is used. Rewriting patterns to be time-efficient, as described below,
 may also reduce the memory requirements.
 </P>
 <P>
-In contrast to <b>pcre2_match()</b>, <b>pcre2_dfa_match()</b> does use recursive 
+In contrast to <b>pcre2_match()</b>, <b>pcre2_dfa_match()</b> does use recursive
 function calls, but only for processing atomic groups, lookaround assertions,
 and recursion within the pattern. Too much nested recursion may cause stack
 issues. The "match depth" parameter can be used to limit the depth of function
@@ -184,7 +184,7 @@ appreciable time with strings longer than about 20 characters.
 </P>
 <P>
 In many cases, the solution to this kind of performance issue is to use an
-atomic group or a possessive quantifier. This can often reduce memory 
+atomic group or a possessive quantifier. This can often reduce memory
 requirements as well. As another example, consider this pattern:
 <pre>
   ([^&#60;]|&#60;(?!inet))+
@@ -205,7 +205,7 @@ are "swallowed" in one item inside the parentheses, and a possessive quantifier
 is used to stop any backtracking into the runs of non-"&#60;" characters. This
 version also uses a lot less memory because entry to a new set of parentheses
 happens only when a "&#60;" character that is not followed by "inet" is encountered
-(and we assume this is relatively rare). 
+(and we assume this is relatively rare).
 </P>
 <P>
 This example shows that one way of optimizing performance when matching long
@@ -216,10 +216,10 @@ than one character whenever possible.
 SETTING RESOURCE LIMITS
 </b><br>
 <P>
-You can set limits on the amount of processing that takes place when matching, 
+You can set limits on the amount of processing that takes place when matching,
 and on the amount of heap memory that is used. The default values of the limits
 are very large, and unlikely ever to operate. They can be changed when PCRE2 is
-built, and they can also be set when <b>pcre2_match()</b> or 
+built, and they can also be set when <b>pcre2_match()</b> or
 <b>pcre2_dfa_match()</b> is called. For details of these interfaces, see the
 <a href="pcre2build.html"><b>pcre2build</b></a>
 documentation and the section entitled
diff --git a/doc/html/pcre2syntax.html b/doc/html/pcre2syntax.html
index ce7e7da..9098f47 100644
--- a/doc/html/pcre2syntax.html
+++ b/doc/html/pcre2syntax.html
@@ -430,11 +430,11 @@ but some of them use Unicode properties if PCRE2_UCP is set. You can use
   (?i)            caseless
   (?J)            allow duplicate names
   (?m)            multiline
-  (?n)            no auto capture 
+  (?n)            no auto capture
   (?s)            single line (dotall)
   (?U)            default ungreedy (lazy)
   (?x)            extended: ignore white space except in classes
-  (?xx)           as (?x) but also ignore space and tab 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