Add requests `dei1' and `ami1' for completeness.

* src/roff/troff/input.cc (calling_mode): Remove
CALLING_DISABLE_COMP.
(comp_mode): New enumeration.
(do_define_string, define_string, define_nocomp_string,
append_string, append_nocomp_string): Updated.
(do_define_macro): Add third parameter.
(define_macro, define_nocomp_macro, define_indirect_macro,
append_macro, append_nocomp_macro, append_indirect_macro): Updated.
(define_indirect_nocomp_macro, append_indirect_nocomp_macro): New
functions.
(ignore): Updated.
(init_input_requests): Add `dei1' and `ami1'.

* tmac/trace.tmac: Handle de1 and am1.
(de): Improve tracing message.
(am): Add missing `do'.
(return): Use de1.

* NEWS, man/groff_diff.man, man/groff.man, doc/groff.texinfo:
Document new requests.

1 files changed, 45 insertions, 3 deletions

diff --git a/tmac/trace.tmac b/tmac/trace.tmac
index a67d9192..0c354eee 100644
--- a/tmac/trace.tmac
+++ b/tmac/trace.tmac
@@ -10,6 +10,7 @@
 .eo
 .
 .rn de !!de
+.rn de1 !!de1
 .
 .
 .!!de de
@@ -17,7 +18,7 @@
 .  ec
 .  do !!de \$1
 .    ie "\$1"\\$0" .do tm1 "\\*[!!sp]*** de trace enter: \\$0 \\$@
-.    el .do tm1 "\\*[!!sp]*** trace enter \$1: \\$0 \\$@
+.    el .do tm1 "\\*[!!sp]*** de trace enter \$1: \\$0 \\$@
 .    do as !!sp " \"
 .    do nop \\*[!!\$1]\\
 .    do substring !!sp 1
@@ -32,7 +33,28 @@
 .  do dei !!d1 !!d2
 ..
 .
+.!!de de1
+.  do ecs
+.  ec
+.  do !!de \$1
+.    ie "\$1"\\$0" .do tm1 "\\*[!!sp]*** de1 trace enter: \\$0 \\$@
+.    el .do tm1 "\\*[!!sp]*** de1 trace enter \$1: \\$0 \\$@
+.    do as !!sp " \"
+.    do nop \\*[!!\$1]\\
+.    do substring !!sp 1
+.    ie "\$1"\\$0" .do tm1 "\\*[!!sp]*** trace exit: \\$0 \\$@
+.    el .do tm1 "\\*[!!sp]*** trace exit \$1: \\$0 \\$@
+\..
+.
+.  do ds !!d1 !!\$1
+.  do ds !!d2 \$2
+.
+.  do ecr
+.  do dei1 !!d1 !!d2
+..
+.
 .rn am !!am
+.rn am1 !!am1
 .
 .!!de am
 .  do ecs
@@ -42,7 +64,7 @@
 .    el .do tm1 "\\*[!!sp]*** am trace enter \$1: \\$0 \\$@
 .    as !!sp " \"
 .    do nop \\*[!!\$1]\\
-.    substring !!sp 1
+.    do substring !!sp 1
 .    ie "\$1"\\$0" .do tm1 "\\*[!!sp]*** trace exit: \\$0 \\$@
 .    el .do tm1 "\\*[!!sp]*** trace exit \$1: \\$0 \\$@
 \..
@@ -54,9 +76,29 @@
 .  do ami !!a1 !!a2
 ..
 .
+.!!de am1
+.  do ecs
+.  ec
+.  do !!am \$1
+.    ie "\$1"\\$0" .do tm1 "\\*[!!sp]*** am1 trace enter: \\$0 \\$@
+.    el .do tm1 "\\*[!!sp]*** am1 trace enter \$1: \\$0 \\$@
+.    as !!sp " \"
+.    do nop \\*[!!\$1]\\
+.    do substring !!sp 1
+.    ie "\$1"\\$0" .do tm1 "\\*[!!sp]*** trace exit: \\$0 \\$@
+.    el .do tm1 "\\*[!!sp]*** trace exit \$1: \\$0 \\$@
+\..
+.
+.  do ds !!a1 !!\$1
+.  do ds !!a2 \$2
+.
+.  do ecr
+.  do ami1 !!a1 !!a2
+..
+.
 .rn return !!return
 .
-.!!de return
+.!!de1 return
 .  substring !!sp 1
 .  tm1 "\*[!!sp]*** return
 .  !!return twice