* NEWS: Updated.

* src/roff/nroff/nroff.sh: Add options -w and -W.
* src/roff/nroff/nroff.man: Document them.


* tmac/hyphenex.pl: Update header output.

5 files changed, 31 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 5be8e85d..050b8e95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2007-12-06  Werner LEMBERG  <wl@gnu.org>
+
+	* NEWS: Updated.
+
+2007-12-06  Colin Watson  <cjwatson@debian.org>
+
+	* src/roff/nroff/nroff.sh: Add options -w and -W.
+	* src/roff/nroff/nroff.man: Document them.
+
+2007-12-06  Karl Berry  <karl@freefriends.org>
+
+	* tmac/hyphenex.pl: Update header output.
+
 2007-11-29  Werner LEMBERG  <wl@gnu.org>
 
 	* src/devices/grotty/tty.cpp (tty_printer::line): Fix line lengths.
diff --git a/NEWS b/NEWS
index dea9b8ab..6950df43 100644
--- a/NEWS
+++ b/NEWS
@@ -69,6 +69,12 @@ o A new escape `\$^' has been added.  It represents the parameters of a
 o A new read-only number register `.O' is available which returns the
   current suppression level as set by the `\O' escape.
   
+Nroff
+-----
+
+o Two new command line options `-w' and `-W' are accepted and passed to
+  groff to enable and disable warning messages, respectively.
+
 Pic
 ---
 
diff --git a/src/roff/nroff/nroff.man b/src/roff/nroff/nroff.man
index 19350c72..df57a023 100644
--- a/src/roff/nroff/nroff.man
+++ b/src/roff/nroff/nroff.man
@@ -34,7 +34,7 @@ the original English.
 ..
 
 .SY @g@nroff
-.OP \-CchipStUv
+.OP \-CchipStUvwW
 .OP \-d cs
 .OP \-M dir
 .OP \-m name
@@ -109,8 +109,10 @@ The
 .BR \-m ,
 .BR \-n ,
 .BR \-o ,
+.BR \-r ,
+.BR \-w ,
 and
-.B \-r
+.B \-W
 options have the effect described in
 .BR @g@troff (@MAN1EXT@).
 In addition,
@@ -156,8 +158,7 @@ executable before searching in PATH.  If unset, `@BINDIR@' is used.
 .
 .SH NOTES
 This shell script is basically intended for use with
-.BR man (1),
-so warnings are suppressed.
+.BR man (1).
 nroff-style character definitions (in the file tty-char.tmac) are also
 loaded to emulate unrepresentable glyphs.
 .
diff --git a/src/roff/nroff/nroff.sh b/src/roff/nroff/nroff.sh
index afd6bf90..2e249054 100644
--- a/src/roff/nroff/nroff.sh
+++ b/src/roff/nroff/nroff.sh
@@ -78,10 +78,10 @@ for i
     -[eq] | -s*)
       # ignore these options
       ;;
-    -[dMmrnoT])
+    -[dMmrnoTwW])
       echo "$prog: option $1 requires an argument" >&2
       exit 1 ;;
-    -[iptSUC] | -[dMmrno]*)
+    -[iptSUC] | -[dMmrnowW]*)
       opts="$opts $1" ;;
     -T*)
       Topt=$1 ;;
@@ -96,7 +96,7 @@ for i
       exit 0 ;;
     --help)
       echo "usage: nroff [-CchipStUv] [-dCS] [-MDIR] [-mNAME] [-nNUM] [-oLIST]"
-      echo "             [-rCN] [-Tname] [FILE...]"
+      echo "             [-rCN] [-Tname] [-WNAME] [-wNAME] [FILE...]"
       exit 0 ;;
     --)
       shift
@@ -134,8 +134,7 @@ esac
 @GROFF_BIN_PATH_SETUP@
 export GROFF_BIN_PATH
 
-# This shell script is intended for use with man, so warnings are
-# probably not wanted.  Also load nroff-style character definitions.
+# Load nroff-style character definitions too.
 
 PATH="$GROFF_RUNTIME$PATH" groff -mtty-char $T $opts ${1+"$@"}
 
diff --git a/tmac/hyphenex.pl b/tmac/hyphenex.pl
index 6d24a647..7cc54663 100644
--- a/tmac/hyphenex.pl
+++ b/tmac/hyphenex.pl
@@ -1,4 +1,4 @@
-#! /usr/bin/perl
+#! /usr/bin/env perl
 #
 #
 # hyphenex.pl
@@ -19,14 +19,14 @@
 
 # print header
 print "% Hyphenation exceptions for US English,\n";
-print "% based on the hyphenation exception log article in TUGBoat.\n";
+print "% based on hyphenation exception log articles in TUGboat.\n";
 print "%\n";
 print "% Copyright 2007 TeX Users Group.\n";
 print "% You may freely use, modify and/or distribute this file.\n";
 print "%\n";
 print "% This is an automatically generated file.  Do not edit!\n";
 print "%\n";
-print "% Please contact Barbara Beeton <bnb\@ams.org>\n";
+print "% Please contact the TUGboat editorial staff <tugboat\@tug.org>\n";
 print "% for corrections and omissions.\n";
 print "\n";
 print "\\hyphenation{\n";