Fix incompatibility between `.de1' and `.do'. Without this change,

the following snippet

  .de1 xx
  .  tm \\n(.C
  ..
  .cp 1
  .do xx

prints 1 instead of 0.

* src/roff/troff/input.cc (do_request): If a macro gets processed,
call tok.next().
(interpolate_macro): Add optional argument.  Update callers.
(request::invoke): Add optional argument.
(macro::invoke): Add optional argument to delay call of tok.next().

* src/roff/troff/request.h (request_or_macro): Add argument to
`invoke' member.  Update all derived classes.

* doc/groff.texinfo: Improve documentation of .do request.

1 files changed, 4 insertions, 1 deletions

diff --git a/doc/groff.texinfo b/doc/groff.texinfo
index 83bec112..017ea32e 100644
--- a/doc/groff.texinfo
+++ b/doc/groff.texinfo
@@ -14166,7 +14166,10 @@ Compatibility mode can be also turned on with the @option{-C} command line
 option.
 
 The @code{do} request turns off compatibility mode
-while executing its arguments as a @code{gtroff} command.
+while executing its arguments as a @code{gtroff} command.  However, it
+does not turn off compatibility mode while processing the macro itself.
+To do that, use the @code{de1} request (or manipulate the @code{.C}
+register manually).  @xref{Writing Macros}.
 
 @Example
 .do fam T