===================================================================
RCS file: /cvs/mandoc/man_html.c,v
retrieving revision 1.46
retrieving revision 1.52
diff -u -p -r1.46 -r1.52
--- mandoc/man_html.c	2010/12/05 16:14:16	1.46
+++ mandoc/man_html.c	2010/12/08 10:58:22	1.52
@@ -1,4 +1,4 @@
-/*	$Id: man_html.c,v 1.46 2010/12/05 16:14:16 kristaps Exp $ */
+/*	$Id: man_html.c,v 1.52 2010/12/08 10:58:22 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -102,11 +102,9 @@ static	const struct htmlman mans[MAN_MAX] = {
 	{ man_alt_pre, NULL }, /* IR */
 	{ man_alt_pre, NULL }, /* RI */
 	{ NULL, NULL }, /* na */
-	{ NULL, NULL }, /* i */
 	{ man_br_pre, NULL }, /* sp */
 	{ man_literal_pre, NULL }, /* nf */
 	{ man_literal_pre, NULL }, /* fi */
-	{ NULL, NULL }, /* r */
 	{ NULL, NULL }, /* RE */
 	{ man_RS_pre, NULL }, /* RS */
 	{ man_ign_pre, NULL }, /* DT */
@@ -114,6 +112,7 @@ static	const struct htmlman mans[MAN_MAX] = {
 	{ man_ign_pre, NULL }, /* PD */
 	{ man_ign_pre, NULL }, /* AT */
 	{ man_in_pre, NULL }, /* in */
+	{ man_ign_pre, NULL }, /* ft */
 };
 
 
@@ -362,15 +361,11 @@ man_br_pre(MAN_ARGS)
 
 	SCALE_VS_INIT(&su, 1);
 
-	switch (n->tok) {
-	case (MAN_sp):
+	if (MAN_sp == n->tok) {
 		if (n->child)
 			a2roffsu(n->child->string, &su, SCALE_VS);
-		break;
-	default:
+	} else
 		su.scale = 0;
-		break;
-	}
 
 	bufcat_su(h, "height", &su);
 	PAIR_STYLE_INIT(&tag, h);
@@ -547,8 +542,10 @@ man_PP_pre(MAN_ARGS)
 	struct roffsu	 su;
 	int		 i;
 
-	if (MAN_BLOCK != n->type)
+	if (MAN_BODY == n->type)
 		return(1);
+	if (MAN_HEAD == n->type)
+		return(0);
 
 	i = 0;
 
@@ -565,6 +562,7 @@ man_PP_pre(MAN_ARGS)
 
 	PAIR_STYLE_INIT(&tag, h);
 	print_otag(h, TAG_DIV, i, &tag);
+
 	return(1);
 }
 
@@ -730,15 +728,11 @@ static int
 man_literal_pre(MAN_ARGS)
 {
 
-	switch (n->tok) {
-	case (MAN_nf):
+	if (MAN_nf == n->tok) {
 		print_otag(h, TAG_BR, 0, NULL);
 		mh->fl |= MANH_LITERAL;
-		break;
-	default:
+	} else
 		mh->fl &= ~MANH_LITERAL;
-		break;
-	}
 
 	return(1);
 }