Virgin import of FSF groff v1.16.1

3 files changed, 16 insertions, 9 deletions

diff --git a/contrib/groff/grodvi/Makefile.sub b/contrib/groff/grodvi/Makefile.sub
index a63905d..0e5d32c 100644
--- a/contrib/groff/grodvi/Makefile.sub
+++ b/contrib/groff/grodvi/Makefile.sub
@@ -3,4 +3,4 @@ MAN1=grodvi.n
 XLIBS=$(LIBDRIVER) $(LIBGROFF)
 MLIB=$(LIBM)
 OBJS=dvi.o
-CCSRCS=dvi.cc
+CCSRCS=$(srcdir)/dvi.cc
diff --git a/contrib/groff/grodvi/dvi.cc b/contrib/groff/grodvi/dvi.cc
index d139124..305470e1 100644
--- a/contrib/groff/grodvi/dvi.cc
+++ b/contrib/groff/grodvi/dvi.cc
@@ -19,6 +19,7 @@ with groff; see the file COPYING.  If not, write to the Free Software
 Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
 #include "driver.h"
+#include "nonposix.h"
 
 #define DEFAULT_LINEWIDTH 40
 static int linewidth = DEFAULT_LINEWIDTH;
@@ -186,8 +187,8 @@ public:
 };
 
 dvi_printer::dvi_printer()
-: byte_count(0), last_bop(-1), page_count(0), cur_font(0), fp(stdout),
-  max_h(0), max_v(0), pushed(0), line_thickness(-1), cur_point_size(-1)
+: fp(stdout), byte_count(0), last_bop(-1), page_count(0), max_h(0), max_v(0),
+  cur_font(0), cur_point_size(-1), pushed(0), line_thickness(-1)
 {
   if (font::res != RES)
     fatal("resolution must be %1", RES);
@@ -854,8 +855,8 @@ int main(int argc, char **argv)
     switch(c) {
     case 'v':
       {
-	extern const char *version_string;
-	fprintf(stderr, "grodvi version %s\n", version_string);
+	extern const char *Version_string;
+	fprintf(stderr, "grodvi version %s\n", Version_string);
 	fflush(stderr);
 	break;
       }
@@ -878,6 +879,9 @@ int main(int argc, char **argv)
     default:
       assert(0);
     }
+#ifdef SET_BINARY
+  SET_BINARY(fileno(stdout));
+#endif
   if (optind >= argc)
     do_file("-");
   else {
diff --git a/contrib/groff/grodvi/grodvi.man b/contrib/groff/grodvi/grodvi.man
index aeb894c..72baf24 100644
--- a/contrib/groff/grodvi/grodvi.man
+++ b/contrib/groff/grodvi/grodvi.man
@@ -1,5 +1,5 @@
 .ig \"-*- nroff -*-
-Copyright (C) 1989-1995 Free Software Foundation, Inc.
+Copyright (C) 1989-2000 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -38,6 +38,9 @@ grodvi \- convert groff output to TeX dvi format
 ] [
 .IR files \|.\|.\|.
 ]
+.PP
+It is possible to have whitespace between a command line option and its
+parameter.
 .SH DESCRIPTION
 .B grodvi
 is a driver for
@@ -139,7 +142,7 @@ for font and device description files.
 .B @FONTDIR@/devdvi/DESC
 Device description file.
 .TP
-.B @FONTDIR@/devdvi/ F
+.BI @FONTDIR@/devdvi/ F
 Font description file for font
 .IR F .
 .TP
@@ -153,7 +156,8 @@ use a different resolution (57816 units per inch) to those produced by
 \*(tx.
 Incorrectly written drivers which assume the resolution used by \*(tx,
 rather than using the resolution specified in the dvi file will not
-work with grodvi.
+work with
+.BR grodvi .
 .LP
 When using the
 .B \-d
@@ -165,7 +169,6 @@ and widths of rules be rounded.
 .BR tfmtodit (@MAN1EXT@),
 .BR groff (@MAN1EXT@),
 .BR @g@troff (@MAN1EXT@),
-.BR @g@eqn (@MAN1EXT@),
 .BR groff_out (@MAN5EXT@),
 .BR groff_font (@MAN5EXT@),
 .BR groff_char (@MAN7EXT@)