diff options
Diffstat (limited to 'mdoc_html.c')
| -rw-r--r-- | mdoc_html.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/mdoc_html.c b/mdoc_html.c index 831580ec..11171c21 100644 --- a/mdoc_html.c +++ b/mdoc_html.c @@ -422,8 +422,14 @@ print_mdoc_node(MDOC_ARGS) case (MDOC_TEXT): /* No tables in this mode... */ assert(NULL == h->tblt); + + /* + * Make sure that if we're in a literal mode already + * (i.e., within a <PRE>) don't print the newline. + */ if (' ' == *n->string && MDOC_LINE & n->flags) - print_otag(h, TAG_BR, 0, NULL); + if ( ! (HTML_LITERAL & h->flags)) + print_otag(h, TAG_BR, 0, NULL); print_text(h, n->string); return; case (MDOC_TBL): @@ -1175,7 +1181,7 @@ static int mdoc_bd_pre(MDOC_ARGS) { struct htmlpair tag[2]; - int comp; + int comp, sv; const struct mdoc_node *nn; struct roffsu su; @@ -1214,6 +1220,11 @@ mdoc_bd_pre(MDOC_ARGS) PAIR_CLASS_INIT(&tag[1], "lit display"); print_otag(h, TAG_PRE, 2, tag); + /* This can be recursive: save & set our literal state. */ + + sv = h->flags & HTML_LITERAL; + h->flags |= HTML_LITERAL; + for (nn = n->child; nn; nn = nn->next) { print_mdoc_node(m, nn, h); /* @@ -1250,6 +1261,9 @@ mdoc_bd_pre(MDOC_ARGS) h->flags |= HTML_NOSPACE; } + if (0 == sv) + h->flags &= ~HTML_LITERAL; + return(0); } |