"sys/param.h is for kernel interface programs.

[mandoc.git] / mdoc_html.c

diff --git a/mdoc_html.c b/mdoc_html.c
index 65f78ea6ea1d0a079310cf7aae3475fea1d5c559..1ee5c07667e1ca1baf1c77b4e59edb546c81f4a5 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,6 +1,6 @@
-/*     $Id: mdoc_html.c,v 1.41 2009/10/28 05:08:17 kristaps Exp $ */
+/*     $Id: mdoc_html.c,v 1.102 2010/08/20 01:02:07 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010 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


@@ -14,17 +14,20 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+

 #include <sys/types.h>
 #include <sys/types.h>

-#include <sys/param.h>

 
 #include <assert.h>
 #include <ctype.h>
 
 #include <assert.h>
 #include <ctype.h>

-#include <err.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 

+#include "mandoc.h"

 #include "out.h"
 #include "html.h"
 #include "mdoc.h"
 #include "out.h"
 #include "html.h"
 #include "mdoc.h"


@@ -37,6 +40,10 @@
                          const struct mdoc_node *n, \
                          struct html *h
 
                          const struct mdoc_node *n, \
                          struct html *h
 

+#ifndef MIN
+#define        MIN(a,b)        ((/*CONSTCOND*/(a)<(b))?(a):(b))
+#endif
+

 struct htmlmdoc {
        int             (*pre)(MDOC_ARGS);
        void            (*post)(MDOC_ARGS);
 struct htmlmdoc {
        int             (*pre)(MDOC_ARGS);
        void            (*post)(MDOC_ARGS);


@@ -46,12 +53,12 @@ static      void              print_mdoc(MDOC_ARGS);
 static void              print_mdoc_head(MDOC_ARGS);
 static void              print_mdoc_node(MDOC_ARGS);
 static void              print_mdoc_nodelist(MDOC_ARGS);
 static void              print_mdoc_head(MDOC_ARGS);
 static void              print_mdoc_node(MDOC_ARGS);
 static void              print_mdoc_nodelist(MDOC_ARGS);

+static void              synopsis_pre(struct html *, 
+                               const struct mdoc_node *);

 
 static void              a2width(const char *, struct roffsu *);
 static void              a2offs(const char *, struct roffsu *);
 
 
 static void              a2width(const char *, struct roffsu *);
 static void              a2offs(const char *, struct roffsu *);
 

-static int               a2list(const struct mdoc_node *);
-

 static void              mdoc_root_post(MDOC_ARGS);
 static int               mdoc_root_pre(MDOC_ARGS);
 
 static void              mdoc_root_post(MDOC_ARGS);
 static int               mdoc_root_pre(MDOC_ARGS);
 


@@ -65,6 +72,8 @@ static        int               mdoc_aq_pre(MDOC_ARGS);
 static int               mdoc_ar_pre(MDOC_ARGS);
 static int               mdoc_bd_pre(MDOC_ARGS);
 static int               mdoc_bf_pre(MDOC_ARGS);
 static int               mdoc_ar_pre(MDOC_ARGS);
 static int               mdoc_bd_pre(MDOC_ARGS);
 static int               mdoc_bf_pre(MDOC_ARGS);

+static void              mdoc_bk_post(MDOC_ARGS);
+static int               mdoc_bk_pre(MDOC_ARGS);

 static void              mdoc_bl_post(MDOC_ARGS);
 static int               mdoc_bl_pre(MDOC_ARGS);
 static void              mdoc_bq_post(MDOC_ARGS);
 static void              mdoc_bl_post(MDOC_ARGS);
 static int               mdoc_bl_pre(MDOC_ARGS);
 static void              mdoc_bq_post(MDOC_ARGS);


@@ -91,11 +100,12 @@ static     void              mdoc_fo_post(MDOC_ARGS);
 static int               mdoc_fo_pre(MDOC_ARGS);
 static int               mdoc_ic_pre(MDOC_ARGS);
 static int               mdoc_in_pre(MDOC_ARGS);
 static int               mdoc_fo_pre(MDOC_ARGS);
 static int               mdoc_ic_pre(MDOC_ARGS);
 static int               mdoc_in_pre(MDOC_ARGS);

-static int               mdoc_it_block_pre(MDOC_ARGS, int, int,
-                               struct roffsu *, struct roffsu *);
-static int               mdoc_it_head_pre(MDOC_ARGS, int, 
+static int               mdoc_it_block_pre(MDOC_ARGS, enum mdoc_list,
+                               int, struct roffsu *, struct roffsu *);
+static int               mdoc_it_head_pre(MDOC_ARGS, enum mdoc_list, 
+                               struct roffsu *);
+static int               mdoc_it_body_pre(MDOC_ARGS, enum mdoc_list,

                                struct roffsu *);
                                struct roffsu *);

-static int               mdoc_it_body_pre(MDOC_ARGS, int);

 static int               mdoc_it_pre(MDOC_ARGS);
 static int               mdoc_lb_pre(MDOC_ARGS);
 static int               mdoc_li_pre(MDOC_ARGS);
 static int               mdoc_it_pre(MDOC_ARGS);
 static int               mdoc_lb_pre(MDOC_ARGS);
 static int               mdoc_li_pre(MDOC_ARGS);


@@ -115,6 +125,7 @@ static      int               mdoc_pq_pre(MDOC_ARGS);
 static int               mdoc_rs_pre(MDOC_ARGS);
 static int               mdoc_rv_pre(MDOC_ARGS);
 static int               mdoc_sh_pre(MDOC_ARGS);
 static int               mdoc_rs_pre(MDOC_ARGS);
 static int               mdoc_rv_pre(MDOC_ARGS);
 static int               mdoc_sh_pre(MDOC_ARGS);

+static int               mdoc_sm_pre(MDOC_ARGS);

 static int               mdoc_sp_pre(MDOC_ARGS);
 static void              mdoc_sq_post(MDOC_ARGS);
 static int               mdoc_sq_pre(MDOC_ARGS);
 static int               mdoc_sp_pre(MDOC_ARGS);
 static void              mdoc_sq_post(MDOC_ARGS);
 static int               mdoc_sq_pre(MDOC_ARGS);


@@ -127,11 +138,6 @@ static     int               mdoc_vt_pre(MDOC_ARGS);
 static int               mdoc_xr_pre(MDOC_ARGS);
 static int               mdoc_xx_pre(MDOC_ARGS);
 
 static int               mdoc_xr_pre(MDOC_ARGS);
 static int               mdoc_xx_pre(MDOC_ARGS);
 

-#ifdef __linux__
-extern size_t            strlcpy(char *, const char *, size_t);
-extern size_t            strlcat(char *, const char *, size_t);
-#endif
-

 static const struct htmlmdoc mdocs[MDOC_MAX] = {
        {mdoc_ap_pre, NULL}, /* Ap */
        {NULL, NULL}, /* Dd */
 static const struct htmlmdoc mdocs[MDOC_MAX] = {
        {mdoc_ap_pre, NULL}, /* Ap */
        {NULL, NULL}, /* Dd */


@@ -199,12 +205,12 @@ static    const struct htmlmdoc mdocs[MDOC_MAX] = {
        {NULL, NULL}, /* Dc */
        {mdoc_dq_pre, mdoc_dq_post}, /* Do */
        {mdoc_dq_pre, mdoc_dq_post}, /* Dq */
        {NULL, NULL}, /* Dc */
        {mdoc_dq_pre, mdoc_dq_post}, /* Do */
        {mdoc_dq_pre, mdoc_dq_post}, /* Dq */

-       {NULL, NULL}, /* Ec */
+       {NULL, NULL}, /* Ec */ /* FIXME: no space */

        {NULL, NULL}, /* Ef */
        {mdoc_em_pre, NULL}, /* Em */ 
        {NULL, NULL}, /* Eo */
        {mdoc_xx_pre, NULL}, /* Fx */
        {NULL, NULL}, /* Ef */
        {mdoc_em_pre, NULL}, /* Em */ 
        {NULL, NULL}, /* Eo */
        {mdoc_xx_pre, NULL}, /* Fx */

-       {mdoc_ms_pre, NULL}, /* Ms */ /* FIXME: convert to symbol? */
+       {mdoc_ms_pre, NULL}, /* Ms */

        {NULL, NULL}, /* No */
        {mdoc_ns_pre, NULL}, /* Ns */
        {mdoc_xx_pre, NULL}, /* Nx */
        {NULL, NULL}, /* No */
        {mdoc_ns_pre, NULL}, /* Ns */
        {mdoc_xx_pre, NULL}, /* Nx */


@@ -222,7 +228,7 @@ static      const struct htmlmdoc mdocs[MDOC_MAX] = {
        {NULL, NULL}, /* Sc */
        {mdoc_sq_pre, mdoc_sq_post}, /* So */
        {mdoc_sq_pre, mdoc_sq_post}, /* Sq */
        {NULL, NULL}, /* Sc */
        {mdoc_sq_pre, mdoc_sq_post}, /* So */
        {mdoc_sq_pre, mdoc_sq_post}, /* Sq */

-       {NULL, NULL}, /* Sm */ /* FIXME - no idea. */
+       {mdoc_sm_pre, NULL}, /* Sm */ 

        {mdoc_sx_pre, NULL}, /* Sx */
        {mdoc_sy_pre, NULL}, /* Sy */
        {NULL, NULL}, /* Tn */
        {mdoc_sx_pre, NULL}, /* Sx */
        {mdoc_sy_pre, NULL}, /* Sy */
        {NULL, NULL}, /* Tn */


@@ -233,7 +239,7 @@ static      const struct htmlmdoc mdocs[MDOC_MAX] = {
        {NULL, NULL}, /* Fc */ 
        {mdoc_op_pre, mdoc_op_post}, /* Oo */
        {NULL, NULL}, /* Oc */
        {NULL, NULL}, /* Fc */ 
        {mdoc_op_pre, mdoc_op_post}, /* Oo */
        {NULL, NULL}, /* Oc */

-       {NULL, NULL}, /* Bk */
+       {mdoc_bk_pre, mdoc_bk_post}, /* Bk */

        {NULL, NULL}, /* Ek */
        {mdoc_bt_pre, NULL}, /* Bt */
        {NULL, NULL}, /* Hf */
        {NULL, NULL}, /* Ek */
        {mdoc_bt_pre, NULL}, /* Bt */
        {NULL, NULL}, /* Hf */


@@ -254,6 +260,7 @@ static      const struct htmlmdoc mdocs[MDOC_MAX] = {
        {mdoc_sp_pre, NULL}, /* br */
        {mdoc_sp_pre, NULL}, /* sp */ 
        {mdoc__x_pre, mdoc__x_post}, /* %U */ 
        {mdoc_sp_pre, NULL}, /* br */
        {mdoc_sp_pre, NULL}, /* sp */ 
        {mdoc__x_pre, mdoc__x_post}, /* %U */ 

+       {NULL, NULL}, /* Ta */ 

 };
 
 
 };
 
 


@@ -265,7 +272,7 @@ html_mdoc(void *arg, const struct mdoc *m)
 
        h = (struct html *)arg;
 
 
        h = (struct html *)arg;
 

-       print_gen_doctype(h);
+       print_gen_decls(h);

        t = print_otag(h, TAG_HTML, 0, NULL);
        print_mdoc(mdoc_meta(m), mdoc_node(m), h);
        print_tagq(h, t);
        t = print_otag(h, TAG_HTML, 0, NULL);
        print_mdoc(mdoc_meta(m), mdoc_node(m), h);
        print_tagq(h, t);


@@ -274,50 +281,6 @@ html_mdoc(void *arg, const struct mdoc *m)
 }
 
 
 }
 
 

-/*
- * Return the list type for `Bl', e.g., `Bl -column' returns 
- * MDOC_Column.  This can ONLY be run for lists; it will abort() if no
- * list type is found. 
- */
-static int
-a2list(const struct mdoc_node *n)
-{
-       int              i;
-
-       assert(n->args);
-       for (i = 0; i < (int)n->args->argc; i++) 
-               switch (n->args->argv[i].arg) {
-               case (MDOC_Enum):
-                       /* FALLTHROUGH */
-               case (MDOC_Dash):
-                       /* FALLTHROUGH */
-               case (MDOC_Hyphen):
-                       /* FALLTHROUGH */
-               case (MDOC_Bullet):
-                       /* FALLTHROUGH */
-               case (MDOC_Tag):
-                       /* FALLTHROUGH */
-               case (MDOC_Hang):
-                       /* FALLTHROUGH */
-               case (MDOC_Inset):
-                       /* FALLTHROUGH */
-               case (MDOC_Diag):
-                       /* FALLTHROUGH */
-               case (MDOC_Item):
-                       /* FALLTHROUGH */
-               case (MDOC_Column):
-                       /* FALLTHROUGH */
-               case (MDOC_Ohang):
-                       return(n->args->argv[i].arg);
-               default:
-                       break;
-               }
-
-       abort();
-       /* NOTREACHED */
-}
-
-

 /*
  * Calculate the scaling unit passed in a `-width' argument.  This uses
  * either a native scaling unit (e.g., 1i, 2m) or the string length of
 /*
  * Calculate the scaling unit passed in a `-width' argument.  This uses
  * either a native scaling unit (e.g., 1i, 2m) or the string length of


@@ -334,6 +297,55 @@ a2width(const char *p, struct roffsu *su)
 }
 
 
 }
 
 

+/*
+ * See the same function in mdoc_term.c for documentation.
+ */
+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;
+
+       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) {
+               print_otag(h, TAG_DIV, 0, NULL);
+               return;
+       }
+
+       switch (n->prev->tok) {
+       case (MDOC_Fd):
+               /* FALLTHROUGH */
+       case (MDOC_Fn):
+               /* FALLTHROUGH */
+       case (MDOC_Fo):
+               /* FALLTHROUGH */
+       case (MDOC_In):
+               /* FALLTHROUGH */
+       case (MDOC_Vt):
+               print_otag(h, TAG_DIV, 1, &tag);
+               break;
+       case (MDOC_Ft):
+               if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) {
+                       print_otag(h, TAG_DIV, 1, &tag);
+                       break;
+               }
+               /* FALLTHROUGH */
+       default:
+               print_otag(h, TAG_DIV, 0, NULL);
+               break;
+       }
+}
+
+

 /*
  * Calculate the scaling unit passed in an `-offset' argument.  This
  * uses either a native scaling unit (e.g., 1i, 2m), one of a set of
 /*
  * Calculate the scaling unit passed in an `-offset' argument.  This
  * uses either a native scaling unit (e.g., 1i, 2m), one of a set of


@@ -386,7 +398,7 @@ print_mdoc_head(MDOC_ARGS)
 
        print_gen_head(h);
        bufinit(h);
 
        print_gen_head(h);
        bufinit(h);

-       buffmt(h, "%s(%d)", m->title, m->msec);
+       buffmt(h, "%s(%s)", m->title, m->msec);

 
        if (m->arch) {
                bufcat(h, " (");
 
        if (m->arch) {
                bufcat(h, " (");


@@ -425,13 +437,25 @@ print_mdoc_node(MDOC_ARGS)
                break;
        case (MDOC_TEXT):
                print_text(h, n->string);
                break;
        case (MDOC_TEXT):
                print_text(h, n->string);

-               break;
+               return;

        default:
        default:

-               if (mdocs[n->tok].pre)
+               if (mdocs[n->tok].pre && ENDBODY_NOT == n->end)

                        child = (*mdocs[n->tok].pre)(m, n, h);
                break;
        }
 
                        child = (*mdocs[n->tok].pre)(m, n, h);
                break;
        }
 

+       if (HTML_KEEP & h->flags) {
+               if (n->prev && n->prev->line != n->line) {
+                       h->flags &= ~HTML_KEEP;
+                       h->flags |= HTML_PREKEEP;
+               } else if (NULL == n->prev) {
+                       if (n->parent && n->parent->line != n->line) {
+                               h->flags &= ~HTML_KEEP;
+                               h->flags |= HTML_PREKEEP;
+                       }
+               }
+       }
+

        if (child && n->child)
                print_mdoc_nodelist(m, n->child, h);
 
        if (child && n->child)
                print_mdoc_nodelist(m, n->child, h);
 


@@ -442,10 +466,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_TEXT):
-               break;

        default:
        default:

-               if (mdocs[n->tok].post)
+               if (mdocs[n->tok].post && ENDBODY_NOT == n->end)

                        (*mdocs[n->tok].post)(m, n, h);
                break;
        }
                        (*mdocs[n->tok].post)(m, n, h);
                break;
        }


@@ -510,7 +532,7 @@ mdoc_root_pre(MDOC_ARGS)
        }
 
        (void)snprintf(title, BUFSIZ - 1, 
        }
 
        (void)snprintf(title, BUFSIZ - 1, 

-                       "%s(%d)", m->title, m->msec);
+                       "%s(%s)", m->title, m->msec);

 
        /* XXX: see note in mdoc_root_post() about divs. */
 
 
        /* XXX: see note in mdoc_root_post() about divs. */
 


@@ -583,21 +605,16 @@ mdoc_sh_pre(MDOC_ARGS)
                return(1);
        }
 
                return(1);
        }
 

-       html_idcpy(buf, "id_", BUFSIZ);
+       buf[0] = '\0';

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

-                       html_idcat(buf, "_", BUFSIZ);
+                       html_idcat(buf, " ", BUFSIZ);

        }
 
        }
 

-       /* 
-        * TODO: make sure there are no duplicates, as HTML does not
-        * allow for multiple `id' tags of the same name.
-        */
-

        PAIR_CLASS_INIT(&tag[0], "sec-head");
        PAIR_CLASS_INIT(&tag[0], "sec-head");

-       tag[1].key = ATTR_ID;
-       tag[1].val = buf;
+       PAIR_ID_INIT(&tag[1], buf);
+

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


@@ -636,11 +653,11 @@ mdoc_ss_pre(MDOC_ARGS)
 
        /* TODO: see note in mdoc_sh_pre() about duplicates. */
 
 
        /* TODO: see note in mdoc_sh_pre() about duplicates. */
 

-       html_idcpy(buf, "id_", BUFSIZ);
+       buf[0] = '\0';

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

-                       html_idcat(buf, "_", BUFSIZ);
+                       html_idcat(buf, " ", BUFSIZ);

        }
 
        SCALE_HS_INIT(&su, INDENT - HALFINDENT);
        }
 
        SCALE_HS_INIT(&su, INDENT - HALFINDENT);


@@ -649,8 +666,8 @@ mdoc_ss_pre(MDOC_ARGS)
 
        PAIR_CLASS_INIT(&tag[0], "ssec-head");
        PAIR_STYLE_INIT(&tag[1], h);
 
        PAIR_CLASS_INIT(&tag[0], "ssec-head");
        PAIR_STYLE_INIT(&tag[1], h);

-       tag[2].key = ATTR_ID;
-       tag[2].val = buf;
+       PAIR_ID_INIT(&tag[2], buf);
+

        print_otag(h, TAG_DIV, 3, tag);
        return(1);
 }
        print_otag(h, TAG_DIV, 3, tag);
        return(1);
 }


@@ -664,10 +681,19 @@ mdoc_fl_pre(MDOC_ARGS)
 
        PAIR_CLASS_INIT(&tag, "flag");
        print_otag(h, TAG_SPAN, 1, &tag);
 
        PAIR_CLASS_INIT(&tag, "flag");
        print_otag(h, TAG_SPAN, 1, &tag);

-       if (MDOC_Fl == n->tok) {
-               print_text(h, "\\-");
+
+       /* `Cm' has no leading hyphen. */
+
+       if (MDOC_Cm == n->tok)
+               return(1);
+
+       print_text(h, "\\-");
+
+       if (n->child)

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

-       }
+       else if (n->next && n->next->line == n->line)
+               h->flags |= HTML_NOSPACE;
+

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


@@ -724,19 +750,69 @@ mdoc_op_post(MDOC_ARGS)
 static int
 mdoc_nm_pre(MDOC_ARGS)
 {
 static int
 mdoc_nm_pre(MDOC_ARGS)
 {

-       struct htmlpair tag;
+       struct htmlpair  tag;
+       struct roffsu    su;
+       const char      *cp;

 
 

-       if ( ! (HTML_NEWLINE & h->flags))
-               if (SEC_SYNOPSIS == n->sec) {
-                       bufcat_style(h, "clear", "both");
-                       PAIR_STYLE_INIT(&tag, h);
-                       print_otag(h, TAG_BR, 1, &tag);
+       /*
+        * Accomodate for `Nm' being both an element (which may have
+        * NULL children AND no m->name) and a block.
+        */
+
+       cp = NULL;
+
+       if (MDOC_ELEM == n->type) {
+               if (NULL == n->child && NULL == m->name)
+                       return(1);
+               synopsis_pre(h, n);
+               PAIR_CLASS_INIT(&tag, "name");
+               print_otag(h, TAG_SPAN, 1, &tag);
+               if (NULL == n->child)
+                       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_CLASS_INIT(&tag, "name");
-       print_otag(h, TAG_SPAN, 1, &tag);
-       if (NULL == n->child)
-               print_text(h, m->name);
+               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));
+
+               bufcat_style(h, "float", "left");
+               bufcat_su(h, "min-width", &su);
+               SCALE_INVERT(&su);
+               bufcat_su(h, "margin-left", &su);
+
+               PAIR_STYLE_INIT(&tag, h);
+               print_otag(h, TAG_DIV, 1, &tag);
+
+               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);
+       }

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


@@ -749,14 +825,16 @@ mdoc_xr_pre(MDOC_ARGS)
        struct htmlpair          tag[2];
        const struct mdoc_node  *nn;
 
        struct htmlpair          tag[2];
        const struct mdoc_node  *nn;
 

+       if (NULL == n->child)
+               return(0);
+

        PAIR_CLASS_INIT(&tag[0], "link-man");
 
        if (h->base_man) {
                buffmt_man(h, n->child->string, 
                                n->child->next ? 
                                n->child->next->string : NULL);
        PAIR_CLASS_INIT(&tag[0], "link-man");
 
        if (h->base_man) {
                buffmt_man(h, n->child->string, 
                                n->child->next ? 
                                n->child->next->string : NULL);

-               tag[1].key = ATTR_HREF;
-               tag[1].val = h->buf;
+               PAIR_HREF_INIT(&tag[1], h->buf);

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


@@ -811,7 +889,7 @@ mdoc_xx_pre(MDOC_ARGS)
                pp = "BSDI BSD/OS";
                break;
        case (MDOC_Dx):
                pp = "BSDI BSD/OS";
                break;
        case (MDOC_Dx):

-               pp = "DragonFlyBSD";
+               pp = "DragonFly";

                break;
        case (MDOC_Fx):
                pp = "FreeBSD";
                break;
        case (MDOC_Fx):
                pp = "FreeBSD";


@@ -859,7 +937,7 @@ mdoc_bx_pre(MDOC_ARGS)
 
 /* ARGSUSED */
 static int
 
 /* ARGSUSED */
 static int

-mdoc_it_block_pre(MDOC_ARGS, int type, int comp,
+mdoc_it_block_pre(MDOC_ARGS, enum mdoc_list type, int comp,

                struct roffsu *offs, struct roffsu *width)
 {
        struct htmlpair          tag;
                struct roffsu *offs, struct roffsu *width)
 {
        struct htmlpair          tag;


@@ -867,17 +945,16 @@ mdoc_it_block_pre(MDOC_ARGS, int type, int comp,
        struct roffsu            su;
 
        nn = n->parent->parent;
        struct roffsu            su;
 
        nn = n->parent->parent;

-       assert(nn->args);

 
        /* XXX: see notes in mdoc_it_pre(). */
 
 
        /* XXX: see notes in mdoc_it_pre(). */
 

-       if (MDOC_Column == type) {
+       if (LIST_column == type) {

                /* Don't width-pad on the left. */
                SCALE_HS_INIT(width, 0);
                /* Also disallow non-compact. */
                comp = 1;
        }
                /* Don't width-pad on the left. */
                SCALE_HS_INIT(width, 0);
                /* Also disallow non-compact. */
                comp = 1;
        }

-       if (MDOC_Diag == type)
+       if (LIST_diag == type)

                /* Mandate non-compact with empty prior. */
                if (n->prev && NULL == n->prev->body->child)
                        comp = 1;
                /* Mandate non-compact with empty prior. */
                if (n->prev && NULL == n->prev->body->child)
                        comp = 1;


@@ -914,17 +991,23 @@ mdoc_it_block_pre(MDOC_ARGS, int type, int comp,
 
 /* ARGSUSED */
 static int
 
 /* ARGSUSED */
 static int

-mdoc_it_body_pre(MDOC_ARGS, int type)
+mdoc_it_body_pre(MDOC_ARGS, enum mdoc_list type, struct roffsu *width)

 {
        struct htmlpair  tag;
        struct roffsu    su;
 
        switch (type) {
 {
        struct htmlpair  tag;
        struct roffsu    su;
 
        switch (type) {

-       case (MDOC_Item):
+       case (LIST_item):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Ohang):
+       case (LIST_ohang):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Column):
+       case (LIST_column):
+               bufcat_su(h, "min-width", width);
+               bufcat_style(h, "clear", "none");
+               if (n->next)
+                       bufcat_style(h, "float", "left");
+               PAIR_STYLE_INIT(&tag, h);
+               print_otag(h, TAG_DIV, 1, &tag);

                break;
        default:
                /* 
                break;
        default:
                /* 


@@ -944,25 +1027,19 @@ mdoc_it_body_pre(MDOC_ARGS, int type)
 
 /* ARGSUSED */
 static int
 
 /* ARGSUSED */
 static int

-mdoc_it_head_pre(MDOC_ARGS, int type, struct roffsu *width)
+mdoc_it_head_pre(MDOC_ARGS, enum mdoc_list type, struct roffsu *width)

 {
        struct htmlpair  tag;
        struct ord      *ord;
        char             nbuf[BUFSIZ];
 
        switch (type) {
 {
        struct htmlpair  tag;
        struct ord      *ord;
        char             nbuf[BUFSIZ];
 
        switch (type) {

-       case (MDOC_Item):
-               /* FALLTHROUGH */
-       case (MDOC_Ohang):
-               print_otag(h, TAG_DIV, 0, NULL);
-               break;
-       case (MDOC_Column):
-               bufcat_su(h, "min-width", width);
-               bufcat_style(h, "clear", "none");
-               if (n->next && MDOC_HEAD == n->next->type)
-                       bufcat_style(h, "float", "left");
-               PAIR_STYLE_INIT(&tag, h);
-               print_otag(h, TAG_DIV, 1, &tag);
+       case (LIST_item):
+               return(0);
+       case (LIST_ohang):
+               print_otag(h, TAG_DIV, 0, &tag);
+               return(1);
+       case (LIST_column):

                break;
        default:
                bufcat_su(h, "min-width", width);
                break;
        default:
                bufcat_su(h, "min-width", width);


@@ -980,24 +1057,24 @@ mdoc_it_head_pre(MDOC_ARGS, int type, struct roffsu *width)
        }
 
        switch (type) {
        }
 
        switch (type) {

-       case (MDOC_Diag):
+       case (LIST_diag):

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

-       case (MDOC_Enum):
+       case (LIST_enum):

                ord = h->ords.head;
                assert(ord);
                nbuf[BUFSIZ - 1] = 0;
                (void)snprintf(nbuf, BUFSIZ - 1, "%d.", ord->pos++);
                print_text(h, nbuf);
                return(0);
                ord = h->ords.head;
                assert(ord);
                nbuf[BUFSIZ - 1] = 0;
                (void)snprintf(nbuf, BUFSIZ - 1, "%d.", ord->pos++);
                print_text(h, nbuf);
                return(0);

-       case (MDOC_Dash):
+       case (LIST_dash):

                print_text(h, "\\(en");
                return(0);
                print_text(h, "\\(en");
                return(0);

-       case (MDOC_Hyphen):
+       case (LIST_hyphen):

                print_text(h, "\\(hy");
                return(0);
                print_text(h, "\\(hy");
                return(0);

-       case (MDOC_Bullet):
+       case (LIST_bullet):

                print_text(h, "\\(bu");
                return(0);
        default:
                print_text(h, "\\(bu");
                return(0);
        default:


@@ -1011,9 +1088,10 @@ mdoc_it_head_pre(MDOC_ARGS, int type, struct roffsu *width)
 static int
 mdoc_it_pre(MDOC_ARGS)
 {
 static int
 mdoc_it_pre(MDOC_ARGS)
 {

-       int                      i, type, wp, comp;
+       int                      i, comp;

        const struct mdoc_node  *bl, *nn;
        struct roffsu            width, offs;
        const struct mdoc_node  *bl, *nn;
        struct roffsu            width, offs;

+       enum mdoc_list           type;

 
        /* 
         * XXX: be very careful in changing anything, here.  Lists in
 
        /* 
         * XXX: be very careful in changing anything, here.  Lists in


@@ -1025,20 +1103,23 @@ mdoc_it_pre(MDOC_ARGS)
        if (MDOC_BLOCK != n->type)
                bl = bl->parent;
 
        if (MDOC_BLOCK != n->type)
                bl = bl->parent;
 

-       type = a2list(bl);
+       SCALE_HS_INIT(&offs, 0);

 
 

-       /* Set default width and offset. */
+       assert(bl->data.Bl);
+       type = bl->data.Bl->type;
+       comp = bl->data.Bl->comp;

 
 

-       SCALE_HS_INIT(&offs, 0);
+       if (bl->data.Bl->offs)
+               a2offs(bl->data.Bl->offs, &offs);

 
        switch (type) {
 
        switch (type) {

-       case (MDOC_Enum):
+       case (LIST_enum):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Dash):
+       case (LIST_dash):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Hyphen):
+       case (LIST_hyphen):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Bullet):
+       case (LIST_bullet):

                SCALE_HS_INIT(&width, 2);
                break;
        default:
                SCALE_HS_INIT(&width, 2);
                break;
        default:


@@ -1046,34 +1127,19 @@ mdoc_it_pre(MDOC_ARGS)
                break;
        }
 
                break;
        }
 

-       /* Get width, offset, and compact arguments. */
-
-       for (wp = -1, comp = i = 0; i < (int)bl->args->argc; i++) 
-               switch (bl->args->argv[i].arg) {
-               case (MDOC_Column):
-                       wp = i; /* Save for later. */
-                       break;
-               case (MDOC_Width):
-                       a2width(bl->args->argv[i].value[0], &width);
-                       break;
-               case (MDOC_Offset):
-                       a2offs(bl->args->argv[i].value[0], &offs);
-                       break;
-               case (MDOC_Compact):
-                       comp = 1;
-                       break;
-               default:
-                       break;
-               }
+       if (bl->data.Bl->width)
+               a2width(bl->data.Bl->width, &width);

 
        /* Override width in some cases. */
 
        switch (type) {
 
        /* Override width in some cases. */
 
        switch (type) {

-       case (MDOC_Item):
+       case (LIST_ohang):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Inset):
+       case (LIST_item):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Diag):
+       case (LIST_inset):
+               /* FALLTHROUGH */
+       case (LIST_diag):

                SCALE_HS_INIT(&width, 0);
                break;
        default:
                SCALE_HS_INIT(&width, 0);
                break;
        default:


@@ -1082,25 +1148,21 @@ mdoc_it_pre(MDOC_ARGS)
                break;
        }
 
                break;
        }
 

-       /* Flip to body/block processing. */
-
-       if (MDOC_BODY == n->type)
-               return(mdoc_it_body_pre(m, n, h, type));
-       if (MDOC_BLOCK == n->type)
-               return(mdoc_it_block_pre(m, n, h, type, comp,
-                                       &offs, &width));
-
-       /* Override column widths. */
-
-       if (MDOC_Column == type) {
+       if (LIST_column == type && MDOC_BODY == n->type) {

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

-               for (i = 0; nn && nn != n; nn = nn->next, i++)
-                       /* Counter... */ ;
-               if (i < (int)bl->args->argv[wp].sz)
-                       a2width(bl->args->argv[wp].value[i], &width);
+               for (i = 0; nn && nn != n; nn = nn->next)
+                       if (MDOC_BODY == nn->type)
+                               i++;
+               if (i < (int)bl->data.Bl->ncols)
+                       a2width(bl->data.Bl->cols[i], &width);

        }
 
        }
 

-       return(mdoc_it_head_pre(m, n, h, type, &width));
+       if (MDOC_HEAD == n->type)
+               return(mdoc_it_head_pre(m, n, h, type, &width));
+       else if (MDOC_BODY == n->type)
+               return(mdoc_it_body_pre(m, n, h, type, &width));
+
+       return(mdoc_it_block_pre(m, n, h, type, comp, &offs, &width));

 }
 
 
 }
 
 


@@ -1110,14 +1172,19 @@ mdoc_bl_pre(MDOC_ARGS)
 {
        struct ord      *ord;
 
 {
        struct ord      *ord;
 

+       if (MDOC_HEAD == n->type)
+               return(0);

        if (MDOC_BLOCK != n->type)
                return(1);
        if (MDOC_BLOCK != n->type)
                return(1);

-       if (MDOC_Enum != a2list(n))
+       assert(n->data.Bl);
+       if (LIST_enum != n->data.Bl->type)

                return(1);
 
        ord = malloc(sizeof(struct ord));
                return(1);
 
        ord = malloc(sizeof(struct ord));

-       if (NULL == ord)
-               err(EXIT_FAILURE, "malloc");
+       if (NULL == ord) {
+               perror(NULL);
+               exit(MANDOCLEVEL_SYSERR);
+       }

        ord->cookie = n;
        ord->pos = 1;
        ord->next = h->ords.head;
        ord->cookie = n;
        ord->pos = 1;
        ord->next = h->ords.head;


@@ -1134,7 +1201,7 @@ mdoc_bl_post(MDOC_ARGS)
 
        if (MDOC_BLOCK != n->type)
                return;
 
        if (MDOC_BLOCK != n->type)
                return;

-       if (MDOC_Enum != a2list(n))
+       if (LIST_enum != n->data.Bl->type)

                return;
 
        ord = h->ords.head;
                return;
 
        ord = h->ords.head;


@@ -1170,7 +1237,7 @@ mdoc_ex_pre(MDOC_ARGS)
                        h->flags &= ~HTML_NOSPACE;
        }
 
                        h->flags &= ~HTML_NOSPACE;
        }
 

-       if (n->child->next)
+       if (n->child && n->child->next)

                print_text(h, "utilities exit");
        else
                print_text(h, "utility exits");
                print_text(h, "utilities exit");
        else
                print_text(h, "utility exits");


@@ -1295,19 +1362,15 @@ mdoc_sx_pre(MDOC_ARGS)
        const struct mdoc_node  *nn;
        char                     buf[BUFSIZ];
 
        const struct mdoc_node  *nn;
        char                     buf[BUFSIZ];
 

-       /* FIXME: duplicates? */
-

        strlcpy(buf, "#", BUFSIZ);
        strlcpy(buf, "#", BUFSIZ);

-       html_idcat(buf, "id_", BUFSIZ);

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

-                       html_idcat(buf, "_", BUFSIZ);
+                       html_idcat(buf, " ", BUFSIZ);

        }
 
        PAIR_CLASS_INIT(&tag[0], "link-sec");
        }
 
        PAIR_CLASS_INIT(&tag[0], "link-sec");

-       tag[1].key = ATTR_HREF;
-       tag[1].val = buf;
+       PAIR_HREF_INIT(&tag[1], buf);

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


@@ -1344,44 +1407,23 @@ static int
 mdoc_bd_pre(MDOC_ARGS)
 {
        struct htmlpair          tag[2];
 mdoc_bd_pre(MDOC_ARGS)
 {
        struct htmlpair          tag[2];

-       int                      type, comp, i;
-       const struct mdoc_node  *bl, *nn;
+       int                      comp;
+       const struct mdoc_node  *nn;

        struct roffsu            su;
 
        struct roffsu            su;
 

-       if (MDOC_BLOCK == n->type)
-               bl = n;
-       else if (MDOC_HEAD == n->type)
+       if (MDOC_HEAD == n->type)

                return(0);
                return(0);

-       else
-               bl = n->parent;

 
        SCALE_VS_INIT(&su, 0);
 
 
        SCALE_VS_INIT(&su, 0);
 

-       type = comp = 0;
-       for (i = 0; i < (int)bl->args->argc; i++) 
-               switch (bl->args->argv[i].arg) {
-               case (MDOC_Offset):
-                       a2offs(bl->args->argv[i].value[0], &su);
-                       break;
-               case (MDOC_Compact):
-                       comp = 1;
-                       break;
-               case (MDOC_Centred):
-                       /* FALLTHROUGH */
-               case (MDOC_Ragged):
-                       /* FALLTHROUGH */
-               case (MDOC_Filled):
-                       /* FALLTHROUGH */
-               case (MDOC_Unfilled):
-                       /* FALLTHROUGH */
-               case (MDOC_Literal):
-                       type = bl->args->argv[i].arg;
-                       break;
-               default:
-                       break;
-               }
+       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: -centered, etc. formatting. */

+       /* FIXME: does not respect -offset ??? */

 
        if (MDOC_BLOCK == n->type) {
                bufcat_su(h, "margin-left", &su);
 
        if (MDOC_BLOCK == n->type) {
                bufcat_su(h, "margin-left", &su);


@@ -1394,7 +1436,8 @@ mdoc_bd_pre(MDOC_ARGS)
                                break;
                }
                if (comp) {
                                break;
                }
                if (comp) {

-                       print_otag(h, TAG_DIV, 0, tag);
+                       PAIR_STYLE_INIT(&tag[0], h);
+                       print_otag(h, TAG_DIV, 1, tag);

                        return(1);
                }
                SCALE_VS_INIT(&su, 1);
                        return(1);
                }
                SCALE_VS_INIT(&su, 1);


@@ -1404,7 +1447,8 @@ mdoc_bd_pre(MDOC_ARGS)
                return(1);
        }
 
                return(1);
        }
 

-       if (MDOC_Unfilled != type && MDOC_Literal != type)
+       if (DISP_unfilled != n->data.Bd->type && 
+                       DISP_literal != n->data.Bd->type)

                return(1);
 
        PAIR_CLASS_INIT(&tag[0], "lit");
                return(1);
 
        PAIR_CLASS_INIT(&tag[0], "lit");


@@ -1413,14 +1457,11 @@ mdoc_bd_pre(MDOC_ARGS)
        print_otag(h, TAG_DIV, 2, tag);
 
        for (nn = n->child; nn; nn = nn->next) {
        print_otag(h, TAG_DIV, 2, tag);
 
        for (nn = n->child; nn; nn = nn->next) {

-               h->flags |= HTML_NOSPACE;

                print_mdoc_node(m, nn, h);
                print_mdoc_node(m, nn, h);

-               if (NULL == nn->next)
+               if (nn->next && nn->next->line == nn->line)

                        continue;
                        continue;

-               if (nn->prev && nn->prev->line < nn->line)
-                       print_text(h, "\n");
-               else if (NULL == nn->prev)
-                       print_text(h, "\n");
+               print_text(h, "\n");
+               h->flags |= HTML_NOSPACE;

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


@@ -1471,7 +1512,7 @@ mdoc_cd_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
 {
        struct htmlpair tag;
 

-       print_otag(h, TAG_DIV, 0, NULL);
+       synopsis_pre(h, n);

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


@@ -1548,17 +1589,8 @@ static int
 mdoc_fd_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;
 mdoc_fd_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;

-       struct roffsu    su;

 
 

-       if (SEC_SYNOPSIS == n->sec) {
-               if (n->next && MDOC_Fd != n->next->tok) {
-                       SCALE_VS_INIT(&su, 1);
-                       bufcat_su(h, "margin-bottom", &su);
-                       PAIR_STYLE_INIT(&tag, h);
-                       print_otag(h, TAG_DIV, 1, &tag);
-               } else
-                       print_otag(h, TAG_DIV, 0, NULL);
-       }
+       synopsis_pre(h, n);

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


@@ -1571,17 +1603,14 @@ static int
 mdoc_vt_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;
 mdoc_vt_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;

-       struct roffsu    su;

 
 

-       if (SEC_SYNOPSIS == n->sec) {
-               if (n->next && MDOC_Vt != n->next->tok) {
-                       SCALE_VS_INIT(&su, 1);
-                       bufcat_su(h, "margin-bottom", &su);
-                       PAIR_STYLE_INIT(&tag, h);
-                       print_otag(h, TAG_DIV, 1, &tag);
-               } else
-                       print_otag(h, TAG_DIV, 0, NULL);
-       }
+       if (MDOC_BLOCK == n->type) {
+               synopsis_pre(h, n);
+               return(1);
+       } else if (MDOC_ELEM == n->type) {
+               synopsis_pre(h, n);
+       } else if (MDOC_HEAD == n->type)
+               return(0);

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


@@ -1594,18 +1623,8 @@ static int
 mdoc_ft_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;
 mdoc_ft_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;

-       struct roffsu    su;
-
-       if (SEC_SYNOPSIS == n->sec) {
-               if (n->prev && MDOC_Fo == n->prev->tok) {
-                       SCALE_VS_INIT(&su, 1);
-                       bufcat_su(h, "margin-top", &su);
-                       PAIR_STYLE_INIT(&tag, h);
-                       print_otag(h, TAG_DIV, 1, &tag);
-               } else
-                       print_otag(h, TAG_DIV, 0, NULL);
-       }

 
 

+       synopsis_pre(h, n);

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


@@ -1622,20 +1641,8 @@ mdoc_fn_pre(MDOC_ARGS)
        char                     nbuf[BUFSIZ];
        const char              *sp, *ep;
        int                      sz, i;
        char                     nbuf[BUFSIZ];
        const char              *sp, *ep;
        int                      sz, i;

-       struct roffsu            su;

 
 

-       if (SEC_SYNOPSIS == n->sec) {
-               SCALE_HS_INIT(&su, INDENT);
-               bufcat_su(h, "margin-left", &su);
-               su.scale = -su.scale;
-               bufcat_su(h, "text-indent", &su);
-               if (n->next) {
-                       SCALE_VS_INIT(&su, 1);
-                       bufcat_su(h, "margin-bottom", &su);
-               }
-               PAIR_STYLE_INIT(&tag[0], h);
-               print_otag(h, TAG_DIV, 1, tag);
-       }
+       synopsis_pre(h, n);

 
        /* Split apart into type and name. */
        assert(n->child->string);
 
        /* Split apart into type and name. */
        assert(n->child->string);


@@ -1658,10 +1665,27 @@ mdoc_fn_pre(MDOC_ARGS)
        }
 
        PAIR_CLASS_INIT(&tag[0], "fname");
        }
 
        PAIR_CLASS_INIT(&tag[0], "fname");

+
+       /*
+        * FIXME: only refer to IDs that we know exist.
+        */
+
+#if 0
+       if (MDOC_SYNPRETTY & n->flags) {
+               nbuf[0] = '\0';
+               html_idcat(nbuf, sp, BUFSIZ);
+               PAIR_ID_INIT(&tag[1], nbuf);
+       } else {
+               strlcpy(nbuf, "#", BUFSIZ);
+               html_idcat(nbuf, sp, BUFSIZ);
+               PAIR_HREF_INIT(&tag[1], nbuf);
+       }
+#endif
+

        t = print_otag(h, TAG_SPAN, 1, tag);
 
        if (sp) {
        t = print_otag(h, TAG_SPAN, 1, tag);
 
        if (sp) {

-               (void)strlcpy(nbuf, sp, BUFSIZ);
+               strlcpy(nbuf, sp, BUFSIZ);

                print_text(h, nbuf);
        }
 
                print_text(h, nbuf);
        }
 


@@ -1677,7 +1701,7 @@ mdoc_fn_pre(MDOC_ARGS)
 
        for (nn = n->child->next; nn; nn = nn->next) {
                i = 1;
 
        for (nn = n->child->next; nn; nn = nn->next) {
                i = 1;

-               if (SEC_SYNOPSIS == n->sec)
+               if (MDOC_SYNPRETTY & n->flags)

                        i = 2;
                t = print_otag(h, TAG_SPAN, i, tag);
                print_text(h, nn->string);
                        i = 2;
                t = print_otag(h, TAG_SPAN, i, tag);
                print_text(h, nn->string);


@@ -1687,13 +1711,30 @@ mdoc_fn_pre(MDOC_ARGS)
        }
 
        print_text(h, ")");
        }
 
        print_text(h, ")");

-       if (SEC_SYNOPSIS == n->sec)
+       if (MDOC_SYNPRETTY & n->flags)

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

+/* ARGSUSED */
+static int
+mdoc_sm_pre(MDOC_ARGS)
+{
+
+       assert(n->child && MDOC_TEXT == n->child->type);
+       if (0 == strcmp("on", n->child->string)) {
+               /* FIXME: no p->col to check... */
+               h->flags &= ~HTML_NOSPACE;
+               h->flags &= ~HTML_NONOSPACE;
+       } else
+               h->flags |= HTML_NONOSPACE;
+
+       return(0);
+}
+
+

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


@@ -1711,6 +1752,11 @@ mdoc_sp_pre(MDOC_ARGS)
                len = 0;
                break;
        default:
                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;
        }
                len = 1;
                break;
        }


@@ -1719,7 +1765,10 @@ mdoc_sp_pre(MDOC_ARGS)
        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);

-       return(1);
+       /* So the div isn't empty: */
+       print_text(h, "\\~");
+
+       return(0);

 
 }
 
 
 }
 


@@ -1759,8 +1808,7 @@ mdoc_lk_pre(MDOC_ARGS)
        nn = n->child;
 
        PAIR_CLASS_INIT(&tag[0], "link-ext");
        nn = n->child;
 
        PAIR_CLASS_INIT(&tag[0], "link-ext");

-       tag[1].key = ATTR_HREF;
-       tag[1].val = nn->string;
+       PAIR_HREF_INIT(&tag[1], nn->string);

        print_otag(h, TAG_A, 2, tag);
 
        if (NULL == nn->next) 
        print_otag(h, TAG_A, 2, tag);
 
        if (NULL == nn->next) 


@@ -1787,7 +1835,7 @@ mdoc_mt_pre(MDOC_ARGS)
                bufinit(h);
                bufcat(h, "mailto:");
                bufcat(h, nn->string);
                bufinit(h);
                bufcat(h, "mailto:");
                bufcat(h, nn->string);

-               PAIR_STYLE_INIT(&tag[1], h);
+               PAIR_HREF_INIT(&tag[1], h->buf);

                t = print_otag(h, TAG_A, 2, tag);
                print_text(h, nn->string);
                print_tagq(h, t);
                t = print_otag(h, TAG_A, 2, tag);
                print_text(h, nn->string);
                print_tagq(h, t);


@@ -1801,19 +1849,29 @@ mdoc_mt_pre(MDOC_ARGS)
 static int
 mdoc_fo_pre(MDOC_ARGS)
 {
 static int
 mdoc_fo_pre(MDOC_ARGS)
 {

-       struct htmlpair tag;
+       struct htmlpair  tag;
+       struct tag      *t;

 
        if (MDOC_BODY == n->type) {
                h->flags |= HTML_NOSPACE;
                print_text(h, "(");
                h->flags |= HTML_NOSPACE;
                return(1);
 
        if (MDOC_BODY == n->type) {
                h->flags |= HTML_NOSPACE;
                print_text(h, "(");
                h->flags |= HTML_NOSPACE;
                return(1);

-       } else if (MDOC_BLOCK == n->type)
+       } else if (MDOC_BLOCK == n->type) {
+               synopsis_pre(h, n);

                return(1);
                return(1);

+       }
+
+       /* XXX: we drop non-initial arguments as per groff. */
+
+       assert(n->child);
+       assert(n->child->string);

 
        PAIR_CLASS_INIT(&tag, "fname");
 
        PAIR_CLASS_INIT(&tag, "fname");

-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
+       t = print_otag(h, TAG_SPAN, 1, &tag);
+       print_text(h, n->child->string);
+       print_tagq(h, t);
+       return(0);

 }
 
 
 }
 
 


@@ -1821,6 +1879,7 @@ mdoc_fo_pre(MDOC_ARGS)
 static void
 mdoc_fo_post(MDOC_ARGS)
 {
 static void
 mdoc_fo_post(MDOC_ARGS)
 {

+

        if (MDOC_BODY != n->type)
                return;
        h->flags |= HTML_NOSPACE;
        if (MDOC_BODY != n->type)
                return;
        h->flags |= HTML_NOSPACE;


@@ -1838,39 +1897,26 @@ mdoc_in_pre(MDOC_ARGS)
        struct tag              *t;
        struct htmlpair          tag[2];
        int                      i;
        struct tag              *t;
        struct htmlpair          tag[2];
        int                      i;

-       struct roffsu            su;

 
 

-       if (SEC_SYNOPSIS == n->sec) {
-               if (n->next && MDOC_In != n->next->tok) {
-                       SCALE_VS_INIT(&su, 1);
-                       bufcat_su(h, "margin-bottom", &su);
-                       PAIR_STYLE_INIT(&tag[0], h);
-                       print_otag(h, TAG_DIV, 1, tag);
-               } else
-                       print_otag(h, TAG_DIV, 0, NULL);
-       }
-
-       /* FIXME: there's a buffer bug in here somewhere. */
+       synopsis_pre(h, n);

 
        PAIR_CLASS_INIT(&tag[0], "includes");
        print_otag(h, TAG_SPAN, 1, tag);
 
 
        PAIR_CLASS_INIT(&tag[0], "includes");
        print_otag(h, TAG_SPAN, 1, tag);
 

-       if (SEC_SYNOPSIS == n->sec)
+       if (MDOC_SYNPRETTY & n->flags && MDOC_LINE & n->flags)

                print_text(h, "#include");
 
        print_text(h, "<");
        h->flags |= HTML_NOSPACE;
 
                print_text(h, "#include");
 
        print_text(h, "<");
        h->flags |= HTML_NOSPACE;
 

-       /* XXX -- see warning in termp_in_post(). */
-

        for (nn = n->child; nn; nn = nn->next) {
                PAIR_CLASS_INIT(&tag[0], "link-includes");
                i = 1;
                bufinit(h);
                if (h->base_includes) {
                        buffmt_includes(h, nn->string);
        for (nn = n->child; nn; nn = nn->next) {
                PAIR_CLASS_INIT(&tag[0], "link-includes");
                i = 1;
                bufinit(h);
                if (h->base_includes) {
                        buffmt_includes(h, nn->string);

-                       tag[i].key = ATTR_HREF;
-                       tag[i++].val = h->buf;
+                       PAIR_HREF_INIT(&tag[i], h->buf);
+                       i++;

                }
                t = print_otag(h, TAG_A, i, tag);
                print_mdoc_node(m, nn, h);
                }
                t = print_otag(h, TAG_A, i, tag);
                print_mdoc_node(m, nn, h);


@@ -1922,7 +1968,7 @@ mdoc_rv_pre(MDOC_ARGS)
                        print_text(h, "()");
        }
 
                        print_text(h, "()");
        }
 

-       if (n->child->next)
+       if (n->child && n->child->next)

                print_text(h, "functions return");
        else
                print_text(h, "function returns");
                print_text(h, "functions return");
        else
                print_text(h, "function returns");


@@ -1992,47 +2038,33 @@ mdoc_ap_pre(MDOC_ARGS)
 static int
 mdoc_bf_pre(MDOC_ARGS)
 {
 static int
 mdoc_bf_pre(MDOC_ARGS)
 {

-       int              i;

        struct htmlpair  tag[2];
        struct roffsu    su;
 
        if (MDOC_HEAD == n->type)
                return(0);
        struct htmlpair  tag[2];
        struct roffsu    su;
 
        if (MDOC_HEAD == n->type)
                return(0);

-       else if (MDOC_BLOCK != n->type)
+       else if (MDOC_BODY != n->type)

                return(1);
 
                return(1);
 

-       PAIR_CLASS_INIT(&tag[0], "lit");
-
-       if (n->head->child) {
-               if ( ! strcmp("Em", n->head->child->string))
-                       PAIR_CLASS_INIT(&tag[0], "emph");
-               else if ( ! strcmp("Sy", n->head->child->string))
-                       PAIR_CLASS_INIT(&tag[0], "symb");
-               else if ( ! strcmp("Li", n->head->child->string))
-                       PAIR_CLASS_INIT(&tag[0], "lit");
-       } else {
-               assert(n->args);
-               for (i = 0; i < (int)n->args->argc; i++) 
-                       switch (n->args->argv[i].arg) {
-                       case (MDOC_Symbolic):
-                               PAIR_CLASS_INIT(&tag[0], "symb");
-                               break;
-                       case (MDOC_Literal):
-                               PAIR_CLASS_INIT(&tag[0], "lit");
-                               break;
-                       case (MDOC_Emphasis):
-                               PAIR_CLASS_INIT(&tag[0], "emph");
-                               break;
-                       default:
-                               break;
-                       }
-       }
+       assert(n->data.Bf);

 
 

-       /* FIXME: div's have spaces stripped--we want them. */
+       if (FONT_Em == n->data.Bf->font) 
+               PAIR_CLASS_INIT(&tag[0], "emph");
+       else if (FONT_Sy == n->data.Bf->font) 
+               PAIR_CLASS_INIT(&tag[0], "symb");
+       else if (FONT_Li == n->data.Bf->font) 
+               PAIR_CLASS_INIT(&tag[0], "lit");
+       else
+               PAIR_CLASS_INIT(&tag[0], "none");

 
 

+       /* 
+        * We want this to be inline-formatted, but needs to be div to
+        * accept block children. 
+        */

        bufcat_style(h, "display", "inline");
        SCALE_HS_INIT(&su, 1);
        bufcat_style(h, "display", "inline");
        SCALE_HS_INIT(&su, 1);

-       bufcat_su(h, "margin-right", &su);
+       /* Needs a left-margin for spacing. */
+       bufcat_su(h, "margin-left", &su);

        PAIR_STYLE_INIT(&tag[1], h);
        print_otag(h, TAG_DIV, 2, tag);
        return(1);
        PAIR_STYLE_INIT(&tag[1], h);
        print_otag(h, TAG_DIV, 2, tag);
        return(1);


@@ -2145,7 +2177,7 @@ mdoc_lb_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
 {
        struct htmlpair tag;
 

-       if (SEC_SYNOPSIS == n->sec)
+       if (SEC_LIBRARY == n->sec && MDOC_LINE & n->flags)

                print_otag(h, TAG_DIV, 0, NULL);
        PAIR_CLASS_INIT(&tag, "lib");
        print_otag(h, TAG_SPAN, 1, &tag);
                print_otag(h, TAG_DIV, 0, NULL);
        PAIR_CLASS_INIT(&tag, "lib");
        print_otag(h, TAG_SPAN, 1, &tag);


@@ -2195,8 +2227,6 @@ mdoc__x_pre(MDOC_ARGS)
                break;
        case(MDOC__T):
                PAIR_CLASS_INIT(&tag[0], "ref-title");
                break;
        case(MDOC__T):
                PAIR_CLASS_INIT(&tag[0], "ref-title");

-               print_text(h, "\\(lq");
-               h->flags |= HTML_NOSPACE;

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


@@ -2225,14 +2255,40 @@ static void
 mdoc__x_post(MDOC_ARGS)
 {
 
 mdoc__x_post(MDOC_ARGS)
 {
 

+       /* TODO: %U */
+

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

-       switch (n->tok) {
-       case (MDOC__T):
-               print_text(h, "\\(rq");
-               h->flags |= HTML_NOSPACE;
+       print_text(h, n->next ? "," : ".");
+}
+
+
+/* ARGSUSED */
+static int
+mdoc_bk_pre(MDOC_ARGS)
+{
+
+       switch (n->type) {
+       case (MDOC_BLOCK):

                break;
                break;

-       default:
+       case (MDOC_HEAD):
+               return(0);
+       case (MDOC_BODY):
+               h->flags |= HTML_PREKEEP;

                break;
                break;

+       default:
+               abort();
+               /* NOTREACHED */

        }
        }

-       print_text(h, n->next ? "," : ".");
+
+       return(1);
+}
+
+
+/* ARGSUSED */
+static void
+mdoc_bk_post(MDOC_ARGS)
+{
+
+       if (MDOC_BODY == n->type)
+               h->flags &= ~(HTML_KEEP | HTML_PREKEEP);

 }
 }