keithmarshall pushed a commit to branch dev-gropdf-boxes in repository groff.
commit d71e05680e6b7843ed8da238f644888262574875 Author: Dave Kemper <saint.s...@gmail.com> AuthorDate: Tue Apr 6 10:48:33 2021 +0000 [nroff]: Support and document -k and -K options. * src/roff/nroff/nroff.sh: Recognize -k and -K options and pass them through to troff. Document them in usage message. * src/roff/nroff/nroff.1.man: Document new -k and -K options. Fixes <https://savannah.gnu.org/bugs/?60349>. --- NEWS | 4 ++-- src/roff/nroff/nroff.1.man | 7 ++++++- src/roff/nroff/nroff.sh | 7 ++++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/NEWS b/NEWS index 684a0e3..22c4d88 100644 --- a/NEWS +++ b/NEWS @@ -79,8 +79,8 @@ o The new option -V emits the constructed groff command that nroff would this is a historical deficiency of the Bourne shell family not yet corrected by the POSIX standard. -o nroff now recognizes the -b, -E, and -z options and passes them - through to troff. +o nroff now recognizes the -b, -E, -k, -K, and -z options and passes + them through to troff. Macro Packages -------------- diff --git a/src/roff/nroff/nroff.1.man b/src/roff/nroff/nroff.1.man index d621196..b43009d 100644 --- a/src/roff/nroff/nroff.1.man +++ b/src/roff/nroff/nroff.1.man @@ -35,11 +35,14 @@ .\" ==================================================================== . .SY @g@nroff -.RB [ \-bcCEhipStUVz ] +.RB [ \-bcCEhikpStUVz ] [\c .BI \-d cs\c ] [\c +.BI \-K arg\c +] +[\c .BI \-m name\c ] [\c @@ -150,6 +153,8 @@ The .BR \-d , .BR \-E , .BR \-i , +.BR \-k , +.BR \-K , .BR \-m , .BR \-M , .BR \-n , diff --git a/src/roff/nroff/nroff.sh b/src/roff/nroff/nroff.sh index d0a1289..f5dcff0 100644 --- a/src/roff/nroff/nroff.sh +++ b/src/roff/nroff/nroff.sh @@ -72,10 +72,10 @@ do -[eq] | -s*) # ignore these options ;; - -[dmMnoPrTwW]) + -[dKmMnoPrTwW]) echo "$prog: option '$1' requires an argument" >&2 exit 1 ;; - -[bCEipStUz] | -[dMmrnoPwW]*) + -[bCEikpStUz] | -[dKMmrnoPwW]*) opts="$opts $1" ;; -T*) Topt=$1 ;; @@ -93,8 +93,9 @@ do echo "GNU nroff (groff) version @VERSION@" opts="$opts $1" ;; --help) + # Wrap usage message at 80 columns. cat <<EOF -usage: nroff [-bcCEhipStUVz] [-dCS] [-mNAME] [-MDIR] [-nNUM] [-oLIST] +usage: nroff [-bcCEhikpStUVz] [-dCS] [-Karg] [-mNAME] [-MDIR] [-nNUM] [-oLIST] [-Popt ...] [-rCN] [-Tname] [-wNAME] [-WNAME] [FILE ...] EOF exit 0 ;; _______________________________________________ Groff-commit mailing list Groff-commit@gnu.org https://lists.gnu.org/mailman/listinfo/groff-commit