* src/include/lib.h [!HAVE_SNPRINTF]: Add declarations for

`snprintf' and `vsnprintf'.

* src/include/htmlindicate.h: Renamed to...
* src/include/htmlhint.h: This.
* src/include/Makefile.sub: Updated.
* src/preproc/eqn/main.cc: Updated.

* man/roff.man, man/groff_out.man, man/groff.man,
man/groff_diff.man, man/ditroff.man, src/roff/groff/groff.man,
src/roff/troff/troff.man: Updated to latest changes in www.tmac.

* win32-diffs: Updated.

6 files changed, 26 insertions, 19 deletions

diff --git a/src/include/Makefile.sub b/src/include/Makefile.sub
index b68e631c..cb484c0c 100644
--- a/src/include/Makefile.sub
+++ b/src/include/Makefile.sub
@@ -11,7 +11,7 @@ HDRS=\
   geometry.h \
   getopt.h \
   groff-getopt.h \
-  htmlindicate.h \
+  htmlhint.h \
   index.h \
   lib.h \
   macropath.h \
diff --git a/src/include/htmlindicate.h b/src/include/htmlhint.h
index f1f46f72..f1f46f72 100755..100644
--- a/src/include/htmlindicate.h
+++ b/src/include/htmlhint.h
diff --git a/src/include/lib.h b/src/include/lib.h
index 48129af0..6cebe33f 100644
--- a/src/include/lib.h
+++ b/src/include/lib.h
@@ -49,6 +49,13 @@ int is_prime(unsigned);
 #include <strings.h>
 #endif
 
+#ifndef HAVE_SNPRINTF
+extern "C" {
+  int snprintf(char *, size_t, const char *, /*args*/ ...);
+  int vsnprintf(char *, size_t, const char *, va_list);
+}
+#endif
+
 #ifndef HAVE_MKSTEMP
 /* since mkstemp() is defined as a real C++ function if taken from
    groff's mkstemp.cc we need a declaration */
diff --git a/src/preproc/eqn/main.cc b/src/preproc/eqn/main.cc
index cad3a4a9..dabac5fd 100644
--- a/src/preproc/eqn/main.cc
+++ b/src/preproc/eqn/main.cc
@@ -24,7 +24,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 #include "device.h"
 #include "searchpath.h"
 #include "macropath.h"
-#include "htmlindicate.h"
+#include "htmlhint.h"
 #include "pbox.h"
 #include "ctype.h"
 
diff --git a/src/roff/groff/groff.man b/src/roff/groff/groff.man
index 648177a1..baad66fc 100644
--- a/src/roff/groff/groff.man
+++ b/src/roff/groff/groff.man
@@ -275,7 +275,7 @@ The
 program and macro suite is the implementation of a
 .BR roff (@MAN7EXT@)
 system within the free software collection
-.URL "GNU" \%http://\:www.gnu.org .
+.URL http://\:www.gnu.org "GNU" .
 .
 The
 .I groff
@@ -1346,24 +1346,24 @@ be reproduced, and say which version of groff you are using.
 .
 Information on how to get groff and related information is available
 at the
-.URL "GNU website" http://\:www.gnu.org/\:software/\:groff .
+.URL http://\:www.gnu.org/\:software/\:groff "GNU website" .
 The most recent released version of groff is available for anonymous
 ftp at the
-.FTP "groff development site" \
-ftp://ftp.ffii.org/\:pub/\:groff/\:devel/\:groff-current.tar.gz .
+.URL ftp://ftp.ffii.org/\:pub/\:groff/\:devel/\:groff-current.tar.gz \
+     "groff development site" .
 .
 .P
 Three groff mailing lists are available:
 .TP
-.MAILTO bug-groff@gnu.org
+.MTO bug-groff@gnu.org
 for reporting bugs,
 .
 .TP
-.MAILTO groff@gnu.org
+.MTO groff@gnu.org
 for general discussion of groff,
 .
 .TP
-.MAILTO groff-commit@ffii.org
+.MTO groff-commit@ffii.org
 a read-only list showing logs of commitments to the CVS repository.
 .
 .P
@@ -1375,12 +1375,12 @@ at the top directory of the groff source package.
 There is a free implementation of the
 .B grap
 preprocessor, written by
-.MAILTO faber@lunabase.org " Ted Faber" .
+.MTO faber@lunabase.org " Ted Faber" .
 .
 The actual version can be found at the
 .
-.URL "grap website" \
-http://\:www.lunabase.org/\:~faber/\:Vault/\:software/\:grap/ .
+.URL http://\:www.lunabase.org/\:~faber/\:Vault/\:software/\:grap/ \
+     "grap website" .
 This is the only grap version supported by groff.
 .
 .
@@ -1396,17 +1396,17 @@ Documentation License) version 1.1 or later.
 .
 You should have received a copy of the FDL on your system, it is also
 available on-line at the
-.URL "GNU copyleft site" http://\:www.gnu.org/\:copyleft/\:fdl.html .
+.URL http://\:www.gnu.org/\:copyleft/\:fdl.html "GNU copyleft site" .
 .
 .P
 This document is based on the original groff man page written by
-.MAILTO jjc@jclark.com "James Clark" .
+.MTO jjc@jclark.com "James Clark" .
 .
 It was rewritten, enhanced, and put under the FDL license by
-.MAILTO bwarken@mayn.de "Bernd Warken" .
+.MTO bwarken@mayn.de "Bernd Warken" .
 .
 It is maintained by
-.MAILTO wl@gnu.org "Werner Lemberg" .
+.MTO wl@gnu.org "Werner Lemberg" .
 .
 .P
 .I groff
diff --git a/src/roff/troff/troff.man b/src/roff/troff/troff.man
index a815fcd3..98c37377 100644
--- a/src/roff/troff/troff.man
+++ b/src/roff/troff/troff.man
@@ -610,11 +610,11 @@ Documentation License) version 1.1 or later.
 .
 You should have received a copy of the FDL on your system, it is also
 available on-line at the
-.URL "GNU copyleft site" http://www.gnu.org/copyleft/fdl.html .
+.URL http://www.gnu.org/copyleft/fdl.html "GNU copyleft site" .
 This document was written by James Clark, with modifications from
-.URL "Werner Lemberg" mailto:wl@gnu.org
+.MTO wl@gnu.org "Werner Lemberg"
 and
-.URL "Bernd Warken" mailto:bwarken@mayn.de
+.MTO bwarken@mayn.de "Bernd Warken"
 .
 .P
 This document is part of