=================================================================== RCS file: /cvs/mandoc/mdoc_html.c,v retrieving revision 1.116 retrieving revision 1.118 diff -u -p -r1.116 -r1.118 --- mandoc/mdoc_html.c 2010/12/15 15:32:01 1.116 +++ mandoc/mdoc_html.c 2010/12/15 16:08:18 1.118 @@ -1,4 +1,4 @@ -/* $Id: mdoc_html.c,v 1.116 2010/12/15 15:32:01 kristaps Exp $ */ +/* $Id: mdoc_html.c,v 1.118 2010/12/15 16:08:18 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons * @@ -369,7 +369,6 @@ static void print_mdoc(MDOC_ARGS) { struct tag *t; - struct htmlpair tag; t = print_otag(h, TAG_HEAD, 0, NULL); print_mdoc_head(m, n, h); @@ -377,10 +376,6 @@ print_mdoc(MDOC_ARGS) t = print_otag(h, TAG_BODY, 0, NULL); - tag.key = ATTR_CLASS; - tag.val = "body"; - print_otag(h, TAG_DIV, 1, &tag); - print_mdoc_nodelist(m, n, h); print_tagq(h, t); } @@ -1043,7 +1038,6 @@ mdoc_bl_pre(MDOC_ARGS) bufcat_su(h, "margin-left", &su); PAIR_STYLE_INIT(&tag[1], h); i = 2; - } switch (n->data.Bl->type) { @@ -1139,13 +1133,17 @@ mdoc_d1_pre(MDOC_ARGS) if (MDOC_BLOCK != n->type) return(1); - /* FIXME: D1 shouldn't be literal. */ + SCALE_VS_INIT(&su, 0); + bufcat_su(h, "margin-top", &su); + bufcat_su(h, "margin-bottom", &su); + PAIR_STYLE_INIT(&tag[0], h); - SCALE_VS_INIT(&su, INDENT - 2); - bufcat_su(h, "margin-left", &su); - PAIR_CLASS_INIT(&tag[0], "lit"); - PAIR_STYLE_INIT(&tag[1], h); - print_otag(h, TAG_DIV, 2, tag); + if (MDOC_Dl == n->tok) { + PAIR_CLASS_INIT(&tag[1], "lit"); + print_otag(h, TAG_BLOCKQUOTE, 2, tag); + } else + print_otag(h, TAG_BLOCKQUOTE, 1, tag); + return(1); }