* src/devices/grohtml/post-html.cpp (html_printer::~html_printer):

Use a loose DTD.

* src/preproc/pic/pic.man, doc/pic.ms: Explain how to get a
vbox with positive height and zero depth if in TeX mode.

* NEWS: Document glyph name changes for grodvi and grolj4.

5 files changed, 94 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index 02989194..9d84d85c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-04-25  Gaius Mulley  <gaius@glam.ac.uk>
+
+	* src/devices/grohtml/post-html.cpp (html_printer::~html_printer):
+	Use a loose DTD.
+
+2003-04-24  Werner LEMBERG  <wl@gnu.org>
+
+	* src/preproc/pic/pic.man, doc/pic.ms: Explain how to get a
+	vbox with positive height and zero depth if in TeX mode.
+
+	* NEWS: Document glyph name changes for grodvi and grolj4.
+
 2003-04-23  Werner LEMBERG  <wl@gnu.org>
 
 	* src/preproc/pic/tex.cpp (tex_output::start_picture): Fix TeX code.
@@ -604,7 +616,7 @@
 
 	* tmac/groff_man.man, doc/groff.texinfo: Many minor fixes.
 
-2003-02-25  Gaius Mulley <gaius@glam.ac.uk>
+2003-02-25  Gaius Mulley  <gaius@glam.ac.uk>
 
 	* aclocal.m4 (GROFF_HTML_PROGRAMS): Add test for pnmtops.
 	(GROFF_PNMTOPS_NOSETPAGE): New macro.
@@ -1558,7 +1570,7 @@
 	Removed `tas' and `tar' (already commented out).
 	* src/roff/troff/Makefile.sub: Updated.
 
-2002-10-31  Ruslan Ermilov <ru@FreeBSD.org>
+2002-10-31  Ruslan Ermilov  <ru@FreeBSD.org>
 
 	* src/roff/nroff/nroff.man, src/roff/nroff/nroff.sh: Fix description
 	of options.
@@ -2081,7 +2093,7 @@ Version 1.18.1 released
 	* src/roff/troff/node.cc (node::add_char): Call `freeze_space' for
 	unbreakable space.
 
-2002-08-08  Aaron Campbell <aaron@monkey.org>
+2002-08-08  Aaron Campbell  <aaron@monkey.org>
 
 	* src/preproc/pic/object.cc (object_spec::make_move): Fix typo
 	(&& -> &).
@@ -2368,7 +2380,7 @@ Version 1.18.0 released
 	(init_input_requests): Updated.
 	* src/roff/troff/request.h: Updated.
 
-2002-07-08  Robert D. Goulding <goulding@Princeton.EDU>
+2002-07-08  Robert D. Goulding  <goulding@Princeton.EDU>
 
 	* src/roff/grog/grog.sh: Fix typo.
 
@@ -3658,7 +3670,7 @@ Version 1.18.0 released
 
 	* NEWS, man/groff_char.man: Updated.
 
-2002-02-21  Phil Lobbes <phil@perkpartners.com>
+2002-02-21  Phil Lobbes  <phil@perkpartners.com>
 
 	* src/include/lib.h [HAVE_SNPRINTF]: Include stdarg.h.
 
diff --git a/NEWS b/NEWS
index 7a905b54..1371d0de 100644
--- a/NEWS
+++ b/NEWS
@@ -128,6 +128,22 @@ o New options -l and -p to set landscape orientation and the paper size.
 
   Consequently, the DESC file should contain a `papersize' keyword.
 
+o The glyph shapes for \[*f] and \[*e] have been exchanged with \[+f] and
+  \[+e], respectively, to be in sync with all other devices.
+
+o Glyphs \[HE] and \[DI] have been replaced with \[u2662] and \[u2661],
+  respectively, since the former two glyphs have a black (filled) shape
+  which grodvi doesn't provide by default (it never has actually).
+
+Grolj4
+------
+
+o The glyphs \[*e] and \[+e] have been exchanged to be in sync with
+  all other devices.
+
+o The glyph \[~=] is now called \[|=].  Similar to other devices, \[~=]
+  is now another name for glyph \[~~].
+
 Grotty
 ------
 
diff --git a/doc/pic.ms b/doc/pic.ms
index bfbc5e49..1860046b 100644
--- a/doc/pic.ms
+++ b/doc/pic.ms
@@ -10,11 +10,17 @@
 .\" This document was written for free use and redistribution by
 .\" Eric S. Raymond <esr@thyrsus.com> in August 1995.
 .\"
-.\"	$Id: pic.ms,v 1.21 2003/04/24 01:07:32 wlemb Exp $	
+.\"	$Id: pic.ms,v 1.22 2003/04/25 16:15:17 wlemb Exp $	
 .\"
-.\" Set a proper TeX
-.ie t .ds tx T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X
-.el .ds tx TeX
+.\" Set a proper TeX and LaTeX
+.ie t \{\
+.  ds tx T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X\"
+.  ds lx L\h'-0.36m'\v'-0.22v'\s-2A\s0\h'-0.15m'\v'0.22v'\*(tx\"
+.\}
+.el \{\
+.  ds tx TeX\"
+.  ds lx LaTeX\"
+.\}
 .\"
 .de CE\"	Centered caption for figure.  Assumes previous .KS
 .ce 1
@@ -1988,8 +1994,9 @@ You must yourself print that vbox using, for example, the command
 \ecenterline{\ebox\egraph}
 .RE
 .LP
-Actually, since the vbox has a height of zero this will produce
-slightly more vertical space above the picture than below it;
+Actually, since the vbox has a height of zero (it is defined with \evtop)
+this will produce slightly more vertical space above the picture than
+below it;
 .RS
 .LP
 .CW
@@ -1998,6 +2005,23 @@ slightly more vertical space above the picture than below it;
 .LP
 would avoid this.
 .PP
+To make the vbox having a positive height and a depth of zero (as used
+e.g.\& by \*(lx's \f(CW\%graphics.sty\fP), define the following macro in
+your document:
+.KS
+.DS
+.CW
+\edef\egpicbox#1{%
+  \eexpandafter\esetbox\ecsname #1\eendcsname
+   \evbox{\eexpandafter\eunvbox\ecsname #1\eendcsname\ekern 0pt}
+.R
+.DE
+.KE
+.LP
+Now you can simply say
+.B \egpicbox{graph}
+instead of \ebox\egraph.
+.PP
 You must use a \*[tx] driver that supports the
 .B tpic
 specials, version\~2.
diff --git a/src/devices/grohtml/post-html.cpp b/src/devices/grohtml/post-html.cpp
index bc942b27..24537c08 100644
--- a/src/devices/grohtml/post-html.cpp
+++ b/src/devices/grohtml/post-html.cpp
@@ -3628,11 +3628,9 @@ html_printer::~html_printer()
     .put_string(ctime(&t), strlen(ctime(&t))-1)
     .end_comment();
 
-  /*
-   *  'HTML: The definitive guide', O'Reilly, p47. advises against specifying
-   *         the dtd.
-   */
-  // fputs("<!doctype html public \"-//IETF//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n", stdout);
+  fputs("<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\"\n", stdout);
+  fputs("\"http://www.w3.org/TR/html4/loose.dtd\">\n", stdout);
+
   fputs("<html>\n", stdout);
   fputs("<head>\n", stdout);
   fputs("<meta name=\"generator\" content=\"groff -Thtml, see www.gnu.org\">\n", stdout);
diff --git a/src/preproc/pic/pic.man b/src/preproc/pic/pic.man
index 40dc6c7b..e25b5d7a 100644
--- a/src/preproc/pic/pic.man
+++ b/src/preproc/pic/pic.man
@@ -25,8 +25,14 @@ the original English.
 .el .TP "\\$1"
 ..
 .
-.ie t .ds tx T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X
-.el   .ds tx TeX
+.ie t \{\
+.  ds tx T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X
+.  ds lx L\h'-0.36m'\v'-0.22v'\s-2A\s0\h'-0.15m'\v'0.22v'\*(tx
+.\}
+.el \{\
+.  ds tx TeX
+.  ds lx LaTeX
+.\}
 .
 .ie \n(.g .ds ic \/
 .el       .ds ic \^
@@ -243,8 +249,9 @@ You must yourself print that vbox using, for example, the command
 \ecenterline{\ebox\egraph}
 .RE
 .LP
-Actually, since the vbox has a height of zero this will produce
-slightly more vertical space above the picture than below it;
+Actually, since the vbox has a height of zero (it is defined with
+\evtop) this will produce slightly more vertical space above the
+picture than below it;
 .RS
 .LP
 .B
@@ -253,6 +260,23 @@ slightly more vertical space above the picture than below it;
 .LP
 would avoid this.
 .LP
+To make the vbox having a positive height and a depth of zero
+(as used e.g.\& by \*(lx's
+.BR \%graphics.sty ),
+define the following macro in your document:
+.RS
+.LP
+.B \edef\egpicbox#1{%
+.br
+.B "  \eexpandafter\esetbox\ecsname #1\eendcsname"
+.br
+.B "   \evbox{\eexpandafter\eunvbox\ecsname #1\eendcsname\ekern 0pt}"
+.RE
+.LP
+Now you can simply say
+.B \egpicbox{graph}
+instead of \ebox\egraph.
+.LP
 You must use a \*(tx driver that supports the
 .B tpic
 specials, version 2.