===================================================================
RCS file: /cvs/mandoc/html.c,v
retrieving revision 1.109
retrieving revision 1.113
diff -u -p -r1.109 -r1.113
--- mandoc/html.c	2010/07/23 00:08:57	1.109
+++ mandoc/html.c	2010/10/01 21:51:13	1.113
@@ -1,4 +1,4 @@
-/*	$Id: html.c,v 1.109 2010/07/23 00:08:57 kristaps Exp $ */
+/*	$Id: html.c,v 1.113 2010/10/01 21:51:13 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -116,7 +116,7 @@ ml_alloc(char *outopts, enum htmltype type)
 	h = calloc(1, sizeof(struct html));
 	if (NULL == h) {
 		perror(NULL);
-		exit(EXIT_FAILURE);
+		exit((int)MANDOCLEVEL_SYSERR);
 	}
 
 	h->type = type;
@@ -398,7 +398,7 @@ print_otag(struct html *h, enum htmltag tag, 
 		t = malloc(sizeof(struct tag));
 		if (NULL == t) {
 			perror(NULL);
-			exit(EXIT_FAILURE);
+			exit((int)MANDOCLEVEL_SYSERR);
 		}
 		t->tag = tag;
 		t->next = h->tags.head;
@@ -419,6 +419,8 @@ print_otag(struct html *h, enum htmltag tag, 
 
 	if ( ! (h->flags & HTML_NONOSPACE))
 		h->flags &= ~HTML_NOSPACE;
+	else
+		h->flags |= HTML_NOSPACE;
 
 	/* Print out the tag name and attributes. */
 
@@ -549,6 +551,8 @@ print_text(struct html *h, const char *word)
 	if ( ! print_encode(h, word, 0))
 		if ( ! (h->flags & HTML_NONOSPACE))
 			h->flags &= ~HTML_NOSPACE;
+
+	h->flags &= ~HTML_IGNDELIM;
 
 	/* 
 	 * Note that we don't process the pipe: the parser sees it as