First cut of the new html device driver. Changes to pre-html and

the new grohtml are too numerous to be documented here.

Stuff related to `html' has been renamed to `html-old' and `html2'
stuff has been renamed to `html' (including directories).  The new
html device driver is therefore invoked as `-Thtml'.

Added new `O' escape to suppress output (needed by html driver).

Added functions and code to pass info about input-level commands
(`.in', `.fl', etc.) to html driver.

Three new functions (.html-begin, .html-end, and .html-image) for
better html handling: `html-begin' will execute the remaining line
if at the outermost nesting level, increasing an internal counter.
`html-end' does the same but decreases the internal counter.
`html_image' puts its arguments into a special node (suppress_node)
to define an image region.

The `output' request has been removed.

* tmac/html-tags.tmac: Removed.
* tmac/arkup.tmac: Updated and renamed to ...
* tmac/www.tmac: New file.
* tmac/markup.tmac Updated and renamed to ...
* tmac/mwww.tmac: New file.
* tmac/Makefile.sub: Updated.
* tmac/an-old.tmac: Updated.
* tmac/eqnrc: Updated.
* tmac/groff_man.man
* tmac/groff_markup.man: Updated and renamed to ...
* tmac/groff_mwww.man: New file.
* tmac/groff_tmac.man: Updated.
* tmac/html-old.tmac: Updated and Renamed from html.tmac.
* tmac/html.tmac: Updated and renamed from html2.tmac.
* tmac/pspic.tmac: Updated html support.
* tmac/s.tmac: Added html output support.
* tmac/troffrc, tmac/troffrc-end: Updated.

* Makefile.in, doc/Makefile: Updated.
* doc/groff.texinfo: Added info about new `O' escape.
* doc/homepage.ms: Use `MAILTO' macro.

* font/devhtml/DESC.proto: Add `C' font.
* font/devhtml/Makefile.sub: Updated.
* font/devhtml/R.proto: Minor fixes.
* font/devhtml-old/Makefile.sub: Updated.

* src/devices/grohtml-old/Makefile.sub: Updated.

* src/libs/libdriver/printer.cc (printer::get_font_from_index): New
method.
* src/libs/libgroff/htmlindicate.cc (html_begin_suppress,
graphic_start): Add `inline' parameter.  Update.
(html_end_suppress, graphic_end): Update.

* src/include/html-strings.h: New file.
* src/include/htmlindicate.h: Comments updated.
* src/include/printer.h: Updated.

* src/preproc/eqn/main.cc (do_file, main): Updated.
* src/preproc/pic/troff.cc (troff_output::start_picture,
troff_output::finish_picture): Updated.
* src/preproc/tbl/main.cc (process_input_file): Updated.

* src/roff/groff/groff.cc (main): Updated.
Pass device arguments to predrivers also.
Use `ps' device for `eqn' preprocessor if `-Thtml' is given.
* src/roff/troff/env.h (environment): Updated.
New elements `need_eol' and `ignore_next_eol' (for html output).
* src/roff/troff/env.cc (environment::environment): Add initializers
for `need_eol' and `ignore_next_eol'.
(environment::add_html_tag_eol, environment::add_html_tag_tabs): New
functions.
(point_size, fill, no_fill, center, right_justify, line_length,
indent, temporary_indent, break_request, handle_tab): Use
`add_html_tag()'.
(set_tabs): Use `add_html_tag_tabs()'.
(environment::add_html_tag): Updated.
(environment::do_break): Updated.
* src/roff/troff/div.cc (space_request, flush_output): Use
`environment::add_html_tag()'.
* src/roff/troff/input.cc: Updated.
New variable `html_level' to indicate nested `html-begin' requests.
(file_iterator::fill): Use `environment::add_html_tag_eol()'.
(non_interpreted_char_node, token_node, non_interpreted_node): Add
`force_tprint()' method.
(token::next): Handle `O'.
(do_suppress): Implement it.
(html_begin, html_end, html_image): New functions.
(init_output_requests): Renamed to ...
(init_html_requests): this.
(main): Use it.
(macro::append_str, macro::append_unsigned, macro::append_int): New
methods.
New variable `output_low_mark_miny' to limit minimal value of y.
(reset_output_registers): Use it.
(output_request): Removed.
(get_output_registers): New function.
* src/roff/troff/node.h (node): Make `force_tprint()' virtual.
(*_node): Added `force_tprint()' if necessary.
(special_node): New elements `tf' and `get_tfont()'.
(suppress_node): New class.
* src/roff/troff/node.cc:
New global variables `image_no' and `suppress_start_page'.
(real_output_file): New method `is_on()'.
(troff_output_file): New method `start_special(tfont)'.
(troff_output_file::really_print_line): Use `tprint' conditionally.
(real_output_file::print_line): Updated.
(real_output_file::on): Updated.
(*_node): Added `force_tprint()'.
(special_node::special_node): Initializer updated.
(special_node::same, special_node::copy, special_node::tprint_start):
Updated.
(get_reg_int, get_reg_str): New functions.
(suppress_node::*): New methods.
New global variables last_position, last_image_filename;
(min): New inline function.
* src/roff/troff/reg.h, src/roff/troff/request.h,
src/roff/troff/troff.h: Updated.

3 files changed, 59 insertions, 17 deletions

diff --git a/doc/Makefile b/doc/Makefile
index 57abf327..408e6e12 100755
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -54,13 +54,13 @@ all: $(DOCS)
 	GROFF_TMAC_PATH=../tmac; \
 	export GROFF_TMAC_PATH; \
 	sed -e "s;@VERSION@;$(version)$(revision);" $< \
-	| $(GROFF) -Tascii $(FFLAG) -U -ms -markup >$@
+	| $(GROFF) -Tascii $(FFLAG) -U -ms -mwww >$@
 
 .ms.ps:
 	GROFF_TMAC_PATH=../tmac; \
 	export GROFF_TMAC_PATH; \
 	sed -e "s;@VERSION@;$(version)$(revision);" $< \
-	| $(GROFF) -Tps $(FFLAG) -U -ms -markup >$@
+	| $(GROFF) -Tps $(FFLAG) -U -ms -mwww >$@
 
 .texinfo.dvi:
 	texi2dvi -e $<
diff --git a/doc/groff.texinfo b/doc/groff.texinfo
index 58fd6da6..b35b7c92 100644
--- a/doc/groff.texinfo
+++ b/doc/groff.texinfo
@@ -1081,7 +1081,7 @@ accessible via @code{groff}.  This option prevents the loading of the
 Make programs run by @code{groff} print out their version number.
 
 @item -V
-Print the pipeline on stdout instead of executing it.
+Print the pipeline on @code{stdout} instead of executing it.
 
 @item -z
 Suppress output from @code{gtroff}.  Only error messages will be
@@ -1352,7 +1352,7 @@ groff file
 @noindent
 This command processes @file{file} without a macro package or a
 preprocessor.  The output device is the default, @samp{ps}, and the
-output is sent to stdout.
+output is sent to @code{stdout}.
 
 @example
 groff -t -mandoc -Tascii file | less
@@ -2174,7 +2174,7 @@ in italic.
 @cindex @file{man}, default indentation
 @cindex default indentation, @file{man}
 The default indentation is 7.2@dmn{n} for all output devices except for
-@code{grohtml} which uses 1.2@dmn{i} instead.
+@code{grohtml} which ignores indentation.
 
 @maindex DT
 @maindex TH
@@ -2329,6 +2329,7 @@ Users of macro packages may skip it if not interested in details.
 * Traps::                       
 * Diversions::                  
 * Environments::                
+* Suppressing output::
 * I/O::                         
 * Postprocessor Access::        
 * Miscellaneous::               
@@ -6362,7 +6363,7 @@ name.
 This would be called as
 
 @example
-.vl $Id: groff.texinfo,v 1.62 2001/01/13 21:49:18 wlemb Exp $
+.vl $Id: groff.texinfo,v 1.63 2001/01/17 14:17:18 wlemb Exp $
 @end example
 
 @xref{Request Arguments}.
@@ -7063,7 +7064,7 @@ hacks; for example, the following will set register @code{n} to@w{ }1.
 
 @c =====================================================================
 
-@node Environments, I/O, Diversions, Programming Tutorial
+@node Environments, Suppressing output, Diversions, Programming Tutorial
 @section Environments
 @cindex environments
 
@@ -7150,7 +7151,46 @@ which takes the name of the environment to copy from as an argument.
 
 @c =====================================================================
 
-@node I/O, Postprocessor Access, Environments, Programming Tutorial
+@node Suppressing output, I/O, Environments, Programming Tutorial
+@section Suppressing output
+@cindex suppressing output
+
+@findex \O
+@code{gtroff} allows the programmer to disable resp.@: enable output
+through the use of the @code{\O} escape:
+
+@table @samp
+@item \O0
+Disable any ditroff glyphs from being emitted to the device driver.
+
+@item \O1
+Enable output of glyphs.
+@end table
+
+The previous commands also reset the four registers @samp{opminx},
+@samp{opminy}, @samp{opmaxx}, and @samp{opmaxy} to -1.  @xref{Register
+Index}.  These four registers mark the top left and bottom right hand
+corners of a box which encompasses all written glyphs.
+
+The following two parameter of @code{\O} are @code{grohtml} device
+specific.
+
+@table @samp
+@item \O2
+Disable any ditroff glyphs from being emitted to the device driver.  Also
+write out to @code{stderr} the page number and four registers encompassing
+the glyphs previously written since the last call to @code{\O}.
+
+@item \O3
+Enable output of glyphs (the default).  Also write out to @code{stderr}
+the page number and four registers encompassing the glyphs previously
+written since the last call to @code{\O}.
+@end table
+
+
+@c =====================================================================
+
+@node I/O, Postprocessor Access, Suppressing output, Programming Tutorial
 @section I/O
 @cindex i/o
 @cindex input and output requests
@@ -7501,16 +7541,16 @@ The @code{pm} request will dump out the entire symbol table.
 @cindex dumping number registers
 @cindex number registers, dumping
 The @code{pnr} request will print the names and contents of all
-currently defined number registers on stderr.
+currently defined number registers on @code{stderr}.
 
 @item
 @findex ptr
 @cindex dumping traps
 @cindex traps, dumping
 The @code{ptr} request will print the names and positions of all traps
-(not including input line traps and diversion traps) on stderr.  Empty
-slots in the page trap list are printed as well, because they can affect
-the priority of subsequently planted traps.
+(not including input line traps and diversion traps) on @code{stderr}.
+Empty slots in the page trap list are printed as well, because they can
+affect the priority of subsequently planted traps.
 
 @item
 @findex fl
diff --git a/doc/homepage.ms b/doc/homepage.ms
index ccf81319..00da216f 100755
--- a/doc/homepage.ms
+++ b/doc/homepage.ms
@@ -139,16 +139,18 @@ bug-groff@gnu.org      for reporting bugs
 groff@gnu.org          for general discussion of groff
 groff-commit@ffii.org  a read-only list showing logs of
                        commitments to the CVS repository
-\fR
+\fP
 .fi
 .RE
 .sp
 .LP
-Note that groff@gnu.org is an alias for groff@ffii.org; you must be
-subscribed to the `groff' and `groff-commit' lists to send mails.
+Note that groff@gnu.org is an alias for
+.MAILTO groff@ffii.org groff@ffii.org ;
+you must be subscribed to the `groff' and `groff-commit' lists to send mails.
 .LP
 To subscribe, send e-mail to [list]-request@[domain] (example:
-groff-request@ffii.org) with the word `subscribe' in either the
+.MAILTO groff-request@ffii.org groff-request@ffii.org )
+with the word `subscribe' in either the
 subject or body of the e-mail (don't include the quotes).
 .LP
 GNU groff was written by
@@ -157,6 +159,6 @@ It is now maintained by
 .MAILTO Ted.Harding@nessie.mcc.ac.uk "Ted Harding"
 and
 .MAILTO wl@gnu.org "Werner Lemberg" .
-.LINE
+.br
 .
 .\" EOF