Change syntax of \O: \O[0] suppresses output, \O[1] enables output

if at outer level; at start-up we are at outer level.

* src/roff/troff/input.cc (do_suppress): Implement it.
Simplify \O[3].

Add option -p to show progress information.
pre-grohtml will now render only one page at a time, reducing the
size of needed disk resources enormously.

* src/preproc/html/pre-html.cc (imagePageStem): Replaced with...
(imagePageName): New global variable.
(psPageName, show_progress, currentPageNo): New global variables.
(html_system): Close saved stderr and stdout handles.
(write_end_image): Accept a parameter to control \O escape.
(write_start_image): Adapted to new \O meaning.
(char_buffer::write_upto_newline): Updated.
(createAllPages): Replaced with...
(createPage): This new function to create a single page for images.
It uses `psselect' from the psutils package.
(removeAllPages): Removed.
(createImage): Updated.
Handle progress display.
(char_buffer::do_html, char_buffer::do_image) [DEBUGGING]: Removed.
(scanArguments): Add option -p.
(makeTempFiles): Updated to create temp files for psPageName and
imagePageName.
(removeTempFiles): Removed.
(main): Updated.

* src/devices/grohtml/post-html.cc (header_desc::write_headings,
html_printer::write_header): Append `\0' to `buffer'.
(html_printer::do_eol): Depend on `current_paragraph->emitted_text'.
(main): Handle -p.
* src/devices/grohtml/html-text.cc (html_text::dump_stack_element):
Handle `text_emitted'.
(html_text::table_is_void): Slightly rewritten.
(stop): New external symbol.
(html_text::do_push) [DEBUGGING]: Use it and simplify.
(html_text::shutdown): Call `dump_stack'.
(html_text::do_space): Rewritten.
* src/devices/grohtml/grohtml.man: Document -p and the need of
`psselect'.

* tmac/www.tmac (DC, HTML-DO-IMAGE, HTML-IMAGE-END): Updated to
new \O syntax.
Call \O[0] if `ps4html' is active.
* tmac/s.tmac (@EQ, @EN): Handle html better.
(@TS, TE): Ditto.
* tmac/html.tmac: Don't use black for background colour.

* src/roff/troff/node.cc: Include `div.h'.
(troff_output_file::really_print_line): Don't use `is_on'.
(troff_output_file::word_marker, troff_output_file::flush_tbuf
troff_output_file::check_charinfo,
troff_output_file::put_char_width, troff_output_file::put_char,
troff_output_file::determine_line_limits, troff_output_file::draw,
real_output_file::begin_page, glyph_color_node::tprintf,
fill_color_node::tprint, hline_node::tprint, vline_node::tprint):
Use `is_on'.
(troff_output_file::really_on): Call `do_motion'.
(suppress_node::tprint): Use `get_page_number' instead of `%'
register.
Call `reset_output_registers' conditionally on `is_on'.

* doc/groff.texinfo: Document new syntax of \O.
* NEWS, man/groff_diff.man: Updated.

1 files changed, 12 insertions, 7 deletions

diff --git a/tmac/s.tmac b/tmac/s.tmac
index 7597374f..7fd95aee 100644
--- a/tmac/s.tmac
+++ b/tmac/s.tmac
@@ -1569,7 +1569,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 .   HTML-IMAGE-INLINE
 .\}
 .if \\n[eqn*type]=2 .HTML-IMAGE
-.nf
+.if !'\*(.T'html' .nf
 ..
 .de @div-end!eqn*div
 .@EN
@@ -1583,12 +1583,16 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 .	nr eqn*have-num 0
 .	if !'\\*[eqn*num]'' .nr eqn*have-num 1
 .	ie \\n[dl]:\\n[eqn*have-num] \{\
-.		sp \\n[DD]u
+.               if !'\*(.T'html' .sp \\n[DD]u
 .		par@reset
 .		ds eqn*tabs \\n[.tabs]
 .		nf
 .		ie \\n[dl] \{\
-.			ds@need \\n[dn]u-1v+\n[.V]u
+.\"                     --fixme-- this really should not be necessary
+.\"                     and indicates that there is extra space creeping into
+.\"                     an equation when ps4html is enabled..
+.                       ie r ps4html .ds@need \\n[dn]u-1v+\n[.V]u+1i
+.                       el .ds@need \\n[dn]u-1v+\n[.V]u
 .			chop eqn*div
 .			ie \\n[eqn*type]=0 \{\
 .				ta (u;\\n[.l]-\\n[.i])R
@@ -1606,7 +1610,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 .			ta (u;\\n[.l]-\\n[.i])R
 \t\\*[eqn*num]
 .		\}
-.		sp \\n[DD]u
+.               if !'\*(.T'html' .sp \\n[DD]u
 .		ta \\*[eqn*tabs]
 .	\}
 .	el \{
@@ -1616,7 +1620,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 .		if '\*(.T'html' \\*[eqn*div]
 .		if r ps4html    \\*[eqn*div]
 .	\}
-.	fi
+.       if !'\*(.T'html' .fi
 .	if \\n[eqn*type]=0 .HTML-IMAGE-END
 .	if \\n[eqn*type]=1 \{\
 .		HTML-IMAGE-END
@@ -1638,8 +1642,9 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ..
 .de @TS
 .sp \\n[DD]u
-.HTML-IMAGE
+.\" .if !'\*(.T'html' .sp \\n[DD]u
 .if '\\$1'H' .di tbl*header-div
+.HTML-IMAGE
 ..
 .de tbl@top-hook
 .if \\n[tbl*have-header] \{\
@@ -1681,7 +1686,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 .ie '\\n(.z'tbl*header-div' .@error-recover .TS H but no .TH before .TE
 .el \{\
 .	nr tbl*have-header 0
-.	sp \\n[DD]u
+.       if !'\*(.T'html' .sp \\n[DD]u
 .\}
 .	HTML-IMAGE-END
 .\" reset tabs