add arch.o

[mandoc.git] / man_html.c

diff --git a/man_html.c b/man_html.c
index 0a3f579030ed777e7c0135439525d7ec45e0a7e7..994a208aa0eeace2ac42a796c683cbadb9738f1c 100644 (file)
--- a/man_html.c
+++ b/man_html.c
@@ -1,7 +1,7 @@
-/*     $Id: man_html.c,v 1.131 2017/01/29 14:02:42 schwarze Exp $ */
+/*     $Id: man_html.c,v 1.173 2019/03/02 16:30:53 schwarze Exp $ */

 /*
  * 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 Ingo Schwarze <schwarze@openbsd.org>
+ * 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -26,39 +26,29 @@
 #include <string.h>
 
 #include "mandoc_aux.h"
 #include <string.h>
 
 #include "mandoc_aux.h"

+#include "mandoc.h"

 #include "roff.h"
 #include "man.h"
 #include "out.h"
 #include "html.h"
 #include "main.h"
 
 #include "roff.h"
 #include "man.h"
 #include "out.h"
 #include "html.h"
 #include "main.h"
 

-/* FIXME: have PD set the default vspace width. */
-
-#define        INDENT            5
-

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

-                         struct mhtml *mh, \

                          struct html *h
 
                          struct html *h
 

-struct mhtml {
-       struct tag       *nofill;
-};
-
-struct htmlman {
+struct man_html_act {

        int             (*pre)(MAN_ARGS);
        int             (*post)(MAN_ARGS);
 };
 
        int             (*pre)(MAN_ARGS);
        int             (*post)(MAN_ARGS);
 };
 

-static void              print_bvspace(struct html *,
-                               const struct roff_node *);
-static void              print_man_head(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 void              print_man_nodelist(MAN_ARGS);
 static void              print_man_node(MAN_ARGS);

-static int               a2width(const struct roff_node *,
-                               struct roffsu *);
+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);


@@ -66,27 +56,28 @@ 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_UR_pre(MAN_ARGS);

+static int               man_abort_pre(MAN_ARGS);

 static int               man_alt_pre(MAN_ARGS);
 static int               man_alt_pre(MAN_ARGS);

-static int               man_br_pre(MAN_ARGS);
-static int               man_fill_pre(MAN_ARGS);

 static int               man_ign_pre(MAN_ARGS);
 static int               man_in_pre(MAN_ARGS);
 static int               man_ign_pre(MAN_ARGS);
 static int               man_in_pre(MAN_ARGS);

-static void              man_root_post(MAN_ARGS);
-static void              man_root_pre(MAN_ARGS);
+static void              man_root_post(const struct roff_meta *,
+                               struct html *);
+static void              man_root_pre(const struct roff_meta *,
+                               struct html *);

 
 

-static const struct htmlman mans[MAN_MAX] = {
-       { man_br_pre, NULL }, /* br */
+static const struct man_html_act man_html_acts[MAN_MAX - MAN_TH] = {

        { NULL, NULL }, /* TH */
        { man_SH_pre, NULL }, /* SH */
        { 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 }, /* TP */

-       { man_PP_pre, NULL }, /* LP */
+       { man_IP_pre, NULL }, /* TQ */
+       { man_abort_pre, NULL }, /* LP */

        { man_PP_pre, NULL }, /* PP */
        { man_PP_pre, NULL }, /* PP */

-       { man_PP_pre, NULL }, /* P */
+       { man_abort_pre, NULL }, /* P */

        { man_IP_pre, NULL }, /* IP */
        { 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 */


@@ -98,9 +89,6 @@ static        const struct htmlman mans[MAN_MAX] = {
        { 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 */

-       { man_br_pre, NULL }, /* sp */
-       { man_fill_pre, NULL }, /* nf */
-       { man_fill_pre, 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 */


@@ -108,68 +96,49 @@ static     const struct htmlman mans[MAN_MAX] = {
        { man_ign_pre, NULL }, /* PD */
        { man_ign_pre, NULL }, /* AT */
        { man_in_pre, NULL }, /* in */
        { man_ign_pre, NULL }, /* PD */
        { man_ign_pre, NULL }, /* AT */
        { man_in_pre, NULL }, /* in */

-       { man_ign_pre, NULL }, /* ft */
+       { man_SY_pre, NULL }, /* SY */
+       { NULL, NULL }, /* YS */

        { man_OP_pre, NULL }, /* OP */
        { man_OP_pre, NULL }, /* OP */

-       { man_fill_pre, NULL }, /* EX */
-       { man_fill_pre, NULL }, /* EE */
+       { NULL, NULL }, /* EX */
+       { NULL, NULL }, /* EE */

        { man_UR_pre, NULL }, /* UR */
        { NULL, NULL }, /* UE */
        { man_UR_pre, NULL }, /* UR */
        { NULL, NULL }, /* UE */

-       { man_ign_pre, NULL }, /* ll */
+       { man_UR_pre, NULL }, /* MT */
+       { NULL, NULL }, /* ME */

 };
 
 
 };
 
 

-/*
- * 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 mhtml     mh;
-       struct html     *h;
-       struct tag      *t;
+       struct html             *h;
+       struct roff_node        *n;
+       struct tag              *t;

 
 

-       mh.nofill = NULL;

        h = (struct html *)arg;
        h = (struct html *)arg;

+       n = man->first->child;

 
        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 != NULL && n->type == ROFFT_COMMENT)
+                       print_gen_comment(h, n);

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

-               print_man_head(&man->meta, man->first, &mh, 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, man->first, &mh, 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, man->first->child, &mh, h);
+       print_man_nodelist(man, n, h);

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

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

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

-print_man_head(MAN_ARGS)
+print_man_head(const struct roff_meta *man, struct html *h)

 {
        char    *cp;
 
 {
        char    *cp;
 


@@ -183,9 +152,8 @@ print_man_head(MAN_ARGS)
 static void
 print_man_nodelist(MAN_ARGS)
 {
 static void
 print_man_nodelist(MAN_ARGS)
 {

-

        while (n != NULL) {
        while (n != NULL) {

-               print_man_node(man, n, mh, h);
+               print_man_node(man, n, h);

                n = n->next;
        }
 }
                n = n->next;
        }
 }


@@ -193,26 +161,33 @@ print_man_nodelist(MAN_ARGS)
 static void
 print_man_node(MAN_ARGS)
 {
 static void
 print_man_node(MAN_ARGS)
 {

-       int              child;

        struct tag      *t;
        struct tag      *t;

+       int              child;

 
 

-       child = 1;
-       t = h->tag;
-       if (t == mh->nofill)
-               t = t->next;
+       if (n->type == ROFFT_COMMENT || n->flags & NODE_NOPRT)
+               return;

 
 

+       html_fillmode(h, n->flags & NODE_NOFILL ? ROFF_nf : ROFF_fi);
+
+       child = 1;

        switch (n->type) {
        case ROFFT_TEXT:
        switch (n->type) {
        case ROFFT_TEXT:

-               if ('\0' == *n->string) {
-                       print_paragraph(h);
+               if (*n->string == '\0') {
+                       print_endline(h);

                        return;
                }
                        return;
                }

-               if (mh->nofill == NULL &&
-                   n->flags & NODE_LINE && *n->string == ' ')
-                       print_otag(h, TAG_BR, "");
+               if (*n->string == ' ' && n->flags & NODE_LINE &&
+                   (h->flags & HTML_NONEWLINE) == 0)
+                       print_endline(h);
+               else if (n->flags & NODE_DELIMC)
+                       h->flags |= HTML_NOSPACE;
+               t = h->tag;
+               t->refcnt++;

                print_text(h, n->string);
                break;
        case ROFFT_EQN:
                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:


@@ -238,44 +213,55 @@ 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);
+                       t->refcnt--;
+                       print_stagq(h, t);
+                       return;

                }
                }

-               if (mans[n->tok].pre)
-                       child = (*mans[n->tok].pre)(man, n, mh, 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);

                break;
        }
 
                break;
        }
 

-       if (child && n->child)
-               print_man_nodelist(man, n->child, mh, h);
+       if (child && n->child != NULL)
+               print_man_nodelist(man, n->child, h);

 
        /* This will automatically close out any font scope. */
 
        /* This will automatically close out any font scope. */

-       print_stagq(h, mh->nofill == NULL ? t : mh->nofill);
-
-       if (n->type != ROFFT_TEXT && n->type != ROFFT_EQN &&
-           mans[n->tok].post != NULL)
-               (*mans[n->tok].post)(man, n, mh, h);
+       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, n->next) == '\0') {
+                       print_tagq(h, t);
+                       t = NULL;
+               }
+       }
+       if (t != NULL)
+               print_stagq(h, t);

 
 

-       if (mh->nofill != NULL &&
-           (n->next == NULL || n->next->flags & NODE_LINE))
+       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);
                print_endline(h);

-}
-
-static int
-a2width(const struct roff_node *n, struct roffsu *su)
-{
-
-       if (n->type != ROFFT_TEXT)
-               return 0;
-       if (a2roffsu(n->string, su, SCALE_EN))
-               return 1;
-
-       return 0;
+       }

 }
 
 static void
 }
 
 static void

-man_root_pre(MAN_ARGS)
+man_root_pre(const struct roff_meta *man, struct html *h)

 {
        struct tag      *t, *tt;
        char            *title;
 {
        struct tag      *t, *tt;
        char            *title;


@@ -285,7 +271,6 @@ man_root_pre(MAN_ARGS)
        mandoc_asprintf(&title, "%s(%s)", man->title, man->msec);
 
        t = print_otag(h, TAG_TABLE, "c", "head");
        mandoc_asprintf(&title, "%s(%s)", man->title, man->msec);
 
        t = print_otag(h, TAG_TABLE, "c", "head");

-       print_otag(h, TAG_TBODY, "");

        tt = print_otag(h, TAG_TR, "");
 
        print_otag(h, TAG_TD, "c", "head-ltitle");
        tt = print_otag(h, TAG_TR, "");
 
        print_otag(h, TAG_TD, "c", "head-ltitle");


@@ -293,7 +278,7 @@ man_root_pre(MAN_ARGS)
        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);
 


@@ -304,7 +289,7 @@ man_root_pre(MAN_ARGS)
 }
 
 static void
 }
 
 static void

-man_root_post(MAN_ARGS)
+man_root_post(const struct roff_meta *man, struct html *h)

 {
        struct tag      *t, *tt;
 
 {
        struct tag      *t, *tt;
 


@@ -316,42 +301,41 @@ man_root_post(MAN_ARGS)
        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);
 }
 

-
-static int
-man_br_pre(MAN_ARGS)
-{
-       struct roffsu    su;
-
-       SCALE_VS_INIT(&su, 1);
-
-       if (MAN_sp == n->tok) {
-               if (NULL != (n = n->child))
-                       if ( ! a2roffsu(n->string, &su, SCALE_VS))
-                               su.scale = 1.0;
-       } else
-               su.scale = 0.0;
-
-       print_otag(h, TAG_DIV, "suh", &su);
-
-       /* So the div isn't empty: */
-       print_text(h, "\\~");
-
-       return 0;
-}
-

 static int
 man_SH_pre(MAN_ARGS)
 {
 static int
 man_SH_pre(MAN_ARGS)
 {

-       if (n->type == ROFFT_BLOCK && mh->nofill != NULL) {
-               print_tagq(h, mh->nofill);
-               mh->nofill = NULL;
-       } else if (n->type == ROFFT_HEAD)
-               print_otag(h, TAG_H1, "c", "Sh");
+       const char      *class;
+       char            *id;
+       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:
+               id = html_make_id(n, 1);
+               print_otag(h, tag, "ci", class, id);
+               if (id != NULL)
+                       print_otag(h, TAG_A, "chR", "permalink", id);
+               break;
+       case ROFFT_BODY:
+               break;
+       default:
+               abort();
+       }

        return 1;
 }
 
        return 1;
 }
 


@@ -359,11 +343,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;


@@ -405,95 +389,134 @@ 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)

 {
 {

-       if (n->type == ROFFT_BLOCK && mh->nofill != NULL) {
-               print_tagq(h, mh->nofill);
-               mh->nofill = NULL;
-       } else if (n->type == ROFFT_HEAD)
-               print_otag(h, TAG_H2, "c", "Ss");
+       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)
 {
        const struct roff_node  *nn;
 }
 
 static int
 man_IP_pre(MAN_ARGS)
 {
        const 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') {
+               /* Start a new list. */
+               if ((list_type = list_continues(nn, nn->next)) == '\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, "c", "It-tag");
+       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(h, TAG_DT, "");
+               break;
+       case ROFFT_BODY:
+               print_otag(h, body_elem, "");

                return 1;
                return 1;

+       default:
+               abort();

        }
 
        }
 

-       /* FIXME: width specification. */
-
-       print_otag(h, TAG_DT, "c", "It-tag");
-
-       /* For IP, only print the first header element. */
-
-       if (MAN_IP == n->tok && n->child)
-               print_man_node(man, n->child, mh, h);
-
-       /* For TP, only print next-line header elements. */
-
-       if (MAN_TP == n->tok) {
+       switch(n->tok) {
+       case MAN_IP:  /* Only print the first header element. */
+               if (n->child != NULL)
+                       print_man_node(man, n->child, h);
+               break;
+       case MAN_TP:  /* Only print next-line header elements. */
+       case MAN_TQ:

                nn = n->child;
                nn = n->child;

-               while (NULL != nn && 0 == (NODE_LINE & nn->flags))
+               while (nn != NULL && (NODE_LINE & nn->flags) == 0)

                        nn = nn->next;
                        nn = nn->next;

-               while (NULL != nn) {
-                       print_man_node(man, nn, mh, h);
+               while (nn != NULL) {
+                       print_man_node(man, nn, h);

                        nn = nn->next;
                }
                        nn = nn->next;
                }

+               break;
+       default:
+               abort();

        }
        }

-

        return 0;
 }
 
        return 0;
 }
 

-static int
-man_HP_pre(MAN_ARGS)
-{
-       struct roffsu    sum, sui;
-       const struct roff_node *np;
-
-       if (n->type == ROFFT_HEAD)
-               return 0;
-       else if (n->type != ROFFT_BLOCK)
-               return 1;
-
-       np = n->head->child;
-
-       if (np == NULL || !a2width(np, &sum))
-               SCALE_HS_INIT(&sum, INDENT);
-
-       sui.unit = sum.unit;
-       sui.scale = -sum.scale;
-
-       print_bvspace(h, n);
-       print_otag(h, TAG_DIV, "csului", "Pp", &sum, &sui);
-       return 1;
-}
-

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


@@ -503,14 +526,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);
        }


@@ -535,24 +558,6 @@ man_I_pre(MAN_ARGS)
        return 1;
 }
 
        return 1;
 }
 

-static int
-man_fill_pre(MAN_ARGS)
-{
-       if (MAN_fi == n->tok || MAN_EE == n->tok) {
-               if (mh->nofill != NULL) {
-                       print_tagq(h, mh->nofill);
-                       mh->nofill = NULL;
-               } else
-                       print_otag(h, TAG_BR, "");
-       } else {
-               if (mh->nofill == NULL)
-                       mh->nofill = print_otag(h, TAG_PRE, "");
-               else
-                       print_otag(h, TAG_BR, "");
-       }
-       return 0;
-}
-

 static int
 man_in_pre(MAN_ARGS)
 {
 static int
 man_in_pre(MAN_ARGS)
 {


@@ -563,43 +568,76 @@ 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)
 {

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

                return 0;
                return 0;

-       else if (n->type == ROFFT_BODY)
-               return 1;
-
-       SCALE_HS_INIT(&su, INDENT);
-       if (n->head->child)
-               a2width(n->head->child, &su);
+       case ROFFT_BODY:
+               print_otag(h, TAG_DIV, "c", "Bd-indent");
+               break;
+       default:
+               abort();
+       }
+       return 1;
+}

 
 

-       print_otag(h, TAG_DIV, "sul", &su);
+static int
+man_SY_pre(MAN_ARGS)
+{
+       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_CODE, "c", "Nm");
+               break;
+       case ROFFT_BODY:
+               print_otag(h, TAG_TD, "");
+               break;
+       default:
+               abort();
+       }

        return 1;
 }
 
 static int
 man_UR_pre(MAN_ARGS)
 {
        return 1;
 }
 
 static int
 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);
        n = n->child;
        assert(n->type == ROFFT_HEAD);
        if (n->child != NULL) {
                assert(n->child->type == ROFFT_TEXT);

-               print_otag(h, TAG_A, "ch", "Lk", n->child->string);
+               if (n->tok == MAN_MT) {
+                       mandoc_asprintf(&cp, "mailto:%s", n->child->string);
+                       print_otag(h, TAG_A, "ch", "Mt", cp);
+                       free(cp);
+               } else
+                       print_otag(h, TAG_A, "ch", "Lk", n->child->string);

        }
 
        assert(n->next->type == ROFFT_BODY);
        if (n->next->child != NULL)
                n = n->next;
 
        }
 
        assert(n->next->type == ROFFT_BODY);
        if (n->next->child != NULL)
                n = n->next;
 

-       print_man_nodelist(man, n->child, mh, h);
-
+       print_man_nodelist(man, n->child, h);

        return 0;
 }
        return 0;
 }

+
+static int
+man_abort_pre(MAN_ARGS)
+{
+       abort();
+}