===================================================================
RCS file: /cvs/mandoc/html.c,v
retrieving revision 1.85
retrieving revision 1.87
diff -u -p -r1.85 -r1.87
--- mandoc/html.c	2009/11/14 11:58:36	1.85
+++ mandoc/html.c	2009/11/14 12:04:59	1.87
@@ -1,4 +1,4 @@
-/*	$Id: html.c,v 1.85 2009/11/14 11:58:36 kristaps Exp $ */
+/*	$Id: html.c,v 1.87 2009/11/14 12:04:59 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -306,11 +306,6 @@ print_otag(struct html *h, enum htmltag tag, 
 	putchar('>');
 
 	h->flags |= HTML_NOSPACE;
-	if (HTML_CLRLINE & htmltags[tag].flags)
-		h->flags |= HTML_NEWLINE;
-	else
-		h->flags &= ~HTML_NEWLINE;
-
 	return(t);
 }
 
@@ -323,10 +318,8 @@ print_ctag(struct html *h, enum htmltag tag)
 	printf("</%s>", htmltags[tag].name);
 	if (HTML_CLRLINE & htmltags[tag].flags) {
 		h->flags |= HTML_NOSPACE;
-		h->flags |= HTML_NEWLINE;
 		putchar('\n');
-	} else
-		h->flags &= ~HTML_NEWLINE;
+	} 
 }
 
 
@@ -372,11 +365,9 @@ print_text(struct html *h, const char *p)
 	if ( ! (h->flags & HTML_NOSPACE))
 		putchar(' ');
 
-	h->flags &= ~HTML_NOSPACE;
-	h->flags &= ~HTML_NEWLINE;
-
-	if (p)
-		print_encode(h, p);
+	assert(p);
+	if ( ! print_encode(h, p))
+		h->flags &= ~HTML_NOSPACE;
 
 	if (*p && 0 == *(p + 1))
 		switch (*p) {