aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2017-01-21 02:09:51 +0000
committerIngo Schwarze <schwarze@openbsd.org>2017-01-21 02:09:51 +0000
commite017bf9218d720071da2fa6ff379604b540bf98c (patch)
tree807747bda7b03e5caab19130db11ad22bd041c15
parent46475ae69cd0362524d880fbc82985ec1661d3f4 (diff)
downloadmandoc-e017bf9218d720071da2fa6ff379604b540bf98c.tar.gz
mandoc-e017bf9218d720071da2fa6ff379604b540bf98c.tar.zst
mandoc-e017bf9218d720071da2fa6ff379604b540bf98c.zip
Avoid writing constant style attributes over and over again.
Move them to the style sheet.
-rw-r--r--mandoc.css11
-rw-r--r--mdoc_html.c25
2 files changed, 22 insertions, 14 deletions
diff --git a/mandoc.css b/mandoc.css
index 7e55118b..000886d2 100644
--- a/mandoc.css
+++ b/mandoc.css
@@ -1,4 +1,4 @@
-/* $Id: mandoc.css,v 1.11 2017/01/21 01:20:32 schwarze Exp $ */
+/* $Id: mandoc.css,v 1.12 2017/01/21 02:09:51 schwarze Exp $ */
/*
* Standard style sheet for mandoc(1) -Thtml and man.cgi(8).
*/
@@ -8,9 +8,12 @@
html { max-width: 100ex; }
body { font-family: Helvetica,Arial,sans-serif; }
table { width: 100%;
- margin-top: 0ex;
- margin-bottom: 0ex; }
+ margin-top: 0em;
+ margin-bottom: 0em; }
td { vertical-align: top; }
+ul, ol, dl { margin-top: 0em;
+ margin-bottom: 0em; }
+li, dt { margin-top: 1em; }
/* Search form and search results. */
@@ -95,7 +98,7 @@ dd.It-tag { }
table.Bl-column { }
tr.It-column { }
-td.It-column { }
+td.It-column { margin-top: 1em; }
span.Rs { }
span.RsA { }
diff --git a/mdoc_html.c b/mdoc_html.c
index 9e037c94..3f757d20 100644
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/* $Id: mdoc_html.c,v 1.259 2017/01/21 01:20:32 schwarze Exp $ */
+/* $Id: mdoc_html.c,v 1.260 2017/01/21 02:09:51 schwarze Exp $ */
/*
* Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -725,8 +725,10 @@ mdoc_it_pre(MDOC_ARGS)
case ROFFT_HEAD:
return 0;
case ROFFT_BODY:
- print_otag(h, TAG_LI, "csvt", cattr,
- !bl->norm->Bl.comp);
+ if (bl->norm->Bl.comp)
+ print_otag(h, TAG_LI, "csvt", cattr, 0);
+ else
+ print_otag(h, TAG_LI, "c", cattr);
break;
default:
break;
@@ -739,8 +741,10 @@ mdoc_it_pre(MDOC_ARGS)
case LIST_tag:
switch (n->type) {
case ROFFT_HEAD:
- print_otag(h, TAG_DT, "csvt", cattr,
- !bl->norm->Bl.comp);
+ if (bl->norm->Bl.comp)
+ print_otag(h, TAG_DT, "csvt", cattr, 0);
+ else
+ print_otag(h, TAG_DT, "c", cattr);
if (type == LIST_diag)
print_otag(h, TAG_B, "c", cattr);
break;
@@ -760,8 +764,10 @@ mdoc_it_pre(MDOC_ARGS)
case ROFFT_HEAD:
break;
case ROFFT_BODY:
- print_otag(h, TAG_TD, "csvt", cattr,
- !bl->norm->Bl.comp);
+ if (bl->norm->Bl.comp)
+ print_otag(h, TAG_TD, "csvt", cattr, 0);
+ else
+ print_otag(h, TAG_TD, "c", cattr);
break;
default:
print_otag(h, TAG_TR, "c", cattr);
@@ -851,10 +857,9 @@ mdoc_bl_pre(MDOC_ARGS)
}
if (n->norm->Bl.offs)
- print_otag(h, elemtype, "csvtvbwl", cattr, 0, 0,
- n->norm->Bl.offs);
+ print_otag(h, elemtype, "cswl", cattr, n->norm->Bl.offs);
else
- print_otag(h, elemtype, "csvtvb", cattr, 0, 0);
+ print_otag(h, elemtype, "c", cattr);
return 1;
}