clean up markup of .Bd, .D1, .Dl, .Li, and .Ql;

in particular, stop abuse of <blockquote>

4 files changed, 24 insertions, 22 deletions

diff --git a/html.c b/html.c
index f7dc4bd1..fcb2e876 100644
--- a/html.c
+++ b/html.c
@@ -1,4 +1,4 @@
-/*	$Id: html.c,v 1.198 2017/01/19 15:27:34 schwarze Exp $ */
+/*	$Id: html.c,v 1.199 2017/01/19 16:59:30 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -75,7 +75,6 @@ static	const struct htmldata htmltags[TAG_MAX] = {
 	{"dl",		HTML_NLALL | HTML_INDENT},
 	{"dt",		HTML_NLAROUND},
 	{"dd",		HTML_NLAROUND | HTML_INDENT},
-	{"blockquote",	HTML_NLALL | HTML_INDENT},
 	{"pre",		HTML_NLALL | HTML_NOINDENT},
 	{"b",		0},
 	{"i",		0},
diff --git a/html.h b/html.h
index f788d73e..19532c49 100644
--- a/html.h
+++ b/html.h
@@ -1,4 +1,4 @@
-/*	$Id: html.h,v 1.77 2017/01/19 01:00:14 schwarze Exp $ */
+/*	$Id: html.h,v 1.78 2017/01/19 16:59:30 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -40,7 +40,6 @@ enum	htmltag {
 	TAG_DL,
 	TAG_DT,
 	TAG_DD,
-	TAG_BLOCKQUOTE,
 	TAG_PRE,
 	TAG_B,
 	TAG_I,
diff --git a/mandoc.css b/mandoc.css
index 6990db73..6158a0cf 100644
--- a/mandoc.css
+++ b/mandoc.css
@@ -1,4 +1,4 @@
-/* $Id: mandoc.css,v 1.6 2017/01/19 15:48:39 schwarze Exp $ */
+/* $Id: mandoc.css,v 1.7 2017/01/19 16:56:54 schwarze Exp $ */
 /*
  * Standard style sheet for mandoc(1) -Thtml and man.cgi(8).
  */
@@ -56,8 +56,18 @@ div.Pp {	margin: 1ex 0ex; }
 a.Sx { }
 a.Xr { }
 
+/* Displays and lists. */
+
+div.Bd { }
+div.D1 {	margin-left: 5ex; }
+
+/* Fonts. */
+
+.Li {		font-style: normal;
+		font-weight: normal;
+		font-family: monospace; }
+
 
-blockquote	{ margin-left: 5ex; margin-top: 0ex; margin-bottom: 0ex; } /* D1. */
 table.synopsis	{ } /* SYNOPSIS section table. */
 
 /* General font modes. */
@@ -67,11 +77,9 @@ i		{ } /* Italic: BI, IB, I, (implicit). */
 b		{ } /* Bold: SB, BI, IB, BR, RB, B, (implicit). */
 .symb		{ font-style: normal; font-weight: bold; } /* Symbolic: Sy, Ms, Bf -symbolic. */
 small		{ } /* Small: SB, SM. */
-.lit		{ font-style: normal; font-weight: normal; font-family: monospace; } /* Literal: Dl, Li, Ql, Bf -literal, Bl -literal, Bl -unfilled. */
 
 /* Block modes. */
 
-.display	{ } /* Top of all Bd, D1, Dl. */
 .list		{ } /* Top of all Bl. */
 
 /* Context-specific modes. */
diff --git a/mdoc_html.c b/mdoc_html.c
index fe9c8180..d8795bb1 100644
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_html.c,v 1.254 2017/01/19 15:48:39 schwarze Exp $ */
+/*	$Id: mdoc_html.c,v 1.255 2017/01/19 16:59:30 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -846,14 +846,10 @@ mdoc_d1_pre(MDOC_ARGS)
 	if (n->type != ROFFT_BLOCK)
 		return 1;
 
-	print_otag(h, TAG_BLOCKQUOTE, "svtvb", 0, 0);
+	print_otag(h, TAG_DIV, "c", "D1");
 
-	/* BLOCKQUOTE needs a block body. */
-
-	print_otag(h, TAG_DIV, "c", "display");
-
-	if (MDOC_Dl == n->tok)
-		print_otag(h, TAG_CODE, "c", "lit");
+	if (n->tok == MDOC_Dl)
+		print_otag(h, TAG_CODE, "c", "Li");
 
 	return 1;
 }
@@ -909,15 +905,15 @@ mdoc_bd_pre(MDOC_ARGS)
 		offs = -1;
 
 	if (offs == -1)
-		print_otag(h, TAG_DIV, "cswl", "display", n->norm->Bd.offs);
+		print_otag(h, TAG_DIV, "cswl", "Bd", n->norm->Bd.offs);
 	else
-		print_otag(h, TAG_DIV, "cshl", "display", offs);
+		print_otag(h, TAG_DIV, "cshl", "Bd", offs);
 
 	if (n->norm->Bd.type != DISP_unfilled &&
 	    n->norm->Bd.type != DISP_literal)
 		return 1;
 
-	print_otag(h, TAG_PRE, "c", "lit");
+	print_otag(h, TAG_PRE, "c", "Li");
 
 	/* This can be recursive: save & set our literal state. */
 
@@ -1414,7 +1410,7 @@ mdoc_bf_pre(MDOC_ARGS)
 	else if (FONT_Sy == n->norm->Bf.font)
 		cattr = "symb";
 	else if (FONT_Li == n->norm->Bf.font)
-		cattr = "lit";
+		cattr = "Li";
 	else
 		cattr = "none";
 
@@ -1473,7 +1469,7 @@ mdoc_no_pre(MDOC_ARGS)
 static int
 mdoc_li_pre(MDOC_ARGS)
 {
-	print_otag(h, TAG_CODE, "c", "lit");
+	print_otag(h, TAG_CODE, "c", "Li");
 	return 1;
 }
 
@@ -1656,7 +1652,7 @@ mdoc_quote_pre(MDOC_ARGS)
 	case MDOC_Ql:
 		print_text(h, "\\(oq");
 		h->flags |= HTML_NOSPACE;
-		print_otag(h, TAG_CODE, "c", "lit");
+		print_otag(h, TAG_CODE, "c", "Li");
 		break;
 	case MDOC_So:
 	case MDOC_Sq: