Enable generation of the desired delim/basic output with groff(1).

[mandoc.git] / html.c

diff --git a/html.c b/html.c
index 4b9c08760cba4d671c544cfcbb552c08a2143e3c..50fa78ce0cc5b2e30b9cae689dc5f4fe7f964b54 100644 (file)
--- a/html.c
+++ b/html.c
@@ -1,4 +1,4 @@
-/*     $Id: html.c,v 1.257 2019/08/29 17:57:29 schwarze Exp $ */
+/*     $Id: html.c,v 1.261 2019/09/05 13:35:04 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2015, 2017-2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -65,7 +65,6 @@ static        const struct htmldata htmltags[TAG_MAX] = {
        {"title",       HTML_NLAROUND},
        {"body",        HTML_NLALL},
        {"div",         HTML_NLAROUND},
-       {"div",         0},
        {"section",     HTML_NLALL},
        {"table",       HTML_NLALL | HTML_INDENT},
        {"tr",          HTML_NLALL | HTML_INDENT},
@@ -272,21 +271,18 @@ print_metaf(struct html *h)
 void
 html_close_paragraph(struct html *h)
 {
-       struct tag      *t;
+       struct tag      *this, *next;
+       int              flags;
 
-       for (t = h->tag; t != NULL && t->closed == 0; t = t->next) {
-               switch(t->tag) {
-               case TAG_P:
-               case TAG_PRE:
-                       print_tagq(h, t);
+       this = h->tag;
+       for (;;) {
+               next = this->next;
+               flags = htmltags[this->tag].flags;
+               if (flags & (HTML_INPHRASE | HTML_TOPHRASE))
+                       print_ctag(h, this);
+               if ((flags & HTML_INPHRASE) == 0)
                        break;
-               case TAG_A:
-                       print_tagq(h, t);
-                       continue;
-               default:
-                       continue;
-               }
-               break;
+               this = next;
        }
 }
 
@@ -594,7 +590,15 @@ print_otag(struct html *h, enum htmltag tag, const char *fmt, ...)
                        assert((htmltags[t->tag].flags & HTML_TOPHRASE) == 0);
                        break;
                }
-       }
+
+       /*
+        * Always wrap phrasing elements in a paragraph
+        * unless already contained in some flow container;
+        * never put them directly into a section.
+        */
+
+       } else if (tflags & HTML_TOPHRASE && h->tag->tag == TAG_SECTION)
+               print_otag(h, TAG_P, "c", "Pp");
 
        /* Push this tag onto the stack of open scopes. */
 
@@ -800,6 +804,16 @@ print_gen_comment(struct html *h, struct roff_node *n)
 void
 print_text(struct html *h, const char *word)
 {
+       /*
+        * Always wrap text in a paragraph unless already contained in
+        * some flow container; never put it directly into a section.
+        */
+
+       if (h->tag->tag == TAG_SECTION)
+               print_otag(h, TAG_P, "c", "Pp");
+
+       /* Output whitespace before this text? */
+
        if (h->col && (h->flags & HTML_NOSPACE) == 0) {
                if ( ! (HTML_KEEP & h->flags)) {
                        if (HTML_PREKEEP & h->flags)
@@ -809,6 +823,11 @@ print_text(struct html *h, const char *word)
                        print_word(h, "&#x00A0;");
        }
 
+       /*
+        * Print the text, optionally surrounded by HTML whitespace,
+        * optionally manually switching fonts before and after.
+        */
+
        assert(h->metaf == NULL);
        print_metaf(h);
        print_indent(h);
@@ -949,15 +968,12 @@ print_indent(struct html *h)
 {
        size_t   i;
 
-       if (h->col)
+       if (h->col || h->noindent)
                return;
 
-       if (h->noindent == 0) {
-               h->col = h->indent * 2;
-               for (i = 0; i < h->col; i++)
-                       putchar(' ');
-       }
-       h->flags &= ~HTML_NOSPACE;
+       h->col = h->indent * 2;
+       for (i = 0; i < h->col; i++)
+               putchar(' ');
 }
 
 /*