* doc/pic.ms: Minor fix.

* src/preproc/html/pre-html.cc (scanArguments): Don't handle `-?'
as a valid command line switch.
* src/devices/grohtml/post-html.cc (main): Ditto.
(usage): Updated.
* src/devices/grohtml/grohtml.man: Updated.
* src/roff/groff/groff.cc (main): Pass `-v' to predriver also.

5 files changed, 16 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 1a115563..99cc6d14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-10-05  Werner LEMBERG  <wl@gnu.org>
+
+	* doc/pic.ms: Minor fix.
+	* src/preproc/html/pre-html.cc (scanArguments): Don't handle `-?'
+	as a valid command line switch.
+	* src/devices/grohtml/post-html.cc (main): Ditto.
+	(usage): Updated.
+	* src/devices/grohtml/grohtml.man: Updated.
+	* src/roff/groff/groff.cc (main): Pass `-v' to predriver also.
+
 2001-10-04  Werner LEMBERG  <wl@gnu.org>
 
 	Implementing color support in troff, pic, grops, and grohtml.  These
diff --git a/doc/pic.ms b/doc/pic.ms
index 14bd5413..49f422b5 100644
--- a/doc/pic.ms
+++ b/doc/pic.ms
@@ -10,7 +10,7 @@
 .\" This document was written for free use and redistribution by
 .\" Eric S. Raymond <esr@thyrsus.com> in August 1995.
 .\"
-.\"	$Id: pic.ms,v 1.8 2001/10/05 14:12:11 wlemb Exp $	
+.\"	$Id: pic.ms,v 1.9 2001/10/05 21:42:29 wlemb Exp $	
 .\"
 .\" Set a proper TeX
 .ie t .ds tx T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X
@@ -81,8 +81,6 @@ and \fB.PE\fP markers, and passes through everything else.  The normal
 definitions of \fB.PS\fP and \fB.PE\fP in the \fIms\fP macro package
 and elsewhere have also the side-effect of centering the \fBpic\fP output
 on the page.
-.PP
-Other details of the \fI[gt]roff\fP(1) interface
 .NH 2
 PIC Error Messages
 .PP
diff --git a/src/devices/grohtml/post-html.cc b/src/devices/grohtml/post-html.cc
index 9bb08fcc..1f34b33b 100644
--- a/src/devices/grohtml/post-html.cc
+++ b/src/devices/grohtml/post-html.cc
@@ -2945,6 +2945,6 @@ int main(int argc, char **argv)
 
 static void usage(FILE *stream)
 {
-  fprintf(stream, "usage: %s [-vld?n] [-D dir] [-I image_stem] [-F dir] [files ...]\n",
+  fprintf(stream, "usage: %s [-vln] [-D dir] [-I image_stem] [-F dir] [files ...]\n",
 	  program_name);
 }
diff --git a/src/preproc/html/pre-html.cc b/src/preproc/html/pre-html.cc
index a83fa811..49eaac90 100644
--- a/src/preproc/html/pre-html.cc
+++ b/src/preproc/html/pre-html.cc
@@ -1185,7 +1185,7 @@ int scanArguments (int argc, char **argv)
     { "version", no_argument, 0, 'v' },
     { NULL, 0, 0, 0 }
   };
-  while ((c = getopt_long(argc, argv, "+o:i:I:D:F:vd?lrn", long_options, NULL))
+  while ((c = getopt_long(argc, argv, "+o:i:I:D:F:vdlrn", long_options, NULL))
 	 != EOF)
     switch(c) {
     case 'v':
diff --git a/src/roff/groff/groff.cc b/src/roff/groff/groff.cc
index 71529a0d..82c1c987 100644
--- a/src/roff/groff/groff.cc
+++ b/src/roff/groff/groff.cc
@@ -283,14 +283,14 @@ int main(int argc, char **argv)
     fatal("invalid device `%1'", device);
   if (!postdriver)
     fatal("no `postpro' command in DESC file for device `%1'", device);
-
   if (predriver && !zflag) {
     commands[TROFF_INDEX].insert_arg(commands[TROFF_INDEX].get_name());
     commands[TROFF_INDEX].set_name(predriver);
     // pass the device arguments to the predrivers as well
     commands[TROFF_INDEX].insert_args(Pargs);
+    if (vflag)
+      commands[TROFF_INDEX].insert_arg("-v");
   }
-
   const char *real_driver = 0;
   if (Xflag) {
     real_driver = postdriver;
@@ -549,7 +549,7 @@ void possible_command::insert_arg(const char *s)
 
 void possible_command::insert_args(string s)
 {
-  const char *p =  s.contents();
+  const char *p = s.contents();
   const char *end = p + s.length();
   int l = 0;
   if (p >= end)