Merge version 1.11.1:

Again lots of cleanup and maintenance work by kristaps@.
- simplify error reporting: less function pointers, more mandoc_[v]msg
- main: split document parsing out of main.c into read.c
- roff, mdoc, man: improved recognition of control characters
- roff: better handling of if/else stack overflows
- roff: add some predefined strings for backward compatibility
- mdoc, man: empty sections are not errors
- mdoc: move delimiter handling to libmdoc
- some header restructuring and some minor features and fixes
This merge causes two minor regressions
that i will fix in separate commits right afterwards.

1 files changed, 1 insertions, 10 deletions

diff --git a/usr.bin/mandoc/html.c b/usr.bin/mandoc/html.c
index b39d28117e0..45197ad76ef 100644
--- a/usr.bin/mandoc/html.c
+++ b/usr.bin/mandoc/html.c
@@ -1,4 +1,4 @@
-/*	$Id: html.c,v 1.24 2011/04/21 22:59:54 schwarze Exp $ */
+/*	$Id: html.c,v 1.25 2011/04/24 16:22:02 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -28,7 +28,6 @@
 
 #include "mandoc.h"
 #include "out.h"
-#include "chars.h"
 #include "html.h"
 #include "main.h"
 
@@ -505,15 +504,10 @@ print_doctype(struct html *h)
 			name, doctype, dtd);
 }
 
-
 void
 print_text(struct html *h, const char *word)
 {
 
-	if (DELIM_CLOSE == mandoc_isdelim(word))
-		if ( ! (HTML_IGNDELIM & h->flags))
-			h->flags |= HTML_NOSPACE;
-
 	if ( ! (HTML_NOSPACE & h->flags)) {
 		/* Manage keeps! */
 		if ( ! (HTML_KEEP & h->flags)) {
@@ -541,9 +535,6 @@ print_text(struct html *h, const char *word)
 	}
 
 	h->flags &= ~HTML_IGNDELIM;
-
-	if (DELIM_OPEN == mandoc_isdelim(word))
-		h->flags |= HTML_NOSPACE;
 }