diff options
| author |   schwarze <schwarze@openbsd.org> | 2010-07-31 21:43:07 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2010-07-31 21:43:07 +0000 |
| commit | 8cd724fbbf0420bb237e8dc5478428899557d568 (patch) | |
| tree | af98b2760ad8dbf8b141c3ab6f006631648eea60 /usr.bin/mandoc/mdoc_html.c | |
| parent | remove references to ``opl'', since it doesn't exist any longer (diff) | |
| download | wireguard-openbsd-8cd724fbbf0420bb237e8dc5478428899557d568.tar.xz wireguard-openbsd-8cd724fbbf0420bb237e8dc5478428899557d568.zip | |
Merge bsd.lv version 1.10.5: last larger batch of bug fixes before release.
NOT including Kristaps' .Bd -literal changes which cause regressions.
Features:
* -Tpdf now fully working
Bugfixes:
* proper handling of quoted strings by .ds in roff(7)
* allow empty .Dd
* make .Sm start no-spacing after the first output word
* underline .Ad
* minor fixes in -Thtml
and some optimisations in terminal output.
Diffstat (limited to 'usr.bin/mandoc/mdoc_html.c')
| -rw-r--r-- | usr.bin/mandoc/mdoc_html.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/usr.bin/mandoc/mdoc_html.c b/usr.bin/mandoc/mdoc_html.c index 73c7aa5aa8a..832f74fe9cd 100644 --- a/usr.bin/mandoc/mdoc_html.c +++ b/usr.bin/mandoc/mdoc_html.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_html.c,v 1.26 2010/07/25 18:05:54 schwarze Exp $ */ +/* $Id: mdoc_html.c,v 1.27 2010/07/31 21:43:07 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -1453,14 +1453,11 @@ mdoc_bd_pre(MDOC_ARGS) print_otag(h, TAG_DIV, 2, tag); for (nn = n->child; nn; nn = nn->next) { - h->flags |= HTML_NOSPACE; - print_mdoc_node(m, nn, h); - if (NULL == nn->next) - continue; - if (nn->prev && nn->prev->line < nn->line) - print_text(h, "\n"); - else if (NULL == nn->prev) + if (nn->prev && nn->prev->line < nn->line) { print_text(h, "\n"); + h->flags |= HTML_NOSPACE; + } + print_mdoc_node(m, nn, h); } return(0); |