Partial cleanup of argument count validation in mdoc(7):

[mandoc.git] / mdoc_html.c

diff --git a/mdoc_html.c b/mdoc_html.c
index 2a0b152944d38e3987b6cd4a38b75cc9d2daf39b..3cfab636173ae03de24eeebe91b7eda3161f697b 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,6 +1,6 @@
-/*     $Id: mdoc_html.c,v 1.20 2009/10/03 19:57:53 kristaps Exp $ */
+/*     $Id: mdoc_html.c,v 1.140 2011/01/01 12:18:37 kristaps 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,20 +14,24 @@
  * 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 <sys/queue.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 "html.h"
 #include "mdoc.h"

+#include "main.h"

 
 #define        INDENT           5
 #define        HALFINDENT       3
 
 #define        INDENT           5
 #define        HALFINDENT       3


@@ -36,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);


@@ -45,40 +53,30 @@ 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 int               a2width(const char *);
-static int               a2offs(const char *);
-static int               a2list(const struct mdoc_node *);
+static void              a2width(const char *, struct roffsu *);
+static void              a2offs(const char *, struct roffsu *);

 
 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);

-static int               mdoc_tbl_pre(MDOC_ARGS, int);
-static int               mdoc_tbl_block_pre(MDOC_ARGS, int, int, int, int);
-static int               mdoc_tbl_body_pre(MDOC_ARGS, int, int);
-static int               mdoc_tbl_head_pre(MDOC_ARGS, int, int);

 
 static void              mdoc__x_post(MDOC_ARGS);
 static int               mdoc__x_pre(MDOC_ARGS);
 static int               mdoc_ad_pre(MDOC_ARGS);
 static int               mdoc_an_pre(MDOC_ARGS);
 static int               mdoc_ap_pre(MDOC_ARGS);
 
 static void              mdoc__x_post(MDOC_ARGS);
 static int               mdoc__x_pre(MDOC_ARGS);
 static int               mdoc_ad_pre(MDOC_ARGS);
 static int               mdoc_an_pre(MDOC_ARGS);
 static int               mdoc_ap_pre(MDOC_ARGS);

-static void              mdoc_aq_post(MDOC_ARGS);
-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_bl_post(MDOC_ARGS);
+static void              mdoc_bk_post(MDOC_ARGS);
+static int               mdoc_bk_pre(MDOC_ARGS);

 static int               mdoc_bl_pre(MDOC_ARGS);
 static int               mdoc_bl_pre(MDOC_ARGS);

-static void              mdoc_bq_post(MDOC_ARGS);
-static int               mdoc_bq_pre(MDOC_ARGS);
-static void              mdoc_brq_post(MDOC_ARGS);
-static int               mdoc_brq_pre(MDOC_ARGS);

 static int               mdoc_bt_pre(MDOC_ARGS);
 static int               mdoc_bx_pre(MDOC_ARGS);
 static int               mdoc_cd_pre(MDOC_ARGS);
 static int               mdoc_d1_pre(MDOC_ARGS);
 static int               mdoc_bt_pre(MDOC_ARGS);
 static int               mdoc_bx_pre(MDOC_ARGS);
 static int               mdoc_cd_pre(MDOC_ARGS);
 static int               mdoc_d1_pre(MDOC_ARGS);

-static void              mdoc_dq_post(MDOC_ARGS);
-static int               mdoc_dq_pre(MDOC_ARGS);

 static int               mdoc_dv_pre(MDOC_ARGS);
 static int               mdoc_fa_pre(MDOC_ARGS);
 static int               mdoc_fd_pre(MDOC_ARGS);
 static int               mdoc_dv_pre(MDOC_ARGS);
 static int               mdoc_fa_pre(MDOC_ARGS);
 static int               mdoc_fd_pre(MDOC_ARGS);


@@ -92,6 +90,7 @@ static        int               mdoc_ex_pre(MDOC_ARGS);
 static void              mdoc_fo_post(MDOC_ARGS);
 static int               mdoc_fo_pre(MDOC_ARGS);
 static int               mdoc_ic_pre(MDOC_ARGS);
 static void              mdoc_fo_post(MDOC_ARGS);
 static int               mdoc_fo_pre(MDOC_ARGS);
 static int               mdoc_ic_pre(MDOC_ARGS);

+static int               mdoc_igndelim_pre(MDOC_ARGS);

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


@@ -102,19 +101,16 @@ static    int               mdoc_ms_pre(MDOC_ARGS);
 static int               mdoc_nd_pre(MDOC_ARGS);
 static int               mdoc_nm_pre(MDOC_ARGS);
 static int               mdoc_ns_pre(MDOC_ARGS);
 static int               mdoc_nd_pre(MDOC_ARGS);
 static int               mdoc_nm_pre(MDOC_ARGS);
 static int               mdoc_ns_pre(MDOC_ARGS);

-static void              mdoc_op_post(MDOC_ARGS);
-static int               mdoc_op_pre(MDOC_ARGS);

 static int               mdoc_pa_pre(MDOC_ARGS);
 static void              mdoc_pf_post(MDOC_ARGS);
 static int               mdoc_pa_pre(MDOC_ARGS);
 static void              mdoc_pf_post(MDOC_ARGS);

-static int               mdoc_pf_pre(MDOC_ARGS);
-static void              mdoc_pq_post(MDOC_ARGS);
-static int               mdoc_pq_pre(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 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 int               mdoc_sp_pre(MDOC_ARGS);

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

 static int               mdoc_ss_pre(MDOC_ARGS);
 static int               mdoc_sx_pre(MDOC_ARGS);
 static int               mdoc_sy_pre(MDOC_ARGS);
 static int               mdoc_ss_pre(MDOC_ARGS);
 static int               mdoc_sx_pre(MDOC_ARGS);
 static int               mdoc_sy_pre(MDOC_ARGS);


@@ -124,11 +120,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 */


@@ -136,12 +127,12 @@ 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 */
        {NULL, NULL}, /* Ed */
        {mdoc_d1_pre, NULL}, /* D1 */
        {mdoc_d1_pre, NULL}, /* Dl */
        {mdoc_bd_pre, NULL}, /* Bd */
        {NULL, NULL}, /* Ed */

-       {mdoc_bl_pre, mdoc_bl_post}, /* Bl */
+       {mdoc_bl_pre, NULL}, /* Bl */

        {NULL, NULL}, /* El */
        {mdoc_it_pre, NULL}, /* It */
        {mdoc_ad_pre, NULL}, /* Ad */ 
        {NULL, NULL}, /* El */
        {mdoc_it_pre, NULL}, /* It */
        {mdoc_ad_pre, NULL}, /* Ad */ 


@@ -163,7 +154,7 @@ static      const struct htmlmdoc mdocs[MDOC_MAX] = {
        {mdoc_li_pre, NULL}, /* Li */
        {mdoc_nd_pre, NULL}, /* Nd */ 
        {mdoc_nm_pre, NULL}, /* Nm */ 
        {mdoc_li_pre, NULL}, /* Li */
        {mdoc_nd_pre, NULL}, /* Nd */ 
        {mdoc_nm_pre, NULL}, /* Nm */ 

-       {mdoc_op_pre, mdoc_op_post}, /* Op */
+       {mdoc_quote_pre, mdoc_quote_post}, /* Op */

        {NULL, NULL}, /* Ot */
        {mdoc_pa_pre, NULL}, /* Pa */
        {mdoc_rv_pre, NULL}, /* Rv */
        {NULL, NULL}, /* Ot */
        {mdoc_pa_pre, NULL}, /* Pa */
        {mdoc_rv_pre, NULL}, /* Rv */


@@ -183,43 +174,43 @@ static    const struct htmlmdoc mdocs[MDOC_MAX] = {
        {mdoc__x_pre, mdoc__x_post}, /* %T */
        {mdoc__x_pre, mdoc__x_post}, /* %V */
        {NULL, NULL}, /* Ac */
        {mdoc__x_pre, mdoc__x_post}, /* %T */
        {mdoc__x_pre, mdoc__x_post}, /* %V */
        {NULL, NULL}, /* Ac */

-       {mdoc_aq_pre, mdoc_aq_post}, /* Ao */
-       {mdoc_aq_pre, mdoc_aq_post}, /* Aq */
+       {mdoc_quote_pre, mdoc_quote_post}, /* Ao */
+       {mdoc_quote_pre, mdoc_quote_post}, /* Aq */

        {NULL, NULL}, /* At */
        {NULL, NULL}, /* Bc */
        {mdoc_bf_pre, NULL}, /* Bf */ 
        {NULL, NULL}, /* At */
        {NULL, NULL}, /* Bc */
        {mdoc_bf_pre, NULL}, /* Bf */ 

-       {mdoc_bq_pre, mdoc_bq_post}, /* Bo */
-       {mdoc_bq_pre, mdoc_bq_post}, /* Bq */
+       {mdoc_quote_pre, mdoc_quote_post}, /* Bo */
+       {mdoc_quote_pre, mdoc_quote_post}, /* Bq */

        {mdoc_xx_pre, NULL}, /* Bsx */
        {mdoc_bx_pre, NULL}, /* Bx */
        {NULL, NULL}, /* Db */
        {NULL, NULL}, /* Dc */
        {mdoc_xx_pre, NULL}, /* Bsx */
        {mdoc_bx_pre, NULL}, /* Bx */
        {NULL, NULL}, /* Db */
        {NULL, NULL}, /* Dc */

-       {mdoc_dq_pre, mdoc_dq_post}, /* Do */
-       {mdoc_dq_pre, mdoc_dq_post}, /* Dq */
-       {NULL, NULL}, /* Ec */
+       {mdoc_quote_pre, mdoc_quote_post}, /* Do */
+       {mdoc_quote_pre, mdoc_quote_post}, /* Dq */
+       {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? */
-       {NULL, NULL}, /* No */
+       {mdoc_ms_pre, NULL}, /* Ms */
+       {mdoc_igndelim_pre, NULL}, /* No */

        {mdoc_ns_pre, NULL}, /* Ns */
        {mdoc_xx_pre, NULL}, /* Nx */
        {mdoc_xx_pre, NULL}, /* Ox */
        {NULL, NULL}, /* Pc */
        {mdoc_ns_pre, NULL}, /* Ns */
        {mdoc_xx_pre, NULL}, /* Nx */
        {mdoc_xx_pre, NULL}, /* Ox */
        {NULL, NULL}, /* Pc */

-       {mdoc_pf_pre, mdoc_pf_post}, /* Pf */
-       {mdoc_pq_pre, mdoc_pq_post}, /* Po */
-       {mdoc_pq_pre, mdoc_pq_post}, /* Pq */
+       {mdoc_igndelim_pre, mdoc_pf_post}, /* Pf */
+       {mdoc_quote_pre, mdoc_quote_post}, /* Po */
+       {mdoc_quote_pre, mdoc_quote_post}, /* Pq */

        {NULL, NULL}, /* Qc */
        {NULL, NULL}, /* Qc */

-       {mdoc_sq_pre, mdoc_sq_post}, /* Ql */
-       {mdoc_dq_pre, mdoc_dq_post}, /* Qo */
-       {mdoc_dq_pre, mdoc_dq_post}, /* Qq */
+       {mdoc_quote_pre, mdoc_quote_post}, /* Ql */
+       {mdoc_quote_pre, mdoc_quote_post}, /* Qo */
+       {mdoc_quote_pre, mdoc_quote_post}, /* Qq */

        {NULL, NULL}, /* Re */
        {mdoc_rs_pre, NULL}, /* Rs */
        {NULL, NULL}, /* Sc */
        {NULL, NULL}, /* Re */
        {mdoc_rs_pre, NULL}, /* Rs */
        {NULL, NULL}, /* Sc */

-       {mdoc_sq_pre, mdoc_sq_post}, /* So */
-       {mdoc_sq_pre, mdoc_sq_post}, /* Sq */
-       {NULL, NULL}, /* Sm */ /* FIXME - no idea. */
+       {mdoc_quote_pre, mdoc_quote_post}, /* So */
+       {mdoc_quote_pre, mdoc_quote_post}, /* Sq */
+       {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 */


@@ -228,20 +219,20 @@ static    const struct htmlmdoc mdocs[MDOC_MAX] = {
        {NULL, NULL}, /* Xo */
        {mdoc_fo_pre, mdoc_fo_post}, /* Fo */ 
        {NULL, NULL}, /* Fc */ 
        {NULL, NULL}, /* Xo */
        {mdoc_fo_pre, mdoc_fo_post}, /* Fo */ 
        {NULL, NULL}, /* Fc */ 

-       {mdoc_op_pre, mdoc_op_post}, /* Oo */
+       {mdoc_quote_pre, mdoc_quote_post}, /* Oo */

        {NULL, NULL}, /* Oc */
        {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}, /* Fr */
        {mdoc_ud_pre, NULL}, /* Ud */
        {mdoc_lb_pre, NULL}, /* Lb */
        {NULL, NULL}, /* Ek */
        {mdoc_bt_pre, NULL}, /* Bt */
        {NULL, NULL}, /* Hf */
        {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_lk_pre, NULL}, /* Lk */ 
        {mdoc_mt_pre, NULL}, /* Mt */ 

-       {mdoc_brq_pre, mdoc_brq_post}, /* Brq */ 
-       {mdoc_brq_pre, mdoc_brq_post}, /* Bro */ 
+       {mdoc_quote_pre, mdoc_quote_post}, /* Brq */ 
+       {mdoc_quote_pre, mdoc_quote_post}, /* Bro */ 

        {NULL, NULL}, /* Brc */ 
        {mdoc__x_pre, mdoc__x_post}, /* %C */ 
        {NULL, NULL}, /* Es */  /* TODO */
        {NULL, NULL}, /* Brc */ 
        {mdoc__x_pre, mdoc__x_post}, /* %C */ 
        {NULL, NULL}, /* Es */  /* TODO */


@@ -250,8 +241,24 @@ static     const struct htmlmdoc mdocs[MDOC_MAX] = {
        {mdoc__x_pre, mdoc__x_post}, /* %Q */ 
        {mdoc_sp_pre, NULL}, /* br */
        {mdoc_sp_pre, NULL}, /* sp */ 
        {mdoc__x_pre, mdoc__x_post}, /* %Q */ 
        {mdoc_sp_pre, NULL}, /* br */
        {mdoc_sp_pre, NULL}, /* sp */ 

+       {mdoc__x_pre, mdoc__x_post}, /* %U */ 
+       {NULL, NULL}, /* Ta */ 

 };
 
 };
 

+static const char * const lists[LIST_MAX] = {
+       NULL,
+       "list-bul",
+       "list-col",
+       "list-dash",
+       "list-diag",
+       "list-enum",
+       "list-hang",
+       "list-hyph",
+       "list-inset",
+       "list-item",
+       "list-ohang",
+       "list-tag"
+};

 
 void
 html_mdoc(void *arg, const struct mdoc *m)
 
 void
 html_mdoc(void *arg, const struct mdoc *m)


@@ -261,7 +268,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);


@@ -270,90 +277,86 @@ html_mdoc(void *arg, const struct mdoc *m)
 }
 
 
 }
 
 

-static int
-a2list(const struct mdoc_node *n)
+/*
+ * 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
+ * the value.
+ */
+static void
+a2width(const char *p, struct roffsu *su)

 {
 {

-       int              i;
-
-       assert(MDOC_BLOCK == n->type && MDOC_Bl == n->tok);
-       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 */
+       if ( ! a2roffsu(p, su, SCALE_MAX)) {
+               su->unit = SCALE_BU;
+               su->scale = (int)strlen(p);
+       }

 }
 
 
 }
 
 

-static int
-a2width(const char *p)
+/*
+ * See the same function in mdoc_term.c for documentation.
+ */
+static void
+synopsis_pre(struct html *h, const struct mdoc_node *n)

 {
 {

-       int              i, len;

 
 

-       if (0 == (len = (int)strlen(p)))
-               return(0);
-       for (i = 0; i < len - 1; i++) 
-               if ( ! isdigit((u_char)p[i]))
-                       break;
+       if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags))
+               return;

 
 

-       if (i == len - 1) 
-               if ('n' == p[len - 1] || 'm' == p[len - 1])
-                       return(atoi(p) + 2);
+       if (n->prev->tok == n->tok && 
+                       MDOC_Fo != n->tok && 
+                       MDOC_Ft != n->tok && 
+                       MDOC_Fn != n->tok) {
+               print_otag(h, TAG_BR, 0, NULL);
+               return;
+       }

 
 

-       return(len + 2);
+       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_P, 0, NULL);
+               break;
+       case (MDOC_Ft):
+               if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) {
+                       print_otag(h, TAG_P, 0, NULL);
+                       break;
+               }
+               /* FALLTHROUGH */
+       default:
+               print_otag(h, TAG_BR, 0, NULL);
+               break;
+       }

 }
 
 
 }
 
 

-static int
-a2offs(const char *p)
+/*
+ * 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
+ * predefined strings (indent, etc.), or the string length of the value.
+ */
+static void
+a2offs(const char *p, struct roffsu *su)

 {
 {

-       int              len, i;
-
-       if (0 == strcmp(p, "left"))
-               return(0);
-       if (0 == strcmp(p, "indent"))
-               return(INDENT + 1);
-       if (0 == strcmp(p, "indent-two"))
-               return((INDENT + 1) * 2);

 
 

-       if (0 == (len = (int)strlen(p)))
-               return(0);
-
-       for (i = 0; i < len - 1; i++) 
-               if ( ! isdigit((u_char)p[i]))
-                       break;
+       /* FIXME: "right"? */

 
 

-       if (i == len - 1) 
-               if ('n' == p[len - 1] || 'm' == p[len - 1])
-                       return(atoi(p));
-
-       return(len);
+       if (0 == strcmp(p, "left"))
+               SCALE_HS_INIT(su, 0);
+       else if (0 == strcmp(p, "indent"))
+               SCALE_HS_INIT(su, INDENT);
+       else if (0 == strcmp(p, "indent-two"))
+               SCALE_HS_INIT(su, INDENT * 2);
+       else if ( ! a2roffsu(p, su, SCALE_MAX)) {
+               su->unit = SCALE_BU;
+               su->scale = (int)strlen(p);
+       }

 }
 
 
 }
 
 


@@ -361,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);
 }


@@ -385,7 +382,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, " (");


@@ -415,74 +412,91 @@ print_mdoc_node(MDOC_ARGS)
        struct tag      *t;
 
        child = 1;
        struct tag      *t;
 
        child = 1;

-       t = SLIST_FIRST(&h->tags);
+       t = h->tags.head;

 
        bufinit(h);
 
        bufinit(h);

-

        switch (n->type) {
        case (MDOC_ROOT):
                child = mdoc_root_pre(m, n, h);
                break;
        case (MDOC_TEXT):
                print_text(h, n->string);
        switch (n->type) {
        case (MDOC_ROOT):
                child = mdoc_root_pre(m, n, h);
                break;
        case (MDOC_TEXT):
                print_text(h, n->string);

-               break;
+               return;
+       case (MDOC_TBL):
+               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);
 
        print_stagq(h, t);
 
        bufinit(h);
        if (child && n->child)
                print_mdoc_nodelist(m, n->child, h);
 
        print_stagq(h, t);
 
        bufinit(h);

-

        switch (n->type) {
        case (MDOC_ROOT):
                mdoc_root_post(m, n, h);
                break;
        switch (n->type) {
        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;
        }
 }
 

-

 /* ARGSUSED */
 static void
 mdoc_root_post(MDOC_ARGS)
 {
 /* ARGSUSED */
 static void
 mdoc_root_post(MDOC_ARGS)
 {

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

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

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

 
 

-       (void)localtime_r(&m->date, &tm);
+       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);

 
 

-       if (0 == strftime(b, BUFSIZ - 1, "%B %e, %Y", &tm))
-               err(EXIT_FAILURE, "strftime");
+       t = print_otag(h, TAG_TBODY, 0, NULL);

 
 

-       tag[0].key = ATTR_CLASS;
-       tag[0].val = "footer";
-       tag[1].key = ATTR_STYLE;
-       tag[1].val = "width: 100%;";
-       t = print_otag(h, TAG_TABLE, 2, tag);

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

-       tag[0].key = ATTR_STYLE;
-       tag[0].val = "width: 50%;";
+       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_stagq(h, tt);
 
        print_text(h, b);
        print_stagq(h, tt);
 

-       tag[0].key = ATTR_STYLE;
-       tag[0].val = "width: 50%; text-align: right;";
-       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);
 }


@@ -492,46 +506,61 @@ mdoc_root_post(MDOC_ARGS)
 static int
 mdoc_root_pre(MDOC_ARGS)
 {
 static int
 mdoc_root_pre(MDOC_ARGS)
 {

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

        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(%d)", m->title, m->msec);
+       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);
+
+       print_otag(h, TAG_TBODY, 0, NULL);

 
 

-       tag[0].key = ATTR_CLASS;
-       tag[0].val = "header";
-       tag[1].key = ATTR_STYLE;
-       tag[1].val = "width: 100%;";
-       t = print_otag(h, TAG_TABLE, 2, tag);

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

-       tag[0].key = ATTR_STYLE;
-       tag[0].val = "width: 10%;";
+       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);
 

-       tag[0].key = ATTR_STYLE;
-       tag[0].val = "width: 80%; white-space: nowrap; text-align: center;";
-       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);
 

-       tag[0].key = ATTR_STYLE;
-       tag[0].val = "width: 10%; text-align: right;";
-       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);
        print_text(h, title);
        print_tagq(h, t);

-

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


@@ -540,52 +569,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;
+       struct htmlpair  tag;
+       char             buf[BUFSIZ];

 
 

-       if (MDOC_HEAD == n->type) {
-               tag[0].key = ATTR_CLASS;
-               tag[0].val = "sec-head";
-               print_otag(h, TAG_DIV, 1, tag);
-               print_otag(h, TAG_SPAN, 1, tag);
-
-               for (nn = n->child; nn; nn = nn->next) {
-                       bufcat(h, nn->string);
-                       if (nn->next)
-                               bufncat(h, " ", 1);
-               }
-               tag[0].key = ATTR_NAME;
-               tag[0].val = h->buf;
-               print_otag(h, TAG_A, 1, 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) {
-               tag[0].key = ATTR_CLASS;
-               tag[0].val = "sec-block";
-
-               if (n->prev && NULL == n->prev->body->child) {
-                       print_otag(h, TAG_DIV, 1, tag);
-                       return(1);
-               }
-
-               bufcat(h, "margin-top: 1em;");
-               if (NULL == n->next)
-                       bufcat(h, "margin-bottom: 1em;");
-
-               tag[1].key = ATTR_STYLE;
-               tag[1].val = h->buf;
-
-               print_otag(h, TAG_DIV, 2, tag);
+       } else if (MDOC_BODY == n->type)

                return(1);
                return(1);

-       }

 
 

-       buffmt(h, "margin-left: %dem;", INDENT);
-       
-       tag[0].key = ATTR_CLASS;
-       tag[0].val = "sec-body";
-       tag[1].key = ATTR_STYLE;
-       tag[1].val = h->buf;
+       buf[0] = '\0';
+       for (n = n->child; n; n = n->next) {
+               html_idcat(buf, n->string, BUFSIZ);
+               if (n->next)
+                       html_idcat(buf, " ", BUFSIZ);
+       }

 
 

-       print_otag(h, TAG_DIV, 2, tag);
+       PAIR_ID_INIT(&tag, buf);
+       print_otag(h, TAG_H1, 1, &tag);

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


@@ -594,54 +596,25 @@ mdoc_sh_pre(MDOC_ARGS)
 static int
 mdoc_ss_pre(MDOC_ARGS)
 {
 static int
 mdoc_ss_pre(MDOC_ARGS)
 {

-       struct htmlpair          tag[2];
-       int                      i;
-       const struct mdoc_node  *nn;
-
-       i = 0;
+       struct htmlpair  tag;
+       char             buf[BUFSIZ];

 
 

-       if (MDOC_BODY == n->type) {
-               tag[i].key = ATTR_CLASS;
-               tag[i++].val = "ssec-body";
-               if (n->parent->next && n->child) {
-                       bufcat(h, "margin-bottom: 1em;");
-                       tag[i].key = ATTR_STYLE;
-                       tag[i++].val = h->buf;
-               }
-               print_otag(h, TAG_DIV, i, 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) {
-               tag[i].key = ATTR_CLASS;
-               tag[i++].val = "ssec-block";
-               if (n->prev) {
-                       bufcat(h, "margin-top: 1em;");
-                       tag[i].key = ATTR_STYLE;
-                       tag[i++].val = h->buf;
-               }
-               print_otag(h, TAG_DIV, i, tag);
+       } else if (MDOC_BODY == n->type)

                return(1);
                return(1);

-       }
-
-       buffmt(h, "margin-left: -%dem;", INDENT - HALFINDENT);

 
 

-       tag[0].key = ATTR_CLASS;
-       tag[0].val = "ssec-head";
-       tag[1].key = ATTR_STYLE;
-       tag[1].val = h->buf;
-
-       print_otag(h, TAG_DIV, 2, tag);
-       print_otag(h, TAG_SPAN, 1, tag);
-
-       bufinit(h);
-       for (nn = n->child; nn; nn = nn->next) {
-               bufcat(h, nn->string);
-               if (nn->next)
-                       bufcat(h, " ");
+       buf[0] = '\0';
+       for (n = n->child; n; n = n->next) {
+               html_idcat(buf, n->string, BUFSIZ);
+               if (n->next)
+                       html_idcat(buf, " ", BUFSIZ);

        }
        }

-       tag[0].key = ATTR_NAME;
-       tag[0].val = h->buf;
-       print_otag(h, TAG_A, 1, tag);

 
 

+       PAIR_ID_INIT(&tag, buf);
+       print_otag(h, TAG_H2, 1, &tag);

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


@@ -652,14 +625,21 @@ mdoc_fl_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;
 
 {
        struct htmlpair  tag;
 

-       tag.key = ATTR_CLASS;
-       tag.val = "flag";
+       PAIR_CLASS_INIT(&tag, "flag");
+       print_otag(h, TAG_B, 1, &tag);

 
 

-       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);
 }
 


@@ -673,65 +653,60 @@ mdoc_nd_pre(MDOC_ARGS)
        if (MDOC_BODY != n->type)
                return(1);
 
        if (MDOC_BODY != n->type)
                return(1);
 

-       /* XXX - this can contain block elements! */
+       /* XXX: this tag in theory can contain block elements. */
+

        print_text(h, "\\(em");
        print_text(h, "\\(em");

-       tag.key = ATTR_CLASS;
-       tag.val = "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);
 }
 
 

-/* ARGSUSED */

 static int
 static int

-mdoc_op_pre(MDOC_ARGS)
+mdoc_nm_pre(MDOC_ARGS)

 {
        struct htmlpair  tag;
 {
        struct htmlpair  tag;

+       struct roffsu    su;
+       size_t           len;

 
 

-       if (MDOC_BODY != n->type)
+       switch (n->type) {
+       case (MDOC_ELEM):
+               synopsis_pre(h, n);
+               PAIR_CLASS_INIT(&tag, "name");
+               print_otag(h, TAG_B, 1, &tag);
+               if (NULL == n->child && m->name)
+                       print_text(h, m->name);

                return(1);
                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;
+       }

 
 

-       /* XXX - this can contain block elements! */
-       print_text(h, "\\(lB");
-       h->flags |= HTML_NOSPACE;
-       tag.key = ATTR_CLASS;
-       tag.val = "opt";
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-mdoc_op_post(MDOC_ARGS)
-{
-
-       if (MDOC_BODY != n->type) 
-               return;
-       h->flags |= HTML_NOSPACE;
-       print_text(h, "\\(rB");
-}
-
-
-static int
-mdoc_nm_pre(MDOC_ARGS)
-{
-       struct htmlpair tag;
+       synopsis_pre(h, n);
+       PAIR_CLASS_INIT(&tag, "synopsis");
+       print_otag(h, TAG_TABLE, 1, &tag);

 
 

-       if ( ! (HTML_NEWLINE & h->flags))
-               if (SEC_SYNOPSIS == n->sec) {
-                       tag.key = ATTR_STYLE;
-                       tag.val = "clear: both;";
-                       print_otag(h, TAG_BR, 1, &tag);
-               }
+       for (len = 0, n = n->child; n; n = n->next)
+               if (MDOC_TEXT == n->type)
+                       len += strlen(n->string);

 
 

-       tag.key = ATTR_CLASS;
-       tag.val = "name";
-
-       print_otag(h, TAG_SPAN, 1, &tag);
-       if (NULL == n->child)
-               print_text(h, m->name);
+       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);
 }
 


@@ -742,20 +717,20 @@ mdoc_xr_pre(MDOC_ARGS)
 {
        struct htmlpair          tag[2];
        const struct mdoc_node  *nn;
 {
        struct htmlpair          tag[2];
        const struct mdoc_node  *nn;

-       int                      i;

 
 

-       i = 0;
-       tag[i].key = ATTR_CLASS;
-       tag[i++].val = "link-man";
+       if (NULL == n->child)
+               return(0);
+
+       PAIR_CLASS_INIT(&tag[0], "link-man");

 
        if (h->base_man) {
 
        if (h->base_man) {

-               buffmt_man(h, n->child->string, n->child->next ? 
+               buffmt_man(h, n->child->string, 
+                               n->child->next ? 

                                n->child->next->string : NULL);
                                n->child->next->string : NULL);

-               tag[i].key = ATTR_HREF;
-               tag[i++].val = h->buf;
-       }
-
-       print_otag(h, TAG_A, i, tag);
+               PAIR_HREF_INIT(&tag[1], h->buf);
+               print_otag(h, TAG_A, 2, tag);
+       } else
+               print_otag(h, TAG_A, 1, tag);

 
        nn = n->child;
        print_text(h, nn->string);
 
        nn = n->child;
        print_text(h, nn->string);


@@ -769,7 +744,6 @@ mdoc_xr_pre(MDOC_ARGS)
        print_text(h, nn->string);
        h->flags |= HTML_NOSPACE;
        print_text(h, ")");
        print_text(h, nn->string);
        h->flags |= HTML_NOSPACE;
        print_text(h, ")");

-

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


@@ -790,10 +764,8 @@ mdoc_ar_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
 {
        struct htmlpair tag;
 

-       tag.key = ATTR_CLASS;
-       tag.val = "arg";
-
-       print_otag(h, TAG_SPAN, 1, &tag);
+       PAIR_CLASS_INIT(&tag, "arg");
+       print_otag(h, TAG_I, 1, &tag);

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


@@ -807,10 +779,10 @@ mdoc_xx_pre(MDOC_ARGS)
 
        switch (n->tok) {
        case (MDOC_Bsx):
 
        switch (n->tok) {
        case (MDOC_Bsx):

-               pp = "BSDI BSD/OS";
+               pp = "BSD/OS";

                break;
        case (MDOC_Dx):
                break;
        case (MDOC_Dx):

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

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


@@ -828,9 +800,7 @@ mdoc_xx_pre(MDOC_ARGS)
                return(1);
        }
 
                return(1);
        }
 

-       tag.key = ATTR_CLASS;
-       tag.val = "unix";
-
+       PAIR_CLASS_INIT(&tag, "unix");

        print_otag(h, TAG_SPAN, 1, &tag);
        print_text(h, pp);
        return(1);
        print_otag(h, TAG_SPAN, 1, &tag);
        print_text(h, pp);
        return(1);


@@ -844,9 +814,7 @@ mdoc_bx_pre(MDOC_ARGS)
        const struct mdoc_node  *nn;
        struct htmlpair          tag;
 
        const struct mdoc_node  *nn;
        struct htmlpair          tag;
 

-       tag.key = ATTR_CLASS;
-       tag.val = "unix";
-
+       PAIR_CLASS_INIT(&tag, "unix");

        print_otag(h, TAG_SPAN, 1, &tag);
 
        for (nn = n->child; nn; nn = nn->next)
        print_otag(h, TAG_SPAN, 1, &tag);
 
        for (nn = n->child; nn; nn = nn->next)


@@ -859,263 +827,208 @@ mdoc_bx_pre(MDOC_ARGS)
        return(0);
 }
 
        return(0);
 }
 

-
-/* ARGSUSED */

 static int
 static int

-mdoc_tbl_block_pre(MDOC_ARGS, int t, int w, int o, int c)
+mdoc_it_pre(MDOC_ARGS)

 {
 {

-       struct htmlpair          tag;
-       const struct mdoc_node  *nn;
+       struct roffsu    su;
+       enum mdoc_list   type;
+       struct htmlpair  tag[2];
+       const struct mdoc_node *bl;

 
 

-       switch (t) {
-       case (MDOC_Column):
-               /* FALLTHROUGH */
-       case (MDOC_Item):
-               /* FALLTHROUGH */
-       case (MDOC_Ohang):
-               buffmt(h, "margin-left: %dem; clear: both;", o);
-               break;
-       default:
-               buffmt(h, "margin-left: %dem; clear: both;", w + o);
-               break;
-       }
+       bl = n->parent;
+       while (bl && MDOC_Bl != bl->tok)
+               bl = bl->parent;

 
 

-       if ( ! c && MDOC_Column != t) {
-               for (nn = n; nn; nn = nn->parent) {
-                       if (MDOC_BLOCK != nn->type)
-                               continue;
-                       switch (nn->tok) {
-                       case (MDOC_Ss):
-                               /* FALLTHROUGH */
-                       case (MDOC_Sh):
-                               c = 1;
+       assert(bl);
+
+       type = bl->norm->Bl.type;
+
+       assert(lists[type]);
+       PAIR_CLASS_INIT(&tag[0], lists[type]);
+
+       if (MDOC_HEAD == n->type) {
+               switch (type) {
+               case(LIST_bullet):
+                       /* FALLTHROUGH */
+               case(LIST_dash):
+                       /* FALLTHROUGH */
+               case(LIST_item):
+                       /* FALLTHROUGH */
+               case(LIST_hyphen):
+                       /* FALLTHROUGH */
+               case(LIST_enum):
+                       return(0);
+               case(LIST_diag):
+                       /* FALLTHROUGH */
+               case(LIST_hang):
+                       /* FALLTHROUGH */
+               case(LIST_inset):
+                       /* FALLTHROUGH */
+               case(LIST_ohang):
+                       /* FALLTHROUGH */
+               case(LIST_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;
                                break;

-                       default:
+                       PAIR_CLASS_INIT(&tag[0], "diag");
+                       print_otag(h, TAG_B, 1, tag);
+                       break;
+               case(LIST_column):
+                       break;
+               default:
+                       break;
+               }
+       } else if (MDOC_BODY == n->type) {
+               switch (type) {
+               case(LIST_bullet):
+                       /* FALLTHROUGH */
+               case(LIST_hyphen):
+                       /* FALLTHROUGH */
+               case(LIST_dash):
+                       /* FALLTHROUGH */
+               case(LIST_enum):
+                       /* FALLTHROUGH */
+               case(LIST_item):
+                       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 */
+               case(LIST_hang):
+                       /* FALLTHROUGH */
+               case(LIST_inset):
+                       /* FALLTHROUGH */
+               case(LIST_ohang):
+                       /* FALLTHROUGH */
+               case(LIST_tag):
+                       if (NULL == bl->norm->Bl.width) {
+                               print_otag(h, TAG_DD, 1, tag);

                                break;
                        }
                                break;
                        }

-                       if (nn->prev)
-                               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):
+                       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;
+               }
+       } else {
+               switch (type) {
+               case (LIST_column):
+                       print_otag(h, TAG_TR, 1, tag);
+                       break;
+               default:
+                       break;

                }
                }

-               if (MDOC_Diag == t && n->prev)
-                       if (NULL == n->prev->body->child)
-                               c = 1;
-               if ( ! c)
-                       bufcat(h, "padding-top: 1em;");

        }
 
        }
 

-       tag.key = ATTR_STYLE;
-       tag.val = h->buf;
-       print_otag(h, TAG_DIV, 1, &tag);

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

-

 /* ARGSUSED */
 static int
 /* ARGSUSED */
 static int

-mdoc_tbl_body_pre(MDOC_ARGS, int t, int w)
-{
-
-       print_otag(h, TAG_DIV, 0, NULL);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_tbl_head_pre(MDOC_ARGS, int t, int w)
+mdoc_bl_pre(MDOC_ARGS)

 {
 {

-       struct htmlpair  tag;
-       struct ord      *ord;
-       char             nbuf[BUFSIZ];
+       size_t           i;
+       struct htmlpair  tag[3];
+       struct roffsu    su;
+       char             buf[BUFSIZ];

 
 

-       switch (t) {
-       case (MDOC_Item):
-               /* FALLTHROUGH */
-       case (MDOC_Ohang):
-               print_otag(h, TAG_DIV, 0, NULL);
-               break;
-       case (MDOC_Column):
-               buffmt(h, "min-width: %dem;", w);
-               bufcat(h, "clear: none;");
-               if (n->next && MDOC_HEAD == n->next->type)
-                       bufcat(h, "float: left;");
-               tag.key = ATTR_STYLE;
-               tag.val = h->buf;
-               print_otag(h, TAG_DIV, 1, &tag);
-               break;
-       default:
-               buffmt(h, "margin-left: -%dem; min-width: %dem;", 
-                               w, w ? w - 1 : 0);
-               bufcat(h, "clear: left;");
-               if (n->next && n->next->child)
-                       bufcat(h, "float: left;");
-               bufcat(h, "padding-right: 1em;");
-               tag.key = ATTR_STYLE;
-               tag.val = h->buf;
-               print_otag(h, TAG_DIV, 1, &tag);
-               break;
+       if (MDOC_BODY == n->type) {
+               if (LIST_column == n->norm->Bl.type)
+                       print_otag(h, TAG_TBODY, 0, NULL);
+               return(1);

        }
 
        }
 

-       switch (t) {
-       case (MDOC_Diag):
-               tag.key = ATTR_CLASS;
-               tag.val = "diag";
-               print_otag(h, TAG_SPAN, 1, &tag);
-               break;
-       case (MDOC_Enum):
-               ord = SLIST_FIRST(&h->ords);
-               assert(ord);
-               nbuf[BUFSIZ - 1] = 0;
-               (void)snprintf(nbuf, BUFSIZ - 1, "%d.", ord->pos++);
-               print_text(h, nbuf);
-               return(0);
-       case (MDOC_Dash):
-               print_text(h, "\\(en");
-               return(0);
-       case (MDOC_Hyphen):
-               print_text(h, "\\(hy");
-               return(0);
-       case (MDOC_Bullet):
-               print_text(h, "\\(bu");
+       if (MDOC_HEAD == n->type) {
+               if (LIST_column != n->norm->Bl.type)
+                       return(0);
+
+               /*
+                * For each column, print out the <COL> tag with our
+                * suggested width.  The last column gets min-width, as
+                * in terminal mode it auto-sizes to the width of the
+                * screen and we want to preserve that behaviour.
+                */
+
+               for (i = 0; i < n->norm->Bl.ncols; i++) {
+                       a2width(n->norm->Bl.cols[i], &su);
+                       bufinit(h);
+                       if (i < n->norm->Bl.ncols - 1)
+                               bufcat_su(h, "width", &su);
+                       else
+                               bufcat_su(h, "min-width", &su);
+                       PAIR_STYLE_INIT(&tag[0], h);
+                       print_otag(h, TAG_COL, 1, tag);
+               }
+

                return(0);
                return(0);

-       default:
-               break;

        }
 
        }
 

-       return(1);
-}
-
+       SCALE_VS_INIT(&su, 0);
+       bufcat_su(h, "margin-top", &su);
+       bufcat_su(h, "margin-bottom", &su);
+       PAIR_STYLE_INIT(&tag[0], h);

 
 

-static int
-mdoc_tbl_pre(MDOC_ARGS, int type)
-{
-       int                      i, w, o, c, wp;
-       const struct mdoc_node  *bl, *nn;
+       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);

 
 

-       bl = n->parent->parent;
-       if (MDOC_BLOCK != n->type) 
-               bl = bl->parent;
+       /* Set the block's left-hand margin. */

 
 

-       assert(bl->args);
-
-       w = o = c = 0;
-       wp = -1;
-
-       for (i = 0; i < (int)bl->args->argc; i++) 
-               if (MDOC_Width == bl->args->argv[i].arg) {
-                       assert(bl->args->argv[i].sz);
-                       wp = i;
-                       w = a2width(bl->args->argv[i].value[0]);
-               } else if (MDOC_Offset == bl->args->argv[i].arg) {
-                       assert(bl->args->argv[i].sz);
-                       o = a2offs(bl->args->argv[i].value[0]);
-               } else if (MDOC_Compact == bl->args->argv[i].arg) 
-                       c = 1;
-       
-       if (MDOC_HEAD == n->type && MDOC_Column == type) {
-               nn = n->parent->child;
-               assert(nn && MDOC_HEAD == nn->type);
-               for (i = 0; nn && nn != n; nn = nn->next, i++)
-                       /* Counter... */ ;
-               assert(nn);
-               if (wp >= 0 && i < (int)bl->args[wp].argv->sz)
-                       w = a2width(bl->args->argv[wp].value[i]);
+       if (n->norm->Bl.offs) {
+               a2offs(n->norm->Bl.offs, &su);
+               bufcat_su(h, "margin-left", &su);

        }
 
        }
 

-       switch (type) {
-       case (MDOC_Enum):
+       switch (n->norm->Bl.type) {
+       case(LIST_bullet):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

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

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Bullet):
-               if (w < 4)
-                       w = 4;
+       case(LIST_item):
+               print_otag(h, TAG_UL, 2, tag);
+               break;
+       case(LIST_enum):
+               print_otag(h, TAG_OL, 2, tag);

                break;
                break;

-       case (MDOC_Inset):
+       case(LIST_diag):
+               /* FALLTHROUGH */
+       case(LIST_hang):

                /* FALLTHROUGH */
                /* FALLTHROUGH */

-       case (MDOC_Diag):
-               w = 1;
+       case(LIST_inset):
+               /* FALLTHROUGH */
+       case(LIST_ohang):
+               /* FALLTHROUGH */
+       case(LIST_tag):
+               print_otag(h, TAG_DL, 2, tag);

                break;
                break;

-       default:
-               if (0 == w)
-                       w = 10;
+       case(LIST_column):
+               print_otag(h, TAG_TABLE, 2, tag);

                break;
                break;

-       }
-
-       switch (n->type) {
-       case (MDOC_BLOCK):
-               break;
-       case (MDOC_HEAD):
-               return(mdoc_tbl_head_pre(m, n, h, type, w));
-       case (MDOC_BODY):
-               return(mdoc_tbl_body_pre(m, n, h, type, w));

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

-       return(mdoc_tbl_block_pre(m, n, h, type, w, o, c));
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_bl_pre(MDOC_ARGS)
-{
-       struct ord      *ord;
-
-       if (MDOC_BLOCK != n->type)
-               return(1);
-       if (MDOC_Enum != a2list(n))
-               return(1);
-
-       /* Allocate an -enum on the stack of indices. */
-
-       ord = malloc(sizeof(struct ord));
-       if (NULL == ord)
-               err(EXIT_FAILURE, "malloc");
-       ord->cookie = n;
-       ord->pos = 1;
-       SLIST_INSERT_HEAD(&h->ords, ord, entry);
-

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

-
-/* ARGSUSED */
-static void
-mdoc_bl_post(MDOC_ARGS)
-{
-       struct ord      *ord;
-
-       if (MDOC_BLOCK != n->type)
-               return;
-       if (MDOC_Enum != a2list(n))
-               return;
-
-       ord = SLIST_FIRST(&h->ords);
-       assert(ord);
-       SLIST_REMOVE_HEAD(&h->ords, entry);
-       free(ord);
-}
-
-
-static int
-mdoc_it_pre(MDOC_ARGS)
-{
-       int              type;
-
-       if (MDOC_BLOCK == n->type)
-               type = a2list(n->parent->parent);
-       else
-               type = a2list(n->parent->parent->parent);
-
-       return(mdoc_tbl_pre(m, n, h, type));
-}
-
-

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


@@ -1124,13 +1037,14 @@ mdoc_ex_pre(MDOC_ARGS)
        struct tag              *t;
        struct htmlpair          tag;
 
        struct tag              *t;
        struct htmlpair          tag;
 

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

 
 

-       tag.key = ATTR_CLASS;
-       tag.val = "utility";
+       PAIR_CLASS_INIT(&tag, "utility");

 
 

+       print_text(h, "The");

        for (nn = n->child; nn; nn = nn->next) {
        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);
 


@@ -1144,7 +1058,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");


@@ -1154,89 +1068,13 @@ mdoc_ex_pre(MDOC_ARGS)
 }
 
 
 }
 
 

-/* ARGSUSED */
-static int
-mdoc_dq_pre(MDOC_ARGS)
-{
-
-       if (MDOC_BODY != n->type)
-               return(1);
-       print_text(h, "\\(lq");
-       h->flags |= HTML_NOSPACE;
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-mdoc_dq_post(MDOC_ARGS)
-{
-
-       if (MDOC_BODY != n->type)
-               return;
-       h->flags |= HTML_NOSPACE;
-       print_text(h, "\\(rq");
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_pq_pre(MDOC_ARGS)
-{
-
-       if (MDOC_BODY != n->type)
-               return(1);
-       print_text(h, "\\&(");
-       h->flags |= HTML_NOSPACE;
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-mdoc_pq_post(MDOC_ARGS)
-{
-
-       if (MDOC_BODY != n->type)
-               return;
-       print_text(h, ")");
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_sq_pre(MDOC_ARGS)
-{
-
-       if (MDOC_BODY != n->type)
-               return(1);
-       print_text(h, "\\(oq");
-       h->flags |= HTML_NOSPACE;
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-mdoc_sq_post(MDOC_ARGS)
-{
-
-       if (MDOC_BODY != n->type)
-               return;
-       h->flags |= HTML_NOSPACE;
-       print_text(h, "\\(aq");
-}
-
-

 /* ARGSUSED */
 static int
 mdoc_em_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
 /* ARGSUSED */
 static int
 mdoc_em_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 

-       tag.key = ATTR_CLASS;
-       tag.val = "emph";
-
+       PAIR_CLASS_INIT(&tag, "emph");

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


@@ -1246,19 +1084,28 @@ mdoc_em_pre(MDOC_ARGS)
 static int
 mdoc_d1_pre(MDOC_ARGS)
 {
 static int
 mdoc_d1_pre(MDOC_ARGS)
 {

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

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

-       buffmt(h, "margin-left: %dem;", INDENT);
+       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);

 
 

-       tag[0].key = ATTR_CLASS;
-       tag[0].val = "lit";
-       tag[1].key = ATTR_STYLE;
-       tag[1].val = h->buf;
+       /* 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);
+       } 

 
 

-       print_otag(h, TAG_DIV, 2, tag);

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


@@ -1269,131 +1116,102 @@ mdoc_sx_pre(MDOC_ARGS)
 {
        struct htmlpair          tag[2];
        const struct mdoc_node  *nn;
 {
        struct htmlpair          tag[2];
        const struct mdoc_node  *nn;

+       char                     buf[BUFSIZ];

 
 

-       bufcat(h, "#");
+       strlcpy(buf, "#", BUFSIZ);

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

-               bufcat(h, nn->string);
+               html_idcat(buf, nn->string, BUFSIZ);

                if (nn->next)
                if (nn->next)

-                       bufcat(h, " ");
+                       html_idcat(buf, " ", BUFSIZ);

        }
 
        }
 

-       tag[0].key = ATTR_HREF;
-       tag[0].val = h->buf;
-       tag[1].key = ATTR_CLASS;
-       tag[1].val = "link-sec";
+       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);
 }
 
 

-/* ARGSUSED */
-static int
-mdoc_aq_pre(MDOC_ARGS)
-{
-
-       if (MDOC_BODY != n->type)
-               return(1);
-       print_text(h, "\\(la");
-       h->flags |= HTML_NOSPACE;
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-mdoc_aq_post(MDOC_ARGS)
-{
-
-       if (MDOC_BODY != n->type)
-               return;
-       h->flags |= HTML_NOSPACE;
-       print_text(h, "\\(ra");
-}
-
-

 /* ARGSUSED */
 static int
 mdoc_bd_pre(MDOC_ARGS)
 {
        struct htmlpair          tag[2];
 /* ARGSUSED */
 static int
 mdoc_bd_pre(MDOC_ARGS)
 {
        struct htmlpair          tag[2];

-       int                      t, c, o, i;
-       const struct mdoc_node  *bl, *nn;
+       int                      comp;
+       const struct mdoc_node  *nn;
+       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;
-
-       t = o = c = 0;
-
-       for (i = 0; i < (int)bl->args->argc; i++) 
-               switch (bl->args->argv[i].arg) {
-               case (MDOC_Offset):
-                       assert(bl->args->argv[i].sz);
-                       o = a2offs(bl->args->argv[i].value[0]);
-                       break;
-               case (MDOC_Compact):
-                       c = 1;
-                       break;
-               case (MDOC_Ragged):
-                       /* FALLTHROUGH */
-               case (MDOC_Filled):
-                       /* FALLTHROUGH */
-               case (MDOC_Unfilled):
-                       /* FALLTHROUGH */
-               case (MDOC_Literal):
-                       t = bl->args->argv[i].arg;
-                       break;
-               }

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

-               if (o)
-                       buffmt(h, "margin-left: %dem;", o);
-               if ( ! c) {
-                       for (nn = n; nn; nn = nn->parent) {
-                               if (MDOC_BLOCK != nn->type)
-                                       continue;
-                               switch (nn->tok) {
-                               case (MDOC_Ss):
-                                       /* FALLTHROUGH */
-                               case (MDOC_Sh):
-                                       c = 1;
-                                       break;
-                               default:
-                                       break;
-                               }
-                               if (nn->prev)
-                                       break;
-                       }
-                       if ( ! c) 
-                               bufcat(h, "margin-top: 1em;");
+               comp = n->norm->Bd.comp;
+               for (nn = n; nn && ! comp; nn = nn->parent) {
+                       if (MDOC_BLOCK != nn->type)
+                               continue;
+                       if (MDOC_Ss == nn->tok || MDOC_Sh == nn->tok)
+                               comp = 1;
+                       if (nn->prev)
+                               break;

                }
                }

-               tag[0].key = ATTR_STYLE;
-               tag[0].val = h->buf;
-               print_otag(h, TAG_DIV, 1, tag);
+               if ( ! comp)
+                       print_otag(h, TAG_P, 0, NULL);

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

-       if (MDOC_Unfilled != t && MDOC_Literal != t)
-               return(1);
+       SCALE_HS_INIT(&su, 0);
+       if (n->norm->Bd.offs)
+               a2offs(n->norm->Bd.offs, &su);

 
 

-       bufcat(h, "white-space: pre;");
-       tag[0].key = ATTR_STYLE;
-       tag[0].val = h->buf;
-       tag[1].key = ATTR_CLASS;
-       tag[1].val = "lit";
+       bufcat_su(h, "margin-left", &su);
+       PAIR_STYLE_INIT(&tag[0], h);

 
 

-       print_otag(h, TAG_DIV, 2, tag);
+       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);
+       }
+
+       PAIR_CLASS_INIT(&tag[1], "lit display");
+       print_otag(h, TAG_PRE, 2, tag);

 
        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);

-               if (NULL == nn->next)
+               /*
+                * If the printed node flushes its own line, then we
+                * needn't do it here as well.  This is hacky, but the
+                * notion of selective eoln whitespace is pretty dumb
+                * anyway, so don't sweat it.
+                */
+               switch (nn->tok) {
+               case (MDOC_Sm):
+                       /* FALLTHROUGH */
+               case (MDOC_br):
+                       /* FALLTHROUGH */
+               case (MDOC_sp):
+                       /* FALLTHROUGH */
+               case (MDOC_Bl):
+                       /* FALLTHROUGH */
+               case (MDOC_D1):
+                       /* FALLTHROUGH */
+               case (MDOC_Dl):
+                       /* FALLTHROUGH */
+               case (MDOC_Lp):
+                       /* FALLTHROUGH */
+               case (MDOC_Pp):

                        continue;
                        continue;

-               if (nn->prev && nn->prev->line < nn->line)
+               default:
+                       break;
+               }
+               if (nn->next && nn->next->line == nn->line)
+                       continue;
+               else if (nn->next)

                        print_text(h, "\n");
                        print_text(h, "\n");

+
+               h->flags |= HTML_NOSPACE;

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


@@ -1406,10 +1224,8 @@ mdoc_pa_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
 {
        struct htmlpair tag;
 

-       tag.key = ATTR_CLASS;
-       tag.val = "file";
-
-       print_otag(h, TAG_SPAN, 1, &tag);
+       PAIR_CLASS_INIT(&tag, "file");
+       print_otag(h, TAG_I, 1, &tag);

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


@@ -1420,9 +1236,8 @@ mdoc_ad_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
 {
        struct htmlpair tag;
 

-       tag.key = ATTR_CLASS;
-       tag.val = "addr";
-       print_otag(h, TAG_SPAN, 1, &tag);
+       PAIR_CLASS_INIT(&tag, "addr");
+       print_otag(h, TAG_I, 1, &tag);

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


@@ -1435,8 +1250,7 @@ mdoc_an_pre(MDOC_ARGS)
 
        /* TODO: -split and -nosplit (see termp_an_pre()). */
 
 
        /* TODO: -split and -nosplit (see termp_an_pre()). */
 

-       tag.key = ATTR_CLASS;
-       tag.val = "author";
+       PAIR_CLASS_INIT(&tag, "author");

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


@@ -1448,9 +1262,9 @@ mdoc_cd_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
 {
        struct htmlpair tag;
 

-       tag.key = ATTR_CLASS;
-       tag.val = "config";
-       print_otag(h, TAG_SPAN, 1, &tag);
+       synopsis_pre(h, n);
+       PAIR_CLASS_INIT(&tag, "config");
+       print_otag(h, TAG_B, 1, &tag);

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


@@ -1461,8 +1275,7 @@ mdoc_dv_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
 {
        struct htmlpair tag;
 

-       tag.key = ATTR_CLASS;
-       tag.val = "define";
+       PAIR_CLASS_INIT(&tag, "define");

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


@@ -1474,8 +1287,7 @@ mdoc_ev_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
 {
        struct htmlpair tag;
 

-       tag.key = ATTR_CLASS;
-       tag.val = "env";
+       PAIR_CLASS_INIT(&tag, "env");

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


@@ -1487,8 +1299,7 @@ mdoc_er_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
 {
        struct htmlpair tag;
 

-       tag.key = ATTR_CLASS;
-       tag.val = "errno";
+       PAIR_CLASS_INIT(&tag, "errno");

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


@@ -1502,16 +1313,14 @@ mdoc_fa_pre(MDOC_ARGS)
        struct htmlpair          tag;
        struct tag              *t;
 
        struct htmlpair          tag;
        struct tag              *t;
 

-       tag.key = ATTR_CLASS;
-       tag.val = "farg";
-
+       PAIR_CLASS_INIT(&tag, "farg");

        if (n->parent->tok != MDOC_Fo) {
        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);
                if (nn->next)
                print_text(h, nn->string);
                print_tagq(h, t);
                if (nn->next)


@@ -1529,20 +1338,12 @@ mdoc_fa_pre(MDOC_ARGS)
 static int
 mdoc_fd_pre(MDOC_ARGS)
 {
 static int
 mdoc_fd_pre(MDOC_ARGS)
 {

-       struct htmlpair tag;
+       struct htmlpair  tag;

 
 

-       if (SEC_SYNOPSIS == n->sec) {
-               if (n->next && MDOC_Fd != n->next->tok) {
-                       tag.key = ATTR_STYLE;
-                       tag.val = "margin-bottom: 1em;";
-                       print_otag(h, TAG_DIV, 1, &tag);
-               } else
-                       print_otag(h, TAG_DIV, 0, NULL);
-       }
+       synopsis_pre(h, n);

 
 

-       tag.key = ATTR_CLASS;
-       tag.val = "macro";
-       print_otag(h, TAG_SPAN, 1, &tag);
+       PAIR_CLASS_INIT(&tag, "macro");
+       print_otag(h, TAG_B, 1, &tag);

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


@@ -1551,19 +1352,17 @@ mdoc_fd_pre(MDOC_ARGS)
 static int
 mdoc_vt_pre(MDOC_ARGS)
 {
 static int
 mdoc_vt_pre(MDOC_ARGS)
 {

-       struct htmlpair tag;
+       struct htmlpair  tag;

 
 

-       if (SEC_SYNOPSIS == n->sec) {
-               if (n->next && MDOC_Vt != n->next->tok) {
-                       tag.key = ATTR_STYLE;
-                       tag.val = "margin-bottom: 1em;";
-                       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);

 
 

-       tag.key = ATTR_CLASS;
-       tag.val = "type";
+       PAIR_CLASS_INIT(&tag, "type");

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


@@ -1573,20 +1372,11 @@ mdoc_vt_pre(MDOC_ARGS)
 static int
 mdoc_ft_pre(MDOC_ARGS)
 {
 static int
 mdoc_ft_pre(MDOC_ARGS)
 {

-       struct htmlpair tag;
-
-       if (SEC_SYNOPSIS == n->sec) {
-               if (n->prev && MDOC_Fo == n->prev->tok) {
-                       tag.key = ATTR_STYLE;
-                       tag.val = "margin-top: 1em;";
-                       print_otag(h, TAG_DIV, 1, &tag);
-               } else
-                       print_otag(h, TAG_DIV, 0, NULL);
-       }
+       struct htmlpair  tag;

 
 

-       tag.key = ATTR_CLASS;
-       tag.val = "ftype";
-       print_otag(h, TAG_SPAN, 1, &tag);
+       synopsis_pre(h, n);
+       PAIR_CLASS_INIT(&tag, "ftype");
+       print_otag(h, TAG_I, 1, &tag);

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


@@ -1602,25 +1392,16 @@ mdoc_fn_pre(MDOC_ARGS)
        const char              *sp, *ep;
        int                      sz, i;
 
        const char              *sp, *ep;
        int                      sz, i;
 

-       if (SEC_SYNOPSIS == n->sec) {
-               bufcat(h, "margin-left: 6em;");
-               bufcat(h, "text-indent: -6em;");
-               if (n->next) 
-                       bufcat(h, "margin-bottom: 1em;");
-               tag[0].key = ATTR_STYLE;
-               tag[0].val = h->buf;
-               print_otag(h, TAG_DIV, 1, tag);
-       }
+       synopsis_pre(h, n);

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

-       if ((ep = strchr(sp, ' '))) {
-               tag[0].key = ATTR_CLASS;
-               tag[0].val = "ftype";
-       
-               t = print_otag(h, TAG_SPAN, 1, tag);
+       ep = strchr(sp, ' ');
+       if (NULL != ep) {
+               PAIR_CLASS_INIT(&tag[0], "ftype");
+               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);


@@ -1633,12 +1414,28 @@ mdoc_fn_pre(MDOC_ARGS)
                print_tagq(h, t);
        }
 
                print_tagq(h, t);
        }
 

-       tag[0].key = ATTR_CLASS;
-       tag[0].val = "fname";
-       t = print_otag(h, TAG_SPAN, 1, tag);
+       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_B, 1, tag);

 
        if (sp) {
 
        if (sp) {

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

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


@@ -1647,16 +1444,16 @@ mdoc_fn_pre(MDOC_ARGS)
        h->flags |= HTML_NOSPACE;
        print_text(h, "(");
 
        h->flags |= HTML_NOSPACE;
        print_text(h, "(");
 

+       bufinit(h);
+       PAIR_CLASS_INIT(&tag[0], "farg");
+       bufcat_style(h, "white-space", "nowrap");
+       PAIR_STYLE_INIT(&tag[1], h);
+

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

-               i = 0;
-               tag[i].key = ATTR_CLASS;
-               tag[i++].val = "farg";
-               if (SEC_SYNOPSIS == n->sec) {
-                       tag[i].key = ATTR_STYLE;
-                       tag[i++].val = "white-space: nowrap;";
-               }
-                       
-               t = print_otag(h, TAG_SPAN, i, tag);
+               i = 1;
+               if (MDOC_SYNPRETTY & n->flags)
+                       i = 2;
+               t = print_otag(h, TAG_I, i, tag);

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


@@ -1664,8 +1461,7 @@ 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);


@@ -1674,56 +1470,64 @@ mdoc_fn_pre(MDOC_ARGS)
 
 /* ARGSUSED */
 static int
 
 /* ARGSUSED */
 static int

-mdoc_sp_pre(MDOC_ARGS)
-{
-       int             len;
-       struct htmlpair tag;
-
-       switch (n->tok) {
-       case (MDOC_sp):
-               len = n->child ? atoi(n->child->string) : 1;
-               break;
-       case (MDOC_br):
-               len = 0;
-               break;
-       default:
-               len = 1;
-               break;
-       }
-
-       buffmt(h, "height: %dem", len);
-       tag.key = ATTR_STYLE;
-       tag.val = h->buf;
-       print_otag(h, TAG_DIV, 1, &tag);
-       return(1);
+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.  Thus, if we have
+                *  .Bd -literal
+                *  .Sm off
+                *  1 2
+                *  .Sm on
+                *  3
+                *  .Ed
+                * the "3" is preceded by a space.
+                */
+               h->flags &= ~HTML_NOSPACE;
+               h->flags &= ~HTML_NONOSPACE;
+       } else
+               h->flags |= HTML_NONOSPACE;

 
 

+       return(0);

 }
 
 }
 

-

 /* ARGSUSED */
 static int
 /* ARGSUSED */
 static int

-mdoc_brq_pre(MDOC_ARGS)
+mdoc_pp_pre(MDOC_ARGS)

 {
 
 {
 

-       if (MDOC_BODY != n->type)
-               return(1);
-       print_text(h, "\\(lC");
-       h->flags |= HTML_NOSPACE;
-       return(1);
-}
+       print_otag(h, TAG_P, 0, NULL);
+       return(0);

 
 

+}

 
 /* ARGSUSED */
 
 /* ARGSUSED */

-static void
-mdoc_brq_post(MDOC_ARGS)
+static int
+mdoc_sp_pre(MDOC_ARGS)

 {
 {

+       struct roffsu    su;
+       struct htmlpair  tag;

 
 

-       if (MDOC_BODY != n->type)
-               return;
-       h->flags |= HTML_NOSPACE;
-       print_text(h, "\\(rC");
-}
+       SCALE_VS_INIT(&su, 1);

 
 

+       if (MDOC_sp == n->tok) {
+               if (n->child)
+                       a2roffsu(n->child->string, &su, SCALE_VS);
+       } else
+               su.scale = 0;
+
+       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, "\\~");
+
+       return(0);
+
+}

 
 /* ARGSUSED */
 static int
 
 /* ARGSUSED */
 static int


@@ -1734,14 +1538,11 @@ mdoc_lk_pre(MDOC_ARGS)
 
        nn = n->child;
 
 
        nn = n->child;
 

-       tag[0].key = ATTR_CLASS;
-       tag[0].val = "link-ext";
-       tag[1].key = ATTR_HREF;
-       tag[1].val = nn->string;
-
+       PAIR_CLASS_INIT(&tag[0], "link-ext");
+       PAIR_HREF_INIT(&tag[1], nn->string);

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

-       if (NULL == nn->next)
+       if (NULL == nn || NULL == nn->next) 

                return(1);
 
        for (nn = nn->next; nn; nn = nn->next) 
                return(1);
 
        for (nn = nn->next; nn; nn = nn->next) 


@@ -1759,17 +1560,13 @@ mdoc_mt_pre(MDOC_ARGS)
        struct tag              *t;
        const struct mdoc_node  *nn;
 
        struct tag              *t;
        const struct mdoc_node  *nn;
 

-       tag[0].key = ATTR_CLASS;
-       tag[0].val = "link-mail";
+       PAIR_CLASS_INIT(&tag[0], "link-mail");

 
        for (nn = n->child; nn; nn = nn->next) {
                bufinit(h);
                bufcat(h, "mailto:");
                bufcat(h, nn->string);
 
        for (nn = n->child; nn; nn = nn->next) {
                bufinit(h);
                bufcat(h, "mailto:");
                bufcat(h, nn->string);

-
-               tag[1].key = ATTR_HREF;
-               tag[1].val = h->buf;
-
+               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);


@@ -1783,20 +1580,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);

+       }

 
 

-       tag.key = ATTR_CLASS;
-       tag.val = "fname";
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
+       /* XXX: we drop non-initial arguments as per groff. */
+
+       assert(n->child);
+       assert(n->child->string);
+
+       PAIR_CLASS_INIT(&tag, "fname");
+       t = print_otag(h, TAG_B, 1, &tag);
+       print_text(h, n->child->string);
+       print_tagq(h, t);
+       return(0);

 }
 
 
 }
 
 


@@ -1804,11 +1610,10 @@ 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;
        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, ";");
 }
 


@@ -1818,41 +1623,29 @@ static int
 mdoc_in_pre(MDOC_ARGS)
 {
        const struct mdoc_node  *nn;
 mdoc_in_pre(MDOC_ARGS)
 {
        const struct mdoc_node  *nn;

-       struct htmlpair          tag[2];

        struct tag              *t;
        struct tag              *t;

+       struct htmlpair          tag[2];

        int                      i;
 
        int                      i;
 

-       if (SEC_SYNOPSIS == n->sec) {
-               if (n->next && MDOC_In != n->next->tok) {
-                       tag[0].key = ATTR_STYLE;
-                       tag[0].val = "margin-bottom: 1em;";
-                       print_otag(h, TAG_DIV, 1, tag);
-               } else
-                       print_otag(h, TAG_DIV, 0, NULL);
-       }
-
-       tag[0].key = ATTR_CLASS;
-       tag[0].val = "includes";
+       synopsis_pre(h, n);

 
 

-       print_otag(h, TAG_SPAN, 1, tag);
+       PAIR_CLASS_INIT(&tag[0], "includes");
+       print_otag(h, TAG_B, 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) {
        for (nn = n->child; nn; nn = nn->next) {

-               assert(MDOC_TEXT == nn->type);
-               i = 0;
-               tag[i].key = ATTR_CLASS;
-               tag[i++].val = "link-includes";
+               PAIR_CLASS_INIT(&tag[0], "link-includes");
+               i = 1;
+               bufinit(h);

                if (h->base_includes) {
                        buffmt_includes(h, nn->string);
                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);


@@ -1872,10 +1665,8 @@ mdoc_ic_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
 {
        struct htmlpair tag;
 

-       tag.key = ATTR_CLASS;
-       tag.val = "cmd";
-
-       print_otag(h, TAG_SPAN, 1, &tag);
+       PAIR_CLASS_INIT(&tag, "cmd");
+       print_otag(h, TAG_B, 1, &tag);

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


@@ -1888,14 +1679,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) {
 
        print_text(h, "The");
 
        for (nn = n->child; nn; nn = nn->next) {

-               tag.key = ATTR_CLASS;
-               tag.val = "fname";
-               t = print_otag(h, TAG_SPAN, 1, &tag);
+               PAIR_CLASS_INIT(&tag, "fname");
+               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);
 


@@ -1908,7 +1699,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");


@@ -1916,9 +1707,8 @@ mdoc_rv_pre(MDOC_ARGS)
                print_text(h, "the value 0 if successful; otherwise the value "
                        "-1 is returned and the global variable");
 
                print_text(h, "the value 0 if successful; otherwise the value "
                        "-1 is returned and the global variable");
 

-       tag.key = ATTR_CLASS;
-       tag.val = "var";
-       t = print_otag(h, TAG_SPAN, 1, &tag);
+       PAIR_CLASS_INIT(&tag, "var");
+       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.");


@@ -1932,38 +1722,12 @@ mdoc_va_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
 {
        struct htmlpair tag;
 

-       tag.key = ATTR_CLASS;
-       tag.val = "var";
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_bq_pre(MDOC_ARGS)
-{
-       
-       if (MDOC_BODY != n->type)
-               return(1);
-       print_text(h, "\\(lB");
-       h->flags |= HTML_NOSPACE;
+       PAIR_CLASS_INIT(&tag, "var");
+       print_otag(h, TAG_B, 1, &tag);

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

-/* ARGSUSED */
-static void
-mdoc_bq_post(MDOC_ARGS)
-{
-       
-       if (MDOC_BODY != n->type)
-               return;
-       h->flags |= HTML_NOSPACE;
-       print_text(h, "\\(rB");
-}
-
-

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


@@ -1980,47 +1744,32 @@ 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 htmlpair  tag[2];
+       struct roffsu    su;

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

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

                return(1);
 
                return(1);
 

-       tag[0].key = ATTR_CLASS;
-       tag[0].val = NULL;
-
-       if (n->head->child) {
-               if ( ! strcmp("Em", n->head->child->string))
-                       tag[0].val = "emph";
-               else if ( ! strcmp("Sy", n->head->child->string))
-                       tag[0].val = "symb";
-               else if ( ! strcmp("Li", n->head->child->string))
-                       tag[0].val = "lit";
-       } else {
-               assert(n->args);
-               for (i = 0; i < (int)n->args->argc; i++) 
-                       switch (n->args->argv[i].arg) {
-                       case (MDOC_Symbolic):
-                               tag[0].val = "symb";
-                               break;
-                       case (MDOC_Literal):
-                               tag[0].val = "lit";
-                               break;
-                       case (MDOC_Emphasis):
-                               tag[0].val = "emph";
-                               break;
-                       default:
-                               break;
-                       }
-       }
-
-       /* FIXME: div's have spaces stripped--we want them. */
-
-       assert(tag[0].val);
-       tag[1].key = ATTR_STYLE;
-       tag[1].val = "display: inline; margin-right: 1em;";
+       if (FONT_Em == n->norm->Bf.font) 
+               PAIR_CLASS_INIT(&tag[0], "emph");
+       else if (FONT_Sy == n->norm->Bf.font) 
+               PAIR_CLASS_INIT(&tag[0], "symb");
+       else if (FONT_Li == n->norm->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);
+       /* 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);
 }
        print_otag(h, TAG_DIV, 2, tag);
        return(1);
 }


@@ -2032,8 +1781,7 @@ mdoc_ms_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
 {
        struct htmlpair tag;
 

-       tag.key = ATTR_CLASS;
-       tag.val = "symb";
+       PAIR_CLASS_INIT(&tag, "symb");

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


@@ -2041,7 +1789,7 @@ mdoc_ms_pre(MDOC_ARGS)
 
 /* ARGSUSED */
 static int
 
 /* ARGSUSED */
 static int

-mdoc_pf_pre(MDOC_ARGS)
+mdoc_igndelim_pre(MDOC_ARGS)

 {
 
        h->flags |= HTML_IGNDELIM;
 {
 
        h->flags |= HTML_IGNDELIM;


@@ -2054,7 +1802,6 @@ static void
 mdoc_pf_post(MDOC_ARGS)
 {
 
 mdoc_pf_post(MDOC_ARGS)
 {
 

-       h->flags &= ~HTML_IGNDELIM;

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


@@ -2063,19 +1810,15 @@ mdoc_pf_post(MDOC_ARGS)
 static int
 mdoc_rs_pre(MDOC_ARGS)
 {
 static int
 mdoc_rs_pre(MDOC_ARGS)
 {

-       struct htmlpair tag;
+       struct htmlpair  tag;

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

-       if (n->prev && SEC_SEE_ALSO == n->sec) {
-               tag.key = ATTR_STYLE;
-               tag.val = "margin-top: 1em;";
-               print_otag(h, TAG_DIV, 1, &tag);
-       }
+       if (n->prev && SEC_SEE_ALSO == n->sec)
+               print_otag(h, TAG_P, 0, NULL);

 
 

-       tag.key = ATTR_CLASS;
-       tag.val = "ref";
+       PAIR_CLASS_INIT(&tag, "ref");

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


@@ -2088,9 +1831,7 @@ mdoc_li_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
 {
        struct htmlpair tag;
 

-       tag.key = ATTR_CLASS;
-       tag.val = "lit";
-
+       PAIR_CLASS_INIT(&tag, "lit");

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


@@ -2102,9 +1843,7 @@ mdoc_sy_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
 {
        struct htmlpair tag;
 

-       tag.key = ATTR_CLASS;
-       tag.val = "symb";
-
+       PAIR_CLASS_INIT(&tag, "symb");

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


@@ -2136,12 +1875,10 @@ mdoc_lb_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
 {
        struct htmlpair tag;
 

-       tag.key = ATTR_CLASS;
-       tag.val = "lib";
-
-       if (SEC_SYNOPSIS == n->sec)
-               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);
 }
        print_otag(h, TAG_SPAN, 1, &tag);
        return(1);
 }


@@ -2151,58 +1888,73 @@ mdoc_lb_pre(MDOC_ARGS)
 static int
 mdoc__x_pre(MDOC_ARGS)
 {
 static int
 mdoc__x_pre(MDOC_ARGS)
 {

-       struct htmlpair tag;
+       struct htmlpair tag[2];
+       enum htmltag    t;

 
 

-       tag.key = ATTR_CLASS;
+       t = TAG_SPAN;

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

-               tag.val = "ref-auth";
+               PAIR_CLASS_INIT(&tag[0], "ref-auth");
+               if (n->prev && MDOC__A == n->prev->tok)
+                       if (NULL == n->next || MDOC__A != n->next->tok)
+                               print_text(h, "and");

                break;
        case(MDOC__B):
                break;
        case(MDOC__B):

-               tag.val = "ref-book";
+               PAIR_CLASS_INIT(&tag[0], "ref-book");
+               t = TAG_I;

                break;
        case(MDOC__C):
                break;
        case(MDOC__C):

-               tag.val = "ref-city";
+               PAIR_CLASS_INIT(&tag[0], "ref-city");

                break;
        case(MDOC__D):
                break;
        case(MDOC__D):

-               tag.val = "ref-date";
+               PAIR_CLASS_INIT(&tag[0], "ref-date");

                break;
        case(MDOC__I):
                break;
        case(MDOC__I):

-               tag.val = "ref-issue";
+               PAIR_CLASS_INIT(&tag[0], "ref-issue");
+               t = TAG_I;

                break;
        case(MDOC__J):
                break;
        case(MDOC__J):

-               tag.val = "ref-jrnl";
+               PAIR_CLASS_INIT(&tag[0], "ref-jrnl");
+               t = TAG_I;

                break;
        case(MDOC__N):
                break;
        case(MDOC__N):

-               tag.val = "ref-num";
+               PAIR_CLASS_INIT(&tag[0], "ref-num");

                break;
        case(MDOC__O):
                break;
        case(MDOC__O):

-               tag.val = "ref-opt";
+               PAIR_CLASS_INIT(&tag[0], "ref-opt");

                break;
        case(MDOC__P):
                break;
        case(MDOC__P):

-               tag.val = "ref-page";
+               PAIR_CLASS_INIT(&tag[0], "ref-page");

                break;
        case(MDOC__Q):
                break;
        case(MDOC__Q):

-               tag.val = "ref-corp";
+               PAIR_CLASS_INIT(&tag[0], "ref-corp");

                break;
        case(MDOC__R):
                break;
        case(MDOC__R):

-               tag.val = "ref-rep";
+               PAIR_CLASS_INIT(&tag[0], "ref-rep");

                break;
        case(MDOC__T):
                break;
        case(MDOC__T):

-               print_text(h, "\\(lq");
-               h->flags |= HTML_NOSPACE;
-               tag.val = "ref-title";
+               PAIR_CLASS_INIT(&tag[0], "ref-title");
+               break;
+       case(MDOC__U):
+               PAIR_CLASS_INIT(&tag[0], "link-ref");

                break;
        case(MDOC__V):
                break;
        case(MDOC__V):

-               tag.val = "ref-vol";
+               PAIR_CLASS_INIT(&tag[0], "ref-vol");

                break;
        default:
                abort();
                /* NOTREACHED */
        }
 
                break;
        default:
                abort();
                /* NOTREACHED */
        }
 

-       print_otag(h, TAG_SPAN, 1, &tag);
+       if (MDOC__U != n->tok) {
+               print_otag(h, t, 1, tag);
+               return(1);
+       }
+
+       PAIR_HREF_INIT(&tag[1], n->child->string);
+       print_otag(h, TAG_A, 2, tag);
+

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


@@ -2212,14 +1964,172 @@ static void
 mdoc__x_post(MDOC_ARGS)
 {
 
 mdoc__x_post(MDOC_ARGS)
 {
 

-       h->flags |= HTML_NOSPACE;
+       if (MDOC__A == n->tok && n->next && MDOC__A == n->next->tok)
+               if (NULL == n->next->next || MDOC__A != n->next->next->tok)
+                       if (NULL == n->prev || MDOC__A != n->prev->tok)
+                               return;
+
+       /* TODO: %U */
+
+       if (NULL == n->parent || MDOC_Rs != n->parent->tok)
+               return;
+
+       print_text(h, n->next ? "," : ".");
+}
+
+
+/* ARGSUSED */
+static int
+mdoc_bk_pre(MDOC_ARGS)
+{
+
+       switch (n->type) {
+       case (MDOC_BLOCK):
+               break;
+       case (MDOC_HEAD):
+               return(0);
+       case (MDOC_BODY):
+               if (n->parent->args || 0 == n->prev->nchild)
+                       h->flags |= HTML_PREKEEP;
+               break;
+       default:
+               abort();
+               /* NOTREACHED */
+       }
+
+       return(1);
+}
+
+
+/* ARGSUSED */
+static void
+mdoc_bk_post(MDOC_ARGS)
+{
+
+       if (MDOC_BODY == n->type)
+               h->flags &= ~(HTML_KEEP | HTML_PREKEEP);
+}
+
+
+/* ARGSUSED */
+static int
+mdoc_quote_pre(MDOC_ARGS)
+{
+       struct htmlpair tag;
+
+       if (MDOC_BODY != n->type)
+               return(1);
+

        switch (n->tok) {
        switch (n->tok) {

-       case (MDOC__T):
-               print_text(h, "\\(rq");
+       case (MDOC_Ao):
+               /* FALLTHROUGH */
+       case (MDOC_Aq):
+               print_text(h, "\\(la");
+               break;
+       case (MDOC_Bro):
+               /* FALLTHROUGH */
+       case (MDOC_Brq):
+               print_text(h, "\\(lC");
+               break;
+       case (MDOC_Bo):
+               /* FALLTHROUGH */
+       case (MDOC_Bq):
+               print_text(h, "\\(lB");
+               break;
+       case (MDOC_Oo):
+               /* FALLTHROUGH */
+       case (MDOC_Op):
+               print_text(h, "\\(lB");

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

+               PAIR_CLASS_INIT(&tag, "opt");
+               print_otag(h, TAG_SPAN, 1, &tag);
+               break;
+       case (MDOC_Do):
+               /* FALLTHROUGH */
+       case (MDOC_Dq):
+               /* FALLTHROUGH */
+       case (MDOC_Qo):
+               /* FALLTHROUGH */
+       case (MDOC_Qq):
+               print_text(h, "\\(lq");
+               break;
+       case (MDOC_Po):
+               /* FALLTHROUGH */
+       case (MDOC_Pq):
+               print_text(h, "(");
+               break;
+       case (MDOC_Ql):
+               /* FALLTHROUGH */
+       case (MDOC_So):
+               /* FALLTHROUGH */
+       case (MDOC_Sq):
+               print_text(h, "\\(oq");

                break;
        default:
                break;
        default:

+               abort();
+               /* NOTREACHED */
+       }
+
+       h->flags |= HTML_NOSPACE;
+       return(1);
+}
+
+
+/* ARGSUSED */
+static void
+mdoc_quote_post(MDOC_ARGS)
+{
+
+       if (MDOC_BODY != n->type)
+               return;
+
+       h->flags |= HTML_NOSPACE;
+
+       switch (n->tok) {
+       case (MDOC_Ao):
+               /* FALLTHROUGH */
+       case (MDOC_Aq):
+               print_text(h, "\\(ra");
+               break;
+       case (MDOC_Bro):
+               /* FALLTHROUGH */
+       case (MDOC_Brq):
+               print_text(h, "\\(rC");
+               break;
+       case (MDOC_Oo):
+               /* FALLTHROUGH */
+       case (MDOC_Op):
+               /* FALLTHROUGH */
+       case (MDOC_Bo):
+               /* FALLTHROUGH */
+       case (MDOC_Bq):
+               print_text(h, "\\(rB");

                break;
                break;

+       case (MDOC_Qo):
+               /* FALLTHROUGH */
+       case (MDOC_Qq):
+               /* FALLTHROUGH */
+       case (MDOC_Do):
+               /* FALLTHROUGH */
+       case (MDOC_Dq):
+               print_text(h, "\\(rq");
+               break;
+       case (MDOC_Po):
+               /* FALLTHROUGH */
+       case (MDOC_Pq):
+               print_text(h, ")");
+               break;
+       case (MDOC_Ql):
+               /* FALLTHROUGH */
+       case (MDOC_So):
+               /* FALLTHROUGH */
+       case (MDOC_Sq):
+               print_text(h, "\\(aq");
+               break;
+       default:
+               abort();
+               /* NOTREACHED */

        }
        }

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

 }
 }

+
+