A number of tidies, file renames, etc.

git-svn-id: svn://vcs.exim.org/pcre/code/trunk@127 2f5784b3-3f2a-0410-8824-cb99058d5e15

14 files changed, 39 insertions, 26 deletions

diff --git a/ChangeLog b/ChangeLog
index 7f6f633..0b1ece9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,8 +32,8 @@ Version 7.1 12-Mar-07
 
  5. Updated the support (such as it is) for Virtual Pascal, thanks to Stefan
     Weber: (1) pcre_internal.h was missing some function renames; (2) updated
-    makevp.bat for the current PCRE, using the additional files !compile.txt,
-    !linklib.txt, and pcregexp.pas.
+    makevp.bat for the current PCRE, using the additional files
+    makevp-compile.txt, makevp-linklib.txt, and pcregexp.pas.
 
  6. A Windows user reported a minor discrepancy with test 2, which turned out
     to be caused by a trailing space on an input line that had got lost in his
diff --git a/maint/Tech.Notes b/HACKING
index c75b3e8..c75b3e8 100644
--- a/maint/Tech.Notes
+++ b/HACKING
diff --git a/Makefile.am b/Makefile.am
index 7dcf101..328a616 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -74,14 +74,15 @@ noinst_PROGRAMS =
 CLEANFILES =
 MAINTAINERCLEANFILES =
 
-# Additional files to bundle with the distribution.
+# Additional files to bundle with the distribution, over and above what 
+# the Autotools include by default.
 EXTRA_DIST =
 
 # These files contain maintenance information
 EXTRA_DIST += \
   doc/perltest.txt \
   NON-UNIX-USE \
-  INSTALL
+  HACKING 
 
 # These files are used in the preparation of a release
 EXTRA_DIST += \
@@ -89,13 +90,13 @@ EXTRA_DIST += \
   CleanTxt \
   Detrail \
   132html \
-  Index.html
+  doc/index.html.src
 
 # These files are to do with building for Virtual Pascal
 EXTRA_DIST += \
   makevp.bat \
-  !compile.txt \
-  !linklib.txt \
+  makevp-compile.txt \
+  makevp-linklib.txt \
   pcregexp.pas
 
 # These files are usable versions of pcre.h and config.h that are distributed
diff --git a/Makefile.in b/Makefile.in
index 6b8887f..e8f1f4b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -405,7 +405,8 @@ noinst_SCRIPTS = RunTest RunGrepTest
 CLEANFILES = pcre_chartables.c testsavedregex teststderr testtry
 MAINTAINERCLEANFILES = config-cmake.h.in
 
-# Additional files to bundle with the distribution.
+# Additional files to bundle with the distribution, over and above what 
+# the Autotools include by default.
 
 # These files contain maintenance information
 
@@ -419,8 +420,8 @@ MAINTAINERCLEANFILES = config-cmake.h.in
 
 # The pcre_printint.src file is #included by some source files, so it must be
 # distributed.
-EXTRA_DIST = doc/perltest.txt NON-UNIX-USE INSTALL PrepareRelease \
-	CleanTxt Detrail 132html Index.html makevp.bat !compile.txt \
+EXTRA_DIST = doc/perltest.txt NON-UNIX-USE PrepareRelease CleanTxt \
+	Detrail 132html doc/index.html.src makevp.bat !compile.txt \
 	!linklib.txt pcregexp.pas pcre.h.generic config.h.generic \
 	pcre_printint.src RunTest.bat testdata/grepinput \
 	testdata/grepinput8 testdata/grepinputx testdata/greplist \
diff --git a/NON-UNIX-USE b/NON-UNIX-USE
index 7c57ff8..ccefe8c 100644
--- a/NON-UNIX-USE
+++ b/NON-UNIX-USE
@@ -92,8 +92,8 @@ xxx.cc files.
 BUILDING FOR VIRTUAL PASCAL
 
 Stefan Weber contributed the following files in the distribution for building
-PCRE for use with VP/Borland: !compile.txt, !linklib.txt, makevp.bat,
-pcregexp.pas.
+PCRE for use with VP/Borland: makevp-compile.txt, makevp-linklib.txt,
+makevp.bat, pcregexp.pas.
 
 
 BUILDING UNDER WINDOWS WITH BCC5.5
diff --git a/PrepareRelease b/PrepareRelease
index 40c5f6c..07b2532 100755
--- a/PrepareRelease
+++ b/PrepareRelease
@@ -17,9 +17,10 @@
 
 # Detrail     A Perl script that removes trailing spaces from files.
 
-# Index.html  A file that is copied as index.html into the doc/html
-#             directory when the HTML documentation is built. It works like
-#             this so that doc/html can be deleted and re-created from scratch.
+# doc/index.html.src  
+#             A file that is copied as index.html into the doc/html directory
+#             when the HTML documentation is built. It works like this so that
+#             doc/html can be deleted and re-created from scratch.
 
 
 # First, sort out the documentation
@@ -71,7 +72,7 @@ done
 
 echo "Making HTML documentation"
 /bin/rm html/*
-cp ../Index.html html/index.html
+cp index.html.src html/index.html
 
 for file in *.1 ; do
   base=`basename $file .1`
diff --git a/README b/README
index 1977979..48f0bbe 100644
--- a/README
+++ b/README
@@ -582,7 +582,7 @@ The distribution should contain the following files:
   ChangeLog              log of changes to the code
   CleanTxt               script to clean nroff output for txt man pages
   Detrail                script to remove trailing spaces
-  Index.html             the base HTML page
+  HACKING                some notes about the internals of PCRE 
   INSTALL                generic installation instructions
   LICENCE                conditions for the use of PCRE
   COPYING                the same, using GNU's standard name
@@ -606,6 +606,7 @@ The distribution should contain the following files:
                          )   automake
   doc/*.3                man page sources for the PCRE functions
   doc/*.1                man page sources for pcregrep and pcretest
+  doc/index.html.src     the base HTML page
   doc/html/*             HTML documentation
   doc/pcre.txt           plain text version of the man pages
   doc/pcretest.txt       plain text documentation of test program
@@ -634,8 +635,8 @@ The distribution should contain the following files:
 (E) Auxiliary files for VPASCAL
 
   makevp.bat
-  !compile.txt
-  !linklib.txt
+  makevp-compile.txt
+  makevp-linklib.txt
   pcregexp.pas
 
 (F) Auxiliary files for building PCRE "by hand"
diff --git a/configure b/configure
index 2de3a76..9c1847e 100755
--- a/configure
+++ b/configure
@@ -20280,7 +20280,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
 # We could be more clever here, given we're doing AC_SUBST with this
-# (eg set a var to be the name of the include file we want).  But we're not
+# (eg set a var to be the name of the include file we want). But we're not
 # so it's easy to change back to 'regular' autoconf vars if we needed to.
 
 
diff --git a/configure.ac b/configure.ac
index 9bd3ea4..fc89785 100644
--- a/configure.ac
+++ b/configure.ac
@@ -193,7 +193,7 @@ then
 AC_LANG_PUSH(C++)
 
 # We could be more clever here, given we're doing AC_SUBST with this
-# (eg set a var to be the name of the include file we want).  But we're not
+# (eg set a var to be the name of the include file we want). But we're not
 # so it's easy to change back to 'regular' autoconf vars if we needed to.
 AC_CHECK_HEADERS(string, [pcre_have_cpp_headers="1"],
                          [pcre_have_cpp_headers="0"])
@@ -251,7 +251,7 @@ fi
 if test "$enable_stack_for_recursion" = "no"; then
   AC_DEFINE([NO_RECURSE], [], [
     PCRE uses recursive function calls to handle backtracking while
-    matching.  This can sometimes be a problem on systems that have
+    matching. This can sometimes be a problem on systems that have
     stacks of limited size. Define NO_RECURSE to get a version that
     doesn't use recursion in the match() function; instead it creates
     its own stack by steam using pcre_recurse_malloc() to obtain memory
diff --git a/Index.html b/doc/index.html.src
index 29d3b01..eda1ad5 100644
--- a/Index.html
+++ b/doc/index.html.src
@@ -1,4 +1,10 @@
 <html>
+<!-- This is a manually maintained file that is the root of the HTML version of 
+     the PCRE documentation. When the HTML documents are built from the man 
+     page versions, the entire doc/html directory is emptied, this file is then 
+     copied into doc/html/index.html, and the remaining files therein are 
+     created by the 132html script.
+-->      
 <head>
 <title>PCRE specification</title>
 </head>
diff --git a/doc/pcreapi.3 b/doc/pcreapi.3
index b380d71..368219b 100644
--- a/doc/pcreapi.3
+++ b/doc/pcreapi.3
@@ -1585,8 +1585,9 @@ pattern. This is needed in order to gain access to the name-to-number
 translation table.
 .P
 These functions call \fBpcre_get_stringnumber()\fP, and if it succeeds, they
-then call \fIpcre_copy_substring()\fP or \fIpcre_get_substring()\fP, as
-appropriate.
+then call \fBpcre_copy_substring()\fP or \fBpcre_get_substring()\fP, as
+appropriate. \fBNOTE:\fP If PCRE_DUPNAMES is set and there are duplicate names,
+the behaviour may not be what you want (see the next section). 
 .
 .
 .SH "DUPLICATE SUBPATTERN NAMES"
diff --git a/!compile.txt b/makevp-compile.txt
index 6048517..6048517 100644
--- a/!compile.txt
+++ b/makevp-compile.txt
diff --git a/!linklib.txt b/makevp-linklib.txt
index cd02aa5..cd02aa5 100644
--- a/!linklib.txt
+++ b/makevp-linklib.txt
diff --git a/makevp.bat b/makevp.bat
index 47ca388..c318a1a 100644
--- a/makevp.bat
+++ b/makevp.bat
@@ -1,6 +1,8 @@
 @echo off
 
 :: AH 20-12-06 modified for new PCRE-7.0 and VP/BCC
+:: PH 19-03-07 renamed !compile.txt and !linklib.txt as makevp-compile and
+::             makevp-linklib
 
 REM This file was contributed by Alexander Tokarev for building PCRE for use
 REM with Virtual Pascal. It has not been tested with the latest PCRE release.
@@ -21,14 +23,14 @@ IF ERRORLEVEL 1 EXIT
 dftables pcre_chartables.c
 
 REM compile and link the PCRE library into lib: option -B for ASM compile works too
-bcc32 -a4 -c -RT- -y- -v- -u- -R- -Q- -X -d -fp -ff -P- -O2 -Oc -Ov -3 -w-8004 -w-8064 -w-8065 -w-8012 -DSTATIC -DVPCOMPAT -UDFTABLES -I%BORLAND%\include @!compile.txt
+bcc32 -a4 -c -RT- -y- -v- -u- -R- -Q- -X -d -fp -ff -P- -O2 -Oc -Ov -3 -w-8004 -w-8064 -w-8065 -w-8012 -DSTATIC -DVPCOMPAT -UDFTABLES -I%BORLAND%\include @makevp-compile.txt
 :: bcc32 -c -RT- -y- -v- -u- -P- -O2 -5 -DSTATIC -DVPCOMPAT -UDFTABLES -I%BORLAND%\include get.c maketables.c pcre.c study.c
 IF ERRORLEVEL 1 EXIT
 
 tlib %BORLAND%\lib\cw32.lib *calloc *del *strncmp *memcpy *memmove *memset *memcmp *strlen
 :: tlib %BORLAND%\lib\cw32.lib *calloc *del *strncmp *memcpy *memmove *memset
 IF ERRORLEVEL 1 EXIT
-tlib pcre%PCRE_VER%.lib @!linklib.txt +calloc.obj +del.obj +strncmp.obj +memcpy.obj +memmove.obj +memset.obj +memcmp.obj +strlen.obj
+tlib pcre%PCRE_VER%.lib @makevp-linklib.txt +calloc.obj +del.obj +strncmp.obj +memcpy.obj +memmove.obj +memset.obj +memcmp.obj +strlen.obj
 :: tlib pcre.lib +get.obj +maketables.obj +pcre.obj +study.obj +calloc.obj +del.obj +strncmp.obj +memcpy.obj +memmove.obj +memset.obj
 IF ERRORLEVEL 1 EXIT