===================================================================
RCS file: /cvs/mandoc/html.c,v
retrieving revision 1.90
retrieving revision 1.92
diff -u -p -r1.90 -r1.92
--- mandoc/html.c	2009/11/16 06:07:49	1.90
+++ mandoc/html.c	2010/01/01 17:14:27	1.92
@@ -1,4 +1,4 @@
-/*	$Id: html.c,v 1.90 2009/11/16 06:07:49 kristaps Exp $ */
+/*	$Id: html.c,v 1.92 2010/01/01 17:14:27 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -14,6 +14,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/types.h>
 
 #include <assert.h>
@@ -89,11 +93,6 @@ static	const char	*const htmlattrs[ATTR_MAX] = {
 	"summary",
 };
 
-#ifdef __linux__
-extern	int		  getsubopt(char **, char * const *, char **);
-#endif
-
-
 static	void		  print_spec(struct html *, const char *, size_t);
 static	void		  print_res(struct html *, const char *, size_t);
 static	void		  print_ctag(struct html *, enum htmltag);
@@ -237,7 +236,7 @@ print_ofont(struct html *h, enum htmlfont font)
 
 	/* FIXME: DECO_ROMAN should just close out preexisting. */
 
-	if (h->metaf)
+	if (h->metaf && h->tags.head == h->metaf)
 		print_tagq(h, h->metaf);
 
 	PAIR_CLASS_INIT(&tag, htmlfonts[font]);