* doc/Makefile (clean): Add *.eps.

(MEMACROS): Removed.
(TFLAG): New variable.
(TROFF): Use it.
Add -ww.
(GROFF): Use TFLAG, FFLAG, -U, -p, -e, -t, and -ww.
(.me.dit): Fixed.
(.ms.html, .ms.ascii, .ms.ps, homepage.html): Simplify.

* tmac/www.tmac: Use dummy diversion while resetting and disabling
`.tl'.
* tmac/e.tmac: Inserted some more `\"' to remove warnings if used
unstripped.
* src/roff/troff/troff.man: Fix order of parameter description.

* NEWS: Updated.

Simplify image handling for grohtml.
Fix <p> bug.

* src/devices/grohtml/html-text.cc (DEBUGGING): Don't undefine but
comment out.
(html_text::dump_stack): Don't emit newline while debugging.
(html_text::do_push) [DEBUGGING]: Print more info.
(html_text::check_emit_text): Fix handling of <p>.
* src/devices/grohtml/html.h: Updated.
* src/devices/grohtml/output.cc (FPUTC, FPUTS, PUTC): New macros,
replacing `fputc', `fputs', `putc'.  If DEBUGGING is defined, they
send its data to stderr also.
Update all callers.
(simple_output::space_or_newline) [DEBUGGING]: Removed.
* src/devices/grohtml/post-html.cc (html_printer::do_links,
html_printer::html_printer): Remove `DEBUGGING' conditionals.

* src/include/html-strings.h (HTML_IMAGE_{CENTERED,LEFT,RIGHT,END}):
Removed.
* src/libs/libgroff/htmlhint.cc (is_in_graphic_start,
is_inline_image): Removed.
(html_begin_suppress, html_end_suppress): Don't take a parameter.
(graphic_start, graphic_end): Removed.
* src/include/htmlindicate.h: Updated.
* src/preproc/html/pre-html.cc (DEBUG_HTML): Removed.
(macroset_template): New global variable.
(makeFileName): Use `macroset_template'.
(write_end_image): Don't take a parameter.
Don't emit newline.
(write_start_image: Don't emit newline.
(char_buffer::write_upto_newline): Updated.
(char_buffer::skip_to_newline): Renamed to ...
(char_buffer::skip_until_newline): This.
Fix code.
(char_buffer::write_file_troff, char_buffer::write_file_html):
Simplified.
(createAllPages, createImage) [DEBUGGING]: Handle `debug' flag.
(removeAllPages): Remove `DEBUGGING' conditionals.
(addRegDef, dump_args): New functions.
(char_buffer::do_html, char_buffer::do_image): Handle
`www-image-template' command line variable.
Add more debugging code.
(addps4html): Removed.
(removeTempFiles) [DEBUGGING]: Handle `debug' flag.

* src/preproc/eqn/main.cc: Include `ctype.h'.
(suppress_html): Removed.
(do_file): Updated.
(inline_equation): Use `html_begin_suppress' and
`html_end_suppress'.
* src/preproc/pic/troff.cc: Don't include `htmlindicate.h'.
(troff_output::start_picture, troff_output::finish_picture):
Updated.
* src/preproc/tbl/main.cc: Don't include `htmlindicate.h'.
(process_input_file): Updated.

* src/roff/troff/div.cc (page_number): Set page number only if the
`ps4html' register isn't defined.
* src/roff/troff/input.cc (image_no): New external variable.
(do_suppress): Use it.
* src/roff/troff/node.h (suppress_node::image_id): New member.
* src/roff/troff/node.cc (image_no): Remove `static' keyword.
(suppress_node::suppress_node): Initialize `image_id' member.
(suppress_node::same): Handle `image_id' also.
(suppress_node::copy): Updated.
(last_image_id): New global variable.
(suppress_node::tprint): Use it.

* tmac/an-old.tmac (TS, TE, EQ, EN): Use HTML-IMAGE and
HTML-IMAGE-END.
* tmac/pspic.mac (PSPIC): Fix html support.
* tmac/s.tmac (@EQ, @EN, @TS, TE, PS, PE): Ditto.
* tmac/www.tmac (www-image-template): Set up.
(HTMLINDEX): Renamed to...
(HX): This.
(BODYCOLOR): Renamed to...
(BCL): This.
(BACKGROUND): Renamed to...
(BGIMG): This.
(URL): Change order of parameters for consistency.
(MAILTO): Renamed to...
(MTO): This.
(IMAGE, PNG-IMAGE, MARGIN-PNG-IMAGE): Renamed to...
(IMG, PIMG, MPIMG): This.
(HTML-H-BEGIN, HTML-H-END): Renamed to...
(HnS, HnE): This.
(LINKS): Renamed to...
(LK): This.
(LINE): Renamed to...
(HR): This.
(NO-AUTO-RULE): Renamed to...
(NHR): This.
(HTML-TL): Renamed to...
(HTL): This.
(UL-BEGIN, UL-END): Renamed to...
(ULS, ULE): This.
(DROPCAP): Renamed to...
(DC): This.
(TS, TE, EQ, EN): Provide default definitions.
(www-make-unique-name): Updated.
(HTML-IMAGE-INLINE): Fix typo.
* tmac/groff_www.man: Updated.

* doc/Makefile (homepage.html): Add option -r to grohtml.
Use shortened image name.
* doc/groff.texinfo: Updated info on grohtml strings and macros.
* doc/homepage.ms: Updated and extended.

1 files changed, 168 insertions, 1 deletions

diff --git a/tmac/html.tmac b/tmac/html.tmac
index 7a147fb5..3ae0e39c 100644
--- a/tmac/html.tmac
+++ b/tmac/html.tmac
@@ -27,6 +27,171 @@
 .if !c\(rh .char \(rh ->
 .if !c\(bq .tr \(bq,
 .if !c\(aq .tr \(aq'
+.\"
+.\" Now set any characters defined in devps/S but not in devhtml/S to nul --
+.\" these are generated by eqn but not used by grohtml.  grops generated
+.\" images during the alternative pass.
+.\"
+.if !c\(*y .tr \(*y
+.if !c\(fa .tr \(fa
+.if !c\(te .tr \(te
+.if !c\(st .tr \(st
+.if !c\(=~ .tr \(=~
+.if !c\(*A .tr \(*A
+.if !c\(*B .tr \(*B
+.if !c\(*X .tr \(*X
+.if !c\(*D .tr \(*D
+.if !c\(*E .tr \(*E
+.if !c\(*F .tr \(*F
+.if !c\(*G .tr \(*G
+.if !c\(*Y .tr \(*Y
+.if !c\(*I .tr \(*I
+.if !c\(+h .tr \(+h
+.if !c\(*K .tr \(*K
+.if !c\(*L .tr \(*L
+.if !c\(*M .tr \(*M
+.if !c\(*N .tr \(*N
+.if !c\(*O .tr \(*O
+.if !c\(*P .tr \(*P
+.if !c\(*H .tr \(*H
+.if !c\(*R .tr \(*R
+.if !c\(*S .tr \(*S
+.if !c\(*T .tr \(*T
+.if !c\(ts .tr \(ts
+.if !c\(*W .tr \(*W
+.if !c\(*C .tr \(*C
+.if !c\(*Q .tr \(*Q
+.if !c\(*Z .tr \(*Z
+.if !c\(3d .tr \(3d
+.if !c\(tf .tr \(tf
+.if !c\(pp .tr \(pp
+.if !c\[radicalex] .tr \[radicalex]
+.if !c\(*a .tr \(*a
+.if !c\(*b .tr \(*b
+.if !c\(*x .tr \(*x
+.if !c\(*d .tr \(*d
+.if !c\(*e .tr \(*e
+.if !c\(*f .tr \(*f
+.if !c\(*g .tr \(*g
+.if !c\(*y .tr \(*y
+.if !c\(*i .tr \(*i
+.if !c\(+f .tr \(+f
+.if !c\(*k .tr \(*k
+.if !c\(*l .tr \(*l
+.if !c\(*m .tr \(*m
+.if !c\(*n .tr \(*n
+.if !c\(*o .tr \(*o
+.if !c\(*p .tr \(*p
+.if !c\(*h .tr \(*h
+.if !c\(*r .tr \(*r
+.if !c\(*s .tr \(*s
+.if !c\(*t .tr \(*t
+.if !c\(*u .tr \(*u
+.if !c\(+p .tr \(+p
+.if !c\(*w .tr \(*w
+.if !c\(*c .tr \(*c
+.if !c\(*q .tr \(*q
+.if !c\(*z .tr \(*z
+.if !c\(ap .tr \(ap
+.if !c\(*U .tr \(*U
+.if !c\(fm .tr \(fm
+.if !c\(<= .tr \(<=
+.if !c\(f/ .tr \(f/
+.if !c\(if .tr \(if
+.if !c\(Fn .tr \(Fn
+.if !c\(CL .tr \(CL
+.if !c\(DI .tr \(DI
+.if !c\(HE .tr \(HE
+.if !c\(SP .tr \(SP
+.if !c\(<> .tr \(<>
+.if !c\(<- .tr \(<-
+.if !c\(ua .tr \(ua
+.\" .if !c\[arrowverttp] .tr \[arrowverttp]
+.if !c\(-> .tr \(->
+.if !c\(da .tr \(da
+.\" .if !c\[arrowvertbt] .tr \[arrowvertbt]
+.if !c\(de .tr \(de
+.if !c\(sd .tr \(sd
+.if !c\(>= .tr \(>=
+.if !c\(pt .tr \(pt
+.if !c\(pd .tr \(pd
+.if !c\(bu .tr \(bu
+.if !c\(di .tr \(di
+.if !c\(!= .tr \(!=
+.if !c\(== .tr \(==
+.if !c\(~~ .tr \(~~
+.if !c\(~= .tr \(~=
+.\" .if !c\[arrowvertex] .tr \[arrowvertex]
+.if !c\(an .tr \(an
+.if !c\(CR .tr \(CR
+.if !c\(Ah .tr \(Ah
+.if !c\(Im .tr \(Im
+.if !c\(Re .tr \(Re
+.if !c\(wp .tr \(wp
+.if !c\(c* .tr \(c*
+.if !c\(c+ .tr \(c+
+.if !c\(es .tr \(es
+.if !c\(ca .tr \(ca
+.if !c\(cu .tr \(cu
+.if !c\(sp .tr \(sp
+.if !c\(ip .tr \(ip
+.if !c\(nb .tr \(nb
+.if !c\(sb .tr \(sb
+.if !c\(ib .tr \(ib
+.if !c\(mo .tr \(mo
+.if !c\(nm .tr \(nm
+.if !c\(/_ .tr \(/_
+.if !c\(gr .tr \(gr
+.\" .if !c\[product] .tr \[product]
+.if !c\(sr .tr \(sr
+.if !c\(md .tr \(md
+.if !c\(no .tr \(no
+.if !c\(AN .tr \(AN
+.if !c\(OR .tr \(OR
+.if !c\(hA .tr \(hA
+.if !c\(lA .tr \(lA
+.if !c\(uA .tr \(uA
+.if !c\(rA .tr \(rA
+.if !c\(dA .tr \(dA
+.if !c\(lz .tr \(lz
+.if !c\(la .tr \(la
+.if !c\[sum] .tr \[sum]
+.\" .if !c\[parenlefttp] .tr \[parenlefttp]
+.\" .if !c\[parenleftex] .tr \[parenleftex]
+.\" .if !c\[parenleftbt] .tr \[parenleftbt]
+.\" .if !c\[bracketlefttp] .tr \[bracketlefttp]
+.if !c\(lc .tr \(lc
+.\" .if !c\[bracketleftex] .tr \[bracketleftex]
+.\" .if !c\[bracketleftbt] .tr \[bracketleftbt]
+.if !c\(lf .tr \(lf
+.\" .if !c\[bracelefttp] .tr \[bracelefttp]
+.if !c\(lt .tr \(lt
+.\" .if !c\[braceleftmid] .tr \[braceleftmid]
+.if !c\(lk .tr \(lk
+.\" .if !c\[braceleftbt] .tr \[braceleftbt]
+.if !c\(lb .tr \(lb
+.\" .if !c\[braceex] .tr \[braceex]
+.\" .if !c\[bracerightex] .tr \[bracerightex]
+.\" .if !c\[braceleftex] .tr \[braceleftex]
+.\" .if !c\[barex] .tr \[barex]
+.if !c\(bv .tr \(bv
+.if !c\(ra .tr \(ra
+.if !c\(is .tr \(is
+.\" .if !c\[parenrighttp] .tr \[parenrighttp]
+.\" .if !c\[parenrightex] .tr \[parenrightex]
+.\" .if !c\[parenrightbt] .tr \[parenrightbt]
+.\" .if !c\[bracketrighttp] .tr \[bracketrighttp]
+.if !c\(rc .tr \(rc
+.\" .if !c\[bracketrightex] .tr \[bracketrightex]
+.\" .if !c\[bracketrightbt] .tr \[bracketrightbt]
+.if !c\(rf .tr \(rf
+.\" .if !c\[bracerighttp] .tr \[bracerighttp]
+.if !c\(rt .tr \(rt
+.\" .if !c\[bracerightmid] .tr \[bracerightmid]
+.if !c\(rk .tr \(rk
+.\" .if !c\[bracerightbt] .tr \[bracerightbt]
+.if !c\(rb .tr \(rb
+.
 .\" now turn off all headers and footers for ms, me and mm macro sets
 .if d EF .EF ''''
 .if d EH .EH ''''
@@ -530,8 +695,10 @@
 .defcolor yellow rgb #ffff00
 .defcolor yellow1 rgb #fffc17
 .defcolor yellowgreen rgb #52d017
-.\" default glyph color to black (leave the background color alone)
+.\" set default glyph color to black (leave the background color alone)
 \m[black]\c
+.
 .if !\n(_C .mso pspic.tmac
 .cp \n(_C
+.\"
 .\" end of file, make sure this is the last line