Merge Groff 1.17 changes.

3 files changed, 67 insertions, 19 deletions

diff --git a/contrib/groff/src/roff/groff/groff.man b/contrib/groff/src/roff/groff/groff.man
index 6244404..4bb321f 100644
--- a/contrib/groff/src/roff/groff/groff.man
+++ b/contrib/groff/src/roff/groff/groff.man
@@ -81,7 +81,7 @@ For PostScript printers and previewers
 For TeX dvi format.
 .TP
 .B X75
-For a 75 dpi X11 previewer.
+For a 75dpi X11 previewer.
 .TP
 .B X100
 For a 100dpi X11 previewer.
@@ -217,10 +217,12 @@ to
 before passing it to the postprocessor.
 .TP
 .B \-l
-Send the output to a printer.
+Send the output to a spooler for printing.
 The command used for this is specified by the
 .B print
-command in the device description file.
+command in the device description file (if not present,
+.B \-l
+has no effect).
 .TP
 .BI \-L arg
 Pass
@@ -236,6 +238,11 @@ does not prepend
 to
 .I arg
 before passing it to the postprocessor.
+If there is no
+.B print
+command in the device description file,
+.B \-L
+is ignored.
 .TP
 .BI \-T dev
 Prepare output for device
@@ -274,11 +281,16 @@ Safer mode.  Pass the
 .B \-S
 option to
 .B @g@pic
-and use the
-.B \%\-msafer
-macros with
+and disable the following
 .B @g@troff
-(enabled by default).
+requests:
+.BR .open ,
+.BR .opena ,
+.BR .pso ,
+.BR .sy ,
+and
+.BR .pi .
+For security reasons, safer mode is enabled by default.
 .TP
 .B \-U
 Unsafe mode.  Reverts to the old unsafe behaviour.
@@ -347,7 +359,10 @@ and
 .SM
 .B GROFF_TMAC_PATH
 A colon separated list of directories in which to search for
-macro files.
+macro files in addition to the default directories.
+See
+.BR troff (1)
+for more details.
 .TP
 .SM
 .B GROFF_TYPESETTER
@@ -357,12 +372,19 @@ Default device.
 .B GROFF_FONT_PATH
 A colon separated list of directories in which to search for the
 .BI dev name
-directory.
+directory in addition to the default one.
+See
+.BR troff (1)
+for more details.
 .TP
 .SM
-.B PATH
-The search path for commands executed by
+.B GROFF_BIN_PATH
+This search path, followed by
+.BR PATH ,
+will be used for commands executed by
 .BR groff .
+If not set, `@BINDIR@' is prepended to
+.BR PATH .
 .TP
 .SM
 .B GROFF_TMPDIR
@@ -467,5 +489,4 @@ The actual version can be found at
 .BR groff_man (@MAN7EXT@),
 .BR groff_ms (@MAN7EXT@),
 .BR groff_me (@MAN7EXT@),
-.BR groff_char (@MAN7EXT@),
-.BR groff_msafer (@MAN7EXT@)
+.BR groff_char (@MAN7EXT@)
diff --git a/contrib/groff/src/roff/nroff/nroff.man b/contrib/groff/src/roff/nroff/nroff.man
index e33feb9..f7f6d38 100644
--- a/contrib/groff/src/roff/nroff/nroff.man
+++ b/contrib/groff/src/roff/nroff/nroff.man
@@ -33,6 +33,7 @@ the original English.
 .ie \\n(.$-1 .RI "[\ \fB\\$1\fP" "\\$2" "\ ]"
 .el .RB "[\ " "\\$1" "\ ]"
 ..
+.OP \-v
 .OP \-h
 .OP \-i
 .OP \-m name
@@ -60,7 +61,9 @@ option with an argument other than
 .BR utf8 ,
 or
 .B cp1047
-will be ignored.
+will be ignored (and
+.B \-Tascii
+will be used).
 The
 .B \-h
 option
@@ -85,8 +88,10 @@ silently ignores options of
 or
 .BR \-s .
 Options 
-.BR \-p ,
-.BR \-t ,
+.B \-p
+(pic),
+.B \-t
+(tbl),
 .B \-S
 (safer) and
 .B \-U
@@ -94,11 +99,20 @@ Options
 .BR groff . 
 .B \-S
 is passed by default.
+.B \-v
+shows the version number.
+.SH ENVIRONMENT
+.TP
+.SM
+.B GROFF_BIN_PATH
+A colon separated list of directories in which to search for the
+.B groff
+executable.  If unset, `@BINDIR@' is used.
 .SH NOTES
 This shell script is basically intended for use with
 .BR man (1),
 so warnings are suppressed.
-nroff-style character definitions (in the file tmac.tty-char) are also
+nroff-style character definitions (in the file tty-char.tmac) are also
 loaded to emulate unrepresentable glyphs.
 .SH "SEE ALSO"
 .BR groff (@MAN1EXT@),
diff --git a/contrib/groff/src/roff/nroff/nroff.sh b/contrib/groff/src/roff/nroff/nroff.sh
index d658657..f2e02f3 100755
--- a/contrib/groff/src/roff/nroff/nroff.sh
+++ b/contrib/groff/src/roff/nroff/nroff.sh
@@ -52,7 +52,7 @@ for i
     -[mrnoT])
       echo "$prog: option $1 requires an argument" >&2
       exit 1 ;;
-    -[itp] | -[mrno]*)
+    -[ipt] | -[mrno]*)
       opts="$opts $1" ;;
     -Tascii | -Tlatin1 | -Tkoi8-r | -Tutf8 | -Tcp1047)
       T=$1 ;;
@@ -69,6 +69,12 @@ for i
       # Solaris 2.2 `man' uses -u0; ignore it,
       # since `less' and `more' can use the emboldening info.
       ;;
+    -v | --version)
+      echo "GNU nroff (groff) version @VERSION@"
+      exit 0 ;;
+    --help)
+      echo "usage: nroff [-h] [-i] [-mNAME] [-nNUM] [-oLIST] [-p] [-rCN] [-t] [-Tname] [FILE...]"
+      exit 0 ;;
     --)
       shift
       break ;;
@@ -85,4 +91,11 @@ done
 
 # This shell script is intended for use with man, so warnings are
 # probably not wanted.  Also load nroff-style character definitions.
-exec groff $safer -Wall -mtty-char $T $opts ${1+"$@"}
+
+OLD_PATH=$PATH
+: ${GROFF_BIN_PATH=@BINDIR@}
+export GROFF_BIN_PATH
+PATH=$GROFF_BIN_PATH
+PATH=$OLD_PATH groff $safer -Wall -mtty-char $T $opts ${1+"$@"}
+
+# eof