* src/roff/nroff/nroff.sh: Adding -p (pic) and -t (tbl) options.

Fix usage of GROFF_BIN_PATH.
* src/roff/nroff/nroff.man: Updated.


* NEWS: Fixing typos.
Updated.

4 files changed, 36 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index e9b435aa..b7cb7689 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2001-04-18  Ruslan Ermilov  <ru@FreeBSD.org>
+
+	* src/roff/nroff/nroff.sh: Adding -p (pic) and -t (tbl) options.
+	Fix usage of GROFF_BIN_PATH.
+	* src/roff/nroff/nroff.man: Updated.
+
+2001-04-18  Werner LEMBERG  <wl@gnu.org>
+
+	* NEWS: Fixing typos.
+	Updated.
+
 Version 1.17 released
 =====================
 
diff --git a/NEWS b/NEWS
index 4866f4f5..77c614f5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+Nroff
+-----
+
+o Options -p (pic) and -t (tbl) added.
+
+o The environment variable GROFF_BIN_PATH will now be checked before PATH
+  for finding groff.
+
+VERSION 1.17
+============
+
 This file describes recent user-visible changes in groff.  Bug fixes
 are not described.  There are more details in the man pages.
 
@@ -164,7 +175,7 @@ o Calling the `fam' request without an argument switches back to the
   previous font family.
 
 o The new read-only register `.int' is set to a positive value if the last
-  output line is interrupted (i.e., if it contains `\c').
+  output line is interrupted (i.e., if the input line contains `\c').
 
 o The `writem' request is not new, but hasn't been documented before.  This
   is similar to `write' but instead of a string the contents of a given
@@ -174,15 +185,10 @@ o The read/write number register `hp' to get/set the current horizontal
   position relative to the input line isn't new but hasn't been documented
   properly before.
 
-o `\X' and `\Y' are no transparent for end-of-sentence recognition.
-
-o The `cu' request in nroff mode now works as documented (i.e., it does
-  underline spaces also).
-
-Nroff
------
+o `\X' and `\Y' are now transparent for end-of-sentence recognition.
 
-Option -v shows the version number.
+o The `cu' request in nroff mode now works as documented (i.e., it
+  underlines spaces also).
 
 Grog
 ----
@@ -190,8 +196,6 @@ Grog
 o The grog script will now work in non-compatibility mode also (which is the
   default).  As usual, use the `-C' option to activate compatibility mode.
 
-o Option -v shows the version number.
-
 Grops
 -----
 
diff --git a/src/roff/nroff/nroff.man b/src/roff/nroff/nroff.man
index c021316b..e9230bb6 100644
--- a/src/roff/nroff/nroff.man
+++ b/src/roff/nroff/nroff.man
@@ -36,7 +36,9 @@ the original English.
 .OP \-m name
 .OP \-n num
 .OP \-o list
+.OP \-p
 .OP \-r cn
+.OP \-t
 .OP \-T name
 .RI "[\ " file\|.\|.\|. "\ ]"
 .br
@@ -82,6 +84,10 @@ silently ignores options of
 or
 .BR \-s .
 Options 
+.B \-p
+(pic),
+.B \-t
+(tbl),
 .B \-S
 (safer) and
 .B \-U
@@ -97,7 +103,7 @@ shows the version number.
 .B GROFF_BIN_PATH
 A colon separated list of directories in which to search for the
 .B groff
-executable.  If unset, `@BINDIR@' is used.
+executable before searching in PATH.  If unset, `@BINDIR@' is used.
 .SH NOTES
 This shell script is basically intended for use with
 .BR man (1),
diff --git a/src/roff/nroff/nroff.sh b/src/roff/nroff/nroff.sh
index 0e9eebdd..cdc221f0 100644
--- a/src/roff/nroff/nroff.sh
+++ b/src/roff/nroff/nroff.sh
@@ -49,7 +49,7 @@ for i
     -[mrnoT])
       echo "$prog: option $1 requires an argument" >&2
       exit 1 ;;
-    -i | -[mrno]*)
+    -[ipt] | -[mrno]*)
       opts="$opts $1" ;;
     -Tascii | -Tlatin1 | -Tutf8 | -Tcp1047)
       T=$1 ;;
@@ -70,7 +70,7 @@ for i
       echo "GNU nroff (groff) version @VERSION@"
       exit 0 ;;
     --help)
-      echo "usage: nroff [-h] [-i] [-mNAME] [-nNUM] [-oLIST] [-rCN] [-Tname] [FILE...]"
+      echo "usage: nroff [-h] [-i] [-mNAME] [-nNUM] [-oLIST] [-p] [-rCN] [-t] [-Tname] [FILE...]"
       exit 0 ;;
     --)
       shift
@@ -89,10 +89,8 @@ done
 # This shell script is intended for use with man, so warnings are
 # probably not wanted.  Also load nroff-style character definitions.
 
-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+"$@"}
+PATH=$GROFF_BIN_PATH:$PATH groff $safer -Wall -mtty-char $T $opts ${1+"$@"}
 
 # eof