[groff] 03/03: [ms]: Warn if highlight macros given excess args.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 9a70d949aa56f1d29710af67456df8513269dc32
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Wed May 5 07:00:24 2021 +1000

    [ms]: Warn if highlight macros given excess args.
    
    * tmac/s.tmac (NL, SM, LG): Issue warning diagnostic if macro called
      with arguments.
      (par*define-font-macro): Construct font macro with diagnostic to warn
      if called with excess arguments.
      (UL, BX): Issue warning diagnostic if macro called with excess
      arguments.
    
    Fixes <https://savannah.gnu.org/bugs/index.php?60522>.
---
 ChangeLog   | 11 +++++++++++
 tmac/s.tmac |  6 ++++++
 2 files changed, 17 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index e101211..8983192 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2021-05-05  G. Branden Robinson <g.branden.robinson@gmail.com>
 
+       * tmac/s.tmac (NL, SM, LG): Issue warning diagnostic if macro
+       called with arguments.
+       (par*define-font-macro): Construct font macro with diagnostic to
+       warn if called with excess arguments.
+       (UL, BX): Issue warning diagnostic if macro called with excess
+       arguments.
+
+       Fixes <https://savannah.gnu.org/bugs/index.php?60522>.
+
+2021-05-05  G. Branden Robinson <g.branden.robinson@gmail.com>
+
        * doc/groff.texi: Delete redefinition of \putwordAppendix
        Texinfo macro.  This restores the word "Appendix" to the names
        of all appendices and fixes two bad internal links to Appendix
diff --git a/tmac/s.tmac b/tmac/s.tmac
index 7910954..c1ee3ba 100644
--- a/tmac/s.tmac
+++ b/tmac/s.tmac
@@ -1506,20 +1506,24 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 ..
 .\" In paragraph macros.
 .de NL
+.if \En[.$] .@warning arguments to .NL ignored
 .ie (\\n[\\n[.ev]:PS] >= 1000) \
 .      ps (\\n[\\n[.ev]:PS]z / 1000u)
 .el \
 .      ps \\n[\\n[.ev]:PS]
 ..
 .de SM
+.if \En[.$] .@warning arguments to .SM ignored
 .ps -2
 ..
 .de LG
+.if \En[.$] .@warning arguments to .LG ignored
 .ps +2
 ..
 .\" par*define-font-macro macro font
 .de par*define-font-macro
 .de \\$1
+.if \En[.$]>3 .@warning excess arguments to .\\$1 ignored
 .ie \En[.$] \{\
 .      nr par*prev-font \En[.f]
 \&\E$3\f[\\$2]\E$1\f[\En[par*prev-font]]\E$2
@@ -1535,10 +1539,12 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 .el   .par*define-font-macro CW CR
 .\" underline a word
 .de UL
+.if \En[.$]>2 .@warning excess arguments to .UL ignored
 \Z'\\$1'\v'.25m'\D'l \w'\\$1'u 0'\v'-.25m'\\$2
 ..
 .\" box a word
 .de BX
+.if \En[.$]>1 .@warning excess arguments to .BX ignored
 .nr par*bxw \w'\\$1'
 .ie t \{\
 .nr par*bxw +.4m