[groff] 04/09: [nroff] Recognize -E and pass it to troff.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit f1af5cdaf19c4c8f28970daa17e867a9864bf639
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Tue Oct 20 22:01:40 2020 +1100

    [nroff] Recognize -E and pass it to troff.
    
    * src/roff/nroff/nroff.sh: Recognize -E option and pass it through to
      troff.  Document it in usage message.
    * src/roff/nroff/nroff.1.man: Document new -E option.
    
    Tested with "printf '\\' | nroff -E", the shortest way to provoke a
    troff _error_ from the _content_ of input that I know.  Anyone for golf?
    
    Based on a patch by Ingo Schwarze.
    
    Fixes <https://savannah.gnu.org/bugs/index.php?44289>.
---
 ChangeLog                  | 10 ++++++++++
 NEWS                       |  6 ++++--
 src/roff/nroff/nroff.1.man |  5 +++--
 src/roff/nroff/nroff.sh    |  4 ++--
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 873faf3..1a86a6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2020-10-20  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * src/roff/nroff/nroff.sh: Recognize -E option and pass it
+       through to troff.  Document it in usage message.
+       * src/roff/nroff/nroff.1.man: Document new -E option.
+
+       Based on a patch by Ingo Schwarze.
+
+       Fixes <https://savannah.gnu.org/bugs/index.php?44289>.
+
 2020-10-18  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * tmac/an-old.tmac: Stop remapping ` and '.  Our own pages now
diff --git a/NEWS b/NEWS
index 69380be..c60f64b 100644
--- a/NEWS
+++ b/NEWS
@@ -7,8 +7,8 @@
 This file describes recent user-visible changes in groff.  Bug fixes are
 not described.  There are more details in the man and info pages.
 
-VERSION 1.22.5
-==============
+VERSION 1.23
+============
 
 Troff
 -----
@@ -86,6 +86,8 @@ o The new option -V emits the constructed groff command that 
nroff would
   prompt; this is a historical deficiency of the Bourne shell family not
   yet corrected by the POSIX standard.
 
+o nroff now recognizes the -E option and passes it through to troff.
+
 Macro Packages
 --------------
 
diff --git a/src/roff/nroff/nroff.1.man b/src/roff/nroff/nroff.1.man
index 42e385e..c82462d 100644
--- a/src/roff/nroff/nroff.1.man
+++ b/src/roff/nroff/nroff.1.man
@@ -35,7 +35,7 @@
 .\" ====================================================================
 .
 .SY @g@nroff
-.RB [ \-cChipStUV ]
+.RB [ \-cCEhipStUV ]
 [\c
 .BI \-d cs\c
 ]
@@ -96,7 +96,7 @@ language for typewriter-like devices such as terminal 
emulators.
 .
 .P
 GNU
-.I @g@nroff
+.I nroff \" GNU
 emulates the AT&T
 .I nroff
 command using
@@ -148,6 +148,7 @@ permitted between an option and its argument.
 The
 .BR \-C ,
 .BR \-d ,
+.BR \-E ,
 .BR \-i ,
 .BR \-m ,
 .BR \-M ,
diff --git a/src/roff/nroff/nroff.sh b/src/roff/nroff/nroff.sh
index 86deaf4..66f5334 100644
--- a/src/roff/nroff/nroff.sh
+++ b/src/roff/nroff/nroff.sh
@@ -75,7 +75,7 @@ do
     -[dmMnoPrTwW])
       echo "$prog: option '$1' requires an argument" >&2
       exit 1 ;;
-    -[CipStU] | -[dMmrnoPwW]*)
+    -[CEipStU] | -[dMmrnoPwW]*)
       opts="$opts $1" ;;
     -T*)
       Topt=$1 ;;
@@ -94,7 +94,7 @@ do
       opts="$opts $1" ;;
     --help)
       cat <<EOF
-usage: nroff [-cChipStUV] [-dCS] [-mNAME] [-MDIR] [-nNUM] [-oLIST]
+usage: nroff [-cCEhipStUV] [-dCS] [-mNAME] [-MDIR] [-nNUM] [-oLIST]
              [-Popt ...] [-rCN] [-Tname] [-wNAME] [-WNAME] [FILE ...]
 EOF
       exit 0 ;;