===================================================================
RCS file: /cvs/mandoc/mdoc_html.c,v
retrieving revision 1.149
retrieving revision 1.152
diff -u -p -r1.149 -r1.152
--- mandoc/mdoc_html.c	2011/01/29 14:49:44	1.149
+++ mandoc/mdoc_html.c	2011/02/06 23:02:31	1.152
@@ -1,6 +1,6 @@
-/*	$Id: mdoc_html.c,v 1.149 2011/01/29 14:49:44 kristaps Exp $ */
+/*	$Id: mdoc_html.c,v 1.152 2011/02/06 23:02:31 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -432,6 +432,8 @@ print_mdoc_node(MDOC_ARGS)
 				print_otag(h, TAG_BR, 0, NULL);
 		print_text(h, n->string);
 		return;
+	case (MDOC_EQN):
+		return;
 	case (MDOC_TBL):
 		/*
 		 * This will take care of initialising all of the table
@@ -780,7 +782,8 @@ static int
 mdoc_ns_pre(MDOC_ARGS)
 {
 
-	h->flags |= HTML_NOSPACE;
+	if ( ! (MDOC_LINE & n->flags))
+		h->flags |= HTML_NOSPACE;
 	return(1);
 }
 
@@ -803,6 +806,7 @@ mdoc_xx_pre(MDOC_ARGS)
 {
 	const char	*pp;
 	struct htmlpair	 tag;
+	int		 flags;
 
 	switch (n->tok) {
 	case (MDOC_Bsx):
@@ -832,9 +836,10 @@ mdoc_xx_pre(MDOC_ARGS)
 
 	print_text(h, pp);
 	if (n->child) {
+		flags = h->flags;
 		h->flags |= HTML_KEEP;
 		print_text(h, n->child->string);
-		h->flags &= ~HTML_KEEP;
+		h->flags = flags;
 	}
 	return(0);
 }