Removing the grohtml-old device driver which is now obsolete.

* src/devices/grohtml-old/*: Removed.
* font/devhtml-old/*: Removed.
* src/libgroff/htmlindicate.cc (graphic_start, graphic_end): Remove
comments.
* Makefile.in (CCPROGDIRS, DEVDIRS): Updated.
* test-groff (PATH): Updated.
* tmac/Makefile.sub (NORMALFILES): Updated.
* tmac/an-old.tmac: Remove special code for html-old device.
Replace `html-or-html-old' register with `an-html'.
* tmac/eqnrc: Updated.
* tmac/html-old.tmac: Removed.
* tmac/troffrc, tmac/troffrc-end: Updated.
* tmac/www.tmac: Remove special code for html-old device.
Replace `html-or-html-old' register with `www-html'.

* src/libgroff/tmpfile.cc (remove_tmp_files),
src/libgroff/htmlindicate.cc (graphic_end), include/htmlindicate.h,
src/preproc/grn/*.cc, src/roff/groff/env.{cc,h}: Remove `void'
parameter if used as a single argument for consistency with rest of
source code.

* aclocal.m4, tmac/an-old.tmac: Fix copyright.


* src/roff/troff/troff.man: Fixing typos.

7 files changed, 35 insertions, 107 deletions

diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub
index db9bad27..ba5718b1 100644
--- a/tmac/Makefile.sub
+++ b/tmac/Makefile.sub
@@ -20,7 +20,7 @@ NORMALFILES=\
   tty.tmac tty-char.tmac latin1.tmac \
   X.tmac Xps.tmac \
   lj4.tmac \
-  html.tmac html-old.tmac mwww.tmac www.tmac \
+  html.tmac mwww.tmac www.tmac \
   eqnrc \
   troffrc troffrc-end \
   hyphen.us
diff --git a/tmac/an-old.tmac b/tmac/an-old.tmac
index 9452f50e..9ef041f9 100644
--- a/tmac/an-old.tmac
+++ b/tmac/an-old.tmac
@@ -1,6 +1,6 @@
 .\" an-old.tmac
 .\"
-.\" Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+.\" Copyright (C) 1989, 1990, 1991, 1992, 2001 Free Software Foundation, Inc.
 .\"      Written by James Clark (jjc@jclark.com)
 .\"
 .\" This file is part of groff.
@@ -52,13 +52,9 @@
 .  el   .nr cR 0
 .\}
 .
-.\" compute the value of '\*(.T'html':'\*(.T'html-old'
-.\" XXX: it would be nice to allow logical or with strings
-.
-.nr html-or-html-old 0
-.if '\*(.T'html-old' .nr html-or-html-old 1
-.if '\*(.T'html'     .nr html-or-html-old 1
-.if \n[html-or-html-old] .nr C 1
+.nr an-html 0
+.if '\*(.T'html' .nr an-html 1
+.if \n[an-html] .nr C 1
 .if r ps4html .nr C 1
 .
 .de set-an-margin
@@ -67,7 +63,7 @@
 .
 .\" .TH title section extra1 extra2 extra3
 .de TH
-.  if '\*(.T'html' \{\
+.  if \\n[an-html] \{\
 .     HTML-TAG ".tl"
 \\$1
 .  \}
@@ -112,8 +108,7 @@
 .  ps \\n[PS]u
 .  vs \\n[VS]u
 .
-.  ie '\*[.T]'html-old' .nr IN 1.2i
-.  el                   .nr IN 7.2n
+.  nr IN 7.2n
 .  PD
 .  nr SN 3n \" the indentation of sub-sub-headings relative to sub-headings
 .  nr an-level 1
@@ -153,7 +148,7 @@
 .  ev 1
 .  ps \\n[PS]u
 .  vs \\n[VS]u
-.  ie \\n[html-or-html-old] \
+.  ie \\n[an-html] \
 .    tl ''''
 .  el \{\
 .    if !\\n[cR] \
@@ -178,7 +173,7 @@
 .  ev 1
 .  ps \\n[PS]u
 .  vs \\n[VS]u
-.  ie \\n[html-or-html-old] \{\
+.  ie \\n[an-html] \{\
 .    ds an-page-string
 .    ds an-extra1
 .    ds an-extra2
@@ -282,7 +277,7 @@
 .  if \\n[.$] .nr an-prevailing-indent (n;\\$1)
 .  it 1 an-trap
 .  if !\\n[an-div?] .di an-div
-.  ie \\n[html-or-html-old] .in \\n[an-margin]u
+.  ie \\n[an-html] .in \\n[an-margin]u
 .  el \{\
 .    in 0
 .    ll -\\n[an-margin]u
@@ -473,7 +468,7 @@
 .ds lq \(lq
 .ds rq \(rq
 .
-.if !\n[html-or-html-old] .hy 14
+.if !\n[an-html] .hy 14
 .
 .\" Load local modifications.
 .mso man.local
diff --git a/tmac/eqnrc b/tmac/eqnrc
index 5b9598fa..cfdbf3f9 100644
--- a/tmac/eqnrc
+++ b/tmac/eqnrc
@@ -15,12 +15,11 @@ ifdef X100 ! define X %1% !
 ifdef X75-12 ! define X %1% !
 ifdef X100-12 ! define X %1% !
 
-ifdef ps ! define ps|X|html|html-old %1% !
-ifdef X ! define ps|X|html|html-old %1% !
-ifdef html ! define ps|X|html|html-old %1% !
-ifdef html-old ! define ps|X|html|html-old %1% !
+ifdef ps ! define ps|X|html %1% !
+ifdef X ! define ps|X|html %1% !
+ifdef html ! define ps|X|html %1% !
 
-ifdef ps|X|html|html-old ! sdefine inf %"\s[\En[.s]*13u/10u]\v'12M'\(if\v'-12M'\s0"% !
+ifdef ps|X|html ! sdefine inf %"\s[\En[.s]*13u/10u]\v'12M'\(if\v'-12M'\s0"% !
 
 ifdef dvi !
 sdefine int %{type "operator" vcenter \(is}%
@@ -48,7 +47,7 @@ set big_op_spacing5 10
 
 ifdef X ! set axis_height 32 !
 
-ifdef ps|X|html|html-old ! set draw_lines 1 !
+ifdef ps|X|html ! set draw_lines 1 !
 
 ifdef ascii ! define n %1% !
 ifdef latin1 ! define n %1% !
@@ -59,6 +58,6 @@ set nroff 1
 !
 
 undef X
-undef ps|X|html|html-old
+undef ps|X|html
 undef n
 .EN
diff --git a/tmac/html-old.tmac b/tmac/html-old.tmac
deleted file mode 100755
index 662cf58f..00000000
--- a/tmac/html-old.tmac
+++ /dev/null
@@ -1,62 +0,0 @@
-.\" html-old.tmac
-.\"
-.nr _C \n(.C
-.cp 0
-.ftr CW CR
-.ftr C CR
-.ftr CO CI
-.ftr CX CBI
-.ftr H HR
-.ftr HO HI
-.ftr HX HBI
-.ftr NX NBI
-.char \(ru \D'l .5m 0'
-.char \(ul \v'.25m'\D'l .5m 0'\v'-.25m'
-.char \(br \v'.25m'\D'l 0 -1m'\v'.75m'
-.char \(rn \v'-.75m'\D'l .5m 0'\v'.75m'
-.\" .char ~ \v'-.55m'\\s[\\n(.s/2u]\v'.2m'\(ti\v'-.2m'\s0\v'.55m'
-.\" .char ^ \v'-.55m'\\s[\\n(.s/2u]\v'.3m'\(ha\v'-.3m'\s0\v'.55m'
-.if !c\(va .char \(va \o'\(ua\(da'
-.if !c\(em .char \(em --
-.if !c\(en .char \(en \-
-.if !c\(fi .char \(fi fi
-.if !c\(fl .char \(fl fl
-.if !c\(ff .char \(ff ff
-.if !c\(Fi .char \(Fi ffi
-.if !c\(Fl .char \(Fl ffl
-.if !c\(ci .char \(ci \v'-.25m'\h'.05m'\D'c .5m'\h'.05m'\v'.25m'
-.if !c\(sq .char \(sq \h'.05m'\D'l .5m 0'\D'l 0 -.5m'\D'l -.5m 0'\D'l 0 .5m'\h'.55m'
-.if !c\(ga .char \(ga \Z'\v'-.7m'\D'l .22m .18m''\h'.33m'
-.if !c\(dg .char \(dg \Z'\h'.25m'\v'.15m'\D'l 0 -.8m'\v'.2m'\h'-.195m'\
-\D'l .39m 0''\h'.5m'
-.if !c\(dd .char \(dd \Z'\h'.25m'\v'.15m'\D'l 0 -.8m'\v'.2m'\h'-.195m'\
-\D'l .39m 0'\v'.4m'\D'l -.39m 0''\h'.5m'
-.if !c\(lq .char \(lq ``
-.if !c\(rq .char \(rq ''
-.if !c\(Bq .char \(bq ,,
-.if !c\(OE .char \(OE O\h'-.25m'E
-.if !c\(oe .char \(oe o\h'-.14m'e
-.if !c\(ah .char \(ah \v'-.55m'\s[\En[.s]/2u]v\s0\v'.55m'
-.if !c\(ao .char \(ao \v'-.55m'\s[\En[.s]*6u/10u]\D'c .25m'\s0\v'.55m'
-.if !c\(ho .char \(ho \s[\En[.s]/2u]\v'.4m'c\v'-.4m'\s0
-.if !c\(lh .char \(lh <-
-.if !c\(rh .char \(rh ->
-.if !c\(bq .tr \(bq,
-.if !c\(aq .tr \(aq'
-.if '\*(.T'html-old' .char \[radicalex] \h'-\w'\(sr'u'\[radicalex]\h'\w'\(sr'u'
-.if !\n(_C .mso pspic.tmac
-.cp \n(_C
-.\" now turn off all headers and footers for ms, me and mm macro sets
-.if d EF .EF '''
-.if d EH .EH '''
-.if d OF .OF '''
-.if d OH .OH '''
-.if d ef .ef '''
-.if d of .of '''
-.if d oh .oh '''
-.if d eh .eh '''
-.\" it doesn't make sense to use hyphenation with html-old, so we turn it off.
-.hy 0
-.nr HY 0
-.\" avoid line breaks after hyphen-like characters.
-.cflags 0 -\(hy\(em\(en\[shc]
diff --git a/tmac/troffrc b/tmac/troffrc
index 9e71e774..c4cfa20f 100644
--- a/tmac/troffrc
+++ b/tmac/troffrc
@@ -17,11 +17,10 @@
 .do ds troffrc!lj4 lj4.tmac
 .do ds troffrc!lbp lbp.tmac
 .do ds troffrc!html www.tmac
-.do ds troffrc!html-old www.tmac
 .do if d troffrc!\*[.T] \
 .	do mso \*[troffrc!\*[.T]]
 .do rm troffrc!ps troffrc!Xps troffrc!dvi troffrc!X75 troffrc!X75-12 \
-troffrc!X100 troffrc!X100-12 troffrc!lj4 troff!lbp troffrc!html troffrc!html-old
+troffrc!X100 troffrc!X100-12 troffrc!lj4 troff!lbp troffrc!html
 .ie '\*(.T'cp1047' .do tr \[char65]
 .el .do tr \[char160]
 .\" Set the hyphenation language to `us'.
diff --git a/tmac/troffrc-end b/tmac/troffrc-end
index 3f44ad6c..631f6b00 100644
--- a/tmac/troffrc-end
+++ b/tmac/troffrc-end
@@ -2,11 +2,10 @@
 .\" final startup file for troff
 .\" this file is parsed after all macro sets have been read
 .\"
-.do if '\*(.T'html'     .mso html.tmac
-.do if '\*(.T'html-old' .mso html-old.tmac
+.do if '\*(.T'html' .mso html.tmac
 .\" if we are running the postscript device for html images then load -mwww
 .\"
-.do if r ps4html        .mso www.tmac
+.do if r ps4html    .mso www.tmac
 .\"
 .\" for all other devices blank out these macros
 .\"
diff --git a/tmac/www.tmac b/tmac/www.tmac
index bd015e07..8358c868 100644
--- a/tmac/www.tmac
+++ b/tmac/www.tmac
@@ -3,25 +3,22 @@
 .\" A simple set of macros to provide HTML documents with basic
 .\" www functionality.  It will work with any macro set.
 .\"
-.\" compute the value of '\*(.T'html-old':'\*(.T'html'
-.\" --fixme-- it would be nice to allow logical or with strings
 .nr _C \n(.C
 .cp 0
-.nr html-or-html-old 0
-.if '\*(.T'html-old'  .nr html-or-html-old 1
-.if '\*(.T'html'      .nr html-or-html-old 1
+.nr www-html 0
+.if '\*(.T'html' .nr www-html 1
 .\"
 .\"
 .\"
 .de HTML
-.  if \\n[html-or-html-old] \{\
+.  if \\n[www-html] \{\
 .\" the following line makes the vertical mode leave, so to say
 \&
 \X^html:\\$*^
 .  \}
 ..
 .de HTMLINDEX
-.  if \\n[html-or-html-old] \X^index:\\$*^
+.  if \\n[www-html] \X^index:\\$*^
 ..
 .\"
 .\"  BODYCOLOR - $1 is foreground color
@@ -45,7 +42,7 @@
 .\"        $3 is optional stuff printed immediately after $3
 .\"
 .de URL
-.  ie \\n[html-or-html-old] \{\
+.  ie \\n[www-html] \{\
 .    HTML <a href="\\$2">\\$1</a>\\$3
 .  \}
 .  el \{\
@@ -57,7 +54,7 @@
 .\"        $2 is the ftp url
 .\"        $3 is optional stuff printed immediately after $2
 .de FTP
-.  ie \\n[html-or-html-old] \{\
+.  ie \\n[www-html] \{\
 .    HTML <a href=\\$2>\\$1</a>\\$3
 .  \}
 .  el \{\
@@ -80,7 +77,7 @@
 .\" force reset after a potential heading by performing some motion..
 .\" how do we do this --fixme--
 .\"  \h'\w' ''\h'-\w' '' doesn't work..
-.  ie \\n[html-or-html-old] \{\
+.  ie \\n[www-html] \{\
 .    ie '\\$2'' \{\
 .      HTML "<a href=mailto:\\$1>\\$1</a>\\$3"
 .    \}
@@ -110,7 +107,7 @@
 .\"         $3 is the y width (default if absent is the x value)
 .\"
 .de IMAGE
-.  ie \\n[html-or-html-old] \{\
+.  ie \\n[www-html] \{\
 .    nr HTMLWIDTH 400
 .    if !'\\$2'' \{\
 .      nr HTMLWIDTH \\$2
@@ -130,7 +127,7 @@
 ..
 .\" HTML-TAG - emit a tag for the new grohtml
 .de HTML-TAG
-.  if '\*(.T'html' \{\
+.  if \\n[www-html] \{\
 .\" the following line makes the vertical mode leave, so to say
 \&
 \X^html-tag:\\$*^
@@ -151,10 +148,11 @@
 .\"
 .\" supplimentary macros used by other macro sets
 .\"
-.\" here are some tags specially for -Tps or -Thtml when invoked by pre-html to
-.\" generate png images from postscript.
+.\" here are some tags specially for -Tps or -Thtml when invoked by pre-html
+.\" to generate png images from postscript.
 .\"
-.\" HTML-DO-IMAGE - tells troff to issue an image marker which can be read back by pre-html
+.\" HTML-DO-IMAGE - tells troff to issue an image marker which can be
+.\"                 read back by pre-html
 .\"
 .de HTML-DO-IMAGE
 .  if r ps4html .begin \{\
@@ -163,7 +161,7 @@
 .         tl ''''
 \O0\O1
 .  \}
-.  if '\*(.T'html' .begin \{
+.  if \\n[www-html] .begin \{
 .         image \\$2 \\$1.png
 \O0
 .  \}
@@ -173,7 +171,7 @@
 .\"
 .de HTML-IMAGE-END
 .  if r ps4html    \O2\O1\O4
-.  if '\*(.T'html' \O2\O1\O4
+.  if \\n[www-html] \O2\O1\O4
 ..
 .nr png-no 0
 .\"