during prioritization for man(1), correctly extract the section name

[mandoc.git] / man_html.c

diff --git a/man_html.c b/man_html.c
index c0a429c5d6c9e63c124a773ad9ac36c28ef816fa..147c20e46443118f00cbacd8609b713254452b48 100644 (file)
--- a/man_html.c
+++ b/man_html.c
@@ -1,7 +1,7 @@
-/*     $Id: man_html.c,v 1.174 2019/04/30 15:53:00 schwarze Exp $ */
+/* $Id: man_html.c,v 1.179 2020/10/16 17:22:43 schwarze Exp $ */
 /*
+ * Copyright (c) 2013-2015, 2017-2020 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2013-2015, 2017-2019 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,6 +14,8 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * HTML formatter for man(7) used by mandoc(1).
  */
 #include "config.h"
 
@@ -34,7 +36,7 @@
 #include "main.h"
 
 #define        MAN_ARGS          const struct roff_meta *man, \
-                         const struct roff_node *n, \
+                         struct roff_node *n, \
                          struct html *h
 
 struct man_html_act {
@@ -167,7 +169,12 @@ print_man_node(MAN_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) == 0)
+               html_fillmode(h, ROFF_fi);
+       else if (html_fillmode(h, ROFF_nf) == ROFF_nf &&
+           n->tok != ROFF_fi && n->flags & NODE_LINE &&
+           (n->prev == NULL || n->prev->tok != MAN_YS))
+               print_endline(h);
 
        child = 1;
        switch (n->type) {
@@ -178,7 +185,7 @@ print_man_node(MAN_ARGS)
                }
                if (*n->string == ' ' && n->flags & NODE_LINE &&
                    (h->flags & HTML_NONEWLINE) == 0)
-                       print_endline(h);
+                       print_otag(h, TAG_BR, "");
                else if (n->flags & NODE_DELIMC)
                        h->flags |= HTML_NOSPACE;
                t = h->tag;
@@ -244,20 +251,13 @@ print_man_node(MAN_ARGS)
                 * Close the list if no further item of the same type
                 * follows; otherwise, close the item only.
                 */
-               if (list_continues(n, n->next) == '\0') {
+               if (list_continues(n, roff_node_next(n)) == '\0') {
                        print_tagq(h, t);
                        t = NULL;
                }
        }
        if (t != NULL)
                print_stagq(h, t);
-
-       if (n->flags & NODE_NOFILL && n->tok != MAN_YS &&
-           (n->next != NULL && n->next->flags & NODE_LINE)) {
-               /* In .nf = <pre>, print even empty lines. */
-               h->col++;
-               print_endline(h);
-       }
 }
 
 static void
@@ -310,7 +310,6 @@ static int
 man_SH_pre(MAN_ARGS)
 {
        const char      *class;
-       char            *id;
        enum htmltag     tag;
 
        if (n->tok == MAN_SH) {
@@ -326,10 +325,7 @@ man_SH_pre(MAN_ARGS)
                print_otag(h, TAG_SECTION, "c", class);
                break;
        case ROFFT_HEAD:
-               id = html_make_id(n, 1);
-               print_otag(h, tag, "ci", class, id);
-               if (id != NULL)
-                       print_otag(h, TAG_A, "chR", "permalink", id);
+               print_otag_id(h, tag, class, n);
                break;
        case ROFFT_BODY:
                break;
@@ -445,15 +441,17 @@ list_continues(const struct roff_node *n1, const struct roff_node *n2)
 static int
 man_IP_pre(MAN_ARGS)
 {
-       const struct roff_node  *nn;
+       struct roff_node        *nn;
        const char              *list_class;
        enum htmltag             list_elem, body_elem;
        char                     list_type;
 
        nn = n->type == ROFFT_BLOCK ? n : n->parent;
-       if ((list_type = list_continues(nn->prev, nn)) == '\0') {
+       list_type = list_continues(roff_node_prev(nn), nn);
+       if (list_type == '\0') {
                /* Start a new list. */
-               if ((list_type = list_continues(nn, nn->next)) == '\0')
+               list_type = list_continues(nn, roff_node_next(nn));
+               if (list_type == '\0')
                        list_type = ' ';
                switch (list_type) {
                case ' ':
@@ -487,7 +485,7 @@ man_IP_pre(MAN_ARGS)
        case ROFFT_HEAD:
                if (body_elem == TAG_LI)
                        return 0;
-               print_otag(h, TAG_DT, "");
+               print_otag_id(h, TAG_DT, NULL, n);
                break;
        case ROFFT_BODY:
                print_otag(h, body_elem, "");
@@ -495,7 +493,6 @@ man_IP_pre(MAN_ARGS)
        default:
                abort();
        }
-
        switch(n->tok) {
        case MAN_IP:  /* Only print the first header element. */
                if (n->child != NULL)