source@mandoc.bsd.lv
 help / color / mirror / Atom feed
* mdocml: clean up markup of .Bd, .D1, .Dl, .Li, and .Ql; in particular,
@ 2017-01-19 17:00 schwarze
  0 siblings, 0 replies; 2+ messages in thread
From: schwarze @ 2017-01-19 17:00 UTC (permalink / raw)
  To: source

Log Message:
-----------
clean up markup of .Bd, .D1, .Dl, .Li, and .Ql;
in particular, stop abuse of <blockquote>

Modified Files:
--------------
    mdocml:
        html.c
        html.h
        mdoc_html.c

Revision Data
-------------
Index: html.h
===================================================================
RCS file: /home/cvs/mdocml/mdocml/html.h,v
retrieving revision 1.77
retrieving revision 1.78
diff -Lhtml.h -Lhtml.h -u -p -r1.77 -r1.78
--- html.h
+++ html.h
@@ -40,7 +40,6 @@ enum	htmltag {
 	TAG_DL,
 	TAG_DT,
 	TAG_DD,
-	TAG_BLOCKQUOTE,
 	TAG_PRE,
 	TAG_B,
 	TAG_I,
Index: html.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/html.c,v
retrieving revision 1.198
retrieving revision 1.199
diff -Lhtml.c -Lhtml.c -u -p -r1.198 -r1.199
--- html.c
+++ html.c
@@ -75,7 +75,6 @@ static	const struct htmldata htmltags[TA
 	{"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},
Index: mdoc_html.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mdoc_html.c,v
retrieving revision 1.254
retrieving revision 1.255
diff -Lmdoc_html.c -Lmdoc_html.c -u -p -r1.254 -r1.255
--- mdoc_html.c
+++ mdoc_html.c
@@ -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:
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv

^ permalink raw reply	[flat|nested] 2+ messages in thread

* mdocml: clean up markup of .Bd, .D1, .Dl, .Li, and .Ql; in particular,
@ 2017-01-19 16:57 schwarze
  0 siblings, 0 replies; 2+ messages in thread
From: schwarze @ 2017-01-19 16:57 UTC (permalink / raw)
  To: source

Log Message:
-----------
clean up markup of .Bd, .D1, .Dl, .Li, and .Ql;
in particular, stop abuse of <blockquote>

Modified Files:
--------------
    mdocml:
        mandoc.css

Revision Data
-------------
Index: mandoc.css
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mandoc.css,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lmandoc.css -Lmandoc.css -u -p -r1.6 -r1.7
--- mandoc.css
+++ mandoc.css
@@ -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. */
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-01-19 17:00 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-19 17:00 mdocml: clean up markup of .Bd, .D1, .Dl, .Li, and .Ql; in particular, schwarze
  -- strict thread matches above, loose matches on Subject: below --
2017-01-19 16:57 schwarze

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).