]> git.cameronkatri.com Git - mandoc.git/blobdiff - mdoc_html.c
git.ckatri.com / mandoc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
delete some TODO entries that were already fixed
[mandoc.git] / mdoc_html.c
diff --git a/mdoc_html.c b/mdoc_html.c
index c7dbfea0999bdd8e40507e26f15e346b9c1804b8..85be95b668b32f7e6ecbb91d2a83676419fe62ab 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,22 +1,21 @@
-/*     $Id: mdoc_html.c,v 1.97 2010/07/19 11:06:31 kristaps Exp $ */
+/*     $Id: mdoc_html.c,v 1.232 2015/04/18 17:53:21 schwarze Exp $ */
 /*
 /*
- * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
 #include "config.h"
-#endif
 
 #include <sys/types.h>
 
 
 #include <sys/types.h>
 
@@ -27,17 +26,17 @@
 #include <string.h>
 #include <unistd.h>
 
 #include <string.h>
 #include <unistd.h>
 
-#include "mandoc.h"
+#include "mandoc_aux.h"
+#include "roff.h"
+#include "mdoc.h"
 #include "out.h"
 #include "html.h"
 #include "out.h"
 #include "html.h"
-#include "mdoc.h"
 #include "main.h"
 
 #define        INDENT           5
 #include "main.h"
 
 #define        INDENT           5
-#define        HALFINDENT       3
 
 
-#define        MDOC_ARGS         const struct mdoc_meta *m, \
-                         const struct mdoc_node *n, \
+#define        MDOC_ARGS         const struct roff_meta *meta, \
+                         struct roff_node *n, \
                          struct html *h
 
 #ifndef MIN
                          struct html *h
 
 #ifndef MIN
@@ -49,15 +48,13 @@ struct      htmlmdoc {
        void            (*post)(MDOC_ARGS);
 };
 
        void            (*post)(MDOC_ARGS);
 };
 
-static void              print_mdoc(MDOC_ARGS);
 static void              print_mdoc_head(MDOC_ARGS);
 static void              print_mdoc_node(MDOC_ARGS);
 static void              print_mdoc_nodelist(MDOC_ARGS);
 static void              print_mdoc_head(MDOC_ARGS);
 static void              print_mdoc_node(MDOC_ARGS);
 static void              print_mdoc_nodelist(MDOC_ARGS);
-static void              synopsis_pre(struct html *, 
-                               const struct mdoc_node *);
+static void              synopsis_pre(struct html *,
+                               const struct roff_node *);
 
 static void              a2width(const char *, struct roffsu *);
 
 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);
@@ -67,25 +64,16 @@ 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 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 void              mdoc_bk_post(MDOC_ARGS);
 static int               mdoc_bk_pre(MDOC_ARGS);
 static int               mdoc_ar_pre(MDOC_ARGS);
 static int               mdoc_bd_pre(MDOC_ARGS);
 static int               mdoc_bf_pre(MDOC_ARGS);
 static void              mdoc_bk_post(MDOC_ARGS);
 static int               mdoc_bk_pre(MDOC_ARGS);
-static void              mdoc_bl_post(MDOC_ARGS);
 static int               mdoc_bl_pre(MDOC_ARGS);
 static 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);
@@ -93,19 +81,16 @@ static      int               mdoc_fl_pre(MDOC_ARGS);
 static int               mdoc_fn_pre(MDOC_ARGS);
 static int               mdoc_ft_pre(MDOC_ARGS);
 static int               mdoc_em_pre(MDOC_ARGS);
 static int               mdoc_fn_pre(MDOC_ARGS);
 static int               mdoc_ft_pre(MDOC_ARGS);
 static int               mdoc_em_pre(MDOC_ARGS);
+static void              mdoc_eo_post(MDOC_ARGS);
+static int               mdoc_eo_pre(MDOC_ARGS);
 static int               mdoc_er_pre(MDOC_ARGS);
 static int               mdoc_ev_pre(MDOC_ARGS);
 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 int               mdoc_er_pre(MDOC_ARGS);
 static int               mdoc_ev_pre(MDOC_ARGS);
 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 int               mdoc_igndelim_pre(MDOC_ARGS);
 static int               mdoc_in_pre(MDOC_ARGS);
 static int               mdoc_in_pre(MDOC_ARGS);
-static int               mdoc_it_block_pre(MDOC_ARGS, enum mdoc_list,
-                               int, struct roffsu *, struct roffsu *);
-static int               mdoc_it_head_pre(MDOC_ARGS, enum mdoc_list, 
-                               struct roffsu *);
-static int               mdoc_it_body_pre(MDOC_ARGS, enum mdoc_list,
-                               struct roffsu *);
 static int               mdoc_it_pre(MDOC_ARGS);
 static int               mdoc_lb_pre(MDOC_ARGS);
 static int               mdoc_li_pre(MDOC_ARGS);
 static int               mdoc_it_pre(MDOC_ARGS);
 static int               mdoc_lb_pre(MDOC_ARGS);
 static int               mdoc_li_pre(MDOC_ARGS);
@@ -114,20 +99,19 @@ static     int               mdoc_mt_pre(MDOC_ARGS);
 static int               mdoc_ms_pre(MDOC_ARGS);
 static int               mdoc_nd_pre(MDOC_ARGS);
 static int               mdoc_nm_pre(MDOC_ARGS);
 static int               mdoc_ms_pre(MDOC_ARGS);
 static int               mdoc_nd_pre(MDOC_ARGS);
 static int               mdoc_nm_pre(MDOC_ARGS);
+static int               mdoc_no_pre(MDOC_ARGS);
 static int               mdoc_ns_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_skip_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);
@@ -143,41 +127,41 @@ static    const struct htmlmdoc mdocs[MDOC_MAX] = {
        {NULL, NULL}, /* Dt */
        {NULL, NULL}, /* Os */
        {mdoc_sh_pre, NULL }, /* Sh */
        {NULL, NULL}, /* Dt */
        {NULL, NULL}, /* Os */
        {mdoc_sh_pre, NULL }, /* Sh */
-       {mdoc_ss_pre, NULL }, /* Ss */ 
-       {mdoc_sp_pre, NULL}, /* Pp */ 
+       {mdoc_ss_pre, NULL }, /* Ss */
+       {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 */
        {NULL, NULL}, /* El */
        {mdoc_it_pre, NULL}, /* It */
-       {mdoc_ad_pre, NULL}, /* Ad */ 
+       {mdoc_ad_pre, NULL}, /* Ad */
        {mdoc_an_pre, NULL}, /* An */
        {mdoc_ar_pre, NULL}, /* Ar */
        {mdoc_cd_pre, NULL}, /* Cd */
        {mdoc_fl_pre, NULL}, /* Cm */
        {mdoc_an_pre, NULL}, /* An */
        {mdoc_ar_pre, NULL}, /* Ar */
        {mdoc_cd_pre, NULL}, /* Cd */
        {mdoc_fl_pre, NULL}, /* Cm */
-       {mdoc_dv_pre, NULL}, /* Dv */ 
-       {mdoc_er_pre, NULL}, /* Er */ 
-       {mdoc_ev_pre, NULL}, /* Ev */ 
+       {mdoc_dv_pre, NULL}, /* Dv */
+       {mdoc_er_pre, NULL}, /* Er */
+       {mdoc_ev_pre, NULL}, /* Ev */
        {mdoc_ex_pre, NULL}, /* Ex */
        {mdoc_ex_pre, NULL}, /* Ex */
-       {mdoc_fa_pre, NULL}, /* Fa */ 
-       {mdoc_fd_pre, NULL}, /* Fd */ 
+       {mdoc_fa_pre, NULL}, /* Fa */
+       {mdoc_fd_pre, NULL}, /* Fd */
        {mdoc_fl_pre, NULL}, /* Fl */
        {mdoc_fl_pre, NULL}, /* Fl */
-       {mdoc_fn_pre, NULL}, /* Fn */ 
-       {mdoc_ft_pre, NULL}, /* Ft */ 
-       {mdoc_ic_pre, NULL}, /* Ic */ 
-       {mdoc_in_pre, NULL}, /* In */ 
+       {mdoc_fn_pre, NULL}, /* Fn */
+       {mdoc_ft_pre, NULL}, /* Ft */
+       {mdoc_ic_pre, NULL}, /* Ic */
+       {mdoc_in_pre, NULL}, /* In */
        {mdoc_li_pre, NULL}, /* Li */
        {mdoc_li_pre, NULL}, /* Li */
-       {mdoc_nd_pre, NULL}, /* Nd */ 
-       {mdoc_nm_pre, NULL}, /* Nm */ 
-       {mdoc_op_pre, mdoc_op_post}, /* Op */
-       {NULL, NULL}, /* Ot */
+       {mdoc_nd_pre, NULL}, /* Nd */
+       {mdoc_nm_pre, NULL}, /* Nm */
+       {mdoc_quote_pre, mdoc_quote_post}, /* Op */
+       {mdoc_ft_pre, NULL}, /* Ot */
        {mdoc_pa_pre, NULL}, /* Pa */
        {mdoc_rv_pre, NULL}, /* Rv */
        {mdoc_pa_pre, NULL}, /* Pa */
        {mdoc_rv_pre, NULL}, /* Rv */
-       {NULL, NULL}, /* St */ 
+       {NULL, NULL}, /* St */
        {mdoc_va_pre, NULL}, /* Va */
        {mdoc_va_pre, NULL}, /* Va */
-       {mdoc_vt_pre, NULL}, /* Vt */ 
+       {mdoc_vt_pre, NULL}, /* Vt */
        {mdoc_xr_pre, NULL}, /* Xr */
        {mdoc__x_pre, mdoc__x_post}, /* %A */
        {mdoc__x_pre, mdoc__x_post}, /* %B */
        {mdoc_xr_pre, NULL}, /* Xr */
        {mdoc__x_pre, mdoc__x_post}, /* %A */
        {mdoc__x_pre, mdoc__x_post}, /* %B */
@@ -191,93 +175,92 @@ 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 */
        {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_bf_pre, NULL}, /* Bf */
+       {mdoc_quote_pre, mdoc_quote_post}, /* Bo */
+       {mdoc_quote_pre, mdoc_quote_post}, /* Bq */
        {mdoc_xx_pre, NULL}, /* Bsx */
        {mdoc_bx_pre, NULL}, /* Bx */
        {mdoc_xx_pre, NULL}, /* Bsx */
        {mdoc_bx_pre, NULL}, /* Bx */
-       {NULL, NULL}, /* Db */
+       {mdoc_skip_pre, NULL}, /* Db */
        {NULL, NULL}, /* Dc */
        {NULL, NULL}, /* Dc */
-       {mdoc_dq_pre, mdoc_dq_post}, /* Do */
-       {mdoc_dq_pre, mdoc_dq_post}, /* Dq */
+       {mdoc_quote_pre, mdoc_quote_post}, /* Do */
+       {mdoc_quote_pre, mdoc_quote_post}, /* Dq */
        {NULL, NULL}, /* Ec */ /* FIXME: no space */
        {NULL, NULL}, /* Ef */
        {NULL, NULL}, /* Ec */ /* FIXME: no space */
        {NULL, NULL}, /* Ef */
-       {mdoc_em_pre, NULL}, /* Em */ 
-       {NULL, NULL}, /* Eo */
+       {mdoc_em_pre, NULL}, /* Em */
+       {mdoc_eo_pre, mdoc_eo_post}, /* Eo */
        {mdoc_xx_pre, NULL}, /* Fx */
        {mdoc_xx_pre, NULL}, /* Fx */
-       {mdoc_ms_pre, NULL}, /* Ms */ /* FIXME: convert to symbol? */
-       {NULL, NULL}, /* No */
+       {mdoc_ms_pre, NULL}, /* Ms */
+       {mdoc_no_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_xx_pre, NULL}, /* Ux */
        {NULL, NULL}, /* Xc */
        {NULL, NULL}, /* Xo */
        {mdoc_sx_pre, NULL}, /* Sx */
        {mdoc_sy_pre, NULL}, /* Sy */
        {NULL, NULL}, /* Tn */
        {mdoc_xx_pre, NULL}, /* Ux */
        {NULL, NULL}, /* Xc */
        {NULL, NULL}, /* Xo */
-       {mdoc_fo_pre, mdoc_fo_post}, /* Fo */ 
-       {NULL, NULL}, /* Fc */ 
-       {mdoc_op_pre, mdoc_op_post}, /* Oo */
+       {mdoc_fo_pre, mdoc_fo_post}, /* Fo */
+       {NULL, NULL}, /* Fc */
+       {mdoc_quote_pre, mdoc_quote_post}, /* Oo */
        {NULL, NULL}, /* Oc */
        {mdoc_bk_pre, mdoc_bk_post}, /* Bk */
        {NULL, NULL}, /* Ek */
        {mdoc_bt_pre, NULL}, /* Bt */
        {NULL, NULL}, /* Hf */
        {NULL, NULL}, /* Oc */
        {mdoc_bk_pre, mdoc_bk_post}, /* Bk */
        {NULL, NULL}, /* Ek */
        {mdoc_bt_pre, NULL}, /* Bt */
        {NULL, NULL}, /* Hf */
-       {NULL, NULL}, /* Fr */
+       {mdoc_em_pre, NULL}, /* Fr */
        {mdoc_ud_pre, NULL}, /* Ud */
        {mdoc_lb_pre, NULL}, /* Lb */
        {mdoc_ud_pre, NULL}, /* Ud */
        {mdoc_lb_pre, NULL}, /* Lb */
-       {mdoc_sp_pre, NULL}, /* Lp */ 
-       {mdoc_lk_pre, NULL}, /* Lk */ 
-       {mdoc_mt_pre, NULL}, /* Mt */ 
-       {mdoc_brq_pre, mdoc_brq_post}, /* Brq */ 
-       {mdoc_brq_pre, mdoc_brq_post}, /* Bro */ 
-       {NULL, NULL}, /* Brc */ 
-       {mdoc__x_pre, mdoc__x_post}, /* %C */ 
-       {NULL, NULL}, /* Es */  /* TODO */
-       {NULL, NULL}, /* En */  /* TODO */
-       {mdoc_xx_pre, NULL}, /* Dx */ 
-       {mdoc__x_pre, mdoc__x_post}, /* %Q */ 
+       {mdoc_pp_pre, NULL}, /* Lp */
+       {mdoc_lk_pre, NULL}, /* Lk */
+       {mdoc_mt_pre, NULL}, /* Mt */
+       {mdoc_quote_pre, mdoc_quote_post}, /* Brq */
+       {mdoc_quote_pre, mdoc_quote_post}, /* Bro */
+       {NULL, NULL}, /* Brc */
+       {mdoc__x_pre, mdoc__x_post}, /* %C */
+       {mdoc_skip_pre, NULL}, /* Es */
+       {mdoc_quote_pre, mdoc_quote_post}, /* En */
+       {mdoc_xx_pre, NULL}, /* Dx */
+       {mdoc__x_pre, mdoc__x_post}, /* %Q */
        {mdoc_sp_pre, NULL}, /* br */
        {mdoc_sp_pre, NULL}, /* br */
-       {mdoc_sp_pre, NULL}, /* sp */ 
-       {mdoc__x_pre, mdoc__x_post}, /* %U */ 
-       {NULL, NULL}, /* Ta */ 
+       {mdoc_sp_pre, NULL}, /* sp */
+       {mdoc__x_pre, mdoc__x_post}, /* %U */
+       {NULL, NULL}, /* Ta */
+       {mdoc_skip_pre, NULL}, /* ll */
 };
 
 };
 
-
-void
-html_mdoc(void *arg, const struct mdoc *m)
-{
-       struct html     *h;
-       struct tag      *t;
-
-       h = (struct html *)arg;
-
-       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);
-
-       printf("\n");
-}
+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"
+};
 
 
 /*
 
 
 /*
@@ -289,137 +272,109 @@ static void
 a2width(const char *p, struct roffsu *su)
 {
 
 a2width(const char *p, struct roffsu *su)
 {
 
-       if ( ! a2roffsu(p, su, SCALE_MAX)) {
-               su->unit = SCALE_EM;
-               su->scale = (int)strlen(p);
-       }
+       if (a2roffsu(p, su, SCALE_MAX) < 2) {
+               su->unit = SCALE_EN;
+               su->scale = html_strlen(p);
+       } else if (su->scale < 0.0)
+               su->scale = 0.0;
 }
 
 }
 
-
 /*
  * See the same function in mdoc_term.c for documentation.
  */
 static void
 /*
  * See the same function in mdoc_term.c for documentation.
  */
 static void
-synopsis_pre(struct html *h, const struct mdoc_node *n)
+synopsis_pre(struct html *h, const struct roff_node *n)
 {
 {
-       struct roffsu    su;
-       struct htmlpair  tag;
 
        if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags))
                return;
 
 
        if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags))
                return;
 
-       SCALE_VS_INIT(&su, 1);
-       bufcat_su(h, "margin-top", &su);
-       PAIR_STYLE_INIT(&tag, h);
-
-       if (n->prev->tok == n->tok && 
-                       MDOC_Fo != n->tok && 
-                       MDOC_Ft != n->tok && 
-                       MDOC_Fn != n->tok) {
-               print_otag(h, TAG_DIV, 0, NULL);
+       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;
        }
 
        switch (n->prev->tok) {
                return;
        }
 
        switch (n->prev->tok) {
-       case (MDOC_Fd):
+       case MDOC_Fd:
                /* FALLTHROUGH */
                /* FALLTHROUGH */
-       case (MDOC_Fn):
+       case MDOC_Fn:
                /* FALLTHROUGH */
                /* FALLTHROUGH */
-       case (MDOC_Fo):
+       case MDOC_Fo:
                /* FALLTHROUGH */
                /* FALLTHROUGH */
-       case (MDOC_In):
+       case MDOC_In:
                /* FALLTHROUGH */
                /* FALLTHROUGH */
-       case (MDOC_Vt):
-               print_otag(h, TAG_DIV, 1, &tag);
+       case MDOC_Vt:
+               print_paragraph(h);
                break;
                break;
-       case (MDOC_Ft):
+       case MDOC_Ft:
                if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) {
                if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) {
-                       print_otag(h, TAG_DIV, 1, &tag);
+                       print_paragraph(h);
                        break;
                }
                /* FALLTHROUGH */
        default:
                        break;
                }
                /* FALLTHROUGH */
        default:
-               print_otag(h, TAG_DIV, 0, NULL);
+               print_otag(h, TAG_BR, 0, NULL);
                break;
        }
 }
 
                break;
        }
 }
 
-
-/*
- * Calculate the scaling unit passed in an `-offset' argument.  This
- * uses either a native scaling unit (e.g., 1i, 2m), one of a set of
- * predefined strings (indent, etc.), or the string length of the value.
- */
-static void
-a2offs(const char *p, struct roffsu *su)
-{
-
-       /* FIXME: "right"? */
-
-       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_EM;
-               su->scale = (int)strlen(p);
-       }
-}
-
-
-static void
-print_mdoc(MDOC_ARGS)
+void
+html_mdoc(void *arg, const struct roff_man *mdoc)
 {
 {
-       struct tag      *t;
        struct htmlpair  tag;
        struct htmlpair  tag;
+       struct html     *h;
+       struct tag      *t, *tt;
 
 
-       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);
+       PAIR_CLASS_INIT(&tag, "mandoc");
+       h = (struct html *)arg;
 
 
-       tag.key = ATTR_CLASS;
-       tag.val = "body";
-       print_otag(h, TAG_DIV, 1, &tag);
+       if ( ! (HTML_FRAGMENT & h->oflags)) {
+               print_gen_decls(h);
+               t = print_otag(h, TAG_HTML, 0, NULL);
+               tt = print_otag(h, TAG_HEAD, 0, NULL);
+               print_mdoc_head(&mdoc->meta, mdoc->first->child, h);
+               print_tagq(h, tt);
+               print_otag(h, TAG_BODY, 0, NULL);
+               print_otag(h, TAG_DIV, 1, &tag);
+       } else
+               t = print_otag(h, TAG_DIV, 1, &tag);
 
 
-       print_mdoc_nodelist(m, n, h);
+       mdoc_root_pre(&mdoc->meta, mdoc->first->child, h);
+       print_mdoc_nodelist(&mdoc->meta, mdoc->first->child, h);
+       mdoc_root_post(&mdoc->meta, mdoc->first->child, h);
        print_tagq(h, t);
        print_tagq(h, t);
+       putchar('\n');
 }
 
 }
 
-
-/* ARGSUSED */
 static void
 print_mdoc_head(MDOC_ARGS)
 {
 
        print_gen_head(h);
        bufinit(h);
 static void
 print_mdoc_head(MDOC_ARGS)
 {
 
        print_gen_head(h);
        bufinit(h);
-       buffmt(h, "%s(%s)", m->title, m->msec);
-
-       if (m->arch) {
-               bufcat(h, " (");
-               bufcat(h, m->arch);
-               bufcat(h, ")");
-       }
+       bufcat(h, meta->title);
+       if (meta->msec)
+               bufcat_fmt(h, "(%s)", meta->msec);
+       if (meta->arch)
+               bufcat_fmt(h, " (%s)", meta->arch);
 
        print_otag(h, TAG_TITLE, 0, NULL);
        print_text(h, h->buf);
 }
 
 
        print_otag(h, TAG_TITLE, 0, NULL);
        print_text(h, h->buf);
 }
 
-
 static void
 print_mdoc_nodelist(MDOC_ARGS)
 {
 
 static void
 print_mdoc_nodelist(MDOC_ARGS)
 {
 
-       print_mdoc_node(m, n, h);
-       if (n->next)
-               print_mdoc_nodelist(m, n->next, h);
+       while (n != NULL) {
+               print_mdoc_node(meta, n, h);
+               n = n->next;
+       }
 }
 
 }
 
-
 static void
 print_mdoc_node(MDOC_ARGS)
 {
 static void
 print_mdoc_node(MDOC_ARGS)
 {
@@ -428,258 +383,223 @@ print_mdoc_node(MDOC_ARGS)
 
        child = 1;
        t = h->tags.head;
 
        child = 1;
        t = h->tags.head;
+       n->flags &= ~MDOC_ENDED;
 
 
-       bufinit(h);
        switch (n->type) {
        switch (n->type) {
-       case (MDOC_ROOT):
-               child = mdoc_root_pre(m, n, h);
-               break;
-       case (MDOC_TEXT):
+       case ROFFT_TEXT:
+               /* No tables in this mode... */
+               assert(NULL == h->tblt);
+
+               /*
+                * Make sure that if we're in a literal mode already
+                * (i.e., within a <PRE>) don't print the newline.
+                */
+               if (' ' == *n->string && MDOC_LINE & n->flags)
+                       if ( ! (HTML_LITERAL & h->flags))
+                               print_otag(h, TAG_BR, 0, NULL);
+               if (MDOC_DELIMC & n->flags)
+                       h->flags |= HTML_NOSPACE;
                print_text(h, n->string);
                print_text(h, n->string);
+               if (MDOC_DELIMO & n->flags)
+                       h->flags |= HTML_NOSPACE;
+               return;
+       case ROFFT_EQN:
+               if (n->flags & MDOC_LINE)
+                       putchar('\n');
+               print_eqn(h, n->eqn);
+               break;
+       case ROFFT_TBL:
+               /*
+                * This will take care of initialising all of the table
+                * state data for the first table, then tearing it down
+                * for the last one.
+                */
+               print_tbl(h, n->span);
                return;
        default:
                return;
        default:
-               if (mdocs[n->tok].pre && ENDBODY_NOT == n->end)
-                       child = (*mdocs[n->tok].pre)(m, n, h);
+               /*
+                * Close out the current table, if it's open, and unset
+                * the "meta" table state.  This will be reopened on the
+                * next table element.
+                */
+               if (h->tblt != NULL) {
+                       print_tblclose(h);
+                       t = h->tags.head;
+               }
+               assert(h->tblt == NULL);
+               if (mdocs[n->tok].pre && (n->end == ENDBODY_NOT || n->child))
+                       child = (*mdocs[n->tok].pre)(meta, n, h);
                break;
        }
 
                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 (h->flags & HTML_KEEP && n->flags & MDOC_LINE) {
+               h->flags &= ~HTML_KEEP;
+               h->flags |= HTML_PREKEEP;
        }
 
        if (child && n->child)
        }
 
        if (child && n->child)
-               print_mdoc_nodelist(m, n->child, h);
+               print_mdoc_nodelist(meta, n->child, h);
 
        print_stagq(h, t);
 
 
        print_stagq(h, t);
 
-       bufinit(h);
        switch (n->type) {
        switch (n->type) {
-       case (MDOC_ROOT):
-               mdoc_root_post(m, n, h);
+       case ROFFT_EQN:
                break;
        default:
                break;
        default:
-               if (mdocs[n->tok].post && ENDBODY_NOT == n->end)
-                       (*mdocs[n->tok].post)(m, n, h);
+               if ( ! mdocs[n->tok].post || n->flags & MDOC_ENDED)
+                       break;
+               (*mdocs[n->tok].post)(meta, n, h);
+               if (n->end != ENDBODY_NOT)
+                       n->body->flags |= MDOC_ENDED;
+               if (n->end == ENDBODY_NOSPACE)
+                       h->flags |= HTML_NOSPACE;
                break;
        }
 }
 
                break;
        }
 }
 
-
-/* ARGSUSED */
 static void
 mdoc_root_post(MDOC_ARGS)
 {
 static void
 mdoc_root_post(MDOC_ARGS)
 {
-       struct htmlpair  tag[3];
+       struct htmlpair  tag;
        struct tag      *t, *tt;
        struct tag      *t, *tt;
-       char             b[DATESIZ];
 
 
-       time2a(m->date, b, DATESIZ);
+       PAIR_CLASS_INIT(&tag, "foot");
+       t = print_otag(h, TAG_TABLE, 1, &tag);
 
 
-       /*
-        * XXX: this should use divs, but in Firefox, divs with nested
-        * divs for some reason puke when trying to put a border line
-        * below.  So I use tables, instead.
-        */
-
-       PAIR_CLASS_INIT(&tag[0], "footer");
-       bufcat_style(h, "width", "100%");
-       PAIR_STYLE_INIT(&tag[1], h);
-       PAIR_SUMMARY_INIT(&tag[2], "footer");
+       print_otag(h, TAG_TBODY, 0, NULL);
 
 
-       t = print_otag(h, TAG_TABLE, 3, tag);
        tt = print_otag(h, TAG_TR, 0, NULL);
 
        tt = print_otag(h, TAG_TR, 0, NULL);
 
-       bufinit(h);
-       bufcat_style(h, "width", "50%");
-       PAIR_STYLE_INIT(&tag[0], h);
-       print_otag(h, TAG_TD, 1, tag);
-       print_text(h, b);
+       PAIR_CLASS_INIT(&tag, "foot-date");
+       print_otag(h, TAG_TD, 1, &tag);
+       print_text(h, meta->date);
        print_stagq(h, tt);
 
        print_stagq(h, tt);
 
-       bufinit(h);
-       bufcat_style(h, "width", "50%");
-       bufcat_style(h, "text-align", "right");
-       PAIR_STYLE_INIT(&tag[0], h);
-       print_otag(h, TAG_TD, 1, tag);
-       print_text(h, m->os);
+       PAIR_CLASS_INIT(&tag, "foot-os");
+       print_otag(h, TAG_TD, 1, &tag);
+       print_text(h, meta->os);
        print_tagq(h, t);
 }
 
        print_tagq(h, t);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_root_pre(MDOC_ARGS)
 {
 static int
 mdoc_root_pre(MDOC_ARGS)
 {
-       struct htmlpair  tag[3];
+       struct htmlpair  tag;
        struct tag      *t, *tt;
        struct tag      *t, *tt;
-       char             b[BUFSIZ], title[BUFSIZ];
-
-       (void)strlcpy(b, m->vol, BUFSIZ);
+       char            *volume, *title;
 
 
-       if (m->arch) {
-               (void)strlcat(b, " (", BUFSIZ);
-               (void)strlcat(b, m->arch, BUFSIZ);
-               (void)strlcat(b, ")", BUFSIZ);
-       }
-
-       (void)snprintf(title, BUFSIZ - 1, 
-                       "%s(%s)", m->title, m->msec);
+       if (NULL == meta->arch)
+               volume = mandoc_strdup(meta->vol);
+       else
+               mandoc_asprintf(&volume, "%s (%s)",
+                   meta->vol, meta->arch);
 
 
-       /* XXX: see note in mdoc_root_post() about divs. */
+       if (NULL == meta->msec)
+               title = mandoc_strdup(meta->title);
+       else
+               mandoc_asprintf(&title, "%s(%s)",
+                   meta->title, meta->msec);
 
 
-       PAIR_CLASS_INIT(&tag[0], "header");
-       bufcat_style(h, "width", "100%");
-       PAIR_STYLE_INIT(&tag[1], h);
-       PAIR_SUMMARY_INIT(&tag[2], "header");
+       PAIR_CLASS_INIT(&tag, "head");
+       t = print_otag(h, TAG_TABLE, 1, &tag);
 
 
-       t = print_otag(h, TAG_TABLE, 3, tag);
+       print_otag(h, TAG_TBODY, 0, NULL);
 
        tt = print_otag(h, TAG_TR, 0, NULL);
 
 
        tt = print_otag(h, TAG_TR, 0, NULL);
 
-       bufinit(h);
-       bufcat_style(h, "width", "10%");
-       PAIR_STYLE_INIT(&tag[0], h);
-       print_otag(h, TAG_TD, 1, tag);
+       PAIR_CLASS_INIT(&tag, "head-ltitle");
+       print_otag(h, TAG_TD, 1, &tag);
        print_text(h, title);
        print_stagq(h, tt);
 
        print_text(h, title);
        print_stagq(h, tt);
 
-       bufinit(h);
-       bufcat_style(h, "text-align", "center");
-       bufcat_style(h, "white-space", "nowrap");
-       bufcat_style(h, "width", "80%");
-       PAIR_STYLE_INIT(&tag[0], h);
-       print_otag(h, TAG_TD, 1, tag);
-       print_text(h, b);
+       PAIR_CLASS_INIT(&tag, "head-vol");
+       print_otag(h, TAG_TD, 1, &tag);
+       print_text(h, volume);
        print_stagq(h, tt);
 
        print_stagq(h, tt);
 
-       bufinit(h);
-       bufcat_style(h, "text-align", "right");
-       bufcat_style(h, "width", "10%");
-       PAIR_STYLE_INIT(&tag[0], h);
-       print_otag(h, TAG_TD, 1, tag);
+       PAIR_CLASS_INIT(&tag, "head-rtitle");
+       print_otag(h, TAG_TD, 1, &tag);
        print_text(h, title);
        print_tagq(h, t);
        print_text(h, title);
        print_tagq(h, t);
+
+       free(title);
+       free(volume);
        return(1);
 }
 
        return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_sh_pre(MDOC_ARGS)
 {
 static int
 mdoc_sh_pre(MDOC_ARGS)
 {
-       struct htmlpair          tag[2];
-       const struct mdoc_node  *nn;
-       char                     buf[BUFSIZ];
-       struct roffsu            su;
+       struct htmlpair  tag;
 
 
-       if (MDOC_BODY == n->type) {
-               SCALE_HS_INIT(&su, INDENT);
-               bufcat_su(h, "margin-left", &su);
-               PAIR_CLASS_INIT(&tag[0], "sec-body");
-               PAIR_STYLE_INIT(&tag[1], h);
-               print_otag(h, TAG_DIV, 2, tag);
+       switch (n->type) {
+       case ROFFT_BLOCK:
+               PAIR_CLASS_INIT(&tag, "section");
+               print_otag(h, TAG_DIV, 1, &tag);
                return(1);
                return(1);
-       } else if (MDOC_BLOCK == n->type) {
-               PAIR_CLASS_INIT(&tag[0], "sec-block");
-               if (n->prev && NULL == n->prev->body->child) {
-                       print_otag(h, TAG_DIV, 1, tag);
-                       return(1);
-               }
-               
-               SCALE_VS_INIT(&su, 1);
-               bufcat_su(h, "margin-top", &su);
-               if (NULL == n->next)
-                       bufcat_su(h, "margin-bottom", &su);
-
-               PAIR_STYLE_INIT(&tag[1], h);
-               print_otag(h, TAG_DIV, 2, tag);
+       case ROFFT_BODY:
+               if (n->sec == SEC_AUTHORS)
+                       h->flags &= ~(HTML_SPLIT|HTML_NOSPLIT);
                return(1);
                return(1);
+       default:
+               break;
        }
 
        }
 
-       buf[0] = '\0';
-       for (nn = n->child; nn; nn = nn->next) {
-               html_idcat(buf, nn->string, BUFSIZ);
-               if (nn->next)
-                       html_idcat(buf, " ", BUFSIZ);
+       bufinit(h);
+       bufcat(h, "x");
+
+       for (n = n->child; n != NULL && n->type == ROFFT_TEXT; ) {
+               bufcat_id(h, n->string);
+               if (NULL != (n = n->next))
+                       bufcat_id(h, " ");
        }
 
        }
 
-       PAIR_CLASS_INIT(&tag[0], "sec-head");
-       PAIR_ID_INIT(&tag[1], buf);
+       if (NULL == n) {
+               PAIR_ID_INIT(&tag, h->buf);
+               print_otag(h, TAG_H1, 1, &tag);
+       } else
+               print_otag(h, TAG_H1, 0, NULL);
 
 
-       print_otag(h, TAG_DIV, 2, tag);
        return(1);
 }
 
        return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_ss_pre(MDOC_ARGS)
 {
 static int
 mdoc_ss_pre(MDOC_ARGS)
 {
-       struct htmlpair          tag[3];
-       const struct mdoc_node  *nn;
-       char                     buf[BUFSIZ];
-       struct roffsu            su;
-
-       SCALE_VS_INIT(&su, 1);
+       struct htmlpair  tag;
 
 
-       if (MDOC_BODY == n->type) {
-               PAIR_CLASS_INIT(&tag[0], "ssec-body");
-               if (n->parent->next && n->child) {
-                       bufcat_su(h, "margin-bottom", &su);
-                       PAIR_STYLE_INIT(&tag[1], h);
-                       print_otag(h, TAG_DIV, 2, tag);
-               } else
-                       print_otag(h, TAG_DIV, 1, tag);
+       if (n->type == ROFFT_BLOCK) {
+               PAIR_CLASS_INIT(&tag, "subsection");
+               print_otag(h, TAG_DIV, 1, &tag);
                return(1);
                return(1);
-       } else if (MDOC_BLOCK == n->type) {
-               PAIR_CLASS_INIT(&tag[0], "ssec-block");
-               if (n->prev) {
-                       bufcat_su(h, "margin-top", &su);
-                       PAIR_STYLE_INIT(&tag[1], h);
-                       print_otag(h, TAG_DIV, 2, tag);
-               } else
-                       print_otag(h, TAG_DIV, 1, tag);
+       } else if (n->type == ROFFT_BODY)
                return(1);
                return(1);
-       }
 
 
-       /* TODO: see note in mdoc_sh_pre() about duplicates. */
+       bufinit(h);
+       bufcat(h, "x");
 
 
-       buf[0] = '\0';
-       for (nn = n->child; nn; nn = nn->next) {
-               html_idcat(buf, nn->string, BUFSIZ);
-               if (nn->next)
-                       html_idcat(buf, " ", BUFSIZ);
+       for (n = n->child; n != NULL && n->type == ROFFT_TEXT; ) {
+               bufcat_id(h, n->string);
+               if (NULL != (n = n->next))
+                       bufcat_id(h, " ");
        }
 
        }
 
-       SCALE_HS_INIT(&su, INDENT - HALFINDENT);
-       su.scale = -su.scale;
-       bufcat_su(h, "margin-left", &su);
-
-       PAIR_CLASS_INIT(&tag[0], "ssec-head");
-       PAIR_STYLE_INIT(&tag[1], h);
-       PAIR_ID_INIT(&tag[2], buf);
+       if (NULL == n) {
+               PAIR_ID_INIT(&tag, h->buf);
+               print_otag(h, TAG_H2, 1, &tag);
+       } else
+               print_otag(h, TAG_H2, 0, NULL);
 
 
-       print_otag(h, TAG_DIV, 3, tag);
        return(1);
 }
 
        return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_fl_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;
 
        PAIR_CLASS_INIT(&tag, "flag");
 static int
 mdoc_fl_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;
 
        PAIR_CLASS_INIT(&tag, "flag");
-       print_otag(h, TAG_SPAN, 1, &tag);
+       print_otag(h, TAG_B, 1, &tag);
 
        /* `Cm' has no leading hyphen. */
 
 
        /* `Cm' has no leading hyphen. */
 
@@ -688,141 +608,84 @@ mdoc_fl_pre(MDOC_ARGS)
 
        print_text(h, "\\-");
 
 
        print_text(h, "\\-");
 
-       if (n->child)
-               h->flags |= HTML_NOSPACE;
-       else if (n->next && n->next->line == n->line)
+       if ( ! (n->nchild == 0 &&
+           (n->next == NULL ||
+            n->next->type == ROFFT_TEXT ||
+            n->next->flags & MDOC_LINE)))
                h->flags |= HTML_NOSPACE;
 
        return(1);
 }
 
                h->flags |= HTML_NOSPACE;
 
        return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_nd_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;
 
 static int
 mdoc_nd_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;
 
-       if (MDOC_BODY != n->type)
+       if (n->type != ROFFT_BODY)
                return(1);
 
        /* XXX: this tag in theory can contain block elements. */
 
        print_text(h, "\\(em");
                return(1);
 
        /* XXX: this tag in theory can contain block elements. */
 
        print_text(h, "\\(em");
-       PAIR_CLASS_INIT(&tag, "desc-body");
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_op_pre(MDOC_ARGS)
-{
-       struct htmlpair  tag;
-
-       if (MDOC_BODY != n->type)
-               return(1);
-
-       /* XXX: this tag in theory can contain block elements. */
-
-       print_text(h, "\\(lB");
-       h->flags |= HTML_NOSPACE;
-       PAIR_CLASS_INIT(&tag, "opt");
+       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 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;
        struct roffsu    su;
 static int
 mdoc_nm_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;
        struct roffsu    su;
-       const char      *cp;
-
-       /*
-        * Accomodate for `Nm' being both an element (which may have
-        * NULL children AND no m->name) and a block.
-        */
-
-       cp = NULL;
+       int              len;
 
 
-       if (MDOC_ELEM == n->type) {
-               if (NULL == n->child && NULL == m->name)
-                       return(1);
+       switch (n->type) {
+       case ROFFT_ELEM:
                synopsis_pre(h, n);
                PAIR_CLASS_INIT(&tag, "name");
                synopsis_pre(h, n);
                PAIR_CLASS_INIT(&tag, "name");
-               print_otag(h, TAG_SPAN, 1, &tag);
-               if (NULL == n->child)
-                       print_text(h, m->name);
-       } else if (MDOC_BLOCK == n->type) {
-               synopsis_pre(h, n);
-
-               bufcat_style(h, "clear", "both");
-               if (n->head->child || m->name) {
-                       if (n->head->child && MDOC_TEXT == 
-                                       n->head->child->type)
-                               cp = n->head->child->string;
-                       if (NULL == cp || '\0' == *cp)
-                               cp = m->name;
-
-                       SCALE_HS_INIT(&su, (double)strlen(cp));
-                       bufcat_su(h, "padding-left", &su);
-               }
-
-               PAIR_STYLE_INIT(&tag, h);
-               print_otag(h, TAG_DIV, 1, &tag);
-       } else if (MDOC_HEAD == n->type) { 
-               if (NULL == n->child && NULL == m->name)
-                       return(1);
-
-               if (n->child && MDOC_TEXT == n->child->type)
-                       cp = n->child->string;
-               if (NULL == cp || '\0' == *cp)
-                       cp = m->name;
-
-               SCALE_HS_INIT(&su, (double)strlen(cp));
+               print_otag(h, TAG_B, 1, &tag);
+               if (NULL == n->child && meta->name)
+                       print_text(h, meta->name);
+               return(1);
+       case ROFFT_HEAD:
+               print_otag(h, TAG_TD, 0, NULL);
+               if (NULL == n->child && meta->name)
+                       print_text(h, meta->name);
+               return(1);
+       case ROFFT_BODY:
+               print_otag(h, TAG_TD, 0, NULL);
+               return(1);
+       default:
+               break;
+       }
 
 
-               bufcat_style(h, "float", "left");
-               bufcat_su(h, "min-width", &su);
-               SCALE_INVERT(&su);
-               bufcat_su(h, "margin-left", &su);
+       synopsis_pre(h, n);
+       PAIR_CLASS_INIT(&tag, "synopsis");
+       print_otag(h, TAG_TABLE, 1, &tag);
 
 
-               PAIR_STYLE_INIT(&tag, h);
-               print_otag(h, TAG_DIV, 1, &tag);
+       for (len = 0, n = n->child; n; n = n->next)
+               if (n->type == ROFFT_TEXT)
+                       len += html_strlen(n->string);
 
 
-               if (NULL == n->child)
-                       print_text(h, m->name);
-       } else if (MDOC_BODY == n->type) {
-               SCALE_HS_INIT(&su, 2);
-               bufcat_su(h, "margin-left", &su);
-               PAIR_STYLE_INIT(&tag, h);
-               print_otag(h, TAG_DIV, 1, &tag);
-       }
+       if (0 == len && meta->name)
+               len = html_strlen(meta->name);
 
 
+       SCALE_HS_INIT(&su, len);
+       bufinit(h);
+       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);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_xr_pre(MDOC_ARGS)
 {
 static int
 mdoc_xr_pre(MDOC_ARGS)
 {
-       struct htmlpair          tag[2];
-       const struct mdoc_node  *nn;
+       struct htmlpair  tag[2];
 
        if (NULL == n->child)
                return(0);
 
        if (NULL == n->child)
                return(0);
@@ -830,76 +693,72 @@ mdoc_xr_pre(MDOC_ARGS)
        PAIR_CLASS_INIT(&tag[0], "link-man");
 
        if (h->base_man) {
        PAIR_CLASS_INIT(&tag[0], "link-man");
 
        if (h->base_man) {
-               buffmt_man(h, n->child->string, 
-                               n->child->next ? 
-                               n->child->next->string : NULL);
+               buffmt_man(h, n->child->string,
+                   n->child->next ?
+                   n->child->next->string : NULL);
                PAIR_HREF_INIT(&tag[1], h->buf);
                print_otag(h, TAG_A, 2, tag);
        } else
                print_otag(h, TAG_A, 1, 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);
+       n = n->child;
+       print_text(h, n->string);
 
 
-       if (NULL == (nn = nn->next))
+       if (NULL == (n = n->next))
                return(0);
 
        h->flags |= HTML_NOSPACE;
        print_text(h, "(");
        h->flags |= HTML_NOSPACE;
                return(0);
 
        h->flags |= HTML_NOSPACE;
        print_text(h, "(");
        h->flags |= HTML_NOSPACE;
-       print_text(h, nn->string);
+       print_text(h, n->string);
        h->flags |= HTML_NOSPACE;
        print_text(h, ")");
        return(0);
 }
 
        h->flags |= HTML_NOSPACE;
        print_text(h, ")");
        return(0);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_ns_pre(MDOC_ARGS)
 {
 
 static int
 mdoc_ns_pre(MDOC_ARGS)
 {
 
-       h->flags |= HTML_NOSPACE;
+       if ( ! (MDOC_LINE & n->flags))
+               h->flags |= HTML_NOSPACE;
        return(1);
 }
 
        return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_ar_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "arg");
 static int
 mdoc_ar_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "arg");
-       print_otag(h, TAG_SPAN, 1, &tag);
+       print_otag(h, TAG_I, 1, &tag);
        return(1);
 }
 
        return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_xx_pre(MDOC_ARGS)
 {
        const char      *pp;
        struct htmlpair  tag;
 static int
 mdoc_xx_pre(MDOC_ARGS)
 {
        const char      *pp;
        struct htmlpair  tag;
+       int              flags;
 
        switch (n->tok) {
 
        switch (n->tok) {
-       case (MDOC_Bsx):
-               pp = "BSDI BSD/OS";
+       case MDOC_Bsx:
+               pp = "BSD/OS";
                break;
                break;
-       case (MDOC_Dx):
+       case MDOC_Dx:
                pp = "DragonFly";
                break;
                pp = "DragonFly";
                break;
-       case (MDOC_Fx):
+       case MDOC_Fx:
                pp = "FreeBSD";
                break;
                pp = "FreeBSD";
                break;
-       case (MDOC_Nx):
+       case MDOC_Nx:
                pp = "NetBSD";
                break;
                pp = "NetBSD";
                break;
-       case (MDOC_Ox):
+       case MDOC_Ox:
                pp = "OpenBSD";
                break;
                pp = "OpenBSD";
                break;
-       case (MDOC_Ux):
+       case MDOC_Ux:
                pp = "UNIX";
                break;
        default:
                pp = "UNIX";
                break;
        default:
@@ -908,419 +767,288 @@ mdoc_xx_pre(MDOC_ARGS)
 
        PAIR_CLASS_INIT(&tag, "unix");
        print_otag(h, TAG_SPAN, 1, &tag);
 
        PAIR_CLASS_INIT(&tag, "unix");
        print_otag(h, TAG_SPAN, 1, &tag);
+
        print_text(h, pp);
        print_text(h, pp);
-       return(1);
+       if (n->child) {
+               flags = h->flags;
+               h->flags |= HTML_KEEP;
+               print_text(h, n->child->string);
+               h->flags = flags;
+       }
+       return(0);
 }
 
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_bx_pre(MDOC_ARGS)
 {
 static int
 mdoc_bx_pre(MDOC_ARGS)
 {
-       const struct mdoc_node  *nn;
-       struct htmlpair          tag;
+       struct htmlpair  tag;
 
        PAIR_CLASS_INIT(&tag, "unix");
        print_otag(h, TAG_SPAN, 1, &tag);
 
 
        PAIR_CLASS_INIT(&tag, "unix");
        print_otag(h, TAG_SPAN, 1, &tag);
 
-       for (nn = n->child; nn; nn = nn->next)
-               print_mdoc_node(m, nn, h);
+       if (NULL != (n = n->child)) {
+               print_text(h, n->string);
+               h->flags |= HTML_NOSPACE;
+               print_text(h, "BSD");
+       } else {
+               print_text(h, "BSD");
+               return(0);
+       }
 
 
-       if (n->child)
+       if (NULL != (n = n->next)) {
+               h->flags |= HTML_NOSPACE;
+               print_text(h, "-");
                h->flags |= HTML_NOSPACE;
                h->flags |= HTML_NOSPACE;
+               print_text(h, n->string);
+       }
 
 
-       print_text(h, "BSD");
        return(0);
 }
 
        return(0);
 }
 
-
-/* ARGSUSED */
 static int
 static int
-mdoc_it_block_pre(MDOC_ARGS, enum mdoc_list type, int comp,
-               struct roffsu *offs, struct roffsu *width)
+mdoc_it_pre(MDOC_ARGS)
 {
 {
-       struct htmlpair          tag;
-       const struct mdoc_node  *nn;
-       struct roffsu            su;
-
-       nn = n->parent->parent;
+       struct roffsu    su;
+       enum mdoc_list   type;
+       struct htmlpair  tag[2];
+       const struct roff_node *bl;
 
 
-       /* XXX: see notes in mdoc_it_pre(). */
+       bl = n->parent;
+       while (bl && MDOC_Bl != bl->tok)
+               bl = bl->parent;
 
 
-       if (LIST_column == type) {
-               /* Don't width-pad on the left. */
-               SCALE_HS_INIT(width, 0);
-               /* Also disallow non-compact. */
-               comp = 1;
-       }
-       if (LIST_diag == type)
-               /* Mandate non-compact with empty prior. */
-               if (n->prev && NULL == n->prev->body->child)
-                       comp = 1;
+       assert(bl);
 
 
-       bufcat_style(h, "clear", "both");
-       if (offs->scale > 0)
-               bufcat_su(h, "margin-left", offs);
-       if (width->scale > 0)
-               bufcat_su(h, "padding-left", width);
+       type = bl->norm->Bl.type;
 
 
-       PAIR_STYLE_INIT(&tag, h);
+       assert(lists[type]);
+       PAIR_CLASS_INIT(&tag[0], lists[type]);
 
 
-       /* Mandate compact following `Ss' and `Sh' starts. */
+       bufinit(h);
 
 
-       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)
+       if (n->type == ROFFT_HEAD) {
+               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;
+                       PAIR_CLASS_INIT(&tag[0], "diag");
+                       print_otag(h, TAG_B, 1, tag);
                        break;
                        break;
+               case LIST_column:
+                       break;
+               default:
+                       break;
+               }
+       } else if (n->type == ROFFT_BODY) {
+               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;
+                       }
+                       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 ( ! comp) {
-               SCALE_VS_INIT(&su, 1);
-               bufcat_su(h, "padding-top", &su);
-       }
-
-       PAIR_STYLE_INIT(&tag, h);
-       print_otag(h, TAG_DIV, 1, &tag);
        return(1);
 }
 
        return(1);
 }
 
-
-/* ARGSUSED */
 static int
 static int
-mdoc_it_body_pre(MDOC_ARGS, enum mdoc_list type, struct roffsu *width)
+mdoc_bl_pre(MDOC_ARGS)
 {
 {
-       struct htmlpair  tag;
+       int              i;
+       struct htmlpair  tag[3];
        struct roffsu    su;
        struct roffsu    su;
+       char             buf[BUFSIZ];
 
 
-       switch (type) {
-       case (LIST_item):
-               /* FALLTHROUGH */
-       case (LIST_ohang):
-               /* FALLTHROUGH */
-       case (LIST_column):
-               bufcat_su(h, "min-width", width);
-               bufcat_style(h, "clear", "none");
-               if (n->next)
-                       bufcat_style(h, "float", "left");
-               PAIR_STYLE_INIT(&tag, h);
-               print_otag(h, TAG_DIV, 1, &tag);
-               break;
-       default:
-               /* 
-                * XXX: this tricks CSS into aligning the bodies with
-                * the right-padding in the head. 
-                */
-               SCALE_HS_INIT(&su, 2);
-               bufcat_su(h, "margin-left", &su);
-               PAIR_STYLE_INIT(&tag, h);
-               print_otag(h, TAG_DIV, 1, &tag);
-               break;
+       if (n->type == ROFFT_BODY) {
+               if (LIST_column == n->norm->Bl.type)
+                       print_otag(h, TAG_TBODY, 0, NULL);
+               return(1);
        }
 
        }
 
-       return(1);
-}
-
+       if (n->type == ROFFT_HEAD) {
+               if (LIST_column != n->norm->Bl.type)
+                       return(0);
 
 
-/* ARGSUSED */
-static int
-mdoc_it_head_pre(MDOC_ARGS, enum mdoc_list type, struct roffsu *width)
-{
-       struct htmlpair  tag;
-       struct ord      *ord;
-       char             nbuf[BUFSIZ];
+               /*
+                * 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.
+                */
 
 
-       switch (type) {
-       case (LIST_item):
-               return(0);
-       case (LIST_ohang):
-               print_otag(h, TAG_DIV, 0, &tag);
-               return(1);
-       case (LIST_column):
-               break;
-       default:
-               bufcat_su(h, "min-width", width);
-               SCALE_INVERT(width);
-               bufcat_su(h, "margin-left", width);
-               if (n->next && n->next->child)
-                       bufcat_style(h, "float", "left");
-
-               /* XXX: buffer if we run into body. */
-               SCALE_HS_INIT(width, 1);
-               bufcat_su(h, "margin-right", width);
-               PAIR_STYLE_INIT(&tag, h);
-               print_otag(h, TAG_DIV, 1, &tag);
-               break;
-       }
+               for (i = 0; i < (int)n->norm->Bl.ncols; i++) {
+                       bufinit(h);
+                       a2width(n->norm->Bl.cols[i], &su);
+                       if (i < (int)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);
+               }
 
 
-       switch (type) {
-       case (LIST_diag):
-               PAIR_CLASS_INIT(&tag, "diag");
-               print_otag(h, TAG_SPAN, 1, &tag);
-               break;
-       case (LIST_enum):
-               ord = h->ords.head;
-               assert(ord);
-               nbuf[BUFSIZ - 1] = 0;
-               (void)snprintf(nbuf, BUFSIZ - 1, "%d.", ord->pos++);
-               print_text(h, nbuf);
-               return(0);
-       case (LIST_dash):
-               print_text(h, "\\(en");
-               return(0);
-       case (LIST_hyphen):
-               print_text(h, "\\(hy");
                return(0);
                return(0);
-       case (LIST_bullet):
-               print_text(h, "\\(bu");
-               return(0);
-       default:
-               break;
        }
 
        }
 
-       return(1);
-}
-
-
-static int
-mdoc_it_pre(MDOC_ARGS)
-{
-       int                      i, comp;
-       const struct mdoc_node  *bl, *nn;
-       struct roffsu            width, offs;
-       enum mdoc_list           type;
-
-       /* 
-        * XXX: be very careful in changing anything, here.  Lists in
-        * mandoc have many peculiarities; furthermore, they don't
-        * translate well into HTML and require a bit of mangling.
-        */
-
-       bl = n->parent->parent;
-       if (MDOC_BLOCK != n->type)
-               bl = bl->parent;
+       SCALE_VS_INIT(&su, 0);
+       bufinit(h);
+       bufcat_su(h, "margin-top", &su);
+       bufcat_su(h, "margin-bottom", &su);
+       PAIR_STYLE_INIT(&tag[0], h);
 
 
-       SCALE_HS_INIT(&offs, 0);
+       assert(lists[n->norm->Bl.type]);
+       (void)strlcpy(buf, "list ", BUFSIZ);
+       (void)strlcat(buf, lists[n->norm->Bl.type], BUFSIZ);
+       PAIR_INIT(&tag[1], ATTR_CLASS, buf);
 
 
-       assert(bl->data.Bl);
-       type = bl->data.Bl->type;
-       comp = bl->data.Bl->comp;
+       /* Set the block's left-hand margin. */
 
 
-       if (bl->data.Bl->offs)
-               a2offs(bl->data.Bl->offs, &offs);
+       if (n->norm->Bl.offs) {
+               a2width(n->norm->Bl.offs, &su);
+               bufcat_su(h, "margin-left", &su);
+       }
 
 
-       switch (type) {
-       case (LIST_enum):
+       switch (n->norm->Bl.type) {
+       case LIST_bullet:
                /* FALLTHROUGH */
                /* FALLTHROUGH */
-       case (LIST_dash):
+       case LIST_dash:
                /* FALLTHROUGH */
                /* FALLTHROUGH */
-       case (LIST_hyphen):
+       case LIST_hyphen:
                /* FALLTHROUGH */
                /* FALLTHROUGH */
-       case (LIST_bullet):
-               SCALE_HS_INIT(&width, 2);
+       case LIST_item:
+               print_otag(h, TAG_UL, 2, tag);
                break;
                break;
-       default:
-               SCALE_HS_INIT(&width, INDENT);
+       case LIST_enum:
+               print_otag(h, TAG_OL, 2, tag);
                break;
                break;
-       }
-
-       if (bl->data.Bl->width)
-               a2width(bl->data.Bl->width, &width);
-
-       /* Override width in some cases. */
-
-       switch (type) {
-       case (LIST_ohang):
+       case LIST_diag:
                /* FALLTHROUGH */
                /* FALLTHROUGH */
-       case (LIST_item):
+       case LIST_hang:
                /* FALLTHROUGH */
                /* FALLTHROUGH */
-       case (LIST_inset):
+       case LIST_inset:
                /* FALLTHROUGH */
                /* FALLTHROUGH */
-       case (LIST_diag):
-               SCALE_HS_INIT(&width, 0);
+       case LIST_ohang:
+               /* FALLTHROUGH */
+       case LIST_tag:
+               print_otag(h, TAG_DL, 2, tag);
                break;
                break;
-       default:
-               if (0 == width.scale)
-                       SCALE_HS_INIT(&width, INDENT);
+       case LIST_column:
+               print_otag(h, TAG_TABLE, 2, tag);
                break;
                break;
+       default:
+               abort();
+               /* NOTREACHED */
        }
 
        }
 
-       if (LIST_column == type && MDOC_BODY == n->type) {
-               nn = n->parent->child;
-               for (i = 0; nn && nn != n; nn = nn->next)
-                       if (MDOC_BODY == nn->type)
-                               i++;
-               if (i < (int)bl->data.Bl->ncols)
-                       a2width(bl->data.Bl->cols[i], &width);
-       }
-
-       if (MDOC_HEAD == n->type)
-               return(mdoc_it_head_pre(m, n, h, type, &width));
-       else if (MDOC_BODY == n->type)
-               return(mdoc_it_body_pre(m, n, h, type, &width));
-
-       return(mdoc_it_block_pre(m, n, h, type, comp, &offs, &width));
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_bl_pre(MDOC_ARGS)
-{
-       struct ord      *ord;
-
-       if (MDOC_HEAD == n->type)
-               return(0);
-       if (MDOC_BLOCK != n->type)
-               return(1);
-       assert(n->data.Bl);
-       if (LIST_enum != n->data.Bl->type)
-               return(1);
-
-       ord = malloc(sizeof(struct ord));
-       if (NULL == ord) {
-               perror(NULL);
-               exit(EXIT_FAILURE);
-       }
-       ord->cookie = n;
-       ord->pos = 1;
-       ord->next = h->ords.head;
-       h->ords.head = ord;
        return(1);
 }
 
        return(1);
 }
 
-
-/* ARGSUSED */
-static void
-mdoc_bl_post(MDOC_ARGS)
-{
-       struct ord      *ord;
-
-       if (MDOC_BLOCK != n->type)
-               return;
-       if (LIST_enum != n->data.Bl->type)
-               return;
-
-       ord = h->ords.head;
-       assert(ord);
-       h->ords.head = ord->next;
-       free(ord);
-}
-
-
-/* ARGSUSED */
 static int
 mdoc_ex_pre(MDOC_ARGS)
 {
 static int
 mdoc_ex_pre(MDOC_ARGS)
 {
-       const struct mdoc_node  *nn;
-       struct tag              *t;
-       struct htmlpair          tag;
+       struct tag      *t;
+       struct htmlpair  tag;
+       int              nchild;
+
+       if (n->prev)
+               print_otag(h, TAG_BR, 0, NULL);
 
        PAIR_CLASS_INIT(&tag, "utility");
 
        print_text(h, "The");
 
        PAIR_CLASS_INIT(&tag, "utility");
 
        print_text(h, "The");
-       for (nn = n->child; nn; nn = nn->next) {
-               t = print_otag(h, TAG_SPAN, 1, &tag);
-               print_text(h, nn->string);
-               print_tagq(h, t);
 
 
-               h->flags |= HTML_NOSPACE;
+       nchild = n->nchild;
+       for (n = n->child; n; n = n->next) {
+               assert(n->type == ROFFT_TEXT);
 
 
-               if (nn->next && NULL == nn->next->next)
-                       print_text(h, ", and");
-               else if (nn->next)
+               t = print_otag(h, TAG_B, 1, &tag);
+               print_text(h, n->string);
+               print_tagq(h, t);
+
+               if (nchild > 2 && n->next) {
+                       h->flags |= HTML_NOSPACE;
                        print_text(h, ",");
                        print_text(h, ",");
-               else
-                       h->flags &= ~HTML_NOSPACE;
+               }
+
+               if (n->next && NULL == n->next->next)
+                       print_text(h, "and");
        }
 
        }
 
-       if (n->child && n->child->next)
-               print_text(h, "utilities exit");
+       if (nchild > 1)
+               print_text(h, "utilities exit\\~0");
        else
        else
-               print_text(h, "utility exits");
+               print_text(h, "utility exits\\~0");
 
 
-               print_text(h, "0 on success, and >0 if an error occurs.");
+       print_text(h, "on success, and\\~>0 if an error occurs.");
        return(0);
 }
 
        return(0);
 }
 
-
-/* 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)
 {
 static int
 mdoc_em_pre(MDOC_ARGS)
 {
@@ -1331,184 +1059,204 @@ mdoc_em_pre(MDOC_ARGS)
        return(1);
 }
 
        return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_d1_pre(MDOC_ARGS)
 {
        struct htmlpair  tag[2];
        struct roffsu    su;
 
 static int
 mdoc_d1_pre(MDOC_ARGS)
 {
        struct htmlpair  tag[2];
        struct roffsu    su;
 
-       if (MDOC_BLOCK != n->type)
+       if (n->type != ROFFT_BLOCK)
                return(1);
 
                return(1);
 
-       /* FIXME: D1 shouldn't be literal. */
-
-       SCALE_VS_INIT(&su, INDENT - 2);
-       bufcat_su(h, "margin-left", &su);
-       PAIR_CLASS_INIT(&tag[0], "lit");
-       PAIR_STYLE_INIT(&tag[1], h);
-       print_otag(h, TAG_DIV, 2, tag);
-       return(1);
-}
+       SCALE_VS_INIT(&su, 0);
+       bufinit(h);
+       bufcat_su(h, "margin-top", &su);
+       bufcat_su(h, "margin-bottom", &su);
+       PAIR_STYLE_INIT(&tag[0], h);
+       print_otag(h, TAG_BLOCKQUOTE, 1, tag);
 
 
+       /* BLOCKQUOTE needs a block body. */
 
 
-/* ARGSUSED */
-static int
-mdoc_sx_pre(MDOC_ARGS)
-{
-       struct htmlpair          tag[2];
-       const struct mdoc_node  *nn;
-       char                     buf[BUFSIZ];
+       PAIR_CLASS_INIT(&tag[0], "display");
+       print_otag(h, TAG_DIV, 1, tag);
 
 
-       strlcpy(buf, "#", BUFSIZ);
-       for (nn = n->child; nn; nn = nn->next) {
-               html_idcat(buf, nn->string, BUFSIZ);
-               if (nn->next)
-                       html_idcat(buf, " ", BUFSIZ);
+       if (MDOC_Dl == n->tok) {
+               PAIR_CLASS_INIT(&tag[0], "lit");
+               print_otag(h, TAG_CODE, 1, tag);
        }
 
        }
 
-       PAIR_CLASS_INIT(&tag[0], "link-sec");
-       PAIR_HREF_INIT(&tag[1], buf);
-
-       print_otag(h, TAG_A, 2, tag);
        return(1);
 }
 
        return(1);
 }
 
-
-/* ARGSUSED */
 static int
 static int
-mdoc_aq_pre(MDOC_ARGS)
+mdoc_sx_pre(MDOC_ARGS)
 {
 {
+       struct htmlpair  tag[2];
 
 
-       if (MDOC_BODY != n->type)
-               return(1);
-       print_text(h, "\\(la");
-       h->flags |= HTML_NOSPACE;
-       return(1);
-}
+       bufinit(h);
+       bufcat(h, "#x");
 
 
+       for (n = n->child; n; ) {
+               bufcat_id(h, n->string);
+               if (NULL != (n = n->next))
+                       bufcat_id(h, " ");
+       }
 
 
-/* ARGSUSED */
-static void
-mdoc_aq_post(MDOC_ARGS)
-{
+       PAIR_CLASS_INIT(&tag[0], "link-sec");
+       PAIR_HREF_INIT(&tag[1], h->buf);
 
 
-       if (MDOC_BODY != n->type)
-               return;
-       h->flags |= HTML_NOSPACE;
-       print_text(h, "\\(ra");
+       print_otag(h, TAG_I, 1, tag);
+       print_otag(h, TAG_A, 2, tag);
+       return(1);
 }
 
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_bd_pre(MDOC_ARGS)
 {
 static int
 mdoc_bd_pre(MDOC_ARGS)
 {
-       struct htmlpair          tag[2];
-       int                      comp;
-       const struct mdoc_node  *nn;
+       struct htmlpair          tag[2];
+       int                      comp, sv;
+       struct roff_node        *nn;
        struct roffsu            su;
 
        struct roffsu            su;
 
-       if (MDOC_HEAD == n->type)
+       if (n->type == ROFFT_HEAD)
                return(0);
 
                return(0);
 
-       SCALE_VS_INIT(&su, 0);
-
-       assert(n->data.Bd);
-       if (n->data.Bd->offs)
-               a2offs(n->data.Bd->offs, &su);
-
-       comp = n->data.Bd->comp;
-
-       /* FIXME: -centered, etc. formatting. */
-       /* FIXME: does not respect -offset ??? */
-
-       if (MDOC_BLOCK == n->type) {
-               bufcat_su(h, "margin-left", &su);
+       if (n->type == ROFFT_BLOCK) {
+               comp = n->norm->Bd.comp;
                for (nn = n; nn && ! comp; nn = nn->parent) {
                for (nn = n; nn && ! comp; nn = nn->parent) {
-                       if (MDOC_BLOCK != nn->type)
+                       if (nn->type != ROFFT_BLOCK)
                                continue;
                        if (MDOC_Ss == nn->tok || MDOC_Sh == nn->tok)
                                comp = 1;
                        if (nn->prev)
                                break;
                }
                                continue;
                        if (MDOC_Ss == nn->tok || MDOC_Sh == nn->tok)
                                comp = 1;
                        if (nn->prev)
                                break;
                }
-               if (comp) {
-                       PAIR_STYLE_INIT(&tag[0], h);
-                       print_otag(h, TAG_DIV, 1, tag);
-                       return(1);
-               }
-               SCALE_VS_INIT(&su, 1);
-               bufcat_su(h, "margin-top", &su);
-               PAIR_STYLE_INIT(&tag[0], h);
-               print_otag(h, TAG_DIV, 1, tag);
+               if ( ! comp)
+                       print_paragraph(h);
                return(1);
        }
 
                return(1);
        }
 
-       if (DISP_unfilled != n->data.Bd->type && 
-                       DISP_literal != n->data.Bd->type)
+       /* Handle the -offset argument. */
+
+       if (n->norm->Bd.offs == NULL ||
+           ! strcmp(n->norm->Bd.offs, "left"))
+               SCALE_HS_INIT(&su, 0);
+       else if ( ! strcmp(n->norm->Bd.offs, "indent"))
+               SCALE_HS_INIT(&su, INDENT);
+       else if ( ! strcmp(n->norm->Bd.offs, "indent-two"))
+               SCALE_HS_INIT(&su, INDENT * 2);
+       else
+               a2width(n->norm->Bd.offs, &su);
+
+       bufinit(h);
+       bufcat_su(h, "margin-left", &su);
+       PAIR_STYLE_INIT(&tag[0], h);
+
+       if (DISP_unfilled != n->norm->Bd.type &&
+           DISP_literal != n->norm->Bd.type) {
+               PAIR_CLASS_INIT(&tag[1], "display");
+               print_otag(h, TAG_DIV, 2, tag);
                return(1);
                return(1);
+       }
 
 
-       PAIR_CLASS_INIT(&tag[0], "lit");
-       bufcat_style(h, "white-space", "pre");
-       PAIR_STYLE_INIT(&tag[1], h);
-       print_otag(h, TAG_DIV, 2, tag);
+       PAIR_CLASS_INIT(&tag[1], "lit display");
+       print_otag(h, TAG_PRE, 2, tag);
+
+       /* This can be recursive: save & set our literal state. */
+
+       sv = h->flags & HTML_LITERAL;
+       h->flags |= HTML_LITERAL;
 
        for (nn = n->child; nn; nn = nn->next) {
 
        for (nn = n->child; nn; nn = nn->next) {
-               h->flags |= HTML_NOSPACE;
-               print_mdoc_node(m, nn, h);
-               if (NULL == nn->next)
+               print_mdoc_node(meta, nn, h);
+               /*
+                * 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)
-                       print_text(h, "\n");
-               else if (NULL == nn->prev)
+               default:
+                       break;
+               }
+               if (h->flags & HTML_NONEWLINE ||
+                   (nn->next && ! (nn->next->flags & MDOC_LINE)))
+                       continue;
+               else if (nn->next)
                        print_text(h, "\n");
                        print_text(h, "\n");
+
+               h->flags |= HTML_NOSPACE;
        }
 
        }
 
+       if (0 == sv)
+               h->flags &= ~HTML_LITERAL;
+
        return(0);
 }
 
        return(0);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_pa_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "file");
 static int
 mdoc_pa_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "file");
-       print_otag(h, TAG_SPAN, 1, &tag);
+       print_otag(h, TAG_I, 1, &tag);
        return(1);
 }
 
        return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_ad_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "addr");
 static int
 mdoc_ad_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "addr");
-       print_otag(h, TAG_SPAN, 1, &tag);
+       print_otag(h, TAG_I, 1, &tag);
        return(1);
 }
 
        return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_an_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
 static int
 mdoc_an_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
-       /* TODO: -split and -nosplit (see termp_an_pre()). */
+       if (n->norm->An.auth == AUTH_split) {
+               h->flags &= ~HTML_NOSPLIT;
+               h->flags |= HTML_SPLIT;
+               return(0);
+       }
+       if (n->norm->An.auth == AUTH_nosplit) {
+               h->flags &= ~HTML_SPLIT;
+               h->flags |= HTML_NOSPLIT;
+               return(0);
+       }
+
+       if (h->flags & HTML_SPLIT)
+               print_otag(h, TAG_BR, 0, NULL);
+
+       if (n->sec == SEC_AUTHORS && ! (h->flags & HTML_NOSPLIT))
+               h->flags |= HTML_SPLIT;
 
        PAIR_CLASS_INIT(&tag, "author");
        print_otag(h, TAG_SPAN, 1, &tag);
        return(1);
 }
 
 
        PAIR_CLASS_INIT(&tag, "author");
        print_otag(h, TAG_SPAN, 1, &tag);
        return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_cd_pre(MDOC_ARGS)
 {
 static int
 mdoc_cd_pre(MDOC_ARGS)
 {
@@ -1516,12 +1264,10 @@ mdoc_cd_pre(MDOC_ARGS)
 
        synopsis_pre(h, n);
        PAIR_CLASS_INIT(&tag, "config");
 
        synopsis_pre(h, n);
        PAIR_CLASS_INIT(&tag, "config");
-       print_otag(h, TAG_SPAN, 1, &tag);
+       print_otag(h, TAG_B, 1, &tag);
        return(1);
 }
 
        return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_dv_pre(MDOC_ARGS)
 {
 static int
 mdoc_dv_pre(MDOC_ARGS)
 {
@@ -1532,8 +1278,6 @@ mdoc_dv_pre(MDOC_ARGS)
        return(1);
 }
 
        return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_ev_pre(MDOC_ARGS)
 {
 static int
 mdoc_ev_pre(MDOC_ARGS)
 {
@@ -1544,8 +1288,6 @@ mdoc_ev_pre(MDOC_ARGS)
        return(1);
 }
 
        return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_er_pre(MDOC_ARGS)
 {
 static int
 mdoc_er_pre(MDOC_ARGS)
 {
@@ -1556,62 +1298,116 @@ mdoc_er_pre(MDOC_ARGS)
        return(1);
 }
 
        return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_fa_pre(MDOC_ARGS)
 {
 static int
 mdoc_fa_pre(MDOC_ARGS)
 {
-       const struct mdoc_node  *nn;
+       const struct roff_node  *nn;
        struct htmlpair          tag;
        struct tag              *t;
 
        PAIR_CLASS_INIT(&tag, "farg");
        if (n->parent->tok != MDOC_Fo) {
        struct htmlpair          tag;
        struct tag              *t;
 
        PAIR_CLASS_INIT(&tag, "farg");
        if (n->parent->tok != MDOC_Fo) {
-               print_otag(h, TAG_SPAN, 1, &tag);
+               print_otag(h, TAG_I, 1, &tag);
                return(1);
        }
 
        for (nn = n->child; nn; nn = nn->next) {
                return(1);
        }
 
        for (nn = n->child; nn; nn = nn->next) {
-               t = print_otag(h, TAG_SPAN, 1, &tag);
+               t = print_otag(h, TAG_I, 1, &tag);
                print_text(h, nn->string);
                print_tagq(h, t);
                print_text(h, nn->string);
                print_tagq(h, t);
-               if (nn->next)
+               if (nn->next) {
+                       h->flags |= HTML_NOSPACE;
                        print_text(h, ",");
                        print_text(h, ",");
+               }
        }
 
        }
 
-       if (n->child && n->next && n->next->tok == MDOC_Fa)
+       if (n->child && n->next && n->next->tok == MDOC_Fa) {
+               h->flags |= HTML_NOSPACE;
                print_text(h, ",");
                print_text(h, ",");
+       }
 
        return(0);
 }
 
 
        return(0);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_fd_pre(MDOC_ARGS)
 {
 static int
 mdoc_fd_pre(MDOC_ARGS)
 {
-       struct htmlpair  tag;
+       struct htmlpair  tag[2];
+       char             buf[BUFSIZ];
+       size_t           sz;
+       int              i;
+       struct tag      *t;
 
        synopsis_pre(h, n);
 
 
        synopsis_pre(h, n);
 
-       PAIR_CLASS_INIT(&tag, "macro");
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
-}
+       if (NULL == (n = n->child))
+               return(0);
+
+       assert(n->type == ROFFT_TEXT);
+
+       if (strcmp(n->string, "#include")) {
+               PAIR_CLASS_INIT(&tag[0], "macro");
+               print_otag(h, TAG_B, 1, tag);
+               return(1);
+       }
+
+       PAIR_CLASS_INIT(&tag[0], "includes");
+       print_otag(h, TAG_B, 1, tag);
+       print_text(h, n->string);
+
+       if (NULL != (n = n->next)) {
+               assert(n->type == ROFFT_TEXT);
+
+               /*
+                * XXX This is broken and not easy to fix.
+                * When using -Oincludes, truncation may occur.
+                * Dynamic allocation wouldn't help because
+                * passing long strings to buffmt_includes()
+                * does not work either.
+                */
+
+               strlcpy(buf, '<' == *n->string || '"' == *n->string ?
+                   n->string + 1 : n->string, BUFSIZ);
+
+               sz = strlen(buf);
+               if (sz && ('>' == buf[sz - 1] || '"' == buf[sz - 1]))
+                       buf[sz - 1] = '\0';
+
+               PAIR_CLASS_INIT(&tag[0], "link-includes");
+
+               i = 1;
+               if (h->base_includes) {
+                       buffmt_includes(h, buf);
+                       PAIR_HREF_INIT(&tag[i], h->buf);
+                       i++;
+               }
+
+               t = print_otag(h, TAG_A, i, tag);
+               print_text(h, n->string);
+               print_tagq(h, t);
 
 
+               n = n->next;
+       }
+
+       for ( ; n; n = n->next) {
+               assert(n->type == ROFFT_TEXT);
+               print_text(h, n->string);
+       }
+
+       return(0);
+}
 
 
-/* ARGSUSED */
 static int
 mdoc_vt_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;
 
 static int
 mdoc_vt_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;
 
-       if (MDOC_BLOCK == n->type) {
+       if (n->type == ROFFT_BLOCK) {
                synopsis_pre(h, n);
                return(1);
                synopsis_pre(h, n);
                return(1);
-       } else if (MDOC_ELEM == n->type) {
+       } else if (n->type == ROFFT_ELEM) {
                synopsis_pre(h, n);
                synopsis_pre(h, n);
-       } else if (MDOC_HEAD == n->type)
+       } else if (n->type == ROFFT_HEAD)
                return(0);
 
        PAIR_CLASS_INIT(&tag, "type");
                return(0);
 
        PAIR_CLASS_INIT(&tag, "type");
@@ -1619,8 +1415,6 @@ mdoc_vt_pre(MDOC_ARGS)
        return(1);
 }
 
        return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_ft_pre(MDOC_ARGS)
 {
 static int
 mdoc_ft_pre(MDOC_ARGS)
 {
@@ -1628,22 +1422,20 @@ mdoc_ft_pre(MDOC_ARGS)
 
        synopsis_pre(h, n);
        PAIR_CLASS_INIT(&tag, "ftype");
 
        synopsis_pre(h, n);
        PAIR_CLASS_INIT(&tag, "ftype");
-       print_otag(h, TAG_SPAN, 1, &tag);
+       print_otag(h, TAG_I, 1, &tag);
        return(1);
 }
 
        return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_fn_pre(MDOC_ARGS)
 {
 static int
 mdoc_fn_pre(MDOC_ARGS)
 {
-       struct tag              *t;
-       struct htmlpair          tag[2];
-       const struct mdoc_node  *nn;
-       char                     nbuf[BUFSIZ];
-       const char              *sp, *ep;
-       int                      sz, i;
+       struct tag      *t;
+       struct htmlpair  tag[2];
+       char             nbuf[BUFSIZ];
+       const char      *sp, *ep;
+       int              sz, i, pretty;
 
 
+       pretty = MDOC_SYNPRETTY & n->flags;
        synopsis_pre(h, n);
 
        /* Split apart into type and name. */
        synopsis_pre(h, n);
 
        /* Split apart into type and name. */
@@ -1653,8 +1445,8 @@ mdoc_fn_pre(MDOC_ARGS)
        ep = strchr(sp, ' ');
        if (NULL != ep) {
                PAIR_CLASS_INIT(&tag[0], "ftype");
        ep = strchr(sp, ' ');
        if (NULL != ep) {
                PAIR_CLASS_INIT(&tag[0], "ftype");
-               t = print_otag(h, TAG_SPAN, 1, tag);
-       
+               t = print_otag(h, TAG_I, 1, tag);
+
                while (ep) {
                        sz = MIN((int)(ep - sp), BUFSIZ - 1);
                        (void)memcpy(nbuf, sp, (size_t)sz);
                while (ep) {
                        sz = MIN((int)(ep - sp), BUFSIZ - 1);
                        (void)memcpy(nbuf, sp, (size_t)sz);
@@ -1684,72 +1476,101 @@ mdoc_fn_pre(MDOC_ARGS)
        }
 #endif
 
        }
 #endif
 
-       t = print_otag(h, TAG_SPAN, 1, tag);
+       t = print_otag(h, TAG_B, 1, tag);
 
 
-       if (sp) {
-               strlcpy(nbuf, sp, BUFSIZ);
-               print_text(h, nbuf);
-       }
+       if (sp)
+               print_text(h, sp);
 
        print_tagq(h, t);
 
        h->flags |= HTML_NOSPACE;
        print_text(h, "(");
 
        print_tagq(h, t);
 
        h->flags |= HTML_NOSPACE;
        print_text(h, "(");
+       h->flags |= HTML_NOSPACE;
 
 
-       bufinit(h);
        PAIR_CLASS_INIT(&tag[0], "farg");
        PAIR_CLASS_INIT(&tag[0], "farg");
+       bufinit(h);
        bufcat_style(h, "white-space", "nowrap");
        PAIR_STYLE_INIT(&tag[1], h);
 
        bufcat_style(h, "white-space", "nowrap");
        PAIR_STYLE_INIT(&tag[1], h);
 
-       for (nn = n->child->next; nn; nn = nn->next) {
+       for (n = n->child->next; n; n = n->next) {
                i = 1;
                if (MDOC_SYNPRETTY & n->flags)
                        i = 2;
                i = 1;
                if (MDOC_SYNPRETTY & n->flags)
                        i = 2;
-               t = print_otag(h, TAG_SPAN, i, tag);
-               print_text(h, nn->string);
+               t = print_otag(h, TAG_I, i, tag);
+               print_text(h, n->string);
                print_tagq(h, t);
                print_tagq(h, t);
-               if (nn->next)
+               if (n->next) {
+                       h->flags |= HTML_NOSPACE;
                        print_text(h, ",");
                        print_text(h, ",");
+               }
        }
 
        }
 
+       h->flags |= HTML_NOSPACE;
        print_text(h, ")");
        print_text(h, ")");
-       if (MDOC_SYNPRETTY & n->flags)
+
+       if (pretty) {
+               h->flags |= HTML_NOSPACE;
                print_text(h, ";");
                print_text(h, ";");
+       }
+
+       return(0);
+}
+
+static int
+mdoc_sm_pre(MDOC_ARGS)
+{
+
+       if (NULL == n->child)
+               h->flags ^= HTML_NONOSPACE;
+       else if (0 == strcmp("on", n->child->string))
+               h->flags &= ~HTML_NONOSPACE;
+       else
+               h->flags |= HTML_NONOSPACE;
+
+       if ( ! (HTML_NONOSPACE & h->flags))
+               h->flags &= ~HTML_NOSPACE;
+
+       return(0);
+}
+
+static int
+mdoc_skip_pre(MDOC_ARGS)
+{
 
        return(0);
 }
 
 
        return(0);
 }
 
+static int
+mdoc_pp_pre(MDOC_ARGS)
+{
+
+       print_paragraph(h);
+       return(0);
+}
 
 
-/* ARGSUSED */
 static int
 mdoc_sp_pre(MDOC_ARGS)
 {
 static int
 mdoc_sp_pre(MDOC_ARGS)
 {
-       int              len;
-       struct htmlpair  tag;
        struct roffsu    su;
        struct roffsu    su;
+       struct htmlpair  tag;
 
 
-       switch (n->tok) {
-       case (MDOC_sp):
-               /* FIXME: can this have a scaling indicator? */
-               len = n->child ? atoi(n->child->string) : 1;
-               break;
-       case (MDOC_br):
-               len = 0;
-               break;
-       default:
-               assert(n->parent);
-               if ((NULL == n->next || NULL == n->prev) &&
-                               (MDOC_Ss == n->parent->tok ||
-                                MDOC_Sh == n->parent->tok))
-                       return(0);
-               len = 1;
-               break;
-       }
+       SCALE_VS_INIT(&su, 1);
+
+       if (MDOC_sp == n->tok) {
+               if (NULL != (n = n->child)) {
+                       if ( ! a2roffsu(n->string, &su, SCALE_VS))
+                               su.scale = 1.0;
+                       else if (su.scale < 0.0)
+                               su.scale = 0.0;
+               }
+       } else
+               su.scale = 0.0;
 
 
-       SCALE_VS_INIT(&su, len);
+       bufinit(h);
        bufcat_su(h, "height", &su);
        PAIR_STYLE_INIT(&tag, h);
        print_otag(h, TAG_DIV, 1, &tag);
        bufcat_su(h, "height", &su);
        PAIR_STYLE_INIT(&tag, h);
        print_otag(h, TAG_DIV, 1, &tag);
+
        /* So the div isn't empty: */
        print_text(h, "\\~");
 
        /* So the div isn't empty: */
        print_text(h, "\\~");
 
@@ -1757,92 +1578,66 @@ mdoc_sp_pre(MDOC_ARGS)
 
 }
 
 
 }
 
-
-/* ARGSUSED */
-static int
-mdoc_brq_pre(MDOC_ARGS)
-{
-
-       if (MDOC_BODY != n->type)
-               return(1);
-       print_text(h, "\\(lC");
-       h->flags |= HTML_NOSPACE;
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-mdoc_brq_post(MDOC_ARGS)
-{
-
-       if (MDOC_BODY != n->type)
-               return;
-       h->flags |= HTML_NOSPACE;
-       print_text(h, "\\(rC");
-}
-
-
-/* ARGSUSED */
 static int
 mdoc_lk_pre(MDOC_ARGS)
 {
 static int
 mdoc_lk_pre(MDOC_ARGS)
 {
-       const struct mdoc_node  *nn;
-       struct htmlpair          tag[2];
+       struct htmlpair  tag[2];
 
 
-       nn = n->child;
+       if (NULL == (n = n->child))
+               return(0);
+
+       assert(n->type == ROFFT_TEXT);
 
        PAIR_CLASS_INIT(&tag[0], "link-ext");
 
        PAIR_CLASS_INIT(&tag[0], "link-ext");
-       PAIR_HREF_INIT(&tag[1], nn->string);
+       PAIR_HREF_INIT(&tag[1], n->string);
+
        print_otag(h, TAG_A, 2, tag);
 
        print_otag(h, TAG_A, 2, tag);
 
-       if (NULL == nn->next) 
-               return(1);
+       if (NULL == n->next)
+               print_text(h, n->string);
 
 
-       for (nn = nn->next; nn; nn = nn->next) 
-               print_text(h, nn->string);
+       for (n = n->next; n; n = n->next)
+               print_text(h, n->string);
 
        return(0);
 }
 
 
        return(0);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_mt_pre(MDOC_ARGS)
 {
 static int
 mdoc_mt_pre(MDOC_ARGS)
 {
-       struct htmlpair          tag[2];
-       struct tag              *t;
-       const struct mdoc_node  *nn;
+       struct htmlpair  tag[2];
+       struct tag      *t;
 
        PAIR_CLASS_INIT(&tag[0], "link-mail");
 
 
        PAIR_CLASS_INIT(&tag[0], "link-mail");
 
-       for (nn = n->child; nn; nn = nn->next) {
+       for (n = n->child; n; n = n->next) {
+               assert(n->type == ROFFT_TEXT);
+
                bufinit(h);
                bufcat(h, "mailto:");
                bufinit(h);
                bufcat(h, "mailto:");
-               bufcat(h, nn->string);
+               bufcat(h, n->string);
+
                PAIR_HREF_INIT(&tag[1], h->buf);
                t = print_otag(h, TAG_A, 2, tag);
                PAIR_HREF_INIT(&tag[1], h->buf);
                t = print_otag(h, TAG_A, 2, tag);
-               print_text(h, nn->string);
+               print_text(h, n->string);
                print_tagq(h, t);
        }
                print_tagq(h, t);
        }
-       
+
        return(0);
 }
 
        return(0);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_fo_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;
        struct tag      *t;
 
 static int
 mdoc_fo_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;
        struct tag      *t;
 
-       if (MDOC_BODY == n->type) {
+       if (n->type == ROFFT_BODY) {
                h->flags |= HTML_NOSPACE;
                print_text(h, "(");
                h->flags |= HTML_NOSPACE;
                return(1);
                h->flags |= HTML_NOSPACE;
                print_text(h, "(");
                h->flags |= HTML_NOSPACE;
                return(1);
-       } else if (MDOC_BLOCK == n->type) {
+       } else if (n->type == ROFFT_BLOCK) {
                synopsis_pre(h, n);
                return(1);
        }
                synopsis_pre(h, n);
                return(1);
        }
@@ -1853,19 +1648,17 @@ mdoc_fo_pre(MDOC_ARGS)
        assert(n->child->string);
 
        PAIR_CLASS_INIT(&tag, "fname");
        assert(n->child->string);
 
        PAIR_CLASS_INIT(&tag, "fname");
-       t = print_otag(h, TAG_SPAN, 1, &tag);
+       t = print_otag(h, TAG_B, 1, &tag);
        print_text(h, n->child->string);
        print_tagq(h, t);
        return(0);
 }
 
        print_text(h, n->child->string);
        print_tagq(h, t);
        return(0);
 }
 
-
-/* ARGSUSED */
 static void
 mdoc_fo_post(MDOC_ARGS)
 {
 
 static void
 mdoc_fo_post(MDOC_ARGS)
 {
 
-       if (MDOC_BODY != n->type)
+       if (n->type != ROFFT_BODY)
                return;
        h->flags |= HTML_NOSPACE;
        print_text(h, ")");
                return;
        h->flags |= HTML_NOSPACE;
        print_text(h, ")");
@@ -1873,20 +1666,24 @@ mdoc_fo_post(MDOC_ARGS)
        print_text(h, ";");
 }
 
        print_text(h, ";");
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_in_pre(MDOC_ARGS)
 {
 static int
 mdoc_in_pre(MDOC_ARGS)
 {
-       const struct mdoc_node  *nn;
-       struct tag              *t;
-       struct htmlpair          tag[2];
-       int                      i;
+       struct tag      *t;
+       struct htmlpair  tag[2];
+       int              i;
 
        synopsis_pre(h, n);
 
        PAIR_CLASS_INIT(&tag[0], "includes");
 
        synopsis_pre(h, n);
 
        PAIR_CLASS_INIT(&tag[0], "includes");
-       print_otag(h, TAG_SPAN, 1, tag);
+       print_otag(h, TAG_B, 1, tag);
+
+       /*
+        * The first argument of the `In' gets special treatment as
+        * being a linked value.  Subsequent values are printed
+        * afterward.  groff does similarly.  This also handles the case
+        * of no children.
+        */
 
        if (MDOC_SYNPRETTY & n->flags && MDOC_LINE & n->flags)
                print_text(h, "#include");
 
        if (MDOC_SYNPRETTY & n->flags && MDOC_LINE & n->flags)
                print_text(h, "#include");
@@ -1894,158 +1691,147 @@ mdoc_in_pre(MDOC_ARGS)
        print_text(h, "<");
        h->flags |= HTML_NOSPACE;
 
        print_text(h, "<");
        h->flags |= HTML_NOSPACE;
 
-       for (nn = n->child; nn; nn = nn->next) {
+       if (NULL != (n = n->child)) {
+               assert(n->type == ROFFT_TEXT);
+
                PAIR_CLASS_INIT(&tag[0], "link-includes");
                PAIR_CLASS_INIT(&tag[0], "link-includes");
+
                i = 1;
                i = 1;
-               bufinit(h);
                if (h->base_includes) {
                if (h->base_includes) {
-                       buffmt_includes(h, nn->string);
+                       buffmt_includes(h, n->string);
                        PAIR_HREF_INIT(&tag[i], h->buf);
                        i++;
                }
                        PAIR_HREF_INIT(&tag[i], h->buf);
                        i++;
                }
+
                t = print_otag(h, TAG_A, i, tag);
                t = print_otag(h, TAG_A, i, tag);
-               print_mdoc_node(m, nn, h);
+               print_text(h, n->string);
                print_tagq(h, t);
                print_tagq(h, t);
+
+               n = n->next;
        }
 
        h->flags |= HTML_NOSPACE;
        print_text(h, ">");
 
        }
 
        h->flags |= HTML_NOSPACE;
        print_text(h, ">");
 
+       for ( ; n; n = n->next) {
+               assert(n->type == ROFFT_TEXT);
+               print_text(h, n->string);
+       }
+
        return(0);
 }
 
        return(0);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_ic_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "cmd");
 static int
 mdoc_ic_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "cmd");
-       print_otag(h, TAG_SPAN, 1, &tag);
+       print_otag(h, TAG_B, 1, &tag);
        return(1);
 }
 
        return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_rv_pre(MDOC_ARGS)
 {
 static int
 mdoc_rv_pre(MDOC_ARGS)
 {
-       const struct mdoc_node  *nn;
-       struct htmlpair          tag;
-       struct tag              *t;
+       struct htmlpair  tag;
+       struct tag      *t;
+       int              nchild;
 
 
-       print_otag(h, TAG_DIV, 0, NULL);
-       print_text(h, "The");
+       if (n->prev)
+               print_otag(h, TAG_BR, 0, NULL);
 
 
-       for (nn = n->child; nn; nn = nn->next) {
-               PAIR_CLASS_INIT(&tag, "fname");
-               t = print_otag(h, TAG_SPAN, 1, &tag);
-               print_text(h, nn->string);
-               print_tagq(h, t);
+       PAIR_CLASS_INIT(&tag, "fname");
 
 
-               h->flags |= HTML_NOSPACE;
-               if (nn->next && NULL == nn->next->next)
-                       print_text(h, "(), and");
-               else if (nn->next)
-                       print_text(h, "(),");
-               else
+       nchild = n->nchild;
+       if (nchild > 0) {
+               print_text(h, "The");
+
+               for (n = n->child; n; n = n->next) {
+                       t = print_otag(h, TAG_B, 1, &tag);
+                       print_text(h, n->string);
+                       print_tagq(h, t);
+
+                       h->flags |= HTML_NOSPACE;
                        print_text(h, "()");
                        print_text(h, "()");
-       }
 
 
-       if (n->child && n->child->next)
-               print_text(h, "functions return");
-       else
-               print_text(h, "function returns");
+                       if (n->next == NULL)
+                               continue;
+
+                       if (nchild > 2) {
+                               h->flags |= HTML_NOSPACE;
+                               print_text(h, ",");
+                       }
+                       if (n->next->next == NULL)
+                               print_text(h, "and");
+               }
 
 
-               print_text(h, "the value 0 if successful; otherwise the value "
-                       "-1 is returned and the global variable");
+               if (nchild > 1)
+                       print_text(h, "functions return");
+               else
+                       print_text(h, "function returns");
+
+               print_text(h, "the value\\~0 if successful;");
+       } else
+               print_text(h, "Upon successful completion,"
+                    " the value\\~0 is returned;");
+
+       print_text(h, "otherwise the value\\~\\-1 is returned"
+          " and the global variable");
 
        PAIR_CLASS_INIT(&tag, "var");
 
        PAIR_CLASS_INIT(&tag, "var");
-       t = print_otag(h, TAG_SPAN, 1, &tag);
+       t = print_otag(h, TAG_B, 1, &tag);
        print_text(h, "errno");
        print_tagq(h, t);
        print_text(h, "errno");
        print_tagq(h, t);
-               print_text(h, "is set to indicate the error.");
+       print_text(h, "is set to indicate the error.");
        return(0);
 }
 
        return(0);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_va_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "var");
 static int
 mdoc_va_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "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;
+       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)
 {
 static int
 mdoc_ap_pre(MDOC_ARGS)
 {
-       
+
        h->flags |= HTML_NOSPACE;
        print_text(h, "\\(aq");
        h->flags |= HTML_NOSPACE;
        return(1);
 }
 
        h->flags |= HTML_NOSPACE;
        print_text(h, "\\(aq");
        h->flags |= HTML_NOSPACE;
        return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_bf_pre(MDOC_ARGS)
 {
        struct htmlpair  tag[2];
        struct roffsu    su;
 
 static int
 mdoc_bf_pre(MDOC_ARGS)
 {
        struct htmlpair  tag[2];
        struct roffsu    su;
 
-       if (MDOC_HEAD == n->type)
+       if (n->type == ROFFT_HEAD)
                return(0);
                return(0);
-       else if (MDOC_BODY != n->type)
+       else if (n->type != ROFFT_BODY)
                return(1);
 
                return(1);
 
-       assert(n->data.Bf);
-
-       if (FONT_Em == n->data.Bf->font) 
+       if (FONT_Em == n->norm->Bf.font)
                PAIR_CLASS_INIT(&tag[0], "emph");
                PAIR_CLASS_INIT(&tag[0], "emph");
-       else if (FONT_Sy == n->data.Bf->font) 
+       else if (FONT_Sy == n->norm->Bf.font)
                PAIR_CLASS_INIT(&tag[0], "symb");
                PAIR_CLASS_INIT(&tag[0], "symb");
-       else if (FONT_Li == n->data.Bf->font) 
+       else if (FONT_Li == n->norm->Bf.font)
                PAIR_CLASS_INIT(&tag[0], "lit");
        else
                PAIR_CLASS_INIT(&tag[0], "none");
 
                PAIR_CLASS_INIT(&tag[0], "lit");
        else
                PAIR_CLASS_INIT(&tag[0], "none");
 
-       /* 
+       /*
         * We want this to be inline-formatted, but needs to be div to
         * We want this to be inline-formatted, but needs to be div to
-        * accept block children. 
+        * accept block children.
         */
         */
+       bufinit(h);
        bufcat_style(h, "display", "inline");
        SCALE_HS_INIT(&su, 1);
        /* Needs a left-margin for spacing. */
        bufcat_style(h, "display", "inline");
        SCALE_HS_INIT(&su, 1);
        /* Needs a left-margin for spacing. */
@@ -2055,8 +1841,6 @@ mdoc_bf_pre(MDOC_ARGS)
        return(1);
 }
 
        return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_ms_pre(MDOC_ARGS)
 {
 static int
 mdoc_ms_pre(MDOC_ARGS)
 {
@@ -2067,64 +1851,58 @@ mdoc_ms_pre(MDOC_ARGS)
        return(1);
 }
 
        return(1);
 }
 
-
-/* ARGSUSED */
 static int
 static int
-mdoc_pf_pre(MDOC_ARGS)
+mdoc_igndelim_pre(MDOC_ARGS)
 {
 
        h->flags |= HTML_IGNDELIM;
        return(1);
 }
 
 {
 
        h->flags |= HTML_IGNDELIM;
        return(1);
 }
 
-
-/* ARGSUSED */
 static void
 mdoc_pf_post(MDOC_ARGS)
 {
 
 static void
 mdoc_pf_post(MDOC_ARGS)
 {
 
-       h->flags &= ~HTML_IGNDELIM;
-       h->flags |= HTML_NOSPACE;
+       if ( ! (n->next == NULL || n->next->flags & MDOC_LINE))
+               h->flags |= HTML_NOSPACE;
 }
 
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_rs_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;
 static int
 mdoc_rs_pre(MDOC_ARGS)
 {
        struct htmlpair  tag;
-       struct roffsu    su;
 
 
-       if (MDOC_BLOCK != n->type)
+       if (n->type != ROFFT_BLOCK)
                return(1);
 
                return(1);
 
-       if (n->prev && SEC_SEE_ALSO == n->sec) {
-               SCALE_VS_INIT(&su, 1);
-               bufcat_su(h, "margin-top", &su);
-               PAIR_STYLE_INIT(&tag, h);
-               print_otag(h, TAG_DIV, 1, &tag);
-       }
+       if (n->prev && SEC_SEE_ALSO == n->sec)
+               print_paragraph(h);
 
        PAIR_CLASS_INIT(&tag, "ref");
        print_otag(h, TAG_SPAN, 1, &tag);
        return(1);
 }
 
 
        PAIR_CLASS_INIT(&tag, "ref");
        print_otag(h, TAG_SPAN, 1, &tag);
        return(1);
 }
 
+static int
+mdoc_no_pre(MDOC_ARGS)
+{
+       struct htmlpair tag;
 
 
+       PAIR_CLASS_INIT(&tag, "none");
+       print_otag(h, TAG_CODE, 1, &tag);
+       return(1);
+}
 
 
-/* ARGSUSED */
 static int
 mdoc_li_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "lit");
 static int
 mdoc_li_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
        PAIR_CLASS_INIT(&tag, "lit");
-       print_otag(h, TAG_SPAN, 1, &tag);
+       print_otag(h, TAG_CODE, 1, &tag);
        return(1);
 }
 
        return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_sy_pre(MDOC_ARGS)
 {
 static int
 mdoc_sy_pre(MDOC_ARGS)
 {
@@ -2135,8 +1913,6 @@ mdoc_sy_pre(MDOC_ARGS)
        return(1);
 }
 
        return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_bt_pre(MDOC_ARGS)
 {
 static int
 mdoc_bt_pre(MDOC_ARGS)
 {
@@ -2145,8 +1921,6 @@ mdoc_bt_pre(MDOC_ARGS)
        return(0);
 }
 
        return(0);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_ud_pre(MDOC_ARGS)
 {
 static int
 mdoc_ud_pre(MDOC_ARGS)
 {
@@ -2155,68 +1929,74 @@ mdoc_ud_pre(MDOC_ARGS)
        return(0);
 }
 
        return(0);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_lb_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
 static int
 mdoc_lb_pre(MDOC_ARGS)
 {
        struct htmlpair tag;
 
-       if (SEC_LIBRARY == n->sec && MDOC_LINE & n->flags)
-               print_otag(h, TAG_DIV, 0, NULL);
+       if (SEC_LIBRARY == n->sec && MDOC_LINE & n->flags && n->prev)
+               print_otag(h, TAG_BR, 0, NULL);
+
        PAIR_CLASS_INIT(&tag, "lib");
        print_otag(h, TAG_SPAN, 1, &tag);
        return(1);
 }
 
        PAIR_CLASS_INIT(&tag, "lib");
        print_otag(h, TAG_SPAN, 1, &tag);
        return(1);
 }
 
-
-/* ARGSUSED */
 static int
 mdoc__x_pre(MDOC_ARGS)
 {
        struct htmlpair tag[2];
 static int
 mdoc__x_pre(MDOC_ARGS)
 {
        struct htmlpair tag[2];
+       enum htmltag    t;
+
+       t = TAG_SPAN;
 
        switch (n->tok) {
 
        switch (n->tok) {
-       case(MDOC__A):
+       case MDOC__A:
                PAIR_CLASS_INIT(&tag[0], "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;
                break;
-       case(MDOC__B):
+       case MDOC__B:
                PAIR_CLASS_INIT(&tag[0], "ref-book");
                PAIR_CLASS_INIT(&tag[0], "ref-book");
+               t = TAG_I;
                break;
                break;
-       case(MDOC__C):
+       case MDOC__C:
                PAIR_CLASS_INIT(&tag[0], "ref-city");
                break;
                PAIR_CLASS_INIT(&tag[0], "ref-city");
                break;
-       case(MDOC__D):
+       case MDOC__D:
                PAIR_CLASS_INIT(&tag[0], "ref-date");
                break;
                PAIR_CLASS_INIT(&tag[0], "ref-date");
                break;
-       case(MDOC__I):
+       case MDOC__I:
                PAIR_CLASS_INIT(&tag[0], "ref-issue");
                PAIR_CLASS_INIT(&tag[0], "ref-issue");
+               t = TAG_I;
                break;
                break;
-       case(MDOC__J):
+       case MDOC__J:
                PAIR_CLASS_INIT(&tag[0], "ref-jrnl");
                PAIR_CLASS_INIT(&tag[0], "ref-jrnl");
+               t = TAG_I;
                break;
                break;
-       case(MDOC__N):
+       case MDOC__N:
                PAIR_CLASS_INIT(&tag[0], "ref-num");
                break;
                PAIR_CLASS_INIT(&tag[0], "ref-num");
                break;
-       case(MDOC__O):
+       case MDOC__O:
                PAIR_CLASS_INIT(&tag[0], "ref-opt");
                break;
                PAIR_CLASS_INIT(&tag[0], "ref-opt");
                break;
-       case(MDOC__P):
+       case MDOC__P:
                PAIR_CLASS_INIT(&tag[0], "ref-page");
                break;
                PAIR_CLASS_INIT(&tag[0], "ref-page");
                break;
-       case(MDOC__Q):
+       case MDOC__Q:
                PAIR_CLASS_INIT(&tag[0], "ref-corp");
                break;
                PAIR_CLASS_INIT(&tag[0], "ref-corp");
                break;
-       case(MDOC__R):
+       case MDOC__R:
                PAIR_CLASS_INIT(&tag[0], "ref-rep");
                break;
                PAIR_CLASS_INIT(&tag[0], "ref-rep");
                break;
-       case(MDOC__T):
+       case MDOC__T:
                PAIR_CLASS_INIT(&tag[0], "ref-title");
                break;
                PAIR_CLASS_INIT(&tag[0], "ref-title");
                break;
-       case(MDOC__U):
+       case MDOC__U:
                PAIR_CLASS_INIT(&tag[0], "link-ref");
                break;
                PAIR_CLASS_INIT(&tag[0], "link-ref");
                break;
-       case(MDOC__V):
+       case MDOC__V:
                PAIR_CLASS_INIT(&tag[0], "ref-vol");
                break;
        default:
                PAIR_CLASS_INIT(&tag[0], "ref-vol");
                break;
        default:
@@ -2225,40 +2005,46 @@ mdoc__x_pre(MDOC_ARGS)
        }
 
        if (MDOC__U != n->tok) {
        }
 
        if (MDOC__U != n->tok) {
-               print_otag(h, TAG_SPAN, 1, tag);
+               print_otag(h, t, 1, tag);
                return(1);
        }
 
        PAIR_HREF_INIT(&tag[1], n->child->string);
        print_otag(h, TAG_A, 2, tag);
                return(1);
        }
 
        PAIR_HREF_INIT(&tag[1], n->child->string);
        print_otag(h, TAG_A, 2, tag);
+
        return(1);
 }
 
        return(1);
 }
 
-
-/* ARGSUSED */
 static void
 mdoc__x_post(MDOC_ARGS)
 {
 
 static void
 mdoc__x_post(MDOC_ARGS)
 {
 
+       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 */
 
        /* TODO: %U */
 
+       if (NULL == n->parent || MDOC_Rs != n->parent->tok)
+               return;
+
        h->flags |= HTML_NOSPACE;
        print_text(h, n->next ? "," : ".");
 }
 
        h->flags |= HTML_NOSPACE;
        print_text(h, n->next ? "," : ".");
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_bk_pre(MDOC_ARGS)
 {
 
        switch (n->type) {
 static int
 mdoc_bk_pre(MDOC_ARGS)
 {
 
        switch (n->type) {
-       case (MDOC_BLOCK):
+       case ROFFT_BLOCK:
                break;
                break;
-       case (MDOC_HEAD):
+       case ROFFT_HEAD:
                return(0);
                return(0);
-       case (MDOC_BODY):
-               h->flags |= HTML_PREKEEP;
+       case ROFFT_BODY:
+               if (n->parent->args || 0 == n->prev->nchild)
+                       h->flags |= HTML_PREKEEP;
                break;
        default:
                abort();
                break;
        default:
                abort();
@@ -2268,12 +2054,189 @@ mdoc_bk_pre(MDOC_ARGS)
        return(1);
 }
 
        return(1);
 }
 
-
-/* ARGSUSED */
 static void
 mdoc_bk_post(MDOC_ARGS)
 {
 
 static void
 mdoc_bk_post(MDOC_ARGS)
 {
 
-       if (MDOC_BODY == n->type)
+       if (n->type == ROFFT_BODY)
                h->flags &= ~(HTML_KEEP | HTML_PREKEEP);
 }
                h->flags &= ~(HTML_KEEP | HTML_PREKEEP);
 }
+
+static int
+mdoc_quote_pre(MDOC_ARGS)
+{
+       struct htmlpair tag;
+
+       if (n->type != ROFFT_BODY)
+               return(1);
+
+       switch (n->tok) {
+       case MDOC_Ao:
+               /* FALLTHROUGH */
+       case MDOC_Aq:
+               print_text(h, n->nchild == 1 &&
+                   n->child->tok == MDOC_Mt ?  "<" : "\\(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;
+               PAIR_CLASS_INIT(&tag, "opt");
+               print_otag(h, TAG_SPAN, 1, &tag);
+               break;
+       case MDOC_En:
+               if (NULL == n->norm->Es ||
+                   NULL == n->norm->Es->child)
+                       return(1);
+               print_text(h, n->norm->Es->child->string);
+               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:
+               print_text(h, "\\(oq");
+               h->flags |= HTML_NOSPACE;
+               PAIR_CLASS_INIT(&tag, "lit");
+               print_otag(h, TAG_CODE, 1, &tag);
+               break;
+       case MDOC_So:
+               /* FALLTHROUGH */
+       case MDOC_Sq:
+               print_text(h, "\\(oq");
+               break;
+       default:
+               abort();
+               /* NOTREACHED */
+       }
+
+       h->flags |= HTML_NOSPACE;
+       return(1);
+}
+
+static void
+mdoc_quote_post(MDOC_ARGS)
+{
+
+       if (n->type != ROFFT_BODY && n->type != ROFFT_ELEM)
+               return;
+
+       h->flags |= HTML_NOSPACE;
+
+       switch (n->tok) {
+       case MDOC_Ao:
+               /* FALLTHROUGH */
+       case MDOC_Aq:
+               print_text(h, n->nchild == 1 &&
+                   n->child->tok == MDOC_Mt ?  ">" : "\\(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;
+       case MDOC_En:
+               if (n->norm->Es == NULL ||
+                   n->norm->Es->child == NULL ||
+                   n->norm->Es->child->next == NULL)
+                       h->flags &= ~HTML_NOSPACE;
+               else
+                       print_text(h, n->norm->Es->child->next->string);
+               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, "\\(cq");
+               break;
+       default:
+               abort();
+               /* NOTREACHED */
+       }
+}
+
+static int
+mdoc_eo_pre(MDOC_ARGS)
+{
+
+       if (n->type != ROFFT_BODY)
+               return(1);
+
+       if (n->end == ENDBODY_NOT &&
+           n->parent->head->child == NULL &&
+           n->child != NULL &&
+           n->child->end != ENDBODY_NOT)
+               print_text(h, "\\&");
+       else if (n->end != ENDBODY_NOT ? n->child != NULL :
+           n->parent->head->child != NULL && (n->child != NULL ||
+           (n->parent->tail != NULL && n->parent->tail->child != NULL)))
+               h->flags |= HTML_NOSPACE;
+       return(1);
+}
+
+static void
+mdoc_eo_post(MDOC_ARGS)
+{
+       int      body, tail;
+
+       if (n->type != ROFFT_BODY)
+               return;
+
+       if (n->end != ENDBODY_NOT) {
+               h->flags &= ~HTML_NOSPACE;
+               return;
+       }
+
+       body = n->child != NULL || n->parent->head->child != NULL;
+       tail = n->parent->tail != NULL && n->parent->tail->child != NULL;
+
+       if (body && tail)
+               h->flags |= HTML_NOSPACE;
+       else if ( ! tail)
+               h->flags &= ~HTML_NOSPACE;
+}
A git conversion mirror of mandoc.bsd.lv