diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2010-03-26 01:22:08 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2010-03-26 01:22:08 +0000 |
| commit | dcee6dc15e4860634d392969fe25b0071e53a315 (patch) | |
| tree | b42684aa08d42078923d0055adf597f3cff60895 /usr.bin/mandoc/man_html.c | |
| parent | 632ebc98eb0fd48262863db3ebb35f66498f3d48 (diff) | |
merge 1.9.17, keeping local patches
* much improved pod2man support and low-level roff robustness
* have -Tlint imply -Wall and -fstrict
* use fewer macros and more enum in libman
* and various bug fixes
Diffstat (limited to 'usr.bin/mandoc/man_html.c')
| -rw-r--r-- | usr.bin/mandoc/man_html.c | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/usr.bin/mandoc/man_html.c b/usr.bin/mandoc/man_html.c index 1d984a8833f..339bbf967e4 100644 --- a/usr.bin/mandoc/man_html.c +++ b/usr.bin/mandoc/man_html.c @@ -1,4 +1,4 @@ -/* $Id: man_html.c,v 1.7 2010/03/25 23:23:01 schwarze Exp $ */ +/* $Id: man_html.c,v 1.8 2010/03/26 01:22:05 schwarze Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> * @@ -100,8 +100,14 @@ static const struct htmlman mans[MAN_MAX] = { { man_ign_pre, NULL }, /* UC */ { man_ign_pre, NULL }, /* PD */ { man_br_pre, NULL }, /* Sp */ - { NULL, NULL }, /* Vb */ - { NULL, NULL }, /* Vi */ + { man_ign_pre, NULL }, /* Vb */ + { NULL, NULL }, /* Ve */ + { man_ign_pre, NULL }, /* de */ + { man_ign_pre, NULL }, /* dei */ + { man_ign_pre, NULL }, /* am */ + { man_ign_pre, NULL }, /* ami */ + { man_ign_pre, NULL }, /* ig */ + { NULL, NULL }, /* . */ }; @@ -340,10 +346,18 @@ man_br_pre(MAN_ARGS) SCALE_VS_INIT(&su, 1); - if ((MAN_sp == n->tok || MAN_Sp == n->tok) && n->child) - a2roffsu(n->child->string, &su, SCALE_VS); - else if (MAN_br == n->tok) + 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); + break; + default: su.scale = 0; + break; + } bufcat_su(h, "height", &su); PAIR_STYLE_INIT(&tag, h); |