[groff] 03/18: tmac/e.tmac: Fix code style nits.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 2da708d81c261d8640114b5df230399a428ace11
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Tue Dec 28 14:18:27 2021 +1100

    tmac/e.tmac: Fix code style nits.
    
    * Use new terminology in diagnostic.  See commit 66ac1a8db9, 11
      December.
    * Drop unused '&&&' annotation for macro definitions.  This was a BSD
      me(7) implementation detail wherein parts of the package were broken
      out into module files, loaded if/when their macros were called.  groff
      me(7) is monolithic, except for devtag and refer(1) support.
    * Remove '&&' end macro when we're done using it.
---
 ChangeLog   | 12 ++++++++++++
 tmac/e.tmac | 24 ++++++++++++------------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c7134f9f..14de27fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2021-12-28  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * tmac/e.tmac: Fix code style nits.
+         - Use new terminology in diagnostic.  See commit 66ac1a8db9,
+           11 December.
+         - Drop unused '&&&' annotation for macro definitions.  This
+           was a BSD me(7) implementation detail wherein parts of the
+           package were broken out into module files, loaded if/when
+           their macros were called.  groff me(7) is monolithic, except
+           for devtag and refer(1) support.
+         - Remove '&&' end macro when we're done using it.
+
 2021-12-27  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        [me]: (Re-)localize strings.
diff --git a/tmac/e.tmac b/tmac/e.tmac
index 1221fccb..de65e068 100644
--- a/tmac/e.tmac
+++ b/tmac/e.tmac
@@ -48,13 +48,11 @@
 .\"*                                                           *
 .\"**************************************************************
 .\"
-.\"    Code on .de commands:
-.\"            ***     a user interface macro.
-.\"            &&&     a user interface macro which is redefined
-.\"                    when used to be the real thing.
-.\"            $$$     a macro which may be redefined by the user
-.\"                    to provide variant functions.
-.\"            ---     an internal macro.
+.\"    Macro definitions are annotated with a code:
+.\"            ***     user interface macro
+.\"            $$$     macro which may be redefined by the user
+.\"                    to provide variant functions
+.\"            ---     internal macro; not to be called by user
 .\"
 .
 .do nr devtag-needs-end-of-heading 0
@@ -170,8 +168,8 @@
 .
 ..
 .
-.rn nm @#              \" --- rename to original command
-.de nm                 \" --- turn on number mode preserving font info
+.rn nm @#              \" --- save troff request
+.de nm                 \" --- turn on number mode, preserving font info
 .ie \\n(.$ \
 \{\
 .      nr _S \\n(.s
@@ -535,7 +533,7 @@
 .      nr _L \\n(.l
 ..
 .
-.rn pl xP              \" *** save page length request
+.rn pl xP              \" --- save troff page length request
 .
 .de pl                 \" *** set page length
 .xP \\$1
@@ -549,7 +547,7 @@
 .nr _o \\n(.o
 ..
 .
-.\" Redefine the fam request to set the family in
+.\" Redefine the groff fam request to set the family in
 .\" environment 2 as well as the current environment.
 .if !\n(.g .ig
 .do rn fam @fam                \" --- set family in current environment
@@ -1411,6 +1409,8 @@
 .\}
 ..
 .
+.rm &&
+.
 .de PF                 \" *** end picture; "fly back" to top
 .if \\n(?n .do PS_nm_check resume
 .ls
@@ -1880,7 +1880,7 @@
 .if "\\$1"AB" \
 .      nr _0 5                 \" abstract
 .if \\n(_0=0 \
-.      @err invalid section type to '++': '\\$1'
+.      @err invalid segment type to '++': '\\$1'
 .nr ?R 0
 .if \\n(_0>10 \
 \{\