Replace call to `troff' with `groff -Z' to make it aware of

GROFF_BIN_PATH.

* src/preproc/html/pre-html.cc (TROFF_COMMAND): New macro.
(troff_command, command_prefix): Removed.
(alterDeviceTo): Use groff.
(addZ): New function.
(char_buffer::do_html): Use it.
(scanArguments): Use TROFF_COMMAND.
(findPrefix): Removed.
(main): Updated.
* src/roff/groff/groff.cc (main): Handle zflag for preprocessors.


* doc/pic.ms: Documentation fixes.


Replace atexit() with global destructor.

* src/libs/libgroff/tmpfile.cc (xtmpfile_list): Add constructor.
(xtmpfile_list_init): New global structure to deallocate
xtmpfile_list on exit.  Its destructor inherits most code from
remove_tmp_files().
(remove_tmp_files): Deleted.
(add_tmp_file): Simplified.

1 files changed, 1 insertions, 1 deletions

diff --git a/src/roff/groff/groff.cc b/src/roff/groff/groff.cc
index 7e95c33e..6e45edfa 100644
--- a/src/roff/groff/groff.cc
+++ b/src/roff/groff/groff.cc
@@ -281,7 +281,7 @@ int main(int argc, char **argv)
   if (!postdriver)
     fatal("no `postpro' command in DESC file for device `%1'", device);
 
-  if (predriver) {
+  if (predriver && !zflag) {
     commands[TROFF_INDEX].insert_arg(commands[TROFF_INDEX].get_name());
     const char *p = Pargs.contents();
     const char *end = p + Pargs.length();