===================================================================
RCS file: /cvs/mandoc/html.c,v
retrieving revision 1.166
retrieving revision 1.176
diff -u -p -r1.166 -r1.176
--- mandoc/html.c	2014/09/27 09:03:24	1.166
+++ mandoc/html.c	2014/10/10 15:26:29	1.176
@@ -1,6 +1,6 @@
-/*	$Id: html.c,v 1.166 2014/09/27 09:03:24 kristaps Exp $ */
+/*	$Id: html.c,v 1.176 2014/10/10 15:26:29 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -68,13 +68,28 @@ static	const struct htmldata htmltags[TAG_MAX] = {
 	{"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 */
 	{"code",	0 }, /* TAG_CODE */
 	{"small",	0 }, /* TAG_SMALL */
 	{"style",	HTML_CLRLINE}, /* TAG_STYLE */
+	{"math",	HTML_CLRLINE}, /* TAG_MATH */
+	{"mrow",	0}, /* TAG_MROW */
+	{"mi",		0}, /* TAG_MI */
+	{"mo",		0}, /* TAG_MO */
+	{"msup",	0}, /* TAG_MSUP */
+	{"msub",	0}, /* TAG_MSUB */
+	{"msubsup",	0}, /* TAG_MSUBSUP */
+	{"mfrac",	0}, /* TAG_MFRAC */
+	{"msqrt",	0}, /* TAG_MSQRT */
+	{"mfenced",	0}, /* TAG_MFENCED */
+	{"mtable",	0}, /* TAG_MTABLE */
+	{"mtr",		0}, /* TAG_MTR */
+	{"mtd",		0}, /* TAG_MTD */
+	{"munderover",	0}, /* TAG_MUNDEROVER */
+	{"munder",	0}, /* TAG_MUNDER*/
+	{"mover",	0}, /* TAG_MOVER*/
 };
 
 static	const char	*const htmlattrs[ATTR_MAX] = {
@@ -85,12 +100,12 @@ static	const char	*const htmlattrs[ATTR_MAX] = {
 	"media", /* ATTR_MEDIA */
 	"class", /* ATTR_CLASS */
 	"style", /* ATTR_STYLE */
-	"width", /* ATTR_WIDTH */
 	"id", /* ATTR_ID */
-	"summary", /* ATTR_SUMMARY */
-	"align", /* ATTR_ALIGN */
 	"colspan", /* ATTR_COLSPAN */
 	"charset", /* ATTR_CHARSET */
+	"open", /* ATTR_OPEN */
+	"close", /* ATTR_CLOSE */
+	"mathvariant", /* ATTR_MATHVARIANT */
 };
 
 static	const char	*const roffscales[SCALE_MAX] = {
@@ -112,11 +127,11 @@ static	int	 print_escape(char);
 static	int	 print_encode(struct html *, const char *, int);
 static	void	 print_metaf(struct html *, enum mandoc_esc);
 static	void	 print_attr(struct html *, const char *, const char *);
-static	void	 *ml_alloc(char *, enum htmltype);
+static	void	 *ml_alloc(char *);
 
 
 static void *
-ml_alloc(char *outopts, enum htmltype type)
+ml_alloc(char *outopts)
 {
 	struct html	*h;
 	const char	*toks[5];
@@ -130,7 +145,6 @@ ml_alloc(char *outopts, enum htmltype type)
 
 	h = mandoc_calloc(1, sizeof(struct html));
 
-	h->type = type;
 	h->tags.head = NULL;
 	h->symtab = mchars_alloc();
 
@@ -159,14 +173,14 @@ void *
 html_alloc(char *outopts)
 {
 
-	return(ml_alloc(outopts, HTML_HTML_4_01_STRICT));
+	return(ml_alloc(outopts));
 }
 
 void *
 xhtml_alloc(char *outopts)
 {
 
-	return(ml_alloc(outopts, HTML_XHTML_1_0_STRICT));
+	return(ml_alloc(outopts));
 }
 
 void
@@ -198,8 +212,16 @@ print_gen_head(struct html *h)
 	tag[0].val = "utf-8";
 	print_otag(h, TAG_META, 1, tag);
 
+	/*
+	 * Print a default style-sheet.
+	 */
 	t = print_otag(h, TAG_STYLE, 0, NULL);
-	print_text(h, "table.head, table.foot { width: 100%; }\n");
+	print_text(h, "table.head, table.foot { width: 100%; }\n"
+	      "td.head-rtitle, td.foot-os { text-align: right; }\n"
+	      "td.head-vol { text-align: center; }\n"
+	      "table.foot td { width: 50%; }\n"
+	      "table.head td { width: 33%; }\n"
+	      "div.spacer { margin: 1em 0; }\n");
 	print_tagq(h, t);
 
 	if (h->style) {
@@ -490,16 +512,10 @@ print_otag(struct html *h, enum htmltag tag,
 	for (i = 0; i < sz; i++)
 		print_attr(h, htmlattrs[p[i].key], p[i].val);
 
-	/* Accommodate for XML "well-formed" singleton escaping. */
+	/* Accommodate for "well-formed" singleton escaping. */
 
 	if (HTML_AUTOCLOSE & htmltags[tag].flags)
-		switch (h->type) {
-		case HTML_XHTML_1_0_STRICT:
-			putchar('/');
-			break;
-		default:
-			break;
-		}
+		putchar('/');
 
 	putchar('>');
 
@@ -617,6 +633,18 @@ print_stagq(struct html *h, const struct tag *suntil)
 		free(tag);
 	}
 }
+
+void
+print_paragraph(struct html *h)
+{
+	struct tag	*t;
+	struct htmlpair	 tag;
+
+	PAIR_CLASS_INIT(&tag, "spacer");
+	t = print_otag(h, TAG_DIV, 1, &tag);
+	print_tagq(h, t);
+}
+
 
 void
 bufinit(struct html *h)