summaryrefslogtreecommitdiff
path: root/tmac/trace.tmac
diff options
context:
space:
mode:
authorwl <wl>2006-10-28 16:59:32 +0000
committerwl <wl>2006-10-28 16:59:32 +0000
commitf04751d104452703d64087b3f89f70a39e8b1c69 (patch)
tree9b93c113b47f7058b32b5e32e21c555f0f88d7de /tmac/trace.tmac
parent1f37a25628c3e4f9bbcba8bd132b3a73526e9d4a (diff)
downloadgroff-f04751d104452703d64087b3f89f70a39e8b1c69.tar.gz
* tmac/trace.tmac: Improve tracing of `.nr'.
Trace `.substring' also. * NEWS: Updated.
Diffstat (limited to 'tmac/trace.tmac')
-rw-r--r--tmac/trace.tmac26
1 files changed, 20 insertions, 6 deletions
diff --git a/tmac/trace.tmac b/tmac/trace.tmac
index 0c8d7410..0e8141a4 100644
--- a/tmac/trace.tmac
+++ b/tmac/trace.tmac
@@ -12,8 +12,15 @@
.rn nr !!nr
.
.de nr
-. do tm1 "\*[!!!sp]*** .nr \$*
-. !!nr \$*
+. do !!ds !!!inc \$2
+. do !!substring !!!inc 0 0
+. do !!nr \$*
+. do ie "\?\*[!!!inc]\?"\?-\?" \
+. do tm1 "\*[!!!sp]*** .nr \$* (-> \n[\$1])
+. el .do ie "\?\*[!!!inc]\?"\?+\?" \
+. do tm1 "\*[!!!sp]*** .nr \$* (-> \n[\$1])
+. el \
+. do tm1 "\*[!!!sp]*** .nr \$*
..
.
.rn ds !!ds
@@ -55,7 +62,7 @@
. do !!as !!!sp " \"
. do ie \\n[.br] .do !!\$1 \\$@
. el 'do !!\$1 \\$@
-. do substring !!!sp 1
+. do !!substring !!!sp 1
. do ie \\n[.br] .!!ds !!!br .\"
. el .do !!ds !!!br '\"
. ie "\$1"\\$0" .do tm1 "\\*[!!!sp]*** trace exit: \\*[!!!br]\\$0 \\$@
@@ -80,7 +87,7 @@
. do !!as !!!sp " \"
. do ie \\n[.br] .do !!\$1 \\$@
. el 'do !!\$1 \\$@
-. do substring !!!sp 1
+. do !!substring !!!sp 1
. do ie \\n[.br] .!!ds !!!br .\"
. el .do !!ds !!!br '\"
. ie "\$1"\\$0" .do tm1 "\\*[!!!sp]*** trace exit: \\*[!!!br]\\$0 \\$@
@@ -108,7 +115,7 @@
. do !!as !!!sp " \"
. do ie \\n[.br] .do !!\$1 \\$@
. el 'do !!\$1 \\$@
-. do substring !!!sp 1
+. do !!substring !!!sp 1
. do ie \\n[.br] .!!ds !!!br .\"
. el .do !!ds !!!br '\"
. ie "\$1"\\$0" .do tm1 "\\*[!!!sp]*** trace exit: \\*[!!!br]\\$0 \\$@
@@ -133,7 +140,7 @@
. do !!as !!!sp " \"
. do ie \\n[.br] .do !!\$1 \\$@
. el 'do !!\$1 \\$@
-. do substring !!!sp 1
+. do !!substring !!!sp 1
. do ie \\n[.br] .!!ds !!!br .\"
. el .do !!ds !!!br '\"
. ie "\$1"\\$0" .do tm1 "\\*[!!!sp]*** trace exit: \\*[!!!br]\\$0 \\$@
@@ -154,6 +161,13 @@
. !!return twice
..
.
+.rn substring !!substring
+.
+.!!de1 substring
+. !!substring \$*
+. tm1 "\*[!!!sp]*** .substring \$* (-> `\*[\$1]')
+..
+.
.ec
.
.cp \n(_C