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, 29 insertions, 9 deletions

diff --git a/man/groff.man b/man/groff.man
index fa35aa09..e9a63941 100644
--- a/man/groff.man
+++ b/man/groff.man
@@ -2,7 +2,7 @@
 .ig
 groff.man
 
-Last update: 15 Jul 2003
+Last update: 23 Jul 2003
 
 This file is part of groff, the GNU roff type-setting system.
 
@@ -1168,6 +1168,16 @@ until
 .request .end
 is called.
 .
+.REQ .am1 macro
+Same as
+.request .am
+but with compatibility mode switched off during macro expansion.
+.
+.REQ .am1 macro end
+Same as
+.request .am
+but with compatibility mode switched off during macro expansion.
+.
 .REQ .ami macro
 Append to a macro whose name is contained in the string register
 .I macro
@@ -1183,14 +1193,14 @@ and
 are string registers whose contents are interpolated for the macro name
 and the end macro, respectively.
 .
-.REQ .am1 macro
+.REQ .ami1 macro
 Same as
-.request .am
+.request .ami
 but with compatibility mode switched off during macro expansion.
 .
-.REQ .am1 macro end
+.REQ .ami1 macro end
 Same as
-.request .am
+.request .ami
 but with compatibility mode switched off during macro expansion.
 .
 .REQ .as stringvar anything
@@ -1199,15 +1209,15 @@ Append
 to
 .IR stringvar .
 .
-.REQ .asciify diversion
-Unformat ASCII characters, spaces, and some escape sequences in
-.IR diversion .
-.
 .REQ .as1 stringvar anything
 Same as
 .request .as
 but with compatibility mode switched off during string expansion.
 .
+.REQ .asciify diversion
+Unformat ASCII characters, spaces, and some escape sequences in
+.IR diversion .
+.
 .REQ .backtrace
 Print a backtrace of the input on stderr.
 .
@@ -1432,6 +1442,16 @@ and
 are string registers whose contents are interpolated for the macro name
 and the end macro, respectively.
 .
+.REQ .dei1 macro
+Same as
+.request .dei
+but with compatibility mode switched off during macro expansion.
+.
+.REQ .dei1 macro end
+Same as
+.request .dei
+but with compatibility mode switched off during macro expansion.
+.
 .REQ .di
 End current diversion.
 .