diff --git a/share/sgml/transpec/docbook-html.ts b/share/sgml/transpec/docbook-html.ts
index 07bc30d03e38..8c3dfb8cf1e5 100644
--- a/share/sgml/transpec/docbook-html.ts
+++ b/share/sgml/transpec/docbook-html.ts
@@ -111,6 +111,9 @@ ${_action &r.blkpe;t}'>
+
+
+
@@ -431,8 +434,10 @@ ${_action &r.blkpe;t}
^<!-- Generated on ${date} using ${transpec} -->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML><TITLE>${_followrel descendant TITLE &r.pass;}</TITLE>
-<BODY BGCOLOR="#FFFFFF" TEXT="#000000">^
+<BODY BGCOLOR="#FFFFFF" TEXT="#000000">
+${_isset inchdr &r.inchdr;}^
^${_set fnotenum 1}${_action &r.fnote;t}
+${_isset incftr &r.incftr;}
</BODY></HTML>
@@ -757,6 +762,13 @@ ${_action &r.blkpe;t}
ENTRYTBL
+
+
+ENVVAR
+
+&m.tt;
+
+
EPIGRAPH
@@ -1602,6 +1614,14 @@ ${_action &r.blkpe;t}
PROGRAMLISTINGCO
+
+
+PROMPT
+
+&m.tt;
+
+
PROPERTY
@@ -2804,4 +2824,22 @@ ${_find top gi FOOTNOTE &r.fnotei;}
^
+
+
+
+inchdr .
+
+${_include ${inchdr}}
+
+
+
+
+
+incftr .
+
+${_include ${incftr}}
+
+
+
+
diff --git a/usr.bin/sgmlfmt/sgmlfmt.pl b/usr.bin/sgmlfmt/sgmlfmt.pl
index de6b1f390117..0df4e7a23cf7 100755
--- a/usr.bin/sgmlfmt/sgmlfmt.pl
+++ b/usr.bin/sgmlfmt/sgmlfmt.pl
@@ -112,7 +112,7 @@ sub sgmlparse {
$defines = "-i $defines";
}
open($ifhandle, "$sgmls $defines $decl $file | " .
- "$instant -Dfilename=$fileroot -t ${dtd}-${replacement}.ts |");
+ "$instant -Dfilename=$fileroot $instantopts -t ${dtd}-${replacement}.ts |");
}
#
@@ -696,6 +696,8 @@ sub main {
$dtd = "docbook";
$decl = "/usr/share/sgml/docbook/docbook.dcl";
if ($opt_f eq 'html') {
+ if ($opt_hdr) {$instantopts .= " -D \"inchdr=${opt_hdr}\"";}
+ if ($opt_ftr) {$instantopts .= " -D \"incftr=${opt_ftr}\"";}
&docbook_html();
}
else {