[bug #55109] [PATCH] s.tmac: Add the name of the calling macro to a diagnostic

[Bjarni Ingi Gislason]

URL:
  <https://savannah.gnu.org/bugs/?55109>

                 Summary: [PATCH] s.tmac: Add the name of the calling macro to
a diagnostic
                 Project: GNU troff
            Submitted by: bjarniig
            Submitted on: Tue 27 Nov 2018 01:27:33 AM UTC
                Category: Macro - ms
                Severity: 3 - Normal
              Item Group: New feature
                  Status: None
                 Privacy: Public
             Assigned to: None
             Open/Closed: Open
         Discussion Lock: Any
         Planned Release: None

    _______________________________________________________

Details:


>From c4627d1f7602d2413f5bed3cd8bf99a34692e06d Mon Sep 17 00:00:00 2001
From: Bjarni Ingi Gislason <address@hidden>
Date: Tue, 27 Nov 2018 01:17:30 +0000
Subject: [PATCH] s.tmac: Add the name of the calling macro to a diagnostic

  See groff bug #52463.

Signed-off-by: Bjarni Ingi Gislason <address@hidden>
---
 tmac/s.tmac | 64 ++++++++++++++++++++++++++---------------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/tmac/s.tmac b/tmac/s.tmac
index 04265537..6dda23b7 100644
--- a/tmac/s.tmac
+++ b/tmac/s.tmac
@@ -89,15 +89,15 @@ along with this program.  If not, see
<http://www.gnu.org/licenses/>.
 ..
 .\" print an error message and then try to recover
 .de @error-recover
address@hidden \\$@ (recovering)
address@hidden \\$0: \\$@ (recovering)
 .nr *pop-count 0
 .while !'\\n(.z'' \{\
-.      \"@warning automatically terminating diversion \\n(.z
+.      \"@warning \\$0: automatically terminating diversion \\n(.z
 .      ie d @div-end!\\n(.z address@hidden(.z
 .      el .*div-end-default
 .      nr *pop-count +1
 .      \" ensure that we don't loop forever
-.      if \\n[*pop-count]>20 address@hidden recovery failed
+.      if \\n[*pop-count]>20 address@hidden \\$0: recovery failed
 .\}
 .while !'\\n[.ev]'0' .ev
 address@hidden
@@ -137,7 +137,7 @@ along with this program.  If not, see
<http://www.gnu.org/licenses/>.
 .ch cov*first-page-init
 .rm cov*first-page-init
 .if !'\\n[.ev]'0' \{\
-.      @error must be in top-level environment, not '\\n[.ev]',
+.      @error \\$0: must be in top-level environment, not '\\n[.ev]',
 .      @error when first page is started
 .\}
 address@hidden
@@ -207,7 +207,7 @@ along with this program.  If not, see
<http://www.gnu.org/licenses/>.
 .      br
 .      di
 .\}
-.ie !\\n[cov*n-au] address@hidden AI before AU
+.ie !\\n[cov*n-au] address@hidden \\$0: AI before AU
 .el \{\
 .      di cov*ai-div!\\n[cov*n-au]
 .      nf
@@ -314,7 +314,7 @@ along with this program.  If not, see
<http://www.gnu.org/licenses/>.
 .      address@hidden
 .      cov*print
 .  \}
-.  el address@hidden AE without AB
+.  el address@hidden \\$0: AE without AB
 .\}
 ..
 .de @div-end!cov*ab-div
@@ -328,7 +328,7 @@ along with this program.  If not, see
<http://www.gnu.org/licenses/>.
 .\}
 .el \{\
 .      if \\n[cov*rp-format] \{\
-.              @warning RP format but no TL
+.              @warning \\$0: RP format but no TL
 .              bp 1
 .              als FS @FS
 .              als FE @FE
@@ -368,7 +368,7 @@ along with this program.  If not, see
<http://www.gnu.org/licenses/>.
 .CHECK-FOOTER-AND-KEEP
 .\" If anything was printed below where the footer line is normally
 .\" printed, then that's an overflow.
-.if -\\n[FM]/2+1v+\\n[cov*page-length]<\\n[nl] address@hidden cover sheet 
overflow
+.if -\\n[FM]/2+1v+\\n[cov*page-length]<\\n[nl] address@hidden \\$0: cover sheet
overflow
 .pl \\n[cov*page-length]u
 .bp 1
 .if !\\n[cov*rp-no] .cov*tl-au-print
@@ -415,7 +415,7 @@ along with this program.  If not, see
<http://www.gnu.org/licenses/>.
 .\" start of footnote on cover
 .de cov*FS
 .if \\n[cov*in-fn] \{\
-.      @error nested FS
+.      @error \\$0: nested FS
 .      FE
 .\}
 .nr cov*in-fn 1
@@ -438,7 +438,7 @@ along with this program.  If not, see
<http://www.gnu.org/licenses/>.
 .      nr cov*in-fn 0
 .      nr cov*fn-height +\\n[dn]
 .\}
-.el address@hidden FE without matching FS
+.el address@hidden \\$0: FE without matching FS
 ..
 .\" ***************************
 .\" ******** module pg ********
@@ -619,7 +619,7 @@ along with this program.  If not, see
<http://www.gnu.org/licenses/>.
 .\" flush out any keeps or footnotes
 .de address@hidden
 .br
-.if !'\\n(.z'' address@hidden diversion open while ejecting page
+.if !'\\n(.z'' address@hidden \\$0: diversion open while ejecting page
 .\" Make sure we stay in the end macro while there is still footnote
 .\" overflow left, or floating keeps.
 .while address@hidden>address@hidden:address@hidden \{\
@@ -659,7 +659,7 @@ along with this program.  If not, see
<http://www.gnu.org/licenses/>.
 ..
 .\" Second argument of 'no' means don't embellish the first argument.
 .de fn*do-FS
-.if \\n[fn*open] address@hidden nested FS
+.if \\n[fn*open] address@hidden \\$0: nested FS
 .nr fn*open 1
 .if \\n[.u] \{\
 .      \" Ensure that the first line of the footnote is on the same page
@@ -679,7 +679,7 @@ along with this program.  If not, see
<http://www.gnu.org/licenses/>.
 .el address@hidden
 ..
 .de @FE
-.ie !\\n[fn*open] address@hidden FE without FS
+.ie !\\n[fn*open] address@hidden \\$0: FE without FS
 .el \{\
 .      nr fn*open 0
 .      br
@@ -771,7 +771,7 @@ along with this program.  If not, see
<http://www.gnu.org/licenses/>.
 .      \}
 .      el \{\
 .              ev fn
-.              @error-recover unclosed diversion within footnote
+.              @error-recover \\$0: unclosed diversion within footnote
 .      \}
 .\}
 ..
@@ -816,7 +816,7 @@ along with this program.  If not, see
<http://www.gnu.org/licenses/>.
 .di kp*div
 ..
 .de KF
-.if !'\\n(.z'' address@hidden KF while open diversion
+.if !'\\n(.z'' address@hidden \\$0: KF while open diversion
 .di kp*fdiv
 .ev k
 address@hidden
@@ -826,7 +826,7 @@ along with this program.  If not, see
<http://www.gnu.org/licenses/>.
 .ie '\\n(.z'kp*div' .kp*end
 .el \{\
 .      ie '\\n(.z'kp*fdiv' .kp*fend
-.      el address@hidden KE without KS or KF
+.      el address@hidden \\$0: KE without KS or KF
 .\}
 ..
 .de @div-end!kp*div
@@ -911,7 +911,7 @@ along with this program.  If not, see
<http://www.gnu.org/licenses/>.
 ..
 .de address@hidden
 .if \\n[\\n[.ev]:ds-type] \{\
-.      @error automatically terminating display
+.      @error \\$0: automatically terminating display
 .      DE
 .\}
 ..
@@ -920,7 +920,7 @@ along with this program.  If not, see
<http://www.gnu.org/licenses/>.
 .el .ds*end!2
 ..
 .de ds*end!0
address@hidden DE without DS, ID, CD, LD or BD
address@hidden \\$0: DE without DS, ID, CD, LD or BD
 ..
 .de LD
 .br
@@ -962,7 +962,7 @@ along with this program.  If not, see
<http://www.gnu.org/licenses/>.
 .      rm ds*div
 .      ds*common-end
 .\}
-.el address@hidden mismatched DE
+.el address@hidden \\$0: mismatched DE
 ..
 .de DS
 .br
@@ -1005,7 +1005,7 @@ along with this program.  If not, see
<http://www.gnu.org/licenses/>.
 .      rm ds*div
 .      ds*common-end
 .\}
-.el address@hidden mismatched DE
+.el address@hidden \\$0: mismatched DE
 ..
 .de ds*end!4
 .ie '\\n(.z'ds*div' \{\
@@ -1018,7 +1018,7 @@ along with this program.  If not, see
<http://www.gnu.org/licenses/>.
 .      rm ds*div
 .      ds*common-end
 .\}
-.el address@hidden mismatched DE
+.el address@hidden \\$0: mismatched DE
 ..
 .\" ****************************
 .\" ******** module par ********
@@ -1355,7 +1355,7 @@ along with this program.  If not, see
<http://www.gnu.org/licenses/>.
 .      lt +\\n[par*box-n]u
 .      par*box-draw \\n[.i]u \\n[.l]u-(\\n[.H]u==1n*1n)
 .\}
-.el address@hidden B2 without B1
+.el address@hidden \\$0: B2 without B1
 .HTML-IMAGE-END
 ..
 .de par*box-mark-top
@@ -1508,7 +1508,7 @@ along with this program.  If not, see
<http://www.gnu.org/licenses/>.
 .de FP
 .br
 .if !d par*fp!\\n[FF] \{\
-.      @error unknown footnote format '\\n[FF]'
+.      @error \\$0: unknown footnote format '\\n[FF]'
 .      nr FF 0
 .\}
 .ie '\\$2'no' .par*fp!\\n[FF]-no "\\$1"
@@ -1573,7 +1573,7 @@ along with this program.  If not, see
<http://www.gnu.org/licenses/>.
 .      if !\\n[nh*hl] \{\
 .              nr H1 1
 .              nr nh*hl 1
-.              @error missing arguments to .NH S
+.              @error \\$0: missing arguments to .NH S
 .      \}
 .\}
 .el \{\
@@ -1586,7 +1586,7 @@ along with this program.  If not, see
<http://www.gnu.org/licenses/>.
 .              \}
 .              el \{\
 .                      if \\n[nh*hl]-\\n[nh*ohl]>1 \
-.                              @warning .NH \\n[nh*ohl] followed by .NH 
\\n[nh*hl]
+.                              @warning \\$0: .NH \\n[nh*ohl] followed by .NH 
\\n[nh*hl]
 .              \}
 .      \}
 .      el .nr nh*hl 1
@@ -1636,7 +1636,7 @@ along with this program.  If not, see
<http://www.gnu.org/licenses/>.
 .      ll -8n
 .      in (n;0\\$2)
 .\}
-.el address@hidden XA without XS
+.el address@hidden \\$0: XA without XS
 ..
 .de XE
 .ie '\\n(.z'toc*div' \{\
@@ -1644,7 +1644,7 @@ along with this program.  If not, see
<http://www.gnu.org/licenses/>.
 .      ev
 .      di
 .\}
-.el address@hidden XE without XS
+.el address@hidden \\$0: XE without XS
 ..
 .de toc*end-entry
 \\a\\t\\*[toc*num]
@@ -1716,7 +1716,7 @@ along with this program.  If not, see
<http://www.gnu.org/licenses/>.
 ..
 .\" Note that geqn mark and lineup work correctly in centered equations.
 .de @EN
-.ie !'\\n(.z'eqn*div' address@hidden mismatched EN
+.ie !'\\n(.z'eqn*div' address@hidden \\$0: mismatched EN
 .el \{\
 .      br
 .      di
@@ -1812,7 +1812,7 @@ along with this program.  If not, see
<http://www.gnu.org/licenses/>.
 .      br
 .      di
 .      ie \\n[dn]+\\n[FM]+\\n[HM]+2v>=\\n[.p] \{\
-.              @error ridiculously long table header
+.              @error \\$0: ridiculously long table header
 .              address@hidden \\n[dn]
 .              tbl*print-header
 .      \}
@@ -1823,14 +1823,14 @@ along with this program.  If not, see
<http://www.gnu.org/licenses/>.
 .              nr tbl*have-header 1
 .      \}
 .\}
-.el address@hidden .TH without .TS H
+.el address@hidden \\$0: .TH without .TS H
 ..
 .de @div-end!tbl*header-div
 .TH
 .TE
 ..
 .de TE
-.ie '\\n(.z'tbl*header-div' address@hidden .TS H but no .TH before .TE
+.ie '\\n(.z'tbl*header-div' address@hidden \\$0: .TS H but no .TH before
.TE
 .el \{\
 .      nr tbl*have-header 0
 .       if !'\*(.T'html' .sp \\n[DD]u
@@ -1857,7 +1857,7 @@ along with this program.  If not, see
<http://www.gnu.org/licenses/>.
 .de PS
 .br
 .sp \\n[DD]u
-.ie \\n[.$]<2 address@hidden bad arguments to PS (not preprocessed with pic?)
+.ie \\n[.$]<2 address@hidden \\$0: bad arguments to PS (not preprocessed with 
pic?)
 .el \{\
 .      address@hidden (u;\\$1)+1v
 .      in +(u;\\n[.l]-\\n[.i]-\\$2/2>?0)
-- 
2.19.2






    _______________________________________________________

Reply to this item at:

  <https://savannah.gnu.org/bugs/?55109>

_______________________________________________
  Message sent via Savannah
  https://savannah.gnu.org/