diff --git a/usr.bin/sgmlfmt/sgmlfmt.pl b/usr.bin/sgmlfmt/sgmlfmt.pl
index 9588cf0cc31..5f9ab856a45 100755
--- a/usr.bin/sgmlfmt/sgmlfmt.pl
+++ b/usr.bin/sgmlfmt/sgmlfmt.pl
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: sgmlfmt.pl,v 1.24 1997/05/10 01:25:50 jfieber Exp $
+# $Id: sgmlfmt.pl,v 1.25 1997/05/10 20:41:11 jfieber Exp $
# Copyright (C) 1996
# John R. Fieber. All rights reserved.
@@ -338,13 +338,13 @@ sub html2html {
$st_parent[0] = -1;
$t = $st_header[0];
$t =~ s|<[a-zA-Z/][^>]*>||g;
- print tocfile "\n$t\n" .
- $html_encoding . "\n";
+ print tocfile "\n$html_encoding\n$t\n" .
+ "\n";
print tocfile "$st_header[0]
\n";
$header[$st_ol[$sc]] =
- "$doctype\n\n\n$t\n" .
- $html_encoding . "\n$BODY\n";
+ "$doctype\n\n\n$html_encoding\n$t\n" .
+ "\n$BODY\n";
$header[$st_ol[$sc]] .= $html_header;
$header[$st_ol[$sc]] .= "\n$st_header[0]
\n";
@@ -372,8 +372,8 @@ sub html2html {
$t = $_;
$t =~ s|<[a-zA-Z/][^>]*>||g;
$header[$st_ol[$sc]] =
- "$doctype\n\n\n$t\n" .
- $html_encoding . "\n$BODY\n";
+ "$doctype\n\n\n$html_encoding\n$t\n" .
+ "\n$BODY\n";
$header[$st_ol[$sc]] .= $html_header;
$header[$st_ol[$sc]] .= "\n$navbar[$st_ol[$sc]]\n
\n";
$footer[$st_ol[$sc]] = "
\n$navbar[$st_ol[$sc]]\n";
@@ -679,7 +679,7 @@ sub main {
$opt_e = "iso-8859-1";
}
$html_encoding = "\n";
+ "CONTENT=\"text/html; charset=" . $opt_e . "\">";
if ($dtd eq "docbook") {
if ($opt_hdr) {$instantopts .= " -D \"inchdr=${opt_hdr}\"";}