=================================================================== RCS file: /cvs/mandoc/man_html.c,v retrieving revision 1.45 retrieving revision 1.47 diff -u -p -r1.45 -r1.47 --- mandoc/man_html.c 2010/07/23 12:27:28 1.45 +++ mandoc/man_html.c 2010/12/06 13:53:07 1.47 @@ -1,4 +1,4 @@ -/* $Id: man_html.c,v 1.45 2010/07/23 12:27:28 kristaps Exp $ */ +/* $Id: man_html.c,v 1.47 2010/12/06 13:53:07 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons * @@ -112,9 +112,6 @@ static const struct htmlman mans[MAN_MAX] = { { man_ign_pre, NULL }, /* DT */ { man_ign_pre, NULL }, /* UC */ { man_ign_pre, NULL }, /* PD */ - { man_br_pre, NULL }, /* Sp */ - { man_literal_pre, NULL }, /* Vb */ - { man_literal_pre, NULL }, /* Ve */ { man_ign_pre, NULL }, /* AT */ { man_in_pre, NULL }, /* in */ }; @@ -366,9 +363,6 @@ man_br_pre(MAN_ARGS) SCALE_VS_INIT(&su, 1); switch (n->tok) { - case (MAN_Sp): - SCALE_VS_INIT(&su, 0.5); - break; case (MAN_sp): if (n->child) a2roffsu(n->child->string, &su, SCALE_VS); @@ -553,8 +547,10 @@ man_PP_pre(MAN_ARGS) struct roffsu su; int i; - if (MAN_BLOCK != n->type) + if (MAN_BODY == n->type) return(1); + if (MAN_HEAD == n->type) + return(0); i = 0; @@ -571,6 +567,7 @@ man_PP_pre(MAN_ARGS) PAIR_STYLE_INIT(&tag, h); print_otag(h, TAG_DIV, i, &tag); + return(1); } @@ -738,11 +735,9 @@ man_literal_pre(MAN_ARGS) switch (n->tok) { case (MAN_nf): - /* FALLTHROUGH */ - case (MAN_Vb): print_otag(h, TAG_BR, 0, NULL); mh->fl |= MANH_LITERAL; - return(MAN_Vb != n->tok); + break; default: mh->fl &= ~MANH_LITERAL; break;