Make empty sections and parts (SH, SS, RS) only produce a warning if it

[mandoc.git] / mdoc_html.c

diff --git a/mdoc_html.c b/mdoc_html.c
index 313a82f091adf706089bc2e90404142949022328..9656aced55e87bbaafeb2ed1ad9df7a15d7e3b39 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,6 +1,6 @@
-/*     $Id: mdoc_html.c,v 1.115 2010/12/15 14:52:16 kristaps Exp $ */
+/*     $Id: mdoc_html.c,v 1.155 2011/03/22 14:05:45 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>

  *
  * 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


@@ -103,6 +103,7 @@ static      int               mdoc_nm_pre(MDOC_ARGS);
 static int               mdoc_ns_pre(MDOC_ARGS);
 static int               mdoc_pa_pre(MDOC_ARGS);
 static void              mdoc_pf_post(MDOC_ARGS);
 static int               mdoc_ns_pre(MDOC_ARGS);
 static int               mdoc_pa_pre(MDOC_ARGS);
 static void              mdoc_pf_post(MDOC_ARGS);

+static int               mdoc_pp_pre(MDOC_ARGS);

 static void              mdoc_quote_post(MDOC_ARGS);
 static int               mdoc_quote_pre(MDOC_ARGS);
 static int               mdoc_rs_pre(MDOC_ARGS);
 static void              mdoc_quote_post(MDOC_ARGS);
 static int               mdoc_quote_pre(MDOC_ARGS);
 static int               mdoc_rs_pre(MDOC_ARGS);


@@ -126,7 +127,7 @@ static      const struct htmlmdoc mdocs[MDOC_MAX] = {
        {NULL, NULL}, /* Os */
        {mdoc_sh_pre, NULL }, /* Sh */
        {mdoc_ss_pre, NULL }, /* Ss */ 
        {NULL, NULL}, /* Os */
        {mdoc_sh_pre, NULL }, /* Sh */
        {mdoc_ss_pre, NULL }, /* Ss */ 

-       {mdoc_sp_pre, NULL}, /* Pp */ 
+       {mdoc_pp_pre, NULL}, /* Pp */ 

        {mdoc_d1_pre, NULL}, /* D1 */
        {mdoc_d1_pre, NULL}, /* Dl */
        {mdoc_bd_pre, NULL}, /* Bd */
        {mdoc_d1_pre, NULL}, /* D1 */
        {mdoc_d1_pre, NULL}, /* Dl */
        {mdoc_bd_pre, NULL}, /* Bd */


@@ -227,7 +228,7 @@ static      const struct htmlmdoc mdocs[MDOC_MAX] = {
        {NULL, NULL}, /* Fr */
        {mdoc_ud_pre, NULL}, /* Ud */
        {mdoc_lb_pre, NULL}, /* Lb */
        {NULL, NULL}, /* Fr */
        {mdoc_ud_pre, NULL}, /* Ud */
        {mdoc_lb_pre, NULL}, /* Lb */

-       {mdoc_sp_pre, NULL}, /* Lp */ 
+       {mdoc_pp_pre, NULL}, /* Lp */ 

        {mdoc_lk_pre, NULL}, /* Lk */ 
        {mdoc_mt_pre, NULL}, /* Mt */ 
        {mdoc_quote_pre, mdoc_quote_post}, /* Brq */ 
        {mdoc_lk_pre, NULL}, /* Lk */ 
        {mdoc_mt_pre, NULL}, /* Mt */ 
        {mdoc_quote_pre, mdoc_quote_post}, /* Brq */ 


@@ -246,13 +247,13 @@ static    const struct htmlmdoc mdocs[MDOC_MAX] = {
 
 static const char * const lists[LIST_MAX] = {
        NULL,
 
 static const char * const lists[LIST_MAX] = {
        NULL,

-       "list-bullet",
-       "list-column",
+       "list-bul",
+       "list-col",

        "list-dash",
        "list-diag",
        "list-enum",
        "list-hang",
        "list-dash",
        "list-diag",
        "list-enum",
        "list-hang",

-       "list-hyphen",
+       "list-hyph",

        "list-inset",
        "list-item",
        "list-ohang",
        "list-inset",
        "list-item",
        "list-ohang",


@@ -286,7 +287,7 @@ a2width(const char *p, struct roffsu *su)
 {
 
        if ( ! a2roffsu(p, su, SCALE_MAX)) {
 {
 
        if ( ! a2roffsu(p, su, SCALE_MAX)) {

-               su->unit = SCALE_EM;
+               su->unit = SCALE_BU;

                su->scale = (int)strlen(p);
        }
 }
                su->scale = (int)strlen(p);
        }
 }


@@ -298,21 +299,15 @@ a2width(const char *p, struct roffsu *su)
 static void
 synopsis_pre(struct html *h, const struct mdoc_node *n)
 {
 static void
 synopsis_pre(struct html *h, const struct mdoc_node *n)
 {

-       struct roffsu    su;
-       struct htmlpair  tag;

 
        if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags))
                return;
 
 
        if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags))
                return;
 

-       SCALE_VS_INIT(&su, 1);
-       bufcat_su(h, "margin-top", &su);
-       PAIR_STYLE_INIT(&tag, h);
-

        if (n->prev->tok == n->tok && 
                        MDOC_Fo != n->tok && 
                        MDOC_Ft != n->tok && 
                        MDOC_Fn != n->tok) {
        if (n->prev->tok == n->tok && 
                        MDOC_Fo != n->tok && 
                        MDOC_Ft != n->tok && 
                        MDOC_Fn != n->tok) {

-               print_otag(h, TAG_DIV, 0, NULL);
+               print_otag(h, TAG_BR, 0, NULL);

                return;
        }
 
                return;
        }
 


@@ -326,16 +321,16 @@ synopsis_pre(struct html *h, const struct mdoc_node *n)
        case (MDOC_In):
                /* FALLTHROUGH */
        case (MDOC_Vt):
        case (MDOC_In):
                /* FALLTHROUGH */
        case (MDOC_Vt):

-               print_otag(h, TAG_DIV, 1, &tag);
+               print_otag(h, TAG_P, 0, NULL);

                break;
        case (MDOC_Ft):
                if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) {
                break;
        case (MDOC_Ft):
                if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) {

-                       print_otag(h, TAG_DIV, 1, &tag);
+                       print_otag(h, TAG_P, 0, NULL);

                        break;
                }
                /* FALLTHROUGH */
        default:
                        break;
                }
                /* FALLTHROUGH */
        default:

-               print_otag(h, TAG_DIV, 0, NULL);
+               print_otag(h, TAG_BR, 0, NULL);

                break;
        }
 }
                break;
        }
 }


@@ -359,7 +354,7 @@ a2offs(const char *p, struct roffsu *su)
        else if (0 == strcmp(p, "indent-two"))
                SCALE_HS_INIT(su, INDENT * 2);
        else if ( ! a2roffsu(p, su, SCALE_MAX)) {
        else if (0 == strcmp(p, "indent-two"))
                SCALE_HS_INIT(su, INDENT * 2);
        else if ( ! a2roffsu(p, su, SCALE_MAX)) {

-               su->unit = SCALE_EM;
+               su->unit = SCALE_BU;

                su->scale = (int)strlen(p);
        }
 }
                su->scale = (int)strlen(p);
        }
 }


@@ -369,18 +364,12 @@ static void
 print_mdoc(MDOC_ARGS)
 {
        struct tag      *t;
 print_mdoc(MDOC_ARGS)
 {
        struct tag      *t;

-       struct htmlpair  tag;

 
        t = print_otag(h, TAG_HEAD, 0, NULL);
        print_mdoc_head(m, n, h);
        print_tagq(h, t);
 
        t = print_otag(h, TAG_BODY, 0, NULL);
 
        t = print_otag(h, TAG_HEAD, 0, NULL);
        print_mdoc_head(m, n, h);
        print_tagq(h, t);
 
        t = print_otag(h, TAG_BODY, 0, NULL);

-
-       tag.key = ATTR_CLASS;
-       tag.val = "body";
-       print_otag(h, TAG_DIV, 1, &tag);
-

        print_mdoc_nodelist(m, n, h);
        print_tagq(h, t);
 }
        print_mdoc_nodelist(m, n, h);
        print_tagq(h, t);
 }


@@ -421,6 +410,7 @@ print_mdoc_node(MDOC_ARGS)
 {
        int              child;
        struct tag      *t;
 {
        int              child;
        struct tag      *t;

+       struct htmlpair  tag;

 
        child = 1;
        t = h->tags.head;
 
        child = 1;
        t = h->tags.head;


@@ -431,9 +421,47 @@ print_mdoc_node(MDOC_ARGS)
                child = mdoc_root_pre(m, n, h);
                break;
        case (MDOC_TEXT):
                child = mdoc_root_pre(m, n, h);
                break;
        case (MDOC_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 && MDOC_LINE & n->flags)
+                       if ( ! (HTML_LITERAL & h->flags))
+                               print_otag(h, TAG_BR, 0, NULL);
+               if (MDOC_DELIMC & n->flags)
+                       h->flags |= HTML_NOSPACE;

                print_text(h, n->string);
                print_text(h, n->string);

+               if (MDOC_DELIMO & n->flags)
+                       h->flags |= HTML_NOSPACE;
+               return;
+       case (MDOC_EQN):
+               PAIR_CLASS_INIT(&tag, "eqn");
+               print_otag(h, TAG_SPAN, 1, &tag);
+               print_text(h, n->eqn->data);
+               break;
+       case (MDOC_TBL):
+               /*
+                * This will take care of initialising all of the table
+                * state data for the first table, then tearing it down
+                * for the last one.
+                */
+               print_tbl(h, n->span);

                return;
        default:
                return;
        default:

+               /*
+                * Close out the current table, if it's open, and unset
+                * the "meta" table state.  This will be reopened on the
+                * next table element.
+                */
+               if (h->tblt) {
+                       print_tblclose(h);
+                       t = h->tags.head;
+               }
+
+               assert(NULL == h->tblt);

                if (mdocs[n->tok].pre && ENDBODY_NOT == n->end)
                        child = (*mdocs[n->tok].pre)(m, n, h);
                break;
                if (mdocs[n->tok].pre && ENDBODY_NOT == n->end)
                        child = (*mdocs[n->tok].pre)(m, n, h);
                break;


@@ -461,6 +489,8 @@ print_mdoc_node(MDOC_ARGS)
        case (MDOC_ROOT):
                mdoc_root_post(m, n, h);
                break;
        case (MDOC_ROOT):
                mdoc_root_post(m, n, h);
                break;

+       case (MDOC_EQN):
+               break;

        default:
                if (mdocs[n->tok].post && ENDBODY_NOT == n->end)
                        (*mdocs[n->tok].post)(m, n, h);
        default:
                if (mdocs[n->tok].post && ENDBODY_NOT == n->end)
                        (*mdocs[n->tok].post)(m, n, h);


@@ -468,43 +498,41 @@ print_mdoc_node(MDOC_ARGS)
        }
 }
 
        }
 }
 

-

 /* ARGSUSED */
 static void
 mdoc_root_post(MDOC_ARGS)
 {
        struct htmlpair  tag[3];
        struct tag      *t, *tt;
 /* ARGSUSED */
 static void
 mdoc_root_post(MDOC_ARGS)
 {
        struct htmlpair  tag[3];
        struct tag      *t, *tt;

-       char             b[DATESIZ];
-
-       time2a(m->date, b, DATESIZ);

 
 

-       /*
-        * XXX: this should use divs, but in Firefox, divs with nested
-        * divs for some reason puke when trying to put a border line
-        * below.  So I use tables, instead.
-        */
+       PAIR_SUMMARY_INIT(&tag[0], "Document Footer");
+       PAIR_CLASS_INIT(&tag[1], "foot");
+       if (NULL == h->style) {
+               PAIR_INIT(&tag[2], ATTR_WIDTH, "100%");
+               t = print_otag(h, TAG_TABLE, 3, tag);
+               PAIR_INIT(&tag[0], ATTR_WIDTH, "50%");
+               print_otag(h, TAG_COL, 1, tag);
+               print_otag(h, TAG_COL, 1, tag);
+       } else
+               t = print_otag(h, TAG_TABLE, 2, tag);

 
 

-       PAIR_CLASS_INIT(&tag[0], "footer");
-       bufcat_style(h, "width", "100%");
-       PAIR_STYLE_INIT(&tag[1], h);
-       PAIR_SUMMARY_INIT(&tag[2], "footer");
+       t = print_otag(h, TAG_TBODY, 0, NULL);

 
 

-       t = print_otag(h, TAG_TABLE, 3, tag);

        tt = print_otag(h, TAG_TR, 0, NULL);
 
        tt = print_otag(h, TAG_TR, 0, NULL);
 

-       bufinit(h);
-       bufcat_style(h, "width", "50%");
-       PAIR_STYLE_INIT(&tag[0], h);
+       PAIR_CLASS_INIT(&tag[0], "foot-date");

        print_otag(h, TAG_TD, 1, tag);
        print_otag(h, TAG_TD, 1, tag);

-       print_text(h, b);
+
+       print_text(h, m->date);

        print_stagq(h, tt);
 
        print_stagq(h, tt);
 

-       bufinit(h);
-       bufcat_style(h, "width", "50%");
-       bufcat_style(h, "text-align", "right");
-       PAIR_STYLE_INIT(&tag[0], h);
-       print_otag(h, TAG_TD, 1, tag);
+       PAIR_CLASS_INIT(&tag[0], "foot-os");
+       if (NULL == h->style) {
+               PAIR_INIT(&tag[1], ATTR_ALIGN, "right");
+               print_otag(h, TAG_TD, 2, tag);
+       } else 
+               print_otag(h, TAG_TD, 1, tag);
+

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


@@ -518,49 +546,55 @@ mdoc_root_pre(MDOC_ARGS)
        struct tag      *t, *tt;
        char             b[BUFSIZ], title[BUFSIZ];
 
        struct tag      *t, *tt;
        char             b[BUFSIZ], title[BUFSIZ];
 

-       (void)strlcpy(b, m->vol, BUFSIZ);
+       strlcpy(b, m->vol, BUFSIZ);

 
        if (m->arch) {
 
        if (m->arch) {

-               (void)strlcat(b, " (", BUFSIZ);
-               (void)strlcat(b, m->arch, BUFSIZ);
-               (void)strlcat(b, ")", BUFSIZ);
+               strlcat(b, " (", BUFSIZ);
+               strlcat(b, m->arch, BUFSIZ);
+               strlcat(b, ")", BUFSIZ);

        }
 
        }
 

-       (void)snprintf(title, BUFSIZ - 1, 
-                       "%s(%s)", m->title, m->msec);
-
-       /* XXX: see note in mdoc_root_post() about divs. */
-
-       PAIR_CLASS_INIT(&tag[0], "header");
-       bufcat_style(h, "width", "100%");
-       PAIR_STYLE_INIT(&tag[1], h);
-       PAIR_SUMMARY_INIT(&tag[2], "header");
+       snprintf(title, BUFSIZ - 1, "%s(%s)", m->title, m->msec);
+
+       PAIR_SUMMARY_INIT(&tag[0], "Document Header");
+       PAIR_CLASS_INIT(&tag[1], "head");
+       if (NULL == h->style) {
+               PAIR_INIT(&tag[2], ATTR_WIDTH, "100%");
+               t = print_otag(h, TAG_TABLE, 3, tag);
+               PAIR_INIT(&tag[0], ATTR_WIDTH, "30%");
+               print_otag(h, TAG_COL, 1, tag);
+               print_otag(h, TAG_COL, 1, tag);
+               print_otag(h, TAG_COL, 1, tag);
+       } else
+               t = print_otag(h, TAG_TABLE, 2, tag);

 
 

-       t = print_otag(h, TAG_TABLE, 3, tag);
+       print_otag(h, TAG_TBODY, 0, NULL);

 
        tt = print_otag(h, TAG_TR, 0, NULL);
 
 
        tt = print_otag(h, TAG_TR, 0, NULL);
 

-       bufinit(h);
-       bufcat_style(h, "width", "10%");
-       PAIR_STYLE_INIT(&tag[0], h);
+       PAIR_CLASS_INIT(&tag[0], "head-ltitle");

        print_otag(h, TAG_TD, 1, tag);
        print_otag(h, TAG_TD, 1, tag);

+

        print_text(h, title);
        print_stagq(h, tt);
 
        print_text(h, title);
        print_stagq(h, tt);
 

-       bufinit(h);
-       bufcat_style(h, "text-align", "center");
-       bufcat_style(h, "white-space", "nowrap");
-       bufcat_style(h, "width", "80%");
-       PAIR_STYLE_INIT(&tag[0], h);
-       print_otag(h, TAG_TD, 1, tag);
+       PAIR_CLASS_INIT(&tag[0], "head-vol");
+       if (NULL == h->style) {
+               PAIR_INIT(&tag[1], ATTR_ALIGN, "center");
+               print_otag(h, TAG_TD, 2, tag);
+       } else 
+               print_otag(h, TAG_TD, 1, tag);
+

        print_text(h, b);
        print_stagq(h, tt);
 
        print_text(h, b);
        print_stagq(h, tt);
 

-       bufinit(h);
-       bufcat_style(h, "text-align", "right");
-       bufcat_style(h, "width", "10%");
-       PAIR_STYLE_INIT(&tag[0], h);
-       print_otag(h, TAG_TD, 1, tag);
+       PAIR_CLASS_INIT(&tag[0], "head-rtitle");
+       if (NULL == h->style) {
+               PAIR_INIT(&tag[1], ATTR_ALIGN, "right");
+               print_otag(h, TAG_TD, 2, tag);
+       } else 
+               print_otag(h, TAG_TD, 1, tag);
+

        print_text(h, title);
        print_tagq(h, t);
        return(1);
        print_text(h, title);
        print_tagq(h, t);
        return(1);


@@ -571,46 +605,25 @@ mdoc_root_pre(MDOC_ARGS)
 static int
 mdoc_sh_pre(MDOC_ARGS)
 {
 static int
 mdoc_sh_pre(MDOC_ARGS)
 {

-       struct htmlpair          tag[2];
-       const struct mdoc_node  *nn;
-       char                     buf[BUFSIZ];
-       struct roffsu            su;
+       struct htmlpair  tag;
+       char             buf[BUFSIZ];

 
 

-       if (MDOC_BODY == n->type) {
-               SCALE_HS_INIT(&su, INDENT);
-               bufcat_su(h, "margin-left", &su);
-               PAIR_CLASS_INIT(&tag[0], "sec-body");
-               PAIR_STYLE_INIT(&tag[1], h);
-               print_otag(h, TAG_DIV, 2, tag);
+       if (MDOC_BLOCK == n->type) {
+               PAIR_CLASS_INIT(&tag, "section");
+               print_otag(h, TAG_DIV, 1, &tag);

                return(1);
                return(1);

-       } else if (MDOC_BLOCK == n->type) {
-               PAIR_CLASS_INIT(&tag[0], "sec-block");
-               if (n->prev && NULL == n->prev->body->child) {
-                       print_otag(h, TAG_DIV, 1, tag);
-                       return(1);
-               }
-               
-               SCALE_VS_INIT(&su, 1);
-               bufcat_su(h, "margin-top", &su);
-               if (NULL == n->next)
-                       bufcat_su(h, "margin-bottom", &su);
-
-               PAIR_STYLE_INIT(&tag[1], h);
-               print_otag(h, TAG_DIV, 2, tag);
+       } else if (MDOC_BODY == n->type)

                return(1);
                return(1);

-       }

 
        buf[0] = '\0';
 
        buf[0] = '\0';

-       for (nn = n->child; nn; nn = nn->next) {
-               html_idcat(buf, nn->string, BUFSIZ);
-               if (nn->next)
+       for (n = n->child; n; n = n->next) {
+               html_idcat(buf, n->string, BUFSIZ);
+               if (n->next)

                        html_idcat(buf, " ", BUFSIZ);
        }
 
                        html_idcat(buf, " ", BUFSIZ);
        }
 

-       PAIR_CLASS_INIT(&tag[0], "sec-head");
-       PAIR_ID_INIT(&tag[1], buf);
-
-       print_otag(h, TAG_DIV, 2, tag);
+       PAIR_ID_INIT(&tag, buf);
+       print_otag(h, TAG_H1, 1, &tag);

        return(1);
 }
 
        return(1);
 }
 


@@ -619,51 +632,25 @@ mdoc_sh_pre(MDOC_ARGS)
 static int
 mdoc_ss_pre(MDOC_ARGS)
 {
 static int
 mdoc_ss_pre(MDOC_ARGS)
 {

-       struct htmlpair          tag[3];
-       const struct mdoc_node  *nn;
-       char                     buf[BUFSIZ];
-       struct roffsu            su;
-
-       SCALE_VS_INIT(&su, 1);
+       struct htmlpair  tag;
+       char             buf[BUFSIZ];

 
 

-       if (MDOC_BODY == n->type) {
-               PAIR_CLASS_INIT(&tag[0], "ssec-body");
-               if (n->parent->next && n->child) {
-                       bufcat_su(h, "margin-bottom", &su);
-                       PAIR_STYLE_INIT(&tag[1], h);
-                       print_otag(h, TAG_DIV, 2, tag);
-               } else
-                       print_otag(h, TAG_DIV, 1, tag);
+       if (MDOC_BLOCK == n->type) {
+               PAIR_CLASS_INIT(&tag, "subsection");
+               print_otag(h, TAG_DIV, 1, &tag);

                return(1);
                return(1);

-       } else if (MDOC_BLOCK == n->type) {
-               PAIR_CLASS_INIT(&tag[0], "ssec-block");
-               if (n->prev) {
-                       bufcat_su(h, "margin-top", &su);
-                       PAIR_STYLE_INIT(&tag[1], h);
-                       print_otag(h, TAG_DIV, 2, tag);
-               } else
-                       print_otag(h, TAG_DIV, 1, tag);
+       } else if (MDOC_BODY == n->type)

                return(1);
                return(1);

-       }
-
-       /* TODO: see note in mdoc_sh_pre() about duplicates. */

 
        buf[0] = '\0';
 
        buf[0] = '\0';

-       for (nn = n->child; nn; nn = nn->next) {
-               html_idcat(buf, nn->string, BUFSIZ);
-               if (nn->next)
+       for (n = n->child; n; n = n->next) {
+               html_idcat(buf, n->string, BUFSIZ);
+               if (n->next)

                        html_idcat(buf, " ", BUFSIZ);
        }
 
                        html_idcat(buf, " ", BUFSIZ);
        }
 

-       SCALE_HS_INIT(&su, INDENT - HALFINDENT);
-       su.scale = -su.scale;
-       bufcat_su(h, "margin-left", &su);
-
-       PAIR_CLASS_INIT(&tag[0], "ssec-head");
-       PAIR_STYLE_INIT(&tag[1], h);
-       PAIR_ID_INIT(&tag[2], buf);
-
-       print_otag(h, TAG_DIV, 3, tag);
+       PAIR_ID_INIT(&tag, buf);
+       print_otag(h, TAG_H2, 1, &tag);

        return(1);
 }
 
        return(1);
 }
 


@@ -675,7 +662,7 @@ mdoc_fl_pre(MDOC_ARGS)
        struct htmlpair  tag;
 
        PAIR_CLASS_INIT(&tag, "flag");
        struct htmlpair  tag;
 
        PAIR_CLASS_INIT(&tag, "flag");

-       print_otag(h, TAG_SPAN, 1, &tag);
+       print_otag(h, TAG_B, 1, &tag);

 
        /* `Cm' has no leading hyphen. */
 
 
        /* `Cm' has no leading hyphen. */
 


@@ -705,7 +692,7 @@ mdoc_nd_pre(MDOC_ARGS)
        /* XXX: this tag in theory can contain block elements. */
 
        print_text(h, "\\(em");
        /* XXX: this tag in theory can contain block elements. */
 
        print_text(h, "\\(em");

-       PAIR_CLASS_INIT(&tag, "desc-body");
+       PAIR_CLASS_INIT(&tag, "desc");

        print_otag(h, TAG_SPAN, 1, &tag);
        return(1);
 }
        print_otag(h, TAG_SPAN, 1, &tag);
        return(1);
 }


@@ -716,68 +703,46 @@ mdoc_nm_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;
        struct roffsu    su;
 {
        struct htmlpair  tag;
        struct roffsu    su;

-       const char      *cp;
-
-       /*
-        * Accomodate for `Nm' being both an element (which may have
-        * NULL children AND no m->name) and a block.
-        */
-
-       cp = NULL;
+       size_t           len;

 
 

-       if (MDOC_ELEM == n->type) {
-               if (NULL == n->child && NULL == m->name)
-                       return(1);
+       switch (n->type) {
+       case (MDOC_ELEM):

                synopsis_pre(h, n);
                PAIR_CLASS_INIT(&tag, "name");
                synopsis_pre(h, n);
                PAIR_CLASS_INIT(&tag, "name");

-               print_otag(h, TAG_SPAN, 1, &tag);
-               if (NULL == n->child)
+               print_otag(h, TAG_B, 1, &tag);
+               if (NULL == n->child && m->name)

                        print_text(h, m->name);
                        print_text(h, m->name);

-       } else if (MDOC_BLOCK == n->type) {
-               synopsis_pre(h, n);
-
-               bufcat_style(h, "clear", "both");
-               if (n->head->child || m->name) {
-                       if (n->head->child && MDOC_TEXT == 
-                                       n->head->child->type)
-                               cp = n->head->child->string;
-                       if (NULL == cp || '\0' == *cp)
-                               cp = m->name;
-
-                       SCALE_HS_INIT(&su, (double)strlen(cp));
-                       bufcat_su(h, "padding-left", &su);
-               }
-
-               PAIR_STYLE_INIT(&tag, h);
-               print_otag(h, TAG_DIV, 1, &tag);
-       } else if (MDOC_HEAD == n->type) { 
-               if (NULL == n->child && NULL == m->name)
-                       return(1);
-
-               if (n->child && MDOC_TEXT == n->child->type)
-                       cp = n->child->string;
-               if (NULL == cp || '\0' == *cp)
-                       cp = m->name;
-
-               SCALE_HS_INIT(&su, (double)strlen(cp));
+               return(1);
+       case (MDOC_HEAD):
+               print_otag(h, TAG_TD, 0, NULL);
+               if (NULL == n->child && m->name)
+                       print_text(h, m->name);
+               return(1);
+       case (MDOC_BODY):
+               print_otag(h, TAG_TD, 0, NULL);
+               return(1);
+       default:
+               break;
+       }

 
 

-               bufcat_style(h, "float", "left");
-               bufcat_su(h, "min-width", &su);
-               SCALE_INVERT(&su);
-               bufcat_su(h, "margin-left", &su);
+       synopsis_pre(h, n);
+       PAIR_CLASS_INIT(&tag, "synopsis");
+       print_otag(h, TAG_TABLE, 1, &tag);

 
 

-               PAIR_STYLE_INIT(&tag, h);
-               print_otag(h, TAG_DIV, 1, &tag);
+       for (len = 0, n = n->child; n; n = n->next)
+               if (MDOC_TEXT == n->type)
+                       len += strlen(n->string);

 
 

-               if (NULL == n->child)
-                       print_text(h, m->name);
-       } else if (MDOC_BODY == n->type) {
-               SCALE_HS_INIT(&su, 2);
-               bufcat_su(h, "margin-left", &su);
-               PAIR_STYLE_INIT(&tag, h);
-               print_otag(h, TAG_DIV, 1, &tag);
-       }
+       if (0 == len && m->name)
+               len = strlen(m->name);

 
 

+       SCALE_HS_INIT(&su, (double)len);
+       bufcat_su(h, "width", &su);
+       PAIR_STYLE_INIT(&tag, h);
+       print_otag(h, TAG_COL, 1, &tag);
+       print_otag(h, TAG_COL, 0, NULL);
+       print_otag(h, TAG_TBODY, 0, NULL);
+       print_otag(h, TAG_TR, 0, NULL);

        return(1);
 }
 
        return(1);
 }
 


@@ -824,7 +789,8 @@ static int
 mdoc_ns_pre(MDOC_ARGS)
 {
 
 mdoc_ns_pre(MDOC_ARGS)
 {
 

-       h->flags |= HTML_NOSPACE;
+       if ( ! (MDOC_LINE & n->flags))
+               h->flags |= HTML_NOSPACE;

        return(1);
 }
 
        return(1);
 }
 


@@ -836,7 +802,7 @@ mdoc_ar_pre(MDOC_ARGS)
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "arg");
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "arg");

-       print_otag(h, TAG_SPAN, 1, &tag);
+       print_otag(h, TAG_I, 1, &tag);

        return(1);
 }
 
        return(1);
 }
 


@@ -847,6 +813,7 @@ mdoc_xx_pre(MDOC_ARGS)
 {
        const char      *pp;
        struct htmlpair  tag;
 {
        const char      *pp;
        struct htmlpair  tag;

+       int              flags;

 
        switch (n->tok) {
        case (MDOC_Bsx):
 
        switch (n->tok) {
        case (MDOC_Bsx):


@@ -873,8 +840,15 @@ mdoc_xx_pre(MDOC_ARGS)
 
        PAIR_CLASS_INIT(&tag, "unix");
        print_otag(h, TAG_SPAN, 1, &tag);
 
        PAIR_CLASS_INIT(&tag, "unix");
        print_otag(h, TAG_SPAN, 1, &tag);

+

        print_text(h, pp);
        print_text(h, pp);

-       return(1);
+       if (n->child) {
+               flags = h->flags;
+               h->flags |= HTML_KEEP;
+               print_text(h, n->child->string);
+               h->flags = flags;
+       }
+       return(0);

 }
 
 
 }
 
 


@@ -882,28 +856,37 @@ mdoc_xx_pre(MDOC_ARGS)
 static int
 mdoc_bx_pre(MDOC_ARGS)
 {
 static int
 mdoc_bx_pre(MDOC_ARGS)
 {

-       const struct mdoc_node  *nn;
-       struct htmlpair          tag;
+       struct htmlpair  tag;

 
        PAIR_CLASS_INIT(&tag, "unix");
        print_otag(h, TAG_SPAN, 1, &tag);
 
 
        PAIR_CLASS_INIT(&tag, "unix");
        print_otag(h, TAG_SPAN, 1, &tag);
 

-       for (nn = n->child; nn; nn = nn->next)
-               print_mdoc_node(m, nn, h);
+       if (NULL != (n = n->child)) {
+               print_text(h, n->string);
+               h->flags |= HTML_NOSPACE;
+               print_text(h, "BSD");
+       } else {
+               print_text(h, "BSD");
+               return(0);
+       }

 
 

-       if (n->child)
+       if (NULL != (n = n->next)) {
+               h->flags |= HTML_NOSPACE;
+               print_text(h, "-");

                h->flags |= HTML_NOSPACE;
                h->flags |= HTML_NOSPACE;

+               print_text(h, n->string);
+       }

 
 

-       print_text(h, "BSD");

        return(0);
 }
 
        return(0);
 }
 

+/* ARGSUSED */

 static int
 mdoc_it_pre(MDOC_ARGS)
 {
        struct roffsu    su;
        enum mdoc_list   type;
 static int
 mdoc_it_pre(MDOC_ARGS)
 {
        struct roffsu    su;
        enum mdoc_list   type;

-       struct htmlpair  tag;
+       struct htmlpair  tag[2];

        const struct mdoc_node *bl;
 
        bl = n->parent;
        const struct mdoc_node *bl;
 
        bl = n->parent;


@@ -912,13 +895,10 @@ mdoc_it_pre(MDOC_ARGS)
 
        assert(bl);
 
 
        assert(bl);
 

-       type = bl->data.Bl->type;
-
-       /* Whether we're top-padded (not "compact"). */
+       type = bl->norm->Bl.type;

 
 

-       SCALE_VS_INIT(&su, ! bl->data.Bl->comp);
-       bufcat_su(h, "margin-top", &su);
-       PAIR_STYLE_INIT(&tag, h);
+       assert(lists[type]);
+       PAIR_CLASS_INIT(&tag[0], lists[type]);

 
        if (MDOC_HEAD == n->type) {
                switch (type) {
 
        if (MDOC_HEAD == n->type) {
                switch (type) {


@@ -941,7 +921,14 @@ mdoc_it_pre(MDOC_ARGS)
                case(LIST_ohang):
                        /* FALLTHROUGH */
                case(LIST_tag):
                case(LIST_ohang):
                        /* FALLTHROUGH */
                case(LIST_tag):

-                       print_otag(h, TAG_DT, 1, &tag);
+                       SCALE_VS_INIT(&su, ! bl->norm->Bl.comp);
+                       bufcat_su(h, "margin-top", &su);
+                       PAIR_STYLE_INIT(&tag[1], h);
+                       print_otag(h, TAG_DT, 2, tag);
+                       if (LIST_diag != type)
+                               break;
+                       PAIR_CLASS_INIT(&tag[0], "diag");
+                       print_otag(h, TAG_B, 1, tag);

                        break;
                case(LIST_column):
                        break;
                        break;
                case(LIST_column):
                        break;


@@ -959,8 +946,10 @@ mdoc_it_pre(MDOC_ARGS)
                case(LIST_enum):
                        /* FALLTHROUGH */
                case(LIST_item):
                case(LIST_enum):
                        /* FALLTHROUGH */
                case(LIST_item):

-                       /* FALLTHROUGH */
-                       print_otag(h, TAG_LI, 1, &tag);
+                       SCALE_VS_INIT(&su, ! bl->norm->Bl.comp);
+                       bufcat_su(h, "margin-top", &su);
+                       PAIR_STYLE_INIT(&tag[1], h);
+                       print_otag(h, TAG_LI, 2, tag);

                        break;
                case(LIST_diag):
                        /* FALLTHROUGH */
                        break;
                case(LIST_diag):
                        /* FALLTHROUGH */


@@ -971,10 +960,20 @@ mdoc_it_pre(MDOC_ARGS)
                case(LIST_ohang):
                        /* FALLTHROUGH */
                case(LIST_tag):
                case(LIST_ohang):
                        /* FALLTHROUGH */
                case(LIST_tag):

-                       print_otag(h, TAG_DD, 0, NULL);
+                       if (NULL == bl->norm->Bl.width) {
+                               print_otag(h, TAG_DD, 1, tag);
+                               break;
+                       }
+                       a2width(bl->norm->Bl.width, &su);
+                       bufcat_su(h, "margin-left", &su);
+                       PAIR_STYLE_INIT(&tag[1], h);
+                       print_otag(h, TAG_DD, 2, tag);

                        break;
                case(LIST_column):
                        break;
                case(LIST_column):

-                       print_otag(h, TAG_TD, 1, &tag);
+                       SCALE_VS_INIT(&su, ! bl->norm->Bl.comp);
+                       bufcat_su(h, "margin-top", &su);
+                       PAIR_STYLE_INIT(&tag[1], h);
+                       print_otag(h, TAG_TD, 2, tag);

                        break;
                default:
                        break;
                        break;
                default:
                        break;


@@ -982,7 +981,7 @@ mdoc_it_pre(MDOC_ARGS)
        } else {
                switch (type) {
                case (LIST_column):
        } else {
                switch (type) {
                case (LIST_column):

-                       print_otag(h, TAG_TR, 0, NULL);
+                       print_otag(h, TAG_TR, 1, tag);

                        break;
                default:
                        break;
                        break;
                default:
                        break;


@@ -996,18 +995,19 @@ mdoc_it_pre(MDOC_ARGS)
 static int
 mdoc_bl_pre(MDOC_ARGS)
 {
 static int
 mdoc_bl_pre(MDOC_ARGS)
 {

-       size_t           i;
-       struct htmlpair  tag[2];
+       int              i;
+       struct htmlpair  tag[3];

        struct roffsu    su;
        struct roffsu    su;

+       char             buf[BUFSIZ];

 
        if (MDOC_BODY == n->type) {
 
        if (MDOC_BODY == n->type) {

-               if (LIST_column == n->data.Bl->type)
+               if (LIST_column == n->norm->Bl.type)

                        print_otag(h, TAG_TBODY, 0, NULL);
                return(1);
        }
 
        if (MDOC_HEAD == n->type) {
                        print_otag(h, TAG_TBODY, 0, NULL);
                return(1);
        }
 
        if (MDOC_HEAD == n->type) {

-               if (LIST_column != n->data.Bl->type)
+               if (LIST_column != n->norm->Bl.type)

                        return(0);
 
                /*
                        return(0);
 
                /*


@@ -1017,10 +1017,10 @@ mdoc_bl_pre(MDOC_ARGS)
                 * screen and we want to preserve that behaviour.
                 */
 
                 * screen and we want to preserve that behaviour.
                 */
 

-               for (i = 0; i < n->data.Bl->ncols; i++) {
-                       a2width(n->data.Bl->cols[i], &su);
+               for (i = 0; i < (int)n->norm->Bl.ncols; i++) {
+                       a2width(n->norm->Bl.cols[i], &su);

                        bufinit(h);
                        bufinit(h);

-                       if (i < n->data.Bl->ncols - 1)
+                       if (i < (int)n->norm->Bl.ncols - 1)

                                bufcat_su(h, "width", &su);
                        else
                                bufcat_su(h, "min-width", &su);
                                bufcat_su(h, "width", &su);
                        else
                                bufcat_su(h, "min-width", &su);


@@ -1031,21 +1031,24 @@ mdoc_bl_pre(MDOC_ARGS)
                return(0);
        }
 
                return(0);
        }
 

-       assert(lists[n->data.Bl->type]);
-       PAIR_CLASS_INIT(&tag[0], lists[n->data.Bl->type]);
-       i = 1;
+       SCALE_VS_INIT(&su, 0);
+       bufcat_su(h, "margin-top", &su);
+       bufcat_su(h, "margin-bottom", &su);
+       PAIR_STYLE_INIT(&tag[0], h);
+
+       assert(lists[n->norm->Bl.type]);
+       strlcpy(buf, "list ", BUFSIZ);
+       strlcat(buf, lists[n->norm->Bl.type], BUFSIZ);
+       PAIR_INIT(&tag[1], ATTR_CLASS, buf);

 
        /* Set the block's left-hand margin. */
 
 
        /* Set the block's left-hand margin. */
 

-       if (n->data.Bl->offs) {
-               a2offs(n->data.Bl->offs, &su);
+       if (n->norm->Bl.offs) {
+               a2offs(n->norm->Bl.offs, &su);

                bufcat_su(h, "margin-left", &su);
                bufcat_su(h, "margin-left", &su);

-               PAIR_STYLE_INIT(&tag[1], h);
-               i = 2;
-

        }
 
        }
 

-       switch (n->data.Bl->type) {
+       switch (n->norm->Bl.type) {

        case(LIST_bullet):
                /* FALLTHROUGH */
        case(LIST_dash):
        case(LIST_bullet):
                /* FALLTHROUGH */
        case(LIST_dash):


@@ -1053,10 +1056,10 @@ mdoc_bl_pre(MDOC_ARGS)
        case(LIST_hyphen):
                /* FALLTHROUGH */
        case(LIST_item):
        case(LIST_hyphen):
                /* FALLTHROUGH */
        case(LIST_item):

-               print_otag(h, TAG_UL, i, tag);
+               print_otag(h, TAG_UL, 2, tag);

                break;
        case(LIST_enum):
                break;
        case(LIST_enum):

-               print_otag(h, TAG_OL, i, tag);
+               print_otag(h, TAG_OL, 2, tag);

                break;
        case(LIST_diag):
                /* FALLTHROUGH */
                break;
        case(LIST_diag):
                /* FALLTHROUGH */


@@ -1067,10 +1070,10 @@ mdoc_bl_pre(MDOC_ARGS)
        case(LIST_ohang):
                /* FALLTHROUGH */
        case(LIST_tag):
        case(LIST_ohang):
                /* FALLTHROUGH */
        case(LIST_tag):

-               print_otag(h, TAG_DL, i, tag);
+               print_otag(h, TAG_DL, 2, tag);

                break;
        case(LIST_column):
                break;
        case(LIST_column):

-               print_otag(h, TAG_TABLE, i, tag);
+               print_otag(h, TAG_TABLE, 2, tag);

                break;
        default:
                abort();
                break;
        default:
                abort();


@@ -1088,11 +1091,14 @@ mdoc_ex_pre(MDOC_ARGS)
        struct tag              *t;
        struct htmlpair          tag;
 
        struct tag              *t;
        struct htmlpair          tag;
 

+       if (n->prev)
+               print_otag(h, TAG_BR, 0, NULL);
+

        PAIR_CLASS_INIT(&tag, "utility");
 
        print_text(h, "The");
        for (nn = n->child; nn; nn = nn->next) {
        PAIR_CLASS_INIT(&tag, "utility");
 
        print_text(h, "The");
        for (nn = n->child; nn; nn = nn->next) {

-               t = print_otag(h, TAG_SPAN, 1, &tag);
+               t = print_otag(h, TAG_B, 1, &tag);

                print_text(h, nn->string);
                print_tagq(h, t);
 
                print_text(h, nn->string);
                print_tagq(h, t);
 


@@ -1138,13 +1144,22 @@ mdoc_d1_pre(MDOC_ARGS)
        if (MDOC_BLOCK != n->type)
                return(1);
 
        if (MDOC_BLOCK != n->type)
                return(1);
 

-       /* FIXME: D1 shouldn't be literal. */
+       SCALE_VS_INIT(&su, 0);
+       bufcat_su(h, "margin-top", &su);
+       bufcat_su(h, "margin-bottom", &su);
+       PAIR_STYLE_INIT(&tag[0], h);
+       print_otag(h, TAG_BLOCKQUOTE, 1, tag);
+
+       /* BLOCKQUOTE needs a block body. */
+
+       PAIR_CLASS_INIT(&tag[0], "display");
+       print_otag(h, TAG_DIV, 1, tag);
+
+       if (MDOC_Dl == n->tok) {
+               PAIR_CLASS_INIT(&tag[0], "lit");
+               print_otag(h, TAG_CODE, 1, tag);
+       } 

 
 

-       SCALE_VS_INIT(&su, INDENT - 2);
-       bufcat_su(h, "margin-left", &su);
-       PAIR_CLASS_INIT(&tag[0], "lit");
-       PAIR_STYLE_INIT(&tag[1], h);
-       print_otag(h, TAG_DIV, 2, tag);

        return(1);
 }
 
        return(1);
 }
 


@@ -1167,6 +1182,7 @@ mdoc_sx_pre(MDOC_ARGS)
        PAIR_CLASS_INIT(&tag[0], "link-sec");
        PAIR_HREF_INIT(&tag[1], buf);
 
        PAIR_CLASS_INIT(&tag[0], "link-sec");
        PAIR_HREF_INIT(&tag[1], buf);
 

+       print_otag(h, TAG_I, 1, tag);

        print_otag(h, TAG_A, 2, tag);
        return(1);
 }
        print_otag(h, TAG_A, 2, tag);
        return(1);
 }


@@ -1177,26 +1193,15 @@ static int
 mdoc_bd_pre(MDOC_ARGS)
 {
        struct htmlpair          tag[2];
 mdoc_bd_pre(MDOC_ARGS)
 {
        struct htmlpair          tag[2];

-       int                      comp;
+       int                      comp, sv;

        const struct mdoc_node  *nn;
        struct roffsu            su;
 
        if (MDOC_HEAD == n->type)
                return(0);
 
        const struct mdoc_node  *nn;
        struct roffsu            su;
 
        if (MDOC_HEAD == n->type)
                return(0);
 

-       SCALE_VS_INIT(&su, 0);
-
-       assert(n->data.Bd);
-       if (n->data.Bd->offs)
-               a2offs(n->data.Bd->offs, &su);
-
-       comp = n->data.Bd->comp;
-
-       /* FIXME: -centered, etc. formatting. */
-       /* FIXME: does not respect -offset ??? */
-

        if (MDOC_BLOCK == n->type) {
        if (MDOC_BLOCK == n->type) {

-               bufcat_su(h, "margin-left", &su);
+               comp = n->norm->Bd.comp;

                for (nn = n; nn && ! comp; nn = nn->parent) {
                        if (MDOC_BLOCK != nn->type)
                                continue;
                for (nn = n; nn && ! comp; nn = nn->parent) {
                        if (MDOC_BLOCK != nn->type)
                                continue;


@@ -1205,26 +1210,32 @@ mdoc_bd_pre(MDOC_ARGS)
                        if (nn->prev)
                                break;
                }
                        if (nn->prev)
                                break;
                }

-               if (comp) {
-                       PAIR_STYLE_INIT(&tag[0], h);
-                       print_otag(h, TAG_DIV, 1, tag);
-                       return(1);
-               }
-               SCALE_VS_INIT(&su, 1);
-               bufcat_su(h, "margin-top", &su);
-               PAIR_STYLE_INIT(&tag[0], h);
-               print_otag(h, TAG_DIV, 1, tag);
+               if ( ! comp)
+                       print_otag(h, TAG_P, 0, NULL);

                return(1);
        }
 
                return(1);
        }
 

-       if (DISP_unfilled != n->data.Bd->type && 
-                       DISP_literal != n->data.Bd->type)
+       SCALE_HS_INIT(&su, 0);
+       if (n->norm->Bd.offs)
+               a2offs(n->norm->Bd.offs, &su);
+
+       bufcat_su(h, "margin-left", &su);
+       PAIR_STYLE_INIT(&tag[0], h);
+
+       if (DISP_unfilled != n->norm->Bd.type && 
+                       DISP_literal != n->norm->Bd.type) {
+               PAIR_CLASS_INIT(&tag[1], "display");
+               print_otag(h, TAG_DIV, 2, tag);

                return(1);
                return(1);

+       }

 
 

-       PAIR_CLASS_INIT(&tag[0], "lit");
-       bufcat_style(h, "white-space", "pre");
-       PAIR_STYLE_INIT(&tag[1], h);
-       print_otag(h, TAG_DIV, 2, tag);
+       PAIR_CLASS_INIT(&tag[1], "lit display");
+       print_otag(h, TAG_PRE, 2, tag);
+
+       /* This can be recursive: save & set our literal state. */
+
+       sv = h->flags & HTML_LITERAL;
+       h->flags |= HTML_LITERAL;

 
        for (nn = n->child; nn; nn = nn->next) {
                print_mdoc_node(m, nn, h);
 
        for (nn = n->child; nn; nn = nn->next) {
                print_mdoc_node(m, nn, h);


@@ -1256,10 +1267,15 @@ mdoc_bd_pre(MDOC_ARGS)
                }
                if (nn->next && nn->next->line == nn->line)
                        continue;
                }
                if (nn->next && nn->next->line == nn->line)
                        continue;

-               print_text(h, "\n");
+               else if (nn->next)
+                       print_text(h, "\n");
+

                h->flags |= HTML_NOSPACE;
        }
 
                h->flags |= HTML_NOSPACE;
        }
 

+       if (0 == sv)
+               h->flags &= ~HTML_LITERAL;
+

        return(0);
 }
 
        return(0);
 }
 


@@ -1271,7 +1287,7 @@ mdoc_pa_pre(MDOC_ARGS)
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "file");
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "file");

-       print_otag(h, TAG_SPAN, 1, &tag);
+       print_otag(h, TAG_I, 1, &tag);

        return(1);
 }
 
        return(1);
 }
 


@@ -1283,7 +1299,7 @@ mdoc_ad_pre(MDOC_ARGS)
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "addr");
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "addr");

-       print_otag(h, TAG_SPAN, 1, &tag);
+       print_otag(h, TAG_I, 1, &tag);

        return(1);
 }
 
        return(1);
 }
 


@@ -1310,7 +1326,7 @@ mdoc_cd_pre(MDOC_ARGS)
 
        synopsis_pre(h, n);
        PAIR_CLASS_INIT(&tag, "config");
 
        synopsis_pre(h, n);
        PAIR_CLASS_INIT(&tag, "config");

-       print_otag(h, TAG_SPAN, 1, &tag);
+       print_otag(h, TAG_B, 1, &tag);

        return(1);
 }
 
        return(1);
 }
 


@@ -1361,20 +1377,24 @@ mdoc_fa_pre(MDOC_ARGS)
 
        PAIR_CLASS_INIT(&tag, "farg");
        if (n->parent->tok != MDOC_Fo) {
 
        PAIR_CLASS_INIT(&tag, "farg");
        if (n->parent->tok != MDOC_Fo) {

-               print_otag(h, TAG_SPAN, 1, &tag);
+               print_otag(h, TAG_I, 1, &tag);

                return(1);
        }
 
        for (nn = n->child; nn; nn = nn->next) {
                return(1);
        }
 
        for (nn = n->child; nn; nn = nn->next) {

-               t = print_otag(h, TAG_SPAN, 1, &tag);
+               t = print_otag(h, TAG_I, 1, &tag);

                print_text(h, nn->string);
                print_tagq(h, t);
                print_text(h, nn->string);
                print_tagq(h, t);

-               if (nn->next)
+               if (nn->next) {
+                       h->flags |= HTML_NOSPACE;

                        print_text(h, ",");
                        print_text(h, ",");

+               }

        }
 
        }
 

-       if (n->child && n->next && n->next->tok == MDOC_Fa)
+       if (n->child && n->next && n->next->tok == MDOC_Fa) {
+               h->flags |= HTML_NOSPACE;

                print_text(h, ",");
                print_text(h, ",");

+       }

 
        return(0);
 }
 
        return(0);
 }


@@ -1389,7 +1409,7 @@ mdoc_fd_pre(MDOC_ARGS)
        synopsis_pre(h, n);
 
        PAIR_CLASS_INIT(&tag, "macro");
        synopsis_pre(h, n);
 
        PAIR_CLASS_INIT(&tag, "macro");

-       print_otag(h, TAG_SPAN, 1, &tag);
+       print_otag(h, TAG_B, 1, &tag);

        return(1);
 }
 
        return(1);
 }
 


@@ -1422,7 +1442,7 @@ mdoc_ft_pre(MDOC_ARGS)
 
        synopsis_pre(h, n);
        PAIR_CLASS_INIT(&tag, "ftype");
 
        synopsis_pre(h, n);
        PAIR_CLASS_INIT(&tag, "ftype");

-       print_otag(h, TAG_SPAN, 1, &tag);
+       print_otag(h, TAG_I, 1, &tag);

        return(1);
 }
 
        return(1);
 }
 


@@ -1447,7 +1467,7 @@ mdoc_fn_pre(MDOC_ARGS)
        ep = strchr(sp, ' ');
        if (NULL != ep) {
                PAIR_CLASS_INIT(&tag[0], "ftype");
        ep = strchr(sp, ' ');
        if (NULL != ep) {
                PAIR_CLASS_INIT(&tag[0], "ftype");

-               t = print_otag(h, TAG_SPAN, 1, tag);
+               t = print_otag(h, TAG_I, 1, tag);

        
                while (ep) {
                        sz = MIN((int)(ep - sp), BUFSIZ - 1);
        
                while (ep) {
                        sz = MIN((int)(ep - sp), BUFSIZ - 1);


@@ -1478,7 +1498,7 @@ mdoc_fn_pre(MDOC_ARGS)
        }
 #endif
 
        }
 #endif
 

-       t = print_otag(h, TAG_SPAN, 1, tag);
+       t = print_otag(h, TAG_B, 1, tag);

 
        if (sp) {
                strlcpy(nbuf, sp, BUFSIZ);
 
        if (sp) {
                strlcpy(nbuf, sp, BUFSIZ);


@@ -1499,16 +1519,22 @@ mdoc_fn_pre(MDOC_ARGS)
                i = 1;
                if (MDOC_SYNPRETTY & n->flags)
                        i = 2;
                i = 1;
                if (MDOC_SYNPRETTY & n->flags)
                        i = 2;

-               t = print_otag(h, TAG_SPAN, i, tag);
+               t = print_otag(h, TAG_I, i, tag);

                print_text(h, nn->string);
                print_tagq(h, t);
                print_text(h, nn->string);
                print_tagq(h, t);

-               if (nn->next)
+               if (nn->next) {
+                       h->flags |= HTML_NOSPACE;

                        print_text(h, ",");
                        print_text(h, ",");

+               }

        }
 
        }
 

+       h->flags |= HTML_NOSPACE;

        print_text(h, ")");
        print_text(h, ")");

-       if (MDOC_SYNPRETTY & n->flags)
+
+       if (MDOC_SYNPRETTY & n->flags) {
+               h->flags |= HTML_NOSPACE;

                print_text(h, ";");
                print_text(h, ";");

+       }

 
        return(0);
 }
 
        return(0);
 }


@@ -1539,37 +1565,35 @@ mdoc_sm_pre(MDOC_ARGS)
        return(0);
 }
 
        return(0);
 }
 

+/* ARGSUSED */
+static int
+mdoc_pp_pre(MDOC_ARGS)
+{
+
+       print_otag(h, TAG_P, 0, NULL);
+       return(0);
+
+}

 
 /* ARGSUSED */
 static int
 mdoc_sp_pre(MDOC_ARGS)
 {
 
 /* ARGSUSED */
 static int
 mdoc_sp_pre(MDOC_ARGS)
 {

-       int              len;
-       struct htmlpair  tag;

        struct roffsu    su;
        struct roffsu    su;

+       struct htmlpair  tag;

 
 

-       switch (n->tok) {
-       case (MDOC_sp):
-               /* FIXME: can this have a scaling indicator? */
-               len = n->child ? atoi(n->child->string) : 1;
-               break;
-       case (MDOC_br):
-               len = 0;
-               break;
-       default:
-               assert(n->parent);
-               if ((NULL == n->next || NULL == n->prev) &&
-                               (MDOC_Ss == n->parent->tok ||
-                                MDOC_Sh == n->parent->tok))
-                       return(0);
-               len = 1;
-               break;
-       }
+       SCALE_VS_INIT(&su, 1);
+
+       if (MDOC_sp == n->tok) {
+               if (n->child)
+                       a2roffsu(n->child->string, &su, SCALE_VS);
+       } else
+               su.scale = 0;

 
 

-       SCALE_VS_INIT(&su, len);

        bufcat_su(h, "height", &su);
        PAIR_STYLE_INIT(&tag, h);
        print_otag(h, TAG_DIV, 1, &tag);
        bufcat_su(h, "height", &su);
        PAIR_STYLE_INIT(&tag, h);
        print_otag(h, TAG_DIV, 1, &tag);

+

        /* So the div isn't empty: */
        print_text(h, "\\~");
 
        /* So the div isn't empty: */
        print_text(h, "\\~");
 


@@ -1577,7 +1601,6 @@ mdoc_sp_pre(MDOC_ARGS)
 
 }
 
 
 }
 

-

 /* ARGSUSED */
 static int
 mdoc_lk_pre(MDOC_ARGS)
 /* ARGSUSED */
 static int
 mdoc_lk_pre(MDOC_ARGS)


@@ -1648,7 +1671,7 @@ mdoc_fo_pre(MDOC_ARGS)
        assert(n->child->string);
 
        PAIR_CLASS_INIT(&tag, "fname");
        assert(n->child->string);
 
        PAIR_CLASS_INIT(&tag, "fname");

-       t = print_otag(h, TAG_SPAN, 1, &tag);
+       t = print_otag(h, TAG_B, 1, &tag);

        print_text(h, n->child->string);
        print_tagq(h, t);
        return(0);
        print_text(h, n->child->string);
        print_tagq(h, t);
        return(0);


@@ -1662,7 +1685,9 @@ mdoc_fo_post(MDOC_ARGS)
 
        if (MDOC_BODY != n->type)
                return;
 
        if (MDOC_BODY != n->type)
                return;

+       h->flags |= HTML_NOSPACE;

        print_text(h, ")");
        print_text(h, ")");

+       h->flags |= HTML_NOSPACE;

        print_text(h, ";");
 }
 
        print_text(h, ";");
 }
 


@@ -1679,7 +1704,7 @@ mdoc_in_pre(MDOC_ARGS)
        synopsis_pre(h, n);
 
        PAIR_CLASS_INIT(&tag[0], "includes");
        synopsis_pre(h, n);
 
        PAIR_CLASS_INIT(&tag[0], "includes");

-       print_otag(h, TAG_SPAN, 1, tag);
+       print_otag(h, TAG_B, 1, tag);

 
        if (MDOC_SYNPRETTY & n->flags && MDOC_LINE & n->flags)
                print_text(h, "#include");
 
        if (MDOC_SYNPRETTY & n->flags && MDOC_LINE & n->flags)
                print_text(h, "#include");


@@ -1715,7 +1740,7 @@ mdoc_ic_pre(MDOC_ARGS)
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "cmd");
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "cmd");

-       print_otag(h, TAG_SPAN, 1, &tag);
+       print_otag(h, TAG_B, 1, &tag);

        return(1);
 }
 
        return(1);
 }
 


@@ -1728,12 +1753,14 @@ mdoc_rv_pre(MDOC_ARGS)
        struct htmlpair          tag;
        struct tag              *t;
 
        struct htmlpair          tag;
        struct tag              *t;
 

-       print_otag(h, TAG_DIV, 0, NULL);
+       if (n->prev)
+               print_otag(h, TAG_BR, 0, NULL);
+

        print_text(h, "The");
 
        for (nn = n->child; nn; nn = nn->next) {
                PAIR_CLASS_INIT(&tag, "fname");
        print_text(h, "The");
 
        for (nn = n->child; nn; nn = nn->next) {
                PAIR_CLASS_INIT(&tag, "fname");

-               t = print_otag(h, TAG_SPAN, 1, &tag);
+               t = print_otag(h, TAG_B, 1, &tag);

                print_text(h, nn->string);
                print_tagq(h, t);
 
                print_text(h, nn->string);
                print_tagq(h, t);
 


@@ -1755,7 +1782,7 @@ mdoc_rv_pre(MDOC_ARGS)
                        "-1 is returned and the global variable");
 
        PAIR_CLASS_INIT(&tag, "var");
                        "-1 is returned and the global variable");
 
        PAIR_CLASS_INIT(&tag, "var");

-       t = print_otag(h, TAG_SPAN, 1, &tag);
+       t = print_otag(h, TAG_B, 1, &tag);

        print_text(h, "errno");
        print_tagq(h, t);
                print_text(h, "is set to indicate the error.");
        print_text(h, "errno");
        print_tagq(h, t);
                print_text(h, "is set to indicate the error.");


@@ -1770,7 +1797,7 @@ mdoc_va_pre(MDOC_ARGS)
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "var");
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "var");

-       print_otag(h, TAG_SPAN, 1, &tag);
+       print_otag(h, TAG_B, 1, &tag);

        return(1);
 }
 
        return(1);
 }
 


@@ -1799,13 +1826,11 @@ mdoc_bf_pre(MDOC_ARGS)
        else if (MDOC_BODY != n->type)
                return(1);
 
        else if (MDOC_BODY != n->type)
                return(1);
 

-       assert(n->data.Bf);
-
-       if (FONT_Em == n->data.Bf->font) 
+       if (FONT_Em == n->norm->Bf.font) 

                PAIR_CLASS_INIT(&tag[0], "emph");
                PAIR_CLASS_INIT(&tag[0], "emph");

-       else if (FONT_Sy == n->data.Bf->font) 
+       else if (FONT_Sy == n->norm->Bf.font) 

                PAIR_CLASS_INIT(&tag[0], "symb");
                PAIR_CLASS_INIT(&tag[0], "symb");

-       else if (FONT_Li == n->data.Bf->font) 
+       else if (FONT_Li == n->norm->Bf.font) 

                PAIR_CLASS_INIT(&tag[0], "lit");
        else
                PAIR_CLASS_INIT(&tag[0], "none");
                PAIR_CLASS_INIT(&tag[0], "lit");
        else
                PAIR_CLASS_INIT(&tag[0], "none");


@@ -1864,10 +1889,8 @@ mdoc_rs_pre(MDOC_ARGS)
        if (MDOC_BLOCK != n->type)
                return(1);
 
        if (MDOC_BLOCK != n->type)
                return(1);
 

-       if (n->prev && SEC_SEE_ALSO == n->sec) {
-               print_otag(h, TAG_BR, 0, NULL);
-               print_otag(h, TAG_BR, 0, NULL);
-       } 
+       if (n->prev && SEC_SEE_ALSO == n->sec)
+               print_otag(h, TAG_P, 0, NULL);

 
        PAIR_CLASS_INIT(&tag, "ref");
        print_otag(h, TAG_SPAN, 1, &tag);
 
        PAIR_CLASS_INIT(&tag, "ref");
        print_otag(h, TAG_SPAN, 1, &tag);


@@ -1926,8 +1949,9 @@ mdoc_lb_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
 {
        struct htmlpair tag;
 

-       if (SEC_LIBRARY == n->sec && MDOC_LINE & n->flags)
-               print_otag(h, TAG_DIV, 0, NULL);
+       if (SEC_LIBRARY == n->sec && MDOC_LINE & n->flags && n->prev)
+               print_otag(h, TAG_BR, 0, NULL);
+

        PAIR_CLASS_INIT(&tag, "lib");
        print_otag(h, TAG_SPAN, 1, &tag);
        return(1);
        PAIR_CLASS_INIT(&tag, "lib");
        print_otag(h, TAG_SPAN, 1, &tag);
        return(1);


@@ -1939,6 +1963,9 @@ static int
 mdoc__x_pre(MDOC_ARGS)
 {
        struct htmlpair tag[2];
 mdoc__x_pre(MDOC_ARGS)
 {
        struct htmlpair tag[2];

+       enum htmltag    t;
+
+       t = TAG_SPAN;

 
        switch (n->tok) {
        case(MDOC__A):
 
        switch (n->tok) {
        case(MDOC__A):


@@ -1949,6 +1976,7 @@ mdoc__x_pre(MDOC_ARGS)
                break;
        case(MDOC__B):
                PAIR_CLASS_INIT(&tag[0], "ref-book");
                break;
        case(MDOC__B):
                PAIR_CLASS_INIT(&tag[0], "ref-book");

+               t = TAG_I;

                break;
        case(MDOC__C):
                PAIR_CLASS_INIT(&tag[0], "ref-city");
                break;
        case(MDOC__C):
                PAIR_CLASS_INIT(&tag[0], "ref-city");


@@ -1958,9 +1986,11 @@ mdoc__x_pre(MDOC_ARGS)
                break;
        case(MDOC__I):
                PAIR_CLASS_INIT(&tag[0], "ref-issue");
                break;
        case(MDOC__I):
                PAIR_CLASS_INIT(&tag[0], "ref-issue");

+               t = TAG_I;

                break;
        case(MDOC__J):
                PAIR_CLASS_INIT(&tag[0], "ref-jrnl");
                break;
        case(MDOC__J):
                PAIR_CLASS_INIT(&tag[0], "ref-jrnl");

+               t = TAG_I;

                break;
        case(MDOC__N):
                PAIR_CLASS_INIT(&tag[0], "ref-num");
                break;
        case(MDOC__N):
                PAIR_CLASS_INIT(&tag[0], "ref-num");


@@ -1992,7 +2022,7 @@ mdoc__x_pre(MDOC_ARGS)
        }
 
        if (MDOC__U != n->tok) {
        }
 
        if (MDOC__U != n->tok) {

-               print_otag(h, TAG_SPAN, 1, tag);
+               print_otag(h, t, 1, tag);

                return(1);
        }
 
                return(1);
        }
 


@@ -2018,6 +2048,7 @@ mdoc__x_post(MDOC_ARGS)
        if (NULL == n->parent || MDOC_Rs != n->parent->tok)
                return;
 
        if (NULL == n->parent || MDOC_Rs != n->parent->tok)
                return;
 

+       h->flags |= HTML_NOSPACE;

        print_text(h, n->next ? "," : ".");
 }
 
        print_text(h, n->next ? "," : ".");
 }
 


@@ -2033,7 +2064,8 @@ mdoc_bk_pre(MDOC_ARGS)
        case (MDOC_HEAD):
                return(0);
        case (MDOC_BODY):
        case (MDOC_HEAD):
                return(0);
        case (MDOC_BODY):

-               h->flags |= HTML_PREKEEP;
+               if (n->parent->args || 0 == n->prev->nchild)
+                       h->flags |= HTML_PREKEEP;

                break;
        default:
                abort();
                break;
        default:
                abort();