===================================================================
RCS file: /cvs/mandoc/man_html.c,v
retrieving revision 1.65
retrieving revision 1.69
diff -u -p -r1.65 -r1.69
--- mandoc/man_html.c	2011/01/12 15:41:09	1.65
+++ mandoc/man_html.c	2011/02/09 09:52:47	1.69
@@ -1,4 +1,4 @@
-/*	$Id: man_html.c,v 1.65 2011/01/12 15:41:09 kristaps Exp $ */
+/*	$Id: man_html.c,v 1.69 2011/02/09 09:52:47 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -100,7 +100,7 @@ static	const struct htmlman mans[MAN_MAX] = {
 	{ man_I_pre, NULL }, /* I */
 	{ man_alt_pre, NULL }, /* IR */
 	{ man_alt_pre, NULL }, /* RI */
-	{ NULL, NULL }, /* na */
+	{ man_ign_pre, NULL }, /* na */
 	{ man_br_pre, NULL }, /* sp */
 	{ man_literal_pre, NULL }, /* nf */
 	{ man_literal_pre, NULL }, /* fi */
@@ -180,6 +180,7 @@ print_man_node(MAN_ARGS)
 {
 	int		 child;
 	struct tag	*t;
+	struct htmlpair	 tag;
 
 	child = 1;
 	t = h->tags.head;
@@ -215,19 +216,38 @@ print_man_node(MAN_ARGS)
 				 n->next->line > n->line))
 			print_otag(h, TAG_BR, 0, NULL);
 		return;
+	case (MAN_EQN):
+		PAIR_CLASS_INIT(&tag, "eqn");
+		print_otag(h, TAG_SPAN, 1, &tag);
+		print_text(h, n->eqn->data);
+		break;
 	case (MAN_TBL):
+		/*
+		 * This will take care of initialising all of the table
+		 * state data for the first table, then tearing it down
+		 * for the last one.
+		 */
 		print_tbl(h, n->span);
 		return;
 	default:
 		/* 
 		 * Close out scope of font prior to opening a macro
-		 * scope.  Assert that the metafont is on the top of the
-		 * stack (it's never nested).
+		 * scope.
 		 */
 		if (HTMLFONT_NONE != h->metac) {
 			h->metal = h->metac;
 			h->metac = HTMLFONT_NONE;
 		}
+
+		/*
+		 * Close out the current table, if it's open, and unset
+		 * the "meta" table state.  This will be reopened on the
+		 * next table element.
+		 */
+		if (h->tblt) {
+			print_tblclose(h);
+			t = h->tags.head;
+		}
 		if (mans[n->tok].pre)
 			child = (*mans[n->tok].pre)(m, n, mh, h);
 		break;
@@ -245,6 +265,8 @@ print_man_node(MAN_ARGS)
 	case (MAN_ROOT):
 		man_root_post(m, n, mh, h);
 		break;
+	case (MAN_EQN):
+		break;
 	default:
 		if (mans[n->tok].post)
 			(*mans[n->tok].post)(m, n, mh, h);
@@ -649,7 +671,7 @@ man_literal_pre(MAN_ARGS)
 	} else
 		mh->fl &= ~MANH_LITERAL;
 
-	return(1);
+	return(0);
 }