More accurately represent cells containing horizontal lines in -T tree

[mandoc.git] / man_html.c

diff --git a/man_html.c b/man_html.c
index 7bf5ebf7f09ca9c1aa3e48cd69cf6ed333a691d7..147c20e46443118f00cbacd8609b713254452b48 100644 (file)
--- a/man_html.c
+++ b/man_html.c
@@ -1,7 +1,7 @@
-/*     $Id: man_html.c,v 1.158 2018/12/03 21:00:10 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) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv>

- * Copyright (c) 2013,2014,2015,2017,2018 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
  *
  * 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.
  * 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"
 
  */
 #include "config.h"
 


@@ -33,10 +35,8 @@
 #include "html.h"
 #include "main.h"
 
 #include "html.h"
 #include "main.h"
 

-/* FIXME: have PD set the default vspace width. */
-

 #define        MAN_ARGS          const struct roff_meta *man, \
 #define        MAN_ARGS          const struct roff_meta *man, \

-                         const struct roff_node *n, \
+                         struct roff_node *n, \

                          struct html *h
 
 struct man_html_act {
                          struct html *h
 
 struct man_html_act {


@@ -44,15 +44,13 @@ struct      man_html_act {
        int             (*post)(MAN_ARGS);
 };
 
        int             (*post)(MAN_ARGS);
 };
 

-static void              print_bvspace(struct html *,
-                               const struct roff_node *);

 static void              print_man_head(const struct roff_meta *,
                                struct html *);
 static void              print_man_nodelist(MAN_ARGS);
 static void              print_man_node(MAN_ARGS);
 static void              print_man_head(const struct roff_meta *,
                                struct html *);
 static void              print_man_nodelist(MAN_ARGS);
 static void              print_man_node(MAN_ARGS);

-static int               fillmode(struct html *, int);
+static char              list_continues(const struct roff_node *,
+                               const struct roff_node *);

 static int               man_B_pre(MAN_ARGS);
 static int               man_B_pre(MAN_ARGS);

-static int               man_HP_pre(MAN_ARGS);

 static int               man_IP_pre(MAN_ARGS);
 static int               man_I_pre(MAN_ARGS);
 static int               man_OP_pre(MAN_ARGS);
 static int               man_IP_pre(MAN_ARGS);
 static int               man_I_pre(MAN_ARGS);
 static int               man_OP_pre(MAN_ARGS);


@@ -60,7 +58,6 @@ static        int               man_PP_pre(MAN_ARGS);
 static int               man_RS_pre(MAN_ARGS);
 static int               man_SH_pre(MAN_ARGS);
 static int               man_SM_pre(MAN_ARGS);
 static int               man_RS_pre(MAN_ARGS);
 static int               man_SH_pre(MAN_ARGS);
 static int               man_SM_pre(MAN_ARGS);

-static int               man_SS_pre(MAN_ARGS);

 static int               man_SY_pre(MAN_ARGS);
 static int               man_UR_pre(MAN_ARGS);
 static int               man_abort_pre(MAN_ARGS);
 static int               man_SY_pre(MAN_ARGS);
 static int               man_UR_pre(MAN_ARGS);
 static int               man_abort_pre(MAN_ARGS);


@@ -75,14 +72,14 @@ static      void              man_root_pre(const struct roff_meta *,
 static const struct man_html_act man_html_acts[MAN_MAX - MAN_TH] = {
        { NULL, NULL }, /* TH */
        { man_SH_pre, NULL }, /* SH */
 static const struct man_html_act man_html_acts[MAN_MAX - MAN_TH] = {
        { NULL, NULL }, /* TH */
        { man_SH_pre, NULL }, /* SH */

-       { man_SS_pre, NULL }, /* SS */
+       { man_SH_pre, NULL }, /* SS */

        { man_IP_pre, NULL }, /* TP */
        { man_IP_pre, NULL }, /* TQ */
        { man_abort_pre, NULL }, /* LP */
        { man_PP_pre, NULL }, /* PP */
        { man_abort_pre, NULL }, /* P */
        { man_IP_pre, NULL }, /* IP */
        { man_IP_pre, NULL }, /* TP */
        { man_IP_pre, NULL }, /* TQ */
        { man_abort_pre, NULL }, /* LP */
        { man_PP_pre, NULL }, /* PP */
        { man_abort_pre, NULL }, /* P */
        { man_IP_pre, NULL }, /* IP */

-       { man_HP_pre, NULL }, /* HP */
+       { man_PP_pre, NULL }, /* HP */

        { man_SM_pre, NULL }, /* SM */
        { man_SM_pre, NULL }, /* SB */
        { man_alt_pre, NULL }, /* BI */
        { man_SM_pre, NULL }, /* SM */
        { man_SM_pre, NULL }, /* SB */
        { man_alt_pre, NULL }, /* BI */


@@ -94,8 +91,6 @@ static        const struct man_html_act man_html_acts[MAN_MAX - MAN_TH] = {
        { man_I_pre, NULL }, /* I */
        { man_alt_pre, NULL }, /* IR */
        { man_alt_pre, NULL }, /* RI */
        { man_I_pre, NULL }, /* I */
        { man_alt_pre, NULL }, /* IR */
        { man_alt_pre, NULL }, /* RI */

-       { NULL, NULL }, /* nf */
-       { NULL, NULL }, /* fi */

        { NULL, NULL }, /* RE */
        { man_RS_pre, NULL }, /* RS */
        { man_ign_pre, NULL }, /* DT */
        { NULL, NULL }, /* RE */
        { man_RS_pre, NULL }, /* RS */
        { man_ign_pre, NULL }, /* DT */


@@ -115,31 +110,8 @@ static     const struct man_html_act man_html_acts[MAN_MAX - MAN_TH] = {
 };
 
 
 };
 
 

-/*
- * Printing leading vertical space before a block.
- * This is used for the paragraph macros.
- * The rules are pretty simple, since there's very little nesting going
- * on here.  Basically, if we're the first within another block (SS/SH),
- * then don't emit vertical space.  If we are (RS), then do.  If not the
- * first, print it.
- */
-static void
-print_bvspace(struct html *h, const struct roff_node *n)
-{
-
-       if (n->body && n->body->child)
-               if (n->body->child->type == ROFFT_TBL)
-                       return;
-
-       if (n->parent->type == ROFFT_ROOT || n->parent->tok != MAN_RS)
-               if (NULL == n->prev)
-                       return;
-
-       print_paragraph(h);
-}
-

 void
 void

-html_man(void *arg, const struct roff_man *man)
+html_man(void *arg, const struct roff_meta *man)

 {
        struct html             *h;
        struct roff_node        *n;
 {
        struct html             *h;
        struct roff_node        *n;


@@ -151,19 +123,19 @@ html_man(void *arg, const struct roff_man *man)
        if ((h->oflags & HTML_FRAGMENT) == 0) {
                print_gen_decls(h);
                print_otag(h, TAG_HTML, "");
        if ((h->oflags & HTML_FRAGMENT) == 0) {
                print_gen_decls(h);
                print_otag(h, TAG_HTML, "");

-               if (n->type == ROFFT_COMMENT)
+               if (n != NULL && n->type == ROFFT_COMMENT)

                        print_gen_comment(h, n);
                t = print_otag(h, TAG_HEAD, "");
                        print_gen_comment(h, n);
                t = print_otag(h, TAG_HEAD, "");

-               print_man_head(&man->meta, h);
+               print_man_head(man, h);

                print_tagq(h, t);
                print_otag(h, TAG_BODY, "");
        }
 
                print_tagq(h, t);
                print_otag(h, TAG_BODY, "");
        }
 

-       man_root_pre(&man->meta, h);
+       man_root_pre(man, h);

        t = print_otag(h, TAG_DIV, "c", "manual-text");
        t = print_otag(h, TAG_DIV, "c", "manual-text");

-       print_man_nodelist(&man->meta, n, h);
+       print_man_nodelist(man, n, h);

        print_tagq(h, t);
        print_tagq(h, t);

-       man_root_post(&man->meta, h);
+       man_root_post(man, h);

        print_tagq(h, NULL);
 }
 
        print_tagq(h, NULL);
 }
 


@@ -182,7 +154,6 @@ print_man_head(const struct roff_meta *man, struct html *h)
 static void
 print_man_nodelist(MAN_ARGS)
 {
 static void
 print_man_nodelist(MAN_ARGS)
 {

-

        while (n != NULL) {
                print_man_node(man, n, h);
                n = n->next;
        while (n != NULL) {
                print_man_node(man, n, h);
                n = n->next;


@@ -192,97 +163,38 @@ print_man_nodelist(MAN_ARGS)
 static void
 print_man_node(MAN_ARGS)
 {
 static void
 print_man_node(MAN_ARGS)
 {

-       static int       want_fillmode = MAN_fi;
-       static int       save_fillmode;
-

        struct tag      *t;
        int              child;
 
        struct tag      *t;
        int              child;
 

-       /*
-        * Handle fill mode switch requests up front,
-        * they would just cause trouble in the subsequent code.
-        */
-
-       switch (n->tok) {
-       case MAN_nf:
-       case MAN_EX:
-               want_fillmode = MAN_nf;
+       if (n->type == ROFFT_COMMENT || n->flags & NODE_NOPRT)

                return;
                return;

-       case MAN_fi:
-       case MAN_EE:
-               want_fillmode = MAN_fi;
-               if (fillmode(h, 0) == MAN_fi)
-                       print_otag(h, TAG_BR, "");
-               return;
-       default:
-               break;
-       }

 
 

-       /* Set up fill mode for the upcoming node. */
+       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) {
        switch (n->type) {

-       case ROFFT_BLOCK:
-               save_fillmode = 0;
-               /* Some block macros suspend or cancel .nf. */
-               switch (n->tok) {
-               case MAN_TP:  /* Tagged paragraphs              */
-               case MAN_IP:  /* temporarily disable .nf        */
-               case MAN_HP:  /* for the head.                  */
-                       save_fillmode = want_fillmode;
-                       /* FALLTHROUGH */
-               case MAN_SH:  /* Section headers                */
-               case MAN_SS:  /* permanently cancel .nf.        */
-                       want_fillmode = MAN_fi;
-                       /* FALLTHROUGH */
-               case MAN_PP:  /* These have no head.            */
-               case MAN_RS:  /* They will simply               */
-               case MAN_UR:  /* reopen .nf in the body.        */
-               case MAN_MT:
-                       fillmode(h, MAN_fi);
-                       break;
-               default:
-                       break;
-               }
-               break;
-       case ROFFT_TBL:
-               fillmode(h, MAN_fi);
-               break;
-       case ROFFT_ELEM:
-               /*
-                * Some in-line macros produce tags and/or text
-                * in the handler, so they require fill mode to be
-                * configured up front just like for text nodes.
-                * For the others, keep the traditional approach
-                * of doing the same, for now.
-                */
-               fillmode(h, want_fillmode);
-               break;

        case ROFFT_TEXT:
        case ROFFT_TEXT:

-               if (fillmode(h, want_fillmode) == MAN_fi &&
-                   want_fillmode == MAN_fi &&
-                   n->flags & NODE_LINE && *n->string == ' ' &&
+               if (*n->string == '\0') {
+                       print_endline(h);
+                       return;
+               }
+               if (*n->string == ' ' && n->flags & NODE_LINE &&

                    (h->flags & HTML_NONEWLINE) == 0)
                        print_otag(h, TAG_BR, "");
                    (h->flags & HTML_NONEWLINE) == 0)
                        print_otag(h, TAG_BR, "");

-               if (want_fillmode == MAN_nf || *n->string != '\0')
-                       break;
-               print_paragraph(h);
-               return;
-       case ROFFT_COMMENT:
-               return;
-       default:
-               break;
-       }
-
-       /* Produce output for this node. */
-
-       child = 1;
-       switch (n->type) {
-       case ROFFT_TEXT:
+               else if (n->flags & NODE_DELIMC)
+                       h->flags |= HTML_NOSPACE;

                t = h->tag;
                t = h->tag;

+               t->refcnt++;

                print_text(h, n->string);
                break;
        case ROFFT_EQN:
                t = h->tag;
                print_text(h, n->string);
                break;
        case ROFFT_EQN:
                t = h->tag;

+               t->refcnt++;

                print_eqn(h, n->eqn);
                break;
        case ROFFT_TBL:
                print_eqn(h, n->eqn);
                break;
        case ROFFT_TBL:


@@ -298,9 +210,9 @@ print_man_node(MAN_ARGS)
                 * Close out scope of font prior to opening a macro
                 * scope.
                 */
                 * Close out scope of font prior to opening a macro
                 * scope.
                 */

-               if (HTMLFONT_NONE != h->metac) {
+               if (h->metac != ESCAPE_FONTROMAN) {

                        h->metal = h->metac;
                        h->metal = h->metac;

-                       h->metac = HTMLFONT_NONE;
+                       h->metac = ESCAPE_FONTROMAN;

                }
 
                /*
                }
 
                /*


@@ -308,66 +220,44 @@ print_man_node(MAN_ARGS)
                 * the "meta" table state.  This will be reopened on the
                 * next table element.
                 */
                 * the "meta" table state.  This will be reopened on the
                 * next table element.
                 */

-               if (h->tblt)
+               if (h->tblt != NULL)

                        print_tblclose(h);
                        print_tblclose(h);

-

                t = h->tag;
                t = h->tag;

+               t->refcnt++;

                if (n->tok < ROFF_MAX) {
                        roff_html_pre(h, n);
                if (n->tok < ROFF_MAX) {
                        roff_html_pre(h, n);

-                       child = 0;
-                       break;
+                       t->refcnt--;
+                       print_stagq(h, t);
+                       return;

                }
                }

-

                assert(n->tok >= MAN_TH && n->tok < MAN_MAX);
                if (man_html_acts[n->tok - MAN_TH].pre != NULL)
                        child = (*man_html_acts[n->tok - MAN_TH].pre)(man,
                            n, h);
                assert(n->tok >= MAN_TH && n->tok < MAN_MAX);
                if (man_html_acts[n->tok - MAN_TH].pre != NULL)
                        child = (*man_html_acts[n->tok - MAN_TH].pre)(man,
                            n, h);

-
-               /* Some block macros resume .nf in the body. */
-               if (save_fillmode && n->type == ROFFT_BODY)
-                       want_fillmode = save_fillmode;
-

                break;
        }
 
                break;
        }
 

-       if (child && n->child)
+       if (child && n->child != NULL)

                print_man_nodelist(man, n->child, h);
 
        /* This will automatically close out any font scope. */
                print_man_nodelist(man, n->child, h);
 
        /* This will automatically close out any font scope. */

-       print_stagq(h, t);
-
-       if (fillmode(h, 0) == MAN_nf &&
-           n->next != NULL && n->next->flags & NODE_LINE) {
-               /* In .nf = <pre>, print even empty lines. */
-               h->col++;
-               print_endline(h);
-       }
-}
-
-/*
- * MAN_nf switches to no-fill mode, MAN_fi to fill mode.
- * Other arguments do not switch.
- * The old mode is returned.
- */
-static int
-fillmode(struct html *h, int want)
-{
-       struct tag      *pre;
-       int              had;
-
-       for (pre = h->tag; pre != NULL; pre = pre->next)
-               if (pre->tag == TAG_PRE)
-                       break;
-
-       had = pre == NULL ? MAN_fi : MAN_nf;
-
-       if (want && want != had) {
-               if (want == MAN_nf)
-                       print_otag(h, TAG_PRE, "");
-               else
-                       print_tagq(h, pre);
+       t->refcnt--;
+       if (n->type == ROFFT_BLOCK &&
+           (n->tok == MAN_IP || n->tok == MAN_TP || n->tok == MAN_TQ)) {
+               t = h->tag;
+               while (t->tag != TAG_DL && t->tag != TAG_UL)
+                       t = t->next;
+               /*
+                * Close the list if no further item of the same type
+                * follows; otherwise, close the item only.
+                */
+               if (list_continues(n, roff_node_next(n)) == '\0') {
+                       print_tagq(h, t);
+                       t = NULL;
+               }

        }
        }

-       return had;
+       if (t != NULL)
+               print_stagq(h, t);

 }
 
 static void
 }
 
 static void


@@ -388,7 +278,7 @@ man_root_pre(const struct roff_meta *man, struct html *h)
        print_stagq(h, tt);
 
        print_otag(h, TAG_TD, "c", "head-vol");
        print_stagq(h, tt);
 
        print_otag(h, TAG_TD, "c", "head-vol");

-       if (NULL != man->vol)
+       if (man->vol != NULL)

                print_text(h, man->vol);
        print_stagq(h, tt);
 
                print_text(h, man->vol);
        print_stagq(h, tt);
 


@@ -411,7 +301,7 @@ man_root_post(const struct roff_meta *man, struct html *h)
        print_stagq(h, tt);
 
        print_otag(h, TAG_TD, "c", "foot-os");
        print_stagq(h, tt);
 
        print_otag(h, TAG_TD, "c", "foot-os");

-       if (man->os)
+       if (man->os != NULL)

                print_text(h, man->os);
        print_tagq(h, t);
 }
                print_text(h, man->os);
        print_tagq(h, t);
 }


@@ -419,13 +309,28 @@ man_root_post(const struct roff_meta *man, struct html *h)
 static int
 man_SH_pre(MAN_ARGS)
 {
 static int
 man_SH_pre(MAN_ARGS)
 {

-       char    *id;
-
-       if (n->type == ROFFT_HEAD) {
-               id = html_make_id(n, 1);
-               print_otag(h, TAG_H1, "cTi", "Sh", id);
-               if (id != NULL)
-                       print_otag(h, TAG_A, "chR", "permalink", id);
+       const char      *class;
+       enum htmltag     tag;
+
+       if (n->tok == MAN_SH) {
+               tag = TAG_H1;
+               class = "Sh";
+       } else {
+               tag = TAG_H2;
+               class = "Ss";
+       }
+       switch (n->type) {
+       case ROFFT_BLOCK:
+               html_close_paragraph(h);
+               print_otag(h, TAG_SECTION, "c", class);
+               break;
+       case ROFFT_HEAD:
+               print_otag_id(h, tag, class, n);
+               break;
+       case ROFFT_BODY:
+               break;
+       default:
+               abort();

        }
        return 1;
 }
        }
        return 1;
 }


@@ -434,11 +339,11 @@ static int
 man_alt_pre(MAN_ARGS)
 {
        const struct roff_node  *nn;
 man_alt_pre(MAN_ARGS)
 {
        const struct roff_node  *nn;

+       struct tag      *t;

        int              i;
        enum htmltag     fp;
        int              i;
        enum htmltag     fp;

-       struct tag      *t;

 
 

-       for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
+       for (i = 0, nn = n->child; nn != NULL; nn = nn->next, i++) {

                switch (n->tok) {
                case MAN_BI:
                        fp = i % 2 ? TAG_I : TAG_B;
                switch (n->tok) {
                case MAN_BI:
                        fp = i % 2 ? TAG_I : TAG_B;


@@ -480,52 +385,114 @@ static int
 man_SM_pre(MAN_ARGS)
 {
        print_otag(h, TAG_SMALL, "");
 man_SM_pre(MAN_ARGS)
 {
        print_otag(h, TAG_SMALL, "");

-       if (MAN_SB == n->tok)
+       if (n->tok == MAN_SB)

                print_otag(h, TAG_B, "");
        return 1;
 }
 
 static int
                print_otag(h, TAG_B, "");
        return 1;
 }
 
 static int

-man_SS_pre(MAN_ARGS)
+man_PP_pre(MAN_ARGS)

 {
 {

-       char    *id;
-
-       if (n->type == ROFFT_HEAD) {
-               id = html_make_id(n, 1);
-               print_otag(h, TAG_H2, "cTi", "Ss", id);
-               if (id != NULL)
-                       print_otag(h, TAG_A, "chR", "permalink", id);
+       switch (n->type) {
+       case ROFFT_BLOCK:
+               html_close_paragraph(h);
+               break;
+       case ROFFT_HEAD:
+               return 0;
+       case ROFFT_BODY:
+               if (n->child != NULL &&
+                   (n->child->flags & NODE_NOFILL) == 0)
+                       print_otag(h, TAG_P, "c",
+                           n->tok == MAN_PP ? "Pp" : "Pp HP");
+               break;
+       default:
+               abort();

        }
        return 1;
 }
 
        }
        return 1;
 }
 

-static int
-man_PP_pre(MAN_ARGS)
+static char
+list_continues(const struct roff_node *n1, const struct roff_node *n2)

 {
 {

-
-       if (n->type == ROFFT_HEAD)
-               return 0;
-       else if (n->type == ROFFT_BLOCK)
-               print_bvspace(h, n);
-
-       return 1;
+       const char *s1, *s2;
+       char c1, c2;
+
+       if (n1 == NULL || n1->type != ROFFT_BLOCK ||
+           n2 == NULL || n2->type != ROFFT_BLOCK)
+               return '\0';
+       if ((n1->tok == MAN_TP || n1->tok == MAN_TQ) &&
+           (n2->tok == MAN_TP || n2->tok == MAN_TQ))
+               return ' ';
+       if (n1->tok != MAN_IP || n2->tok != MAN_IP)
+               return '\0';
+       n1 = n1->head->child;
+       n2 = n2->head->child;
+       s1 = n1 == NULL ? "" : n1->string;
+       s2 = n2 == NULL ? "" : n2->string;
+       c1 = strcmp(s1, "*") == 0 ? '*' :
+            strcmp(s1, "\\-") == 0 ? '-' :
+            strcmp(s1, "\\(bu") == 0 ? 'b' : ' ';
+       c2 = strcmp(s2, "*") == 0 ? '*' :
+            strcmp(s2, "\\-") == 0 ? '-' :
+            strcmp(s2, "\\(bu") == 0 ? 'b' : ' ';
+       return c1 != c2 ? '\0' : c1 == 'b' ? '*' : c1;

 }
 
 static int
 man_IP_pre(MAN_ARGS)
 {
 }
 
 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;
+       list_type = list_continues(roff_node_prev(nn), nn);
+       if (list_type == '\0') {
+               /* Start a new list. */
+               list_type = list_continues(nn, roff_node_next(nn));
+               if (list_type == '\0')
+                       list_type = ' ';
+               switch (list_type) {
+               case ' ':
+                       list_class = "Bl-tag";
+                       list_elem = TAG_DL;
+                       break;
+               case '*':
+                       list_class = "Bl-bullet";
+                       list_elem = TAG_UL;
+                       break;
+               case '-':
+                       list_class = "Bl-dash";
+                       list_elem = TAG_UL;
+                       break;
+               default:
+                       abort();
+               }
+       } else {
+               /* Continue a list that was started earlier. */
+               list_class = NULL;
+               list_elem = TAG_MAX;
+       }
+       body_elem = list_type == ' ' ? TAG_DD : TAG_LI;

 
 

-       if (n->type == ROFFT_BODY) {
-               print_otag(h, TAG_DD, "");
+       switch (n->type) {
+       case ROFFT_BLOCK:
+               html_close_paragraph(h);
+               if (list_elem != TAG_MAX)
+                       print_otag(h, list_elem, "c", list_class);

                return 1;
                return 1;

-       } else if (n->type != ROFFT_HEAD) {
-               print_otag(h, TAG_DL, "c", "Bl-tag");
+       case ROFFT_HEAD:
+               if (body_elem == TAG_LI)
+                       return 0;
+               print_otag_id(h, TAG_DT, NULL, n);
+               break;
+       case ROFFT_BODY:
+               print_otag(h, body_elem, "");

                return 1;
                return 1;

+       default:
+               abort();

        }
        }

-
-       print_otag(h, TAG_DT, "");
-

        switch(n->tok) {
        case MAN_IP:  /* Only print the first header element. */
                if (n->child != NULL)
        switch(n->tok) {
        case MAN_IP:  /* Only print the first header element. */
                if (n->child != NULL)


@@ -544,23 +511,9 @@ man_IP_pre(MAN_ARGS)
        default:
                abort();
        }
        default:
                abort();
        }

-

        return 0;
 }
 
        return 0;
 }
 

-static int
-man_HP_pre(MAN_ARGS)
-{
-       if (n->type == ROFFT_HEAD)
-               return 0;
-
-       if (n->type == ROFFT_BLOCK) {
-               print_bvspace(h, n);
-               print_otag(h, TAG_DIV, "c", "HP");
-       }
-       return 1;
-}
-

 static int
 man_OP_pre(MAN_ARGS)
 {
 static int
 man_OP_pre(MAN_ARGS)
 {


@@ -570,14 +523,14 @@ man_OP_pre(MAN_ARGS)
        h->flags |= HTML_NOSPACE;
        tt = print_otag(h, TAG_SPAN, "c", "Op");
 
        h->flags |= HTML_NOSPACE;
        tt = print_otag(h, TAG_SPAN, "c", "Op");
 

-       if (NULL != (n = n->child)) {
+       if ((n = n->child) != NULL) {

                print_otag(h, TAG_B, "");
                print_text(h, n->string);
        }
 
        print_stagq(h, tt);
 
                print_otag(h, TAG_B, "");
                print_text(h, n->string);
        }
 
        print_stagq(h, tt);
 

-       if (NULL != n && NULL != n->next) {
+       if (n != NULL && n->next != NULL) {

                print_otag(h, TAG_I, "");
                print_text(h, n->next->string);
        }
                print_otag(h, TAG_I, "");
                print_text(h, n->next->string);
        }


@@ -612,17 +565,24 @@ man_in_pre(MAN_ARGS)
 static int
 man_ign_pre(MAN_ARGS)
 {
 static int
 man_ign_pre(MAN_ARGS)
 {

-

        return 0;
 }
 
 static int
 man_RS_pre(MAN_ARGS)
 {
        return 0;
 }
 
 static int
 man_RS_pre(MAN_ARGS)
 {

-       if (n->type == ROFFT_HEAD)
+       switch (n->type) {
+       case ROFFT_BLOCK:
+               html_close_paragraph(h);
+               break;
+       case ROFFT_HEAD:

                return 0;
                return 0;

-       if (n->type == ROFFT_BLOCK)
+       case ROFFT_BODY:

                print_otag(h, TAG_DIV, "c", "Bd-indent");
                print_otag(h, TAG_DIV, "c", "Bd-indent");

+               break;
+       default:
+               abort();
+       }

        return 1;
 }
 
        return 1;
 }
 


@@ -631,12 +591,13 @@ man_SY_pre(MAN_ARGS)
 {
        switch (n->type) {
        case ROFFT_BLOCK:
 {
        switch (n->type) {
        case ROFFT_BLOCK:

+               html_close_paragraph(h);

                print_otag(h, TAG_TABLE, "c", "Nm");
                print_otag(h, TAG_TR, "");
                break;
        case ROFFT_HEAD:
                print_otag(h, TAG_TD, "");
                print_otag(h, TAG_TABLE, "c", "Nm");
                print_otag(h, TAG_TR, "");
                break;
        case ROFFT_HEAD:
                print_otag(h, TAG_TD, "");

-               print_otag(h, TAG_CODE, "cT", "Nm");
+               print_otag(h, TAG_CODE, "c", "Nm");

                break;
        case ROFFT_BODY:
                print_otag(h, TAG_TD, "");
                break;
        case ROFFT_BODY:
                print_otag(h, TAG_TD, "");


@@ -651,16 +612,17 @@ static int
 man_UR_pre(MAN_ARGS)
 {
        char *cp;
 man_UR_pre(MAN_ARGS)
 {
        char *cp;

+

        n = n->child;
        assert(n->type == ROFFT_HEAD);
        if (n->child != NULL) {
                assert(n->child->type == ROFFT_TEXT);
                if (n->tok == MAN_MT) {
                        mandoc_asprintf(&cp, "mailto:%s", n->child->string);
        n = n->child;
        assert(n->type == ROFFT_HEAD);
        if (n->child != NULL) {
                assert(n->child->type == ROFFT_TEXT);
                if (n->tok == MAN_MT) {
                        mandoc_asprintf(&cp, "mailto:%s", n->child->string);

-                       print_otag(h, TAG_A, "cTh", "Mt", cp);
+                       print_otag(h, TAG_A, "ch", "Mt", cp);

                        free(cp);
                } else
                        free(cp);
                } else

-                       print_otag(h, TAG_A, "cTh", "Lk", n->child->string);
+                       print_otag(h, TAG_A, "ch", "Lk", n->child->string);

        }
 
        assert(n->next->type == ROFFT_BODY);
        }
 
        assert(n->next->type == ROFFT_BODY);


@@ -668,7 +630,6 @@ man_UR_pre(MAN_ARGS)
                n = n->next;
 
        print_man_nodelist(man, n->child, h);
                n = n->next;
 
        print_man_nodelist(man, n->child, h);

-

        return 0;
 }
 
        return 0;
 }