===================================================================
RCS file: /cvs/mandoc/man_html.c,v
retrieving revision 1.18
retrieving revision 1.20
diff -u -p -r1.18 -r1.20
--- mandoc/man_html.c	2009/11/10 12:03:30	1.18
+++ mandoc/man_html.c	2009/11/14 19:23:58	1.20
@@ -1,4 +1,4 @@
-/*	$Id: man_html.c,v 1.18 2009/11/10 12:03:30 kristaps Exp $ */
+/*	$Id: man_html.c,v 1.20 2009/11/14 19:23:58 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -188,16 +188,18 @@ print_man_node(MAN_ARGS)
 		break;
 	case (MAN_TEXT):
 		print_text(h, n->string);
-		break;
+		return;
 	default:
+		if (h->metaf) {
+			assert(h->metaf == t);
+			print_tagq(h, h->metaf);
+			t = h->tags.head;
+		}
 		if (mans[n->tok].pre)
 			child = (*mans[n->tok].pre)(m, n, h);
 		break;
 	}
 
-	if (child && n->child)
-		print_man_nodelist(m, n->child, h);
-
 	print_stagq(h, t);
 
 	bufinit(h);
@@ -211,9 +213,6 @@ print_man_node(MAN_ARGS)
 	default:
 		if (mans[n->tok].post)
 			(*mans[n->tok].post)(m, n, h);
-
-		/* Reset metafont upon exit from macro. */
-		h->metafont = 0;
 		break;
 	}
 }