More file tidies for 10.33-RC1

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

15 files changed, 109 insertions, 102 deletions

diff --git a/doc/html/NON-AUTOTOOLS-BUILD.txt b/doc/html/NON-AUTOTOOLS-BUILD.txt
index 118bc2b..39e7620 100644
--- a/doc/html/NON-AUTOTOOLS-BUILD.txt
+++ b/doc/html/NON-AUTOTOOLS-BUILD.txt
@@ -47,7 +47,7 @@ can skip ahead to the CMake section.
      environment. In particular, you can alter the definition of the NEWLINE
      macro to specify what character(s) you want to be interpreted as line
      terminators by default.
-     
+
      When you subsequently compile any of the PCRE2 modules, you must specify
      -DHAVE_CONFIG_H to your compiler so that src/config.h is included in the
      sources.
@@ -61,7 +61,7 @@ can skip ahead to the CMake section.
      configure/make world, this is handled automatically.) When upgrading to a
      new release, you are strongly advised to review src/config.h.generic
      before re-using what you had previously.
-     
+
      Note also that the src/config.h.generic file is created from a config.h
      that was generated by Autotools, which automatically includes settings of
      a number of macros that are not actually used by PCRE2 (for example,
@@ -109,7 +109,7 @@ can skip ahead to the CMake section.
        pcre2_newline.c
        pcre2_ord2utf.c
        pcre2_pattern_info.c
-       pcre2_script_run.c 
+       pcre2_script_run.c
        pcre2_serialize.c
        pcre2_string_utils.c
        pcre2_study.c
diff --git a/doc/html/README.txt b/doc/html/README.txt
index af5af63..2a26f9d 100644
--- a/doc/html/README.txt
+++ b/doc/html/README.txt
@@ -53,7 +53,7 @@ The header file for the POSIX-style functions is called pcre2posix.h. The
 official POSIX name is regex.h, but I did not want to risk possible problems
 with existing files of that name by distributing it that way. To use PCRE2 with
 an existing program that uses the POSIX API, pcre2posix.h will have to be
-renamed or pointed at by a link (or the program modified, of course). See the 
+renamed or pointed at by a link (or the program modified, of course). See the
 pcre2posix documentation for more details.
 
 
@@ -311,7 +311,11 @@ library. They are also documented in the pcre2build man page.
 . There is support for calling external programs during matching in the
   pcre2grep command, using PCRE2's callout facility with string arguments. This
   support can be disabled by adding --disable-pcre2grep-callout to the
-  "configure" command.
+  "configure" command. There are two kinds of callout: one that generates
+  output from inbuilt code, and another that calls an external program. The
+  latter has special support for Windows and VMS; otherwise it assumes the
+  existence of the fork() function. This facility can be disabled by adding
+  --disable-pcre2grep-callout-fork to the "configure" command.
 
 . The pcre2grep program currently supports only 8-bit data files, and so
   requires the 8-bit PCRE2 library. It is possible to compile pcre2grep to use
@@ -363,14 +367,14 @@ library. They are also documented in the pcre2build man page.
   If you get error messages about missing functions tgetstr, tgetent, tputs,
   tgetflag, or tgoto, this is the problem, and linking with the ncurses library
   should fix it.
-  
-. The C99 standard defines formatting modifiers z and t for size_t and 
-  ptrdiff_t values, respectively. By default, PCRE2 uses these modifiers in 
-  environments other than Microsoft Visual Studio when __STDC_VERSION__ is 
+
+. The C99 standard defines formatting modifiers z and t for size_t and
+  ptrdiff_t values, respectively. By default, PCRE2 uses these modifiers in
+  environments other than Microsoft Visual Studio when __STDC_VERSION__ is
   defined and has a value greater than or equal to 199901L (indicating C99).
   However, there is at least one environment that claims to be C99 but does not
   support these modifiers. If --disable-percent-zt is specified, no use is made
-  of the z or t modifiers. Instead or %td or %zu, %lu is used, with a cast for 
+  of the z or t modifiers. Instead or %td or %zu, %lu is used, with a cast for
   size_t values.
 
 . There is a special option called --enable-fuzz-support for use by people who
@@ -786,7 +790,7 @@ The distribution should contain the files listed below.
   src/pcre2_newline.c      )
   src/pcre2_ord2utf.c      )
   src/pcre2_pattern_info.c )
-  src/pcre2_script_run.c   ) 
+  src/pcre2_script_run.c   )
   src/pcre2_serialize.c    )
   src/pcre2_string_utils.c )
   src/pcre2_study.c        )
@@ -886,4 +890,4 @@ The distribution should contain the files listed below.
 Philip Hazel
 Email local part: ph10
 Email domain: cam.ac.uk
-Last updated: 29 January 2019
+Last updated: 03 March 2019
diff --git a/doc/html/pcre2_dfa_match.html b/doc/html/pcre2_dfa_match.html
index ad9a28f..232e2bc 100644
--- a/doc/html/pcre2_dfa_match.html
+++ b/doc/html/pcre2_dfa_match.html
@@ -52,7 +52,7 @@ characters. The options are:
 <pre>
   PCRE2_ANCHORED          Match only at the first position
   PCRE2_COPY_MATCHED_SUBJECT
-                          On success, make a private subject copy  
+                          On success, make a private subject copy
   PCRE2_ENDANCHORED       Pattern can match only at end of subject
   PCRE2_NOTBOL            Subject is not the beginning of a line
   PCRE2_NOTEOL            Subject is not the end of a line
diff --git a/doc/html/pcre2_match.html b/doc/html/pcre2_match.html
index 82c9491..90f7fcc 100644
--- a/doc/html/pcre2_match.html
+++ b/doc/html/pcre2_match.html
@@ -61,7 +61,7 @@ terminated by a binary zero code unit. The options are:
 <pre>
   PCRE2_ANCHORED          Match only at the first position
   PCRE2_COPY_MATCHED_SUBJECT
-                          On success, make a private subject copy   
+                          On success, make a private subject copy
   PCRE2_ENDANCHORED       Pattern can match only at end of subject
   PCRE2_NOTBOL            Subject string is not the beginning of a line
   PCRE2_NOTEOL            Subject string is not the end of a line
diff --git a/doc/html/pcre2_match_data_free.html b/doc/html/pcre2_match_data_free.html
index 746c3c1..6ba6162 100644
--- a/doc/html/pcre2_match_data_free.html
+++ b/doc/html/pcre2_match_data_free.html
@@ -31,7 +31,7 @@ using the memory freeing function from the general context or compiled pattern
 with which it was created, or <b>free()</b> if that was not set.
 </P>
 <P>
-If the PCRE2_COPY_MATCHED_SUBJECT was used for a successful match using this 
+If the PCRE2_COPY_MATCHED_SUBJECT was used for a successful match using this
 match data block, the copy of the subject that was remembered with the block is
 also freed.
 </P>
diff --git a/doc/html/pcre2_set_compile_extra_options.html b/doc/html/pcre2_set_compile_extra_options.html
index 4e342cf..c6c11f7 100644
--- a/doc/html/pcre2_set_compile_extra_options.html
+++ b/doc/html/pcre2_set_compile_extra_options.html
@@ -31,7 +31,7 @@ housed in a compile context. It completely replaces all the bits. The extra
 options are:
 <pre>
   PCRE2_EXTRA_ALLOW_SURROGATE_ESCAPES  Allow \x{df800} to \x{dfff} in UTF-8 and UTF-32 modes
-  PCRE2_EXTRA_ALT_BSUX                 Extended alternate \u, \U, and \x handling 
+  PCRE2_EXTRA_ALT_BSUX                 Extended alternate \u, \U, and \x handling
   PCRE2_EXTRA_BAD_ESCAPE_IS_LITERAL    Treat all invalid escapes as a literal following character
   PCRE2_EXTRA_ESCAPED_CR_IS_LF         Interpret \r as \n
   PCRE2_EXTRA_MATCH_LINE               Pattern matches whole lines
diff --git a/doc/html/pcre2api.html b/doc/html/pcre2api.html
index 682d9ad..20d92c0 100644
--- a/doc/html/pcre2api.html
+++ b/doc/html/pcre2api.html
@@ -1309,7 +1309,7 @@ be referenced by the substring extraction functions after a successful match.
 After running a match, you must not free a compiled pattern or a subject string
 until after all operations on the
 <a href="#matchdatablock">match data block</a>
-have taken place, unless, in the case of the subject string, you have used the 
+have taken place, unless, in the case of the subject string, you have used the
 PCRE2_COPY_MATCHED_SUBJECT option, which is described in the section entitled
 "Option bits for <b>pcre2_match()</b>"
 <a href="#matchoptions>">below.</a>
@@ -1437,8 +1437,8 @@ binary zero character followed by z).
 ECMAscript 6 added additional functionality to \u. This can be accessed using
 the PCRE2_EXTRA_ALT_BSUX extra option (see "Extra compile options"
 <a href="#extracompileoptions">below).</a>
-Note that this alternative escape handling applies only to patterns. Neither of 
-these options affects the processing of replacement strings passed to 
+Note that this alternative escape handling applies only to patterns. Neither of
+these options affects the processing of replacement strings passed to
 <b>pcre2_substitute()</b>.
 <pre>
   PCRE2_ALT_CIRCUMFLEX
@@ -1875,10 +1875,10 @@ characters if the matching function is called with PCRE2_NO_UTF_CHECK set.
 <pre>
   PCRE2_EXTRA_ALT_BSUX
 </pre>
-The original option PCRE2_ALT_BSUX causes PCRE2 to process \U, \u, and \x in 
-the way that ECMAscript (aka JavaScript) does. Additional functionality was 
-defined by ECMAscript 6; setting PCRE2_EXTRA_ALT_BSUX has the effect of 
-PCRE2_ALT_BSUX, but in addition it recognizes \u{hhh..} as a hexadecimal 
+The original option PCRE2_ALT_BSUX causes PCRE2 to process \U, \u, and \x in
+the way that ECMAscript (aka JavaScript) does. Additional functionality was
+defined by ECMAscript 6; setting PCRE2_EXTRA_ALT_BSUX has the effect of
+PCRE2_ALT_BSUX, but in addition it recognizes \u{hhh..} as a hexadecimal
 character code, where hhh.. is any number of hexadecimal digits.
 <pre>
   PCRE2_EXTRA_BAD_ESCAPE_IS_LITERAL
@@ -1896,7 +1896,7 @@ If the PCRE2_EXTRA_BAD_ESCAPE_IS_LITERAL extra option is passed to
 <b>pcre2_compile()</b>, all unrecognized or malformed escape sequences are
 treated as single-character escapes. For example, \j is a literal "j" and
 \x{2z} is treated as the literal string "x{2z}". Setting this option means
-that typos in patterns may go undetected and have unexpected results. Also note 
+that typos in patterns may go undetected and have unexpected results. Also note
 that a sequence such as [\N{] is interpreted as a malformed attempt at
 [\N{...}] and so is treated as [N{] whereas [\N] gives an error because an
 unqualified \N is a valid escape sequence but is not supported in a character
@@ -1904,9 +1904,9 @@ class. To reiterate: this is a dangerous option. Use with great care.
 <pre>
   PCRE2_EXTRA_ESCAPED_CR_IS_LF
 </pre>
-There are some legacy applications where the escape sequence \r in a pattern 
-is expected to match a newline. If this option is set, \r in a pattern is 
-converted to \n so that it matches a LF (linefeed) instead of a CR (carriage 
+There are some legacy applications where the escape sequence \r in a pattern
+is expected to match a newline. If this option is set, \r in a pattern is
+converted to \n so that it matches a LF (linefeed) instead of a CR (carriage
 return) character. The option does not affect a literal CR in the pattern, nor
 does it affect CR specified as an explicit code point such as \x{0D}.
 <pre>
@@ -2564,7 +2564,7 @@ Option bits for <b>pcre2_match()</b>
 </b><br>
 <P>
 The unused bits of the <i>options</i> argument for <b>pcre2_match()</b> must be
-zero. The only bits that may be set are PCRE2_ANCHORED, 
+zero. The only bits that may be set are PCRE2_ANCHORED,
 PCRE2_COPY_MATCHED_SUBJECT, PCRE2_ENDANCHORED, PCRE2_NOTBOL, PCRE2_NOTEOL,
 PCRE2_NOTEMPTY, PCRE2_NOTEMPTY_ATSTART, PCRE2_NO_JIT, PCRE2_NO_UTF_CHECK,
 PCRE2_PARTIAL_HARD, and PCRE2_PARTIAL_SOFT. Their action is described below.
@@ -2585,8 +2585,8 @@ matching.
 <pre>
   PCRE2_COPY_MATCHED_SUBJECT
 </pre>
-By default, a pointer to the subject is remembered in the match data block so 
-that, after a successful match, it can be referenced by the substring 
+By default, a pointer to the subject is remembered in the match data block so
+that, after a successful match, it can be referenced by the substring
 extraction functions. This means that the subject's memory must not be freed
 until all such operations are complete. For some applications where the
 lifetime of the subject string is not guaranteed, it may be necessary to make a
@@ -2866,8 +2866,8 @@ undefined.
 <P>
 After a successful match, a partial match (PCRE2_ERROR_PARTIAL), or a failure
 to match (PCRE2_ERROR_NOMATCH), a mark name may be available. The function
-<b>pcre2_get_mark()</b> can be called to access this name, which can be 
-specified in the pattern by any of the backtracking control verbs, not just 
+<b>pcre2_get_mark()</b> can be called to access this name, which can be
+specified in the pattern by any of the backtracking control verbs, not just
 (*MARK). The same function applies to all the verbs. It returns a pointer to
 the zero-terminated name, which is within the compiled pattern. If no name is
 available, NULL is returned. The length of the name (excluding the terminating
@@ -3002,7 +3002,7 @@ The backtracking match limit was reached.
 If a pattern contains many nested backtracking points, heap memory is used to
 remember them. This error is given when the memory allocation function (default
 or custom) fails. Note that a different error, PCRE2_ERROR_HEAPLIMIT, is given
-if the amount of memory needed exceeds the heap limit. PCRE2_ERROR_NOMEMORY is 
+if the amount of memory needed exceeds the heap limit. PCRE2_ERROR_NOMEMORY is
 also returned if PCRE2_COPY_MATCHED_SUBJECT is set and memory allocation fails.
 <pre>
   PCRE2_ERROR_NULL
@@ -3405,7 +3405,7 @@ capture groups and letters within \Q...\E quoted sequences.
 <P>
 Note that case forcing sequences such as \U...\E do not nest. For example,
 the result of processing "\Uaa\LBB\Ecc\E" is "AAbbcc"; the final \E has no
-effect. Note also that the PCRE2_ALT_BSUX and PCRE2_EXTRA_ALT_BSUX options do 
+effect. Note also that the PCRE2_ALT_BSUX and PCRE2_EXTRA_ALT_BSUX options do
 not apply to not apply to replacement strings.
 </P>
 <P>
@@ -3439,7 +3439,7 @@ substitutions. However, PCRE2_SUBSTITUTE_UNKNOWN_UNSET does cause unknown
 groups in the extended syntax forms to be treated as unset.
 </P>
 <P>
-If successful, <b>pcre2_substitute()</b> returns the number of successful 
+If successful, <b>pcre2_substitute()</b> returns the number of successful
 matches. This may be zero if no matches were found, and is never greater than 1
 unless PCRE2_SUBSTITUTE_GLOBAL is set.
 </P>
@@ -3489,8 +3489,8 @@ Substitution callouts
 <br>
 The <b>pcre2_set_substitution_callout()</b> function can be used to specify a
 callout function for <b>pcre2_substitute()</b>. This information is passed in
-a match context. The callout function is called after each substitution has 
-been processed, but it can cause the replacement not to happen. The callout 
+a match context. The callout function is called after each substitution has
+been processed, but it can cause the replacement not to happen. The callout
 function is not called for simulated substitutions that happen as a result of
 the PCRE2_SUBSTITUTE_OVERFLOW_LENGTH option.
 </P>
@@ -3500,10 +3500,10 @@ block structure, which contains the following fields, not necessarily in this
 order:
 <pre>
   uint32_t    <i>version</i>;
-  uint32_t    <i>subscount</i>;  
+  uint32_t    <i>subscount</i>;
   PCRE2_SPTR  <i>input</i>;
-  PCRE2_SPTR  <i>output</i>; 
-  PCRE2_SIZE <i>*ovector</i>; 
+  PCRE2_SPTR  <i>output</i>;
+  PCRE2_SIZE <i>*ovector</i>;
   uint32_t    <i>oveccount</i>;
   PCRE2_SIZE  <i>output_offsets[2]</i>;
 </pre>
@@ -3517,9 +3517,9 @@ first callout, 2 for the second, and so on. The <i>input</i> and <i>output</i>
 pointers are copies of the values passed to <b>pcre2_substitute()</b>.
 </P>
 <P>
-The <i>ovector</i> field points to the ovector, which contains the result of the 
-most recent match. The <i>oveccount</i> field contains the number of pairs that 
-are set in the ovector, and is always greater than zero. 
+The <i>ovector</i> field points to the ovector, which contains the result of the
+most recent match. The <i>oveccount</i> field contains the number of pairs that
+are set in the ovector, and is always greater than zero.
 </P>
 <P>
 The <i>output_offsets</i> vector contains the offsets of the replacement in the
diff --git a/doc/html/pcre2build.html b/doc/html/pcre2build.html
index a18e269..13d9da2 100644
--- a/doc/html/pcre2build.html
+++ b/doc/html/pcre2build.html
@@ -376,12 +376,15 @@ environment.
 </P>
 <br><a name="SEC14" href="#TOC1">PCRE2GREP SUPPORT FOR EXTERNAL SCRIPTS</a><br>
 <P>
-By default, on non-Windows systems, <b>pcre2grep</b> supports the use of
-callouts with string arguments within the patterns it is matching, in order to
-run external scripts. For details, see the
+By default <b>pcre2grep</b> supports the use of callouts with string arguments
+within the patterns it is matching. There are two kinds: one that generates
+output using local code, and another that calls an external program or script.
+If --disable-pcre2grep-callout-fork is added to the <b>configure</b> command,
+only the first kind of callout is supported; if --disable-pcre2grep-callout is
+used, all callouts are completely ignored. For more details of <b>pcre2grep</b>
+callouts, see the
 <a href="pcre2grep.html"><b>pcre2grep</b></a>
-documentation. This support can be disabled by adding
---disable-pcre2grep-callout to the <b>configure</b> command.
+documentation.
 </P>
 <br><a name="SEC15" href="#TOC1">PCRE2GREP OPTIONS FOR COMPRESSED FILE SUPPORT</a><br>
 <P>
@@ -526,14 +529,14 @@ documentation.
 </P>
 <br><a name="SEC21" href="#TOC1">DISABLING THE Z AND T FORMATTING MODIFIERS</a><br>
 <P>
-The C99 standard defines formatting modifiers z and t for size_t and 
-ptrdiff_t values, respectively. By default, PCRE2 uses these modifiers in 
-environments other than Microsoft Visual Studio when __STDC_VERSION__ is 
+The C99 standard defines formatting modifiers z and t for size_t and
+ptrdiff_t values, respectively. By default, PCRE2 uses these modifiers in
+environments other than Microsoft Visual Studio when __STDC_VERSION__ is
 defined and has a value greater than or equal to 199901L (indicating C99).
 However, there is at least one environment that claims to be C99 but does not
-support these modifiers. If 
+support these modifiers. If
 <pre>
-  --disable-percent-zt 
+  --disable-percent-zt
 </pre>
 is specified, no use is made of the z or t modifiers. Instead or %td or %zu,
 %lu is used, with a cast for size_t values.
@@ -589,9 +592,9 @@ Cambridge, England.
 </P>
 <br><a name="SEC26" href="#TOC1">REVISION</a><br>
 <P>
-Last updated: 15 November 2018
+Last updated: 03 March 2019
 <br>
-Copyright &copy; 1997-2018 University of Cambridge.
+Copyright &copy; 1997-2019 University of Cambridge.
 <br>
 <p>
 Return to the <a href="index.html">PCRE2 index page</a>.
diff --git a/doc/html/pcre2callout.html b/doc/html/pcre2callout.html
index 899a476..65db933 100644
--- a/doc/html/pcre2callout.html
+++ b/doc/html/pcre2callout.html
@@ -48,7 +48,7 @@ When using the <b>pcre2_substitute()</b> function, an additional callout feature
 is available. This does a callout after each change to the subject string and
 is described in the
 <a href="pcre2api.html"><b>pcre2api</b></a>
-documentation; the rest of this document is concerned with callouts during 
+documentation; the rest of this document is concerned with callouts during
 pattern matching.
 </P>
 <P>
diff --git a/doc/html/pcre2grep.html b/doc/html/pcre2grep.html
index 634d517..d66cee3 100644
--- a/doc/html/pcre2grep.html
+++ b/doc/html/pcre2grep.html
@@ -871,8 +871,8 @@ only callouts with string arguments are useful.
 Calling external programs or scripts
 </b><br>
 <P>
-This facility can be independently disabled when <b>pcre2grep</b> is built. It 
-is supported for Windows, where a call to <b>_spawnvp()</b> is used, for VMS, 
+This facility can be independently disabled when <b>pcre2grep</b> is built. It
+is supported for Windows, where a call to <b>_spawnvp()</b> is used, for VMS,
 where <b>lib$spawn()</b> is used, and for any other Unix-like environment where
 <b>fork()</b> and <b>execv()</b> are available.
 </P>
diff --git a/doc/html/pcre2pattern.html b/doc/html/pcre2pattern.html
index d69e6cb..e6958c1 100644
--- a/doc/html/pcre2pattern.html
+++ b/doc/html/pcre2pattern.html
@@ -418,13 +418,13 @@ two compile-time options. If PCRE2_ALT_BSUX is set, the sequence \x followed
 by { is not recognized. Only if \x is followed by two hexadecimal digits is it
 recognized as a character escape. Otherwise it is interpreted as a literal "x"
 character. In this mode, support for code points greater than 256 is provided
-by \u, which must be followed by four hexadecimal digits; otherwise it is 
+by \u, which must be followed by four hexadecimal digits; otherwise it is
 interpreted as a literal "u" character.
 </P>
 <P>
 PCRE2_EXTRA_ALT_BSUX has the same effect as PCRE2_ALT_BSUX and, in addition,
 \u{hhh..} is recognized as the character specified by hexadecimal code point.
-There may be any number of hexadecimal digits. This syntax is from ECMAScript 
+There may be any number of hexadecimal digits. This syntax is from ECMAScript
 6.
 </P>
 <P>
@@ -1194,7 +1194,7 @@ character. If any other of these assertions appears in a character class, an
 A word boundary is a position in the subject string where the current character
 and the previous character do not both match \w or \W (i.e. one matches
 \w and the other matches \W), or the start or end of the string if the
-first or last character matches \w, respectively. When PCRE2 is built with 
+first or last character matches \w, respectively. When PCRE2 is built with
 Unicode support, the meanings of \w and \W can be changed by setting the
 PCRE2_UCP option. When this is done, it also affects \b and \B. Neither PCRE2
 nor Perl has a separate "start of word" or "end of word" metasequence. However,
diff --git a/doc/html/pcre2posix.html b/doc/html/pcre2posix.html
index b03948e..20a2009 100644
--- a/doc/html/pcre2posix.html
+++ b/doc/html/pcre2posix.html
@@ -50,13 +50,13 @@ expression 8-bit library. There are no POSIX-style wrappers for PCRE2's 16-bit
 and 32-bit libraries. See the
 <a href="pcre2api.html"><b>pcre2api</b></a>
 documentation for a description of PCRE2's native API, which contains much
-additional functionality. 
+additional functionality.
 </P>
 <P>
 The functions described here are wrapper functions that ultimately call the
 PCRE2 native API. Their prototypes are defined in the <b>pcre2posix.h</b> header
 file, and they all have unique names starting with <b>pcre2_</b>. However, the
-<b>pcre2posix.h</b> header also contains macro definitions that convert the 
+<b>pcre2posix.h</b> header also contains macro definitions that convert the
 standard POSIX names such <b>regcomp()</b> into <b>pcre2_regcomp()</b> etc. This
 means that a program can use the usual POSIX names without running the risk of
 accidentally linking with POSIX functions from a different library.
@@ -68,7 +68,7 @@ application. Because the POSIX functions call the native ones, it is also
 necessary to add <b>-lpcre2-8</b>.
 </P>
 <P>
-Although they are not defined as protypes in <b>pcre2posix.h</b>, the library 
+Although they are not defined as protypes in <b>pcre2posix.h</b>, the library
 does contain functions with the POSIX names <b>regcomp()</b> etc. These simply
 pass their arguments to the PCRE2 functions. These functions are provided for
 backwards compatibility with earlier versions of PCRE2, so that existing
diff --git a/doc/html/pcre2syntax.html b/doc/html/pcre2syntax.html
index 5022e12..e3dc186 100644
--- a/doc/html/pcre2syntax.html
+++ b/doc/html/pcre2syntax.html
@@ -58,7 +58,7 @@ documentation. This document contains a quick-reference summary of the syntax.
 </P>
 <br><a name="SEC3" href="#TOC1">ESCAPED CHARACTERS</a><br>
 <P>
-This table applies to ASCII and Unicode environments. An unrecognized escape 
+This table applies to ASCII and Unicode environments. An unrecognized escape
 sequence causes an error.
 <pre>
   \a         alarm, that is, the BEL character (hex 07)
@@ -85,7 +85,7 @@ following are also recognized:
 When \x is not followed by {, from zero to two hexadecimal digits are read,
 but in ALT_BSUX mode \x must be followed by two hexadecimal digits to be
 recognized as a hexadecimal escape; otherwise it matches a literal "x".
-Likewise, if \u (in ALT_BSUX mode) is not followed by four hexadecimal digits 
+Likewise, if \u (in ALT_BSUX mode) is not followed by four hexadecimal digits
 or (in EXTRA_ALT_BSUX mode) a sequence of hex digits in curly brackets, it
 matches a literal "u".
 </P>
diff --git a/doc/html/pcre2test.html b/doc/html/pcre2test.html
index 1eb1553..8f35acc 100644
--- a/doc/html/pcre2test.html
+++ b/doc/html/pcre2test.html
@@ -606,10 +606,10 @@ for a description of the effects of these options.
   /s  dotall                    set PCRE2_DOTALL
       dupnames                  set PCRE2_DUPNAMES
       endanchored               set PCRE2_ENDANCHORED
-      escaped_cr_is_lf          set PCRE2_EXTRA_ESCAPED_CR_IS_LF 
+      escaped_cr_is_lf          set PCRE2_EXTRA_ESCAPED_CR_IS_LF
   /x  extended                  set PCRE2_EXTENDED
   /xx extended_more             set PCRE2_EXTENDED_MORE
-      extra_alt_bsux            set PCRE2_EXTRA_ALT_BSUX 
+      extra_alt_bsux            set PCRE2_EXTRA_ALT_BSUX
       firstline                 set PCRE2_FIRSTLINE
       literal                   set PCRE2_LITERAL
       match_line                set PCRE2_EXTRA_MATCH_LINE
@@ -1043,7 +1043,7 @@ process.
       aftertext                  show text after match
       allaftertext               show text after captures
       allcaptures                show all captures
-      allvector                  show the entire ovector 
+      allvector                  show the entire ovector
       allusedtext                show all consulted text
       altglobal                  alternative global matching
   /g  global                     global matching
@@ -1051,9 +1051,9 @@ process.
       mark                       show mark values
       replace=&#60;string&#62;           specify a replacement string
       startchar                  show starting character when relevant
-      substitute_callout         use substitution callouts 
+      substitute_callout         use substitution callouts
       substitute_extended        use PCRE2_SUBSTITUTE_EXTENDED
-      substitute_skip=&#60;n&#62;        skip substitution number n 
+      substitute_skip=&#60;n&#62;        skip substitution number n
       substitute_overflow_length use PCRE2_SUBSTITUTE_OVERFLOW_LENGTH
       substitute_stop=&#60;n&#62;        skip substitution number n and greater
       substitute_unknown_unset   use PCRE2_SUBSTITUTE_UNKNOWN_UNSET
@@ -1191,7 +1191,7 @@ pattern.
       aftertext                  show text after match
       allaftertext               show text after captures
       allcaptures                show all captures
-      allvector                  show the entire ovector 
+      allvector                  show the entire ovector
       allusedtext                show all consulted text (non-JIT only)
       altglobal                  alternative global matching
       callout_capture            show captures at callout time
@@ -1221,9 +1221,9 @@ pattern.
       replace=&#60;string&#62;           specify a replacement string
       startchar                  show startchar when relevant
       startoffset=&#60;n&#62;            same as offset=&#60;n&#62;
-      substitute_callout         use substitution callouts 
+      substitute_callout         use substitution callouts
       substitute_extedded        use PCRE2_SUBSTITUTE_EXTENDED
-      substitute_skip=&#60;n&#62;        skip substitution number n 
+      substitute_skip=&#60;n&#62;        skip substitution number n
       substitute_overflow_length use PCRE2_SUBSTITUTE_OVERFLOW_LENGTH
       substitute_stop=&#60;n&#62;        skip substitution number n and greater
       substitute_unknown_unset   use PCRE2_SUBSTITUTE_UNKNOWN_UNSET
@@ -1306,9 +1306,9 @@ result, and also for DFA matching, provides a means of checking that there are
 no unexpected modifications to ovector fields. Before each match attempt, the
 ovector is filled with a special value, and if this is found in both elements
 of a capturing pair, "&#60;unchanged&#62;" is output. After a successful match, this
-applies to all groups after the maximum capture group for the pattern. In other 
-cases it applies to the entire ovector. After a partial match, the first two 
-elements are the only ones that should be set. After a DFA match, the amount of 
+applies to all groups after the maximum capture group for the pattern. In other
+cases it applies to the entire ovector. After a partial match, the first two
+elements are the only ones that should be set. After a DFA match, the amount of
 ovector that is used depends on the number of matches that were found.
 </P>
 <br><b>
@@ -1320,7 +1320,7 @@ functions, unless <b>callout_none</b> is specified. Its behaviour can be
 controlled by various modifiers listed above whose names begin with
 <b>callout_</b>. Details are given in the section entitled "Callouts"
 <a href="#callouts">below.</a>
-Testing callouts from <b>pcre2_substitute()</b> is decribed separately in 
+Testing callouts from <b>pcre2_substitute()</b> is decribed separately in
 "Testing the substitution function"
 <a href="#substitution">below.</a>
 </P>
@@ -1449,14 +1449,14 @@ matching provokes an error return ("bad option value") from
 Testing substitute callouts
 </b><br>
 <P>
-If the <b>substitute_callout</b> modifier is set, a substitution callout 
+If the <b>substitute_callout</b> modifier is set, a substitution callout
 function is set up. When it is called (after each substitution), details of the
 the input and output strings are output. For example:
 <pre>
   /abc/g,replace=&#60;$0&#62;,substitute_callout
       abcdefabcpqr
    1(1) Old 0 3 "abc" New 0 5 "&#60;abc&#62;"
-   2(1) Old 6 9 "abc" New 8 13 "&#60;abc&#62;" 
+   2(1) Old 6 9 "abc" New 8 13 "&#60;abc&#62;"
    2: &#60;abc&#62;def&#60;abc&#62;pqr
 </pre>
 The first number on each callout line is the count of matches. The
@@ -1466,11 +1466,11 @@ listed the offsets of the old substring, its contents, and the same for the
 replacement.
 </P>
 <P>
-By default, the substitution callout function returns zero, which accepts the 
-replacement and causes matching to continue if /g was used. Two further 
-modifiers can be used to test other return values. If <b>substitute_skip</b> is 
-set to a value greater than zero the callout function returns +1 for the match 
-of that number, and similarly <b>substitute_stop</b> returns -1. These cause the 
+By default, the substitution callout function returns zero, which accepts the
+replacement and causes matching to continue if /g was used. Two further
+modifiers can be used to test other return values. If <b>substitute_skip</b> is
+set to a value greater than zero the callout function returns +1 for the match
+of that number, and similarly <b>substitute_stop</b> returns -1. These cause the
 replacement to be rejected, and -1 causes no further matching to take place. If
 either of them are set, <b>substitute_callout</b> is assumed. For example:
 <pre>
@@ -1483,7 +1483,7 @@ either of them are set, <b>substitute_callout</b> is assumed. For example:
    1(1) Old 0 3 "abc" New 0 5 "&#60;abc&#62; STOPPED"
    1: abcdefabcpqr
 </pre>
-If both are set for the same number, stop takes precedence. Only a single skip 
+If both are set for the same number, stop takes precedence. Only a single skip
 or stop is supported, which is sufficient for testing that the feature works.
 </P>
 <br><b>
diff --git a/doc/html/pcre2unicode.html b/doc/html/pcre2unicode.html
index 53a2e11..268119c 100644
--- a/doc/html/pcre2unicode.html
+++ b/doc/html/pcre2unicode.html
@@ -82,7 +82,7 @@ The escape sequence \C can be used to match a single code unit in a UTF mode,
 but its use can lead to some strange effects because it breaks up multi-unit
 characters (see the description of \C in the
 <a href="pcre2pattern.html"><b>pcre2pattern</b></a>
-documentation). For this reason, there is a build-time option that disables 
+documentation). For this reason, there is a build-time option that disables
 support for \C completely. There is also a less draconian compile-time option
 for locking out the use of \C when a pattern is compiled.
 </P>
@@ -144,14 +144,14 @@ scripts are commonly used together, and because some diacritical and other
 marks are used with multiple scripts, it is not that simple.
 </P>
 <P>
-Every Unicode character has a Script property, mostly with a value 
+Every Unicode character has a Script property, mostly with a value
 corresponding to the name of a script, such as Latin, Greek, or Cyrillic. There
 are also three special values:
 </P>
 <P>
 "Unknown" is used for code points that have not been assigned, and also for the
 surrogate code points. In the PCRE2 32-bit library, characters whose code
-points are greater than the Unicode maximum (U+10FFFF), which are accessible 
+points are greater than the Unicode maximum (U+10FFFF), which are accessible
 only in non-UTF mode, are assigned the Unknown script.
 </P>
 <P>
@@ -165,20 +165,20 @@ previous character. These are considered to take on the script of the character
 that they modify.
 </P>
 <P>
-Some Inherited characters are used with many scripts, but many of them are only 
-normally used with a small number of scripts. For example, U+102E0 (Coptic 
-Epact thousands mark) is used only with Arabic and Coptic. In order to make it 
-possible to check this, a Unicode property called Script Extension exists. Its 
-value is a list of scripts that apply to the character. For the majority of 
+Some Inherited characters are used with many scripts, but many of them are only
+normally used with a small number of scripts. For example, U+102E0 (Coptic
+Epact thousands mark) is used only with Arabic and Coptic. In order to make it
+possible to check this, a Unicode property called Script Extension exists. Its
+value is a list of scripts that apply to the character. For the majority of
 characters, the list contains just one script, the same one as the Script
 property. However, for characters such as U+102E0 more than one Script is
 listed. There are also some Common characters that have a single, non-Common
 script in their Script Extension list.
 </P>
 <P>
-The next section describes the basic rules for deciding whether a given string 
-of characters is a script run. Note, however, that there are some special cases 
-involving the Chinese Han script, and an additional constraint for decimal 
+The next section describes the basic rules for deciding whether a given string
+of characters is a script run. Note, however, that there are some special cases
+involving the Chinese Han script, and an additional constraint for decimal
 digits. These are covered in subsequent sections.
 </P>
 <br><b>
@@ -201,17 +201,17 @@ all the sets of scripts must not be empty.
 <P>
 A simple example is an Internet name such as "google.com". The letters are all
 in the Latin script, and the dot is Common, so this string is a script run.
-However, the Cyrillic letter "o" looks exactly the same as the Latin "o"; a 
+However, the Cyrillic letter "o" looks exactly the same as the Latin "o"; a
 string that looks the same, but with Cyrillic "o"s is not a script run.
 </P>
 <P>
-More interesting examples involve characters with more than one script in their 
+More interesting examples involve characters with more than one script in their
 Script Extension. Consider the following characters:
 <pre>
   U+060C  Arabic comma
   U+06D4  Arabic full stop
 </pre>
-The first has the Script Extension list Arabic, Hanifi Rohingya, Syriac, and 
+The first has the Script Extension list Arabic, Hanifi Rohingya, Syriac, and
 Thaana; the second has just Arabic and Hanifi Rohingya. Both of them could
 appear in script runs of either Arabic or Hanifi Rohingya. The first could also
 appear in Syriac or Thaana script runs, but the second could not.
@@ -220,8 +220,8 @@ appear in Syriac or Thaana script runs, but the second could not.
 The Chinese Han script
 </b><br>
 <P>
-The Chinese Han script is commonly used in conjunction with other scripts for 
-writing certain languages. Japanese uses the Hiragana and Katakana scripts 
+The Chinese Han script is commonly used in conjunction with other scripts for
+writing certain languages. Japanese uses the Hiragana and Katakana scripts
 together with Han; Korean uses Hangul and Han; Taiwanese Mandarin uses Bopomofo
 and Han. These three combinations are treated as special cases when checking
 script runs and are, in effect, "virtual scripts". Thus, a script run may