aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/mdoc_html.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2019-09-15 00:08:55 +0000
committerIngo Schwarze <schwarze@openbsd.org>2019-09-15 00:08:55 +0000
commitdb2d16f56377f1c3ad5da3fb0e06f90f377677c1 (patch)
tree58bfd66b6d1312ff370ec97ed7c30dbc977ad2b5 /mdoc_html.c
parent333417082dab30264386c33095d1f6e64f6939cc (diff)
downloadmandoc-db2d16f56377f1c3ad5da3fb0e06f90f377677c1.tar.gz
mandoc-db2d16f56377f1c3ad5da3fb0e06f90f377677c1.tar.zst
mandoc-db2d16f56377f1c3ad5da3fb0e06f90f377677c1.zip
Fix line breaking in no-fill mode (.Bd -unfilled/<pre>),
which apparently didn't work since the .Pp/<p> reorg. The new logic is more similar to what the terminal formatter does: 1. Before a node that starts a new mdoc(7) input line, start a new HTML output line. 2. An empty input line or a .Pp causes an empty output line. 3. Nothing needs to be done at the end of a node. Severe misformatting was reported in table(5) by Edgar Pettijohn <edgar at pettijohn dash web dot com> on misc@.
Diffstat (limited to 'mdoc_html.c')
-rw-r--r--mdoc_html.c48
1 files changed, 27 insertions, 21 deletions
diff --git a/mdoc_html.c b/mdoc_html.c
index b371ad49..1d2709ec 100644
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/* $Id: mdoc_html.c,v 1.330 2019/09/03 15:09:44 schwarze Exp $ */
+/* $Id: mdoc_html.c,v 1.331 2019/09/15 00:08:55 schwarze Exp $ */
/*
* Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2014-2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -351,26 +351,34 @@ print_mdoc_node(MDOC_ARGS)
if (n->type == ROFFT_COMMENT || n->flags & NODE_NOPRT)
return;
- html_fillmode(h, n->flags & NODE_NOFILL ? ROFF_nf : ROFF_fi);
+ if (n->flags & NODE_NOFILL) {
+ html_fillmode(h, ROFF_nf);
+ if (n->flags & NODE_LINE)
+ print_endline(h);
+ } else
+ html_fillmode(h, ROFF_fi);
child = 1;
n->flags &= ~NODE_ENDED;
switch (n->type) {
case ROFFT_TEXT:
+ if (n->flags & NODE_LINE) {
+ switch (*n->string) {
+ case '\0':
+ h->col = 1;
+ print_endline(h);
+ return;
+ case ' ':
+ if ((h->flags & HTML_NONEWLINE) == 0 &&
+ (n->flags & NODE_NOFILL) == 0)
+ print_otag(h, TAG_BR, "");
+ break;
+ default:
+ break;
+ }
+ }
t = h->tag;
t->refcnt++;
-
- /* 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 == ' ' && n->flags & NODE_LINE &&
- (h->flags & HTML_NONEWLINE) == 0 &&
- (n->flags & NODE_NOFILL) == 0)
- print_otag(h, TAG_BR, "");
if (NODE_DELIMC & n->flags)
h->flags |= HTML_NOSPACE;
print_text(h, n->string);
@@ -439,12 +447,6 @@ print_mdoc_node(MDOC_ARGS)
n->body->flags |= NODE_ENDED;
break;
}
-
- if (n->flags & NODE_NOFILL &&
- (n->next == NULL || n->next->flags & NODE_LINE)) {
- h->col++;
- print_endline(h);
- }
}
static void
@@ -1270,7 +1272,11 @@ mdoc_skip_pre(MDOC_ARGS)
static int
mdoc_pp_pre(MDOC_ARGS)
{
- if ((n->flags & NODE_NOFILL) == 0) {
+ if (n->flags & NODE_NOFILL) {
+ print_endline(h);
+ h->col = 1;
+ print_endline(h);
+ } else {
html_close_paragraph(h);
print_otag(h, TAG_P, "c", "Pp");
}