[Groff-commit] groff ./ChangeLog src/roff/nroff/nroff.man src/...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Branch:         
Changes by:     Werner LEMBERG <address@hidden> 05/04/13 05:56:32

Modified files:
        .              : ChangeLog 
        src/roff/nroff : nroff.man nroff.sh 

Log message:
        * src/roff/nroff/nroff.man: Document option `-M'.
        
        * src/roff/nroff/nroff.sh: Make the script accept option `-M'.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.810&tr2=1.811&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/roff/nroff/nroff.man.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/roff/nroff/nroff.sh.diff?tr1=1.16&tr2=1.17&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.810 groff/ChangeLog:1.811
--- groff/ChangeLog:1.810       Sat Apr  2 12:49:10 2005
+++ groff/ChangeLog     Wed Apr 13 05:56:32 2005
@@ -1,3 +1,11 @@
+2005-04-13  Werner LEMBERG  <address@hidden>
+
+       * src/roff/nroff/nroff.man: Document option `-M'.
+
+2005-04-13  Bruce Lilly  <address@hidden>
+
+       * src/roff/nroff/nroff.sh: Make the script accept option `-M'.
+
 2005-04-01  Kees Zeelenberg  <address@hidden>
             Werner LEMBERG  <address@hidden>
 
Index: groff/src/roff/nroff/nroff.man
diff -u groff/src/roff/nroff/nroff.man:1.16 groff/src/roff/nroff/nroff.man:1.17
--- groff/src/roff/nroff/nroff.man:1.16 Mon Jan  5 22:49:10 2004
+++ groff/src/roff/nroff/nroff.man      Wed Apr 13 05:56:32 2005
@@ -1,5 +1,5 @@
 .ig
-Copyright (C) 1989-2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright (C) 1989-2001, 2002, 2003, 2005 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -16,9 +16,12 @@
 translations approved by the Free Software Foundation instead of in
 the original English.
 ..
+.
 .TH @address@hidden @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.
 .SH NAME
 @address@hidden \- emulate nroff command with groff
+.
 .SH SYNOPSIS
 .nr a \n(.j
 .ad l
@@ -30,8 +33,10 @@
 .ie \\n(.$-1 .RI "[\ \fB\\$1\fP" "\\$2" "\ ]"
 .el .RB "[\ " "\\$1" "\ ]"
 ..
+.
 .OP \-CchipStUv
 .OP \-d cs
+.OP \-M dir
 .OP \-m name
 .OP \-n num
 .OP \-o list
@@ -40,6 +45,7 @@
 .RI "[\ " "file" "\ .\|.\|.\ ]"
 .br
 .ad \na
+.
 .SH DESCRIPTION
 The
 .B @address@hidden
@@ -89,6 +95,7 @@
 .BR \-d ,
 .BR \-C ,
 .BR \-i ,
+.BR \-M ,
 .BR \-m ,
 .BR \-n ,
 .BR \-o ,
@@ -117,6 +124,7 @@
 .BR groff . 
 .B \-v
 shows the version number.
+.
 .SH ENVIRONMENT
 .TP
 .SM
@@ -130,6 +138,7 @@
 so warnings are suppressed.
 nroff-style character definitions (in the file tty-char.tmac) are also
 loaded to emulate unrepresentable glyphs.
+.
 .SH "SEE ALSO"
 .BR groff (@MAN1EXT@),
 .BR @address@hidden (@MAN1EXT@),
Index: groff/src/roff/nroff/nroff.sh
diff -u groff/src/roff/nroff/nroff.sh:1.16 groff/src/roff/nroff/nroff.sh:1.17
--- groff/src/roff/nroff/nroff.sh:1.16  Tue Jan 25 20:39:15 2005
+++ groff/src/roff/nroff/nroff.sh       Wed Apr 13 05:56:32 2005
@@ -47,10 +47,10 @@
     -[eq] | -s*)
       # ignore these options
       ;;
-    -[dmrnoT])
+    -[dMmrnoT])
       echo "$prog: option $1 requires an argument" >&2
       exit 1 ;;
-    -[iptSUC] | -[dmrno]*)
+    -[iptSUC] | -[dMmrno]*)
       opts="$opts $1" ;;
     -Tascii | -Tlatin1 | -Tutf8 | -Tcp1047)
       T=$1 ;;
@@ -67,8 +67,8 @@
       echo "GNU nroff (groff) version @VERSION@"
       exit 0 ;;
     --help)
-      echo "usage: nroff [-CchipStUv] [-dCS] [-mNAME] [-nNUM] [-oLIST] [-rCN]"
-      echo "       [-Tname] [FILE...]"
+      echo "usage: nroff [-CchipStUv] [-dCS] [-MDIR] [-mNAME] [-nNUM] [-oLIST]"
+      echo "             [-rCN] [-Tname] [FILE...]"
       exit 0 ;;
     --)
       shift