diff options
| author |   Kristaps Dzonsons <kristaps@bsd.lv> | 2010-12-15 16:35:21 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-12-15 16:35:21 +0000 |
| commit | 8802f26277b361f248ff2e068e40653bc9e00560 (patch) | |
| tree | 95955b197fd9e076b34d6be9a6bb54e50e07d0c2 /mdoc_html.c | |
| parent | bdc802d779898b003e5f5aff9dc567ad537dd0b4 (diff) | |
| download | mandoc-8802f26277b361f248ff2e068e40653bc9e00560.tar.gz mandoc-8802f26277b361f248ff2e068e40653bc9e00560.tar.zst mandoc-8802f26277b361f248ff2e068e40653bc9e00560.zip | |
Make sure that new list types don't emit whitespace before or after (we
have to do this manually).
Diffstat (limited to 'mdoc_html.c')
| -rw-r--r-- | mdoc_html.c | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/mdoc_html.c b/mdoc_html.c index 7d62474a..7aa6b47e 100644 --- a/mdoc_html.c +++ b/mdoc_html.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_html.c,v 1.118 2010/12/15 16:08:18 kristaps Exp $ */ +/* $Id: mdoc_html.c,v 1.119 2010/12/15 16:35:21 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -375,7 +375,6 @@ print_mdoc(MDOC_ARGS) print_tagq(h, t); t = print_otag(h, TAG_BODY, 0, NULL); - print_mdoc_nodelist(m, n, h); print_tagq(h, t); } @@ -474,12 +473,6 @@ mdoc_root_post(MDOC_ARGS) time2a(m->date, b, DATESIZ); - /* - * XXX: this should use divs, but in Firefox, divs with nested - * divs for some reason puke when trying to put a border line - * below. So I use tables, instead. - */ - PAIR_CLASS_INIT(&tag[0], "footer"); bufcat_style(h, "width", "100%"); PAIR_STYLE_INIT(&tag[1], h); @@ -513,18 +506,15 @@ mdoc_root_pre(MDOC_ARGS) struct tag *t, *tt; char b[BUFSIZ], title[BUFSIZ]; - (void)strlcpy(b, m->vol, BUFSIZ); + strlcpy(b, m->vol, BUFSIZ); if (m->arch) { - (void)strlcat(b, " (", BUFSIZ); - (void)strlcat(b, m->arch, BUFSIZ); - (void)strlcat(b, ")", BUFSIZ); + strlcat(b, " (", BUFSIZ); + strlcat(b, m->arch, BUFSIZ); + strlcat(b, ")", BUFSIZ); } - (void)snprintf(title, BUFSIZ - 1, - "%s(%s)", m->title, m->msec); - - /* XXX: see note in mdoc_root_post() about divs. */ + snprintf(title, BUFSIZ - 1, "%s(%s)", m->title, m->msec); PAIR_CLASS_INIT(&tag[0], "header"); bufcat_style(h, "width", "100%"); @@ -993,7 +983,7 @@ static int mdoc_bl_pre(MDOC_ARGS) { size_t i; - struct htmlpair tag[2]; + struct htmlpair tag[3]; struct roffsu su; if (MDOC_BODY == n->type) { @@ -1027,17 +1017,22 @@ mdoc_bl_pre(MDOC_ARGS) return(0); } + SCALE_VS_INIT(&su, 0); + bufcat_su(h, "margin-top", &su); + bufcat_su(h, "margin-bottom", &su); + PAIR_STYLE_INIT(&tag[0], h); + assert(lists[n->data.Bl->type]); - PAIR_CLASS_INIT(&tag[0], lists[n->data.Bl->type]); - i = 1; + PAIR_CLASS_INIT(&tag[1], lists[n->data.Bl->type]); + i = 2; /* Set the block's left-hand margin. */ if (n->data.Bl->offs) { a2offs(n->data.Bl->offs, &su); bufcat_su(h, "margin-left", &su); - PAIR_STYLE_INIT(&tag[1], h); - i = 2; + PAIR_STYLE_INIT(&tag[2], h); + i = 3; } switch (n->data.Bl->type) { |