diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2019-01-06 04:41:16 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2019-01-06 04:41:16 +0000 |
| commit | a7e276d2dd22a043f79e6c0a53b1d01549d585ac (patch) | |
| tree | 5eecbaa7dedd3f82cf5eec045cbcebc09cc788a2 /usr.bin/mandoc/roff_html.c | |
| parent | b564c8b89dc3914a5e9096719a141f1be39731a6 (diff) | |
Finally, represent the man(7) .PP and .HP macros by the natural
choice, which is <p> HTML element. On top of the previous fill-mode
improvements, the key to making this possible is to automatically
close the <p> when required: before headers, subsequent paragraphs,
lists, indented blocks, synopsis blocks, tbl(7) blocks, and before
blocks using no-fill mode.
In man(7) documents, represent the .sp request by a blank line in
no-fill mode and in the same way as .PP in fill mode.
Diffstat (limited to 'usr.bin/mandoc/roff_html.c')
| -rw-r--r-- | usr.bin/mandoc/roff_html.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/usr.bin/mandoc/roff_html.c b/usr.bin/mandoc/roff_html.c index 517a2257ab7..79527ec2e50 100644 --- a/usr.bin/mandoc/roff_html.c +++ b/usr.bin/mandoc/roff_html.c @@ -1,4 +1,4 @@ -/* $OpenBSD: roff_html.c,v 1.17 2019/01/05 09:14:11 schwarze Exp $ */ +/* $OpenBSD: roff_html.c,v 1.18 2019/01/06 04:41:15 schwarze Exp $ */ /* * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2014, 2017, 2018, 2019 Ingo Schwarze <schwarze@openbsd.org> @@ -107,5 +107,11 @@ roff_html_pre_nf(ROFF_HTML_ARGS) static void roff_html_pre_sp(ROFF_HTML_ARGS) { - print_paragraph(h); + if (html_fillmode(h, TOKEN_NONE) == ROFF_nf) { + h->col++; + print_endline(h); + } else if (n->parent->tok >= MAN_TH) + print_otag(h, TAG_P, "c", "Pp"); + else + print_paragraph(h); } |