Fix line breaking in no-fill mode (.Bd -unfilled/<pre>),

[mandoc.git] / mdoc_html.c

diff --git a/mdoc_html.c b/mdoc_html.c
index c7f452ecabab86d3ed9c10a5b735a02f2c0a8dd7..1d2709ec4fbb9a5629e00f6e03b82a6e68cb9778 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_html.c,v 1.326 2019/01/11 16:36:19 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,27 +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;
-       t = h->tag;
-       if (t->tag == TAG_P || t->tag == TAG_PRE)
-               t = t->next;
-
        n->flags &= ~NODE_ENDED;
        switch (n->type) {
        case ROFFT_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 == ' ' && n->flags & NODE_LINE &&
-                   (h->flags & HTML_NONEWLINE) == 0 &&
-                   (n->flags & NODE_NOFILL) == 0)
-                       print_otag(h, TAG_BR, "");
+               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++;
                if (NODE_DELIMC & n->flags)
                        h->flags |= HTML_NOSPACE;
                print_text(h, n->string);
@@ -379,6 +386,8 @@ print_mdoc_node(MDOC_ARGS)
                        h->flags |= HTML_NOSPACE;
                break;
        case ROFFT_EQN:
+               t = h->tag;
+               t->refcnt++;
                print_eqn(h, n->eqn);
                break;
        case ROFFT_TBL:
@@ -395,13 +404,14 @@ print_mdoc_node(MDOC_ARGS)
                 * the "meta" table state.  This will be reopened on the
                 * next table element.
                 */
-               if (h->tblt != NULL) {
+               if (h->tblt != NULL)
                        print_tblclose(h);
-                       t = h->tag;
-               }
                assert(h->tblt == NULL);
+               t = h->tag;
+               t->refcnt++;
                if (n->tok < ROFF_MAX) {
                        roff_html_pre(h, n);
+                       t->refcnt--;
                        print_stagq(h, t);
                        return;
                }
@@ -421,6 +431,7 @@ print_mdoc_node(MDOC_ARGS)
        if (child && n->child != NULL)
                print_mdoc_nodelist(meta, n->child, h);
 
+       t->refcnt--;
        print_stagq(h, t);
 
        switch (n->type) {
@@ -436,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
@@ -528,8 +533,10 @@ mdoc_sh_pre(MDOC_ARGS)
                html_close_paragraph(h);
                if ((h->oflags & HTML_TOC) == 0 ||
                    h->flags & HTML_TOCDONE ||
-                   n->sec <= SEC_SYNOPSIS)
+                   n->sec <= SEC_SYNOPSIS) {
+                       print_otag(h, TAG_SECTION, "c", "Sh");
                        break;
+               }
                h->flags |= HTML_TOCDONE;
                sc = 0;
                for (sn = n->next; sn != NULL; sn = sn->next)
@@ -570,6 +577,7 @@ mdoc_sh_pre(MDOC_ARGS)
                        print_tagq(h, tsec);
                }
                print_tagq(h, t);
+               print_otag(h, TAG_SECTION, "c", "Sh");
                break;
        case ROFFT_HEAD:
                id = html_make_id(n, 1);
@@ -595,6 +603,7 @@ mdoc_ss_pre(MDOC_ARGS)
        switch (n->type) {
        case ROFFT_BLOCK:
                html_close_paragraph(h);
+               print_otag(h, TAG_SECTION, "c", "Ss");
                return 1;
        case ROFFT_HEAD:
                break;
@@ -646,7 +655,6 @@ mdoc_nd_pre(MDOC_ARGS)
 {
        switch (n->type) {
        case ROFFT_BLOCK:
-               html_close_paragraph(h);
                return 1;
        case ROFFT_HEAD:
                return 0;
@@ -656,8 +664,7 @@ mdoc_nd_pre(MDOC_ARGS)
                abort();
        }
        print_text(h, "\\(em");
-       /* Cannot use TAG_SPAN because it may contain blocks. */
-       print_otag(h, TAG_DIV, "c", "Nd");
+       print_otag(h, TAG_SPAN, "c", "Nd");
        return 1;
 }
 
@@ -1265,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");
        }
@@ -1693,7 +1704,7 @@ mdoc_quote_pre(MDOC_ARGS)
                /*
                 * Give up on semantic markup for now.
                 * We cannot use TAG_SPAN because .Oo may contain blocks.
-                * We cannot use TAG_IDIV because we might be in a
+                * We cannot use TAG_DIV because we might be in a
                 * phrasing context (like .Dl or .Pp); we cannot
                 * close out a .Pp at this point either because
                 * that would break the line.