===================================================================
RCS file: /cvs/mandoc/html.c,v
retrieving revision 1.114
retrieving revision 1.120
diff -u -p -r1.114 -r1.120
--- mandoc/html.c	2010/12/15 14:52:16	1.114
+++ mandoc/html.c	2010/12/20 13:07:55	1.120
@@ -1,4 +1,4 @@
-/*	$Id: html.c,v 1.114 2010/12/15 14:52:16 kristaps Exp $ */
+/*	$Id: html.c,v 1.120 2010/12/20 13:07:55 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -67,6 +67,12 @@ static	const struct htmldata htmltags[TAG_MAX] = {
 	{"dl",		HTML_CLRLINE}, /* TAG_DL */
 	{"dt",		HTML_CLRLINE}, /* TAG_DT */
 	{"dd",		HTML_CLRLINE}, /* TAG_DD */
+	{"blockquote",	HTML_CLRLINE}, /* TAG_BLOCKQUOTE */
+	{"p",		HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_P */
+	{"pre",		HTML_CLRLINE }, /* TAG_PRE */
+	{"b",		0 }, /* TAG_B */
+	{"i",		0 }, /* TAG_I */
+	{"u",		0 }, /* TAG_U */
 };
 
 static	const char	*const htmlfonts[HTMLFONT_MAX] = {
@@ -76,20 +82,19 @@ static	const char	*const htmlfonts[HTMLFONT_MAX] = {
 };
 
 static	const char	*const htmlattrs[ATTR_MAX] = {
-	"http-equiv",
-	"content",
-	"name",
-	"rel",
-	"href",
-	"type",
-	"media",
-	"class",
-	"style",
-	"width",
-	"valign",
-	"target",
-	"id",
-	"summary",
+	"http-equiv", /* ATTR_HTTPEQUIV */
+	"content", /* ATTR_CONTENT */
+	"name", /* ATTR_NAME */
+	"rel", /* ATTR_REL */
+	"href", /* ATTR_HREF */
+	"type", /* ATTR_TYPE */
+	"media", /* ATTR_MEDIA */
+	"class", /* ATTR_CLASS */
+	"style", /* ATTR_STYLE */
+	"width", /* ATTR_WIDTH */
+	"id", /* ATTR_ID */
+	"summary", /* ATTR_SUMMARY */
+	"align", /* ATTR_ALIGN */
 };
 
 static	void		  print_spec(struct html *, enum roffdeco,
@@ -447,6 +452,10 @@ print_otag(struct html *h, enum htmltag tag, 
 	putchar('>');
 
 	h->flags |= HTML_NOSPACE;
+
+	if ((HTML_AUTOCLOSE | HTML_CLRLINE) & htmltags[tag].flags)
+		putchar('\n');
+
 	return(t);
 }