]> 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
In HTML output, allow switching the desired font for subsequent
[mandoc.git] / mdoc_html.c
diff --git a/mdoc_html.c b/mdoc_html.c
index e4d4739238b6ac92c32c38faddc20ad78ce764e1..87bf42a72ba0a1d150c439323afadfcc315503aa 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,78 +1,80 @@
-/*     $Id: mdoc_html.c,v 1.2 2009/09/21 23:12:08 kristaps Exp $ */
+/*     $Id: mdoc_html.c,v 1.328 2019/03/01 10:57:18 schwarze Exp $ */
 /*
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2014-2019 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * 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.
  */
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/types.h>
-#include <sys/queue.h>
 
 #include <assert.h>
 #include <ctype.h>
 
 #include <assert.h>
 #include <ctype.h>
-#include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-#include "html.h"
+#include "mandoc_aux.h"
+#include "mandoc.h"
+#include "roff.h"
 #include "mdoc.h"
 #include "mdoc.h"
+#include "out.h"
+#include "html.h"
+#include "main.h"
 
 
-#define        INDENT           5
-#define        HALFINDENT       3
-
-#define        MDOC_ARGS         const struct mdoc_meta *m, \
-                         const struct mdoc_node *n, \
-                         struct html *h
-#define        MAN_ARGS          const struct man_meta *m, \
-                         const struct man_node *n, \
+#define        MDOC_ARGS         const struct roff_meta *meta, \
+                         struct roff_node *n, \
                          struct html *h
 
                          struct html *h
 
-struct htmlmdoc {
+#ifndef MIN
+#define        MIN(a,b)        ((/*CONSTCOND*/(a)<(b))?(a):(b))
+#endif
+
+struct mdoc_html_act {
        int             (*pre)(MDOC_ARGS);
        void            (*post)(MDOC_ARGS);
 };
 
        int             (*pre)(MDOC_ARGS);
        void            (*post)(MDOC_ARGS);
 };
 
-static void              print_mdoc(MDOC_ARGS);
-static void              print_mdoc_head(MDOC_ARGS);
+static char             *cond_id(const struct roff_node *);
+static void              print_mdoc_head(const struct roff_meta *,
+                               struct html *);
 static void              print_mdoc_node(MDOC_ARGS);
 static void              print_mdoc_nodelist(MDOC_ARGS);
 static void              print_mdoc_node(MDOC_ARGS);
 static void              print_mdoc_nodelist(MDOC_ARGS);
+static void              synopsis_pre(struct html *,
+                               const struct roff_node *);
 
 
-static int               a2width(const char *);
-static int               a2offs(const char *);
-static int               a2list(const struct mdoc_node *);
-
-static void              mdoc_root_post(MDOC_ARGS);
-static int               mdoc_root_pre(MDOC_ARGS);
-static int               mdoc_tbl_pre(MDOC_ARGS, int);
-static int               mdoc_tbl_block_pre(MDOC_ARGS, int, int, int, int);
-static int               mdoc_tbl_body_pre(MDOC_ARGS, int, int);
-static int               mdoc_tbl_head_pre(MDOC_ARGS, int, int);
+static void              mdoc_root_post(const struct roff_meta *,
+                               struct html *);
+static int               mdoc_root_pre(const struct roff_meta *,
+                               struct html *);
 
 
+static void              mdoc__x_post(MDOC_ARGS);
+static int               mdoc__x_pre(MDOC_ARGS);
+static int               mdoc_abort_pre(MDOC_ARGS);
 static int               mdoc_ad_pre(MDOC_ARGS);
 static int               mdoc_an_pre(MDOC_ARGS);
 static int               mdoc_ad_pre(MDOC_ARGS);
 static int               mdoc_an_pre(MDOC_ARGS);
-static void              mdoc_aq_post(MDOC_ARGS);
-static int               mdoc_aq_pre(MDOC_ARGS);
+static int               mdoc_ap_pre(MDOC_ARGS);
 static int               mdoc_ar_pre(MDOC_ARGS);
 static int               mdoc_bd_pre(MDOC_ARGS);
 static int               mdoc_ar_pre(MDOC_ARGS);
 static int               mdoc_bd_pre(MDOC_ARGS);
-static void              mdoc_bl_post(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_bl_pre(MDOC_ARGS);
 static int               mdoc_bl_pre(MDOC_ARGS);
-static void              mdoc_brq_post(MDOC_ARGS);
-static int               mdoc_brq_pre(MDOC_ARGS);
 static int               mdoc_cd_pre(MDOC_ARGS);
 static int               mdoc_cd_pre(MDOC_ARGS);
+static int               mdoc_cm_pre(MDOC_ARGS);
 static int               mdoc_d1_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);
@@ -80,1623 +82,1760 @@ 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 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_it_pre(MDOC_ARGS);
 static int               mdoc_it_pre(MDOC_ARGS);
+static int               mdoc_lb_pre(MDOC_ARGS);
+static int               mdoc_li_pre(MDOC_ARGS);
 static int               mdoc_lk_pre(MDOC_ARGS);
 static int               mdoc_mt_pre(MDOC_ARGS);
 static int               mdoc_lk_pre(MDOC_ARGS);
 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_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 int               mdoc_pa_pre(MDOC_ARGS);
-static void              mdoc_pq_post(MDOC_ARGS);
-static int               mdoc_pq_pre(MDOC_ARGS);
-static void              mdoc_qq_post(MDOC_ARGS);
-static int               mdoc_qq_pre(MDOC_ARGS);
+static void              mdoc_pf_post(MDOC_ARGS);
+static int               mdoc_pp_pre(MDOC_ARGS);
+static void              mdoc_quote_post(MDOC_ARGS);
+static int               mdoc_quote_pre(MDOC_ARGS);
+static int               mdoc_rs_pre(MDOC_ARGS);
 static int               mdoc_sh_pre(MDOC_ARGS);
 static int               mdoc_sh_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_skip_pre(MDOC_ARGS);
+static int               mdoc_sm_pre(MDOC_ARGS);
 static int               mdoc_ss_pre(MDOC_ARGS);
 static int               mdoc_ss_pre(MDOC_ARGS);
+static int               mdoc_st_pre(MDOC_ARGS);
 static int               mdoc_sx_pre(MDOC_ARGS);
 static int               mdoc_sx_pre(MDOC_ARGS);
+static int               mdoc_sy_pre(MDOC_ARGS);
+static int               mdoc_va_pre(MDOC_ARGS);
 static int               mdoc_vt_pre(MDOC_ARGS);
 static int               mdoc_xr_pre(MDOC_ARGS);
 static int               mdoc_xx_pre(MDOC_ARGS);
 
 static int               mdoc_vt_pre(MDOC_ARGS);
 static int               mdoc_xr_pre(MDOC_ARGS);
 static int               mdoc_xx_pre(MDOC_ARGS);
 
-#ifdef __linux__
-extern size_t            strlcpy(char *, const char *, size_t);
-extern size_t            strlcat(char *, const char *, size_t);
-#endif
-
-static const struct htmlmdoc mdocs[MDOC_MAX] = {
-       {NULL, NULL}, /* Ap */
+static const struct mdoc_html_act mdoc_html_acts[MDOC_MAX - MDOC_Dd] = {
        {NULL, NULL}, /* Dd */
        {NULL, NULL}, /* Dt */
        {NULL, NULL}, /* Os */
        {mdoc_sh_pre, NULL }, /* Sh */
        {NULL, NULL}, /* Dd */
        {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_an_pre, NULL}, /* An */
+       {mdoc_ap_pre, NULL}, /* Ap */
        {mdoc_ar_pre, NULL}, /* Ar */
        {mdoc_cd_pre, NULL}, /* Cd */
        {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_cm_pre, NULL}, /* Cm */
+       {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 */ 
-       {NULL, NULL}, /* Ic */ 
-       {NULL, NULL}, /* In */ 
-       {NULL, NULL}, /* Li */
-       {mdoc_nd_pre, NULL}, /* Nd */ 
-       {mdoc_nm_pre, NULL}, /* Nm */ 
-       {mdoc_op_pre, mdoc_op_post}, /* Op */
-       {NULL, NULL}, /* Ot */
+       {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_nd_pre, NULL}, /* Nd */
+       {mdoc_nm_pre, NULL}, /* Nm */
+       {mdoc_quote_pre, mdoc_quote_post}, /* Op */
+       {mdoc_abort_pre, NULL}, /* Ot */
        {mdoc_pa_pre, NULL}, /* Pa */
        {mdoc_pa_pre, NULL}, /* Pa */
-       {NULL, NULL}, /* Rv */
-       {NULL, NULL}, /* St */ 
-       {NULL, NULL}, /* Va */
-       {mdoc_vt_pre, NULL}, /* Vt */ 
+       {mdoc_ex_pre, NULL}, /* Rv */
+       {mdoc_st_pre, NULL}, /* St */
+       {mdoc_va_pre, NULL}, /* Va */
+       {mdoc_vt_pre, NULL}, /* Vt */
        {mdoc_xr_pre, NULL}, /* Xr */
        {mdoc_xr_pre, NULL}, /* Xr */
-       {NULL, NULL}, /* %A */
-       {NULL, NULL}, /* %B */
-       {NULL, NULL}, /* %D */
-       {NULL, NULL}, /* %I */
-       {NULL, NULL}, /* %J */
-       {NULL, NULL}, /* %N */
-       {NULL, NULL}, /* %O */
-       {NULL, NULL}, /* %P */
-       {NULL, NULL}, /* %R */
-       {NULL, NULL}, /* %T */
-       {NULL, NULL}, /* %V */
+       {mdoc__x_pre, mdoc__x_post}, /* %A */
+       {mdoc__x_pre, mdoc__x_post}, /* %B */
+       {mdoc__x_pre, mdoc__x_post}, /* %D */
+       {mdoc__x_pre, mdoc__x_post}, /* %I */
+       {mdoc__x_pre, mdoc__x_post}, /* %J */
+       {mdoc__x_pre, mdoc__x_post}, /* %N */
+       {mdoc__x_pre, mdoc__x_post}, /* %O */
+       {mdoc__x_pre, mdoc__x_post}, /* %P */
+       {mdoc__x_pre, mdoc__x_post}, /* %R */
+       {mdoc__x_pre, mdoc__x_post}, /* %T */
+       {mdoc__x_pre, mdoc__x_post}, /* %V */
        {NULL, NULL}, /* Ac */
        {NULL, NULL}, /* Ac */
-       {mdoc_aq_pre, mdoc_aq_post}, /* Ao */
-       {mdoc_aq_pre, mdoc_aq_post}, /* Aq */
-       {NULL, NULL}, /* At */
+       {mdoc_quote_pre, mdoc_quote_post}, /* Ao */
+       {mdoc_quote_pre, mdoc_quote_post}, /* Aq */
+       {mdoc_xx_pre, NULL}, /* At */
        {NULL, NULL}, /* Bc */
        {NULL, NULL}, /* Bc */
-       {NULL, NULL}, /* Bf */ 
-       {NULL, NULL}, /* Bo */
-       {NULL, NULL}, /* 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_xx_pre, NULL}, /* Bsx */
-       {NULL, NULL}, /* Bx */
-       {NULL, NULL}, /* Db */
+       {mdoc_xx_pre, NULL}, /* Bx */
+       {mdoc_skip_pre, NULL}, /* Db */
        {NULL, NULL}, /* Dc */
        {NULL, NULL}, /* Dc */
-       {NULL, NULL}, /* Do */
-       {mdoc_dq_pre, mdoc_dq_post}, /* Dq */
-       {NULL, NULL}, /* Ec */
+       {mdoc_quote_pre, mdoc_quote_post}, /* Do */
+       {mdoc_quote_pre, mdoc_quote_post}, /* Dq */
+       {NULL, NULL}, /* Ec */ /* FIXME: no space */
        {NULL, NULL}, /* Ef */
        {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 */
-       {NULL, NULL}, /* Ms */
-       {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 */
-       {NULL, NULL}, /* 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 */
-       {NULL, NULL}, /* Ql */
-       {mdoc_qq_pre, mdoc_qq_post}, /* Qo */
-       {mdoc_qq_pre, mdoc_qq_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 */
        {NULL, NULL}, /* Re */
-       {NULL, NULL}, /* Rs */
+       {mdoc_rs_pre, NULL}, /* Rs */
        {NULL, NULL}, /* Sc */
        {NULL, NULL}, /* Sc */
-       {mdoc_sq_pre, mdoc_sq_post}, /* So */
-       {mdoc_sq_pre, mdoc_sq_post}, /* Sq */
-       {NULL, NULL}, /* Sm */
+       {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_sx_pre, NULL}, /* Sx */
-       {NULL, NULL}, /* Sy */
+       {mdoc_sy_pre, NULL}, /* Sy */
        {NULL, NULL}, /* Tn */
        {mdoc_xx_pre, NULL}, /* Ux */
        {NULL, NULL}, /* Xc */
        {NULL, NULL}, /* Xo */
        {NULL, NULL}, /* Tn */
        {mdoc_xx_pre, NULL}, /* Ux */
        {NULL, NULL}, /* Xc */
        {NULL, NULL}, /* Xo */
-       {NULL, NULL}, /* Fo */ 
-       {NULL, NULL}, /* Fc */ 
-       {NULL, NULL}, /* Oo */
+       {mdoc_fo_pre, mdoc_fo_post}, /* Fo */
+       {NULL, NULL}, /* Fc */
+       {mdoc_quote_pre, mdoc_quote_post}, /* Oo */
        {NULL, NULL}, /* Oc */
        {NULL, NULL}, /* Oc */
-       {NULL, NULL}, /* Bk */
+       {mdoc_bk_pre, mdoc_bk_post}, /* Bk */
        {NULL, NULL}, /* Ek */
        {NULL, NULL}, /* Bt */
        {NULL, NULL}, /* Hf */
        {NULL, NULL}, /* Ek */
        {NULL, NULL}, /* Bt */
        {NULL, NULL}, /* Hf */
-       {NULL, NULL}, /* Fr */
+       {mdoc_em_pre, NULL}, /* Fr */
        {NULL, NULL}, /* Ud */
        {NULL, NULL}, /* Ud */
-       {NULL, 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 */ 
-       {NULL, NULL}, /* %C */ 
-       {NULL, NULL}, /* Es */  /* TODO */
-       {NULL, NULL}, /* En */  /* TODO */
-       {mdoc_xx_pre, NULL}, /* Dx */ 
-       {NULL, NULL}, /* %Q */ 
-       {mdoc_sp_pre, NULL}, /* br */
-       {mdoc_sp_pre, NULL}, /* sp */ 
+       {mdoc_lb_pre, NULL}, /* Lb */
+       {mdoc_abort_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__x_pre, mdoc__x_post}, /* %U */
+       {NULL, NULL}, /* Ta */
 };
 
 };
 
-static char              buf[BUFSIZ]; /* XXX */
-
-#define        bufcat(x)         (void)strlcat(buf, (x), BUFSIZ) 
-#define        bufinit()         buf[0] = 0
-#define        buffmt(...)       (void)snprintf(buf, BUFSIZ - 1, __VA_ARGS__)
-
-void
-html_mdoc(void *arg, const struct mdoc *m)
-{
-       struct html     *h;
-       struct tag      *t;
-
-       h = (struct html *)arg;
-
-       print_gen_doctype(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 int
-a2list(const struct mdoc_node *n)
-{
-       int              i;
-
-       assert(MDOC_BLOCK == n->type && MDOC_Bl == n->tok);
-       assert(n->args);
-
-       for (i = 0; i < (int)n->args->argc; i++) 
-               switch (n->args->argv[i].arg) {
-               case (MDOC_Enum):
-                       /* FALLTHROUGH */
-               case (MDOC_Dash):
-                       /* FALLTHROUGH */
-               case (MDOC_Hyphen):
-                       /* FALLTHROUGH */
-               case (MDOC_Bullet):
-                       /* FALLTHROUGH */
-               case (MDOC_Tag):
-                       /* FALLTHROUGH */
-               case (MDOC_Hang):
-                       /* FALLTHROUGH */
-               case (MDOC_Inset):
-                       /* FALLTHROUGH */
-               case (MDOC_Diag):
-                       /* FALLTHROUGH */
-               case (MDOC_Item):
-                       /* FALLTHROUGH */
-               case (MDOC_Column):
-                       /* FALLTHROUGH */
-               case (MDOC_Ohang):
-                       return(n->args->argv[i].arg);
-               default:
-                       break;
-               }
-
-       abort();
-       /* NOTREACHED */
-}
-
-
-static int
-a2width(const char *p)
-{
-       int              i, len;
-
-       if (0 == (len = (int)strlen(p)))
-               return(0);
-       for (i = 0; i < len - 1; i++) 
-               if ( ! isdigit((u_char)p[i]))
-                       break;
-
-       if (i == len - 1) 
-               if ('n' == p[len - 1] || 'm' == p[len - 1])
-                       return(atoi(p) + 2);
-
-       return(len + 2);
-}
-
 
 
-static int
-a2offs(const char *p)
+/*
+ * See the same function in mdoc_term.c for documentation.
+ */
+static void
+synopsis_pre(struct html *h, const struct roff_node *n)
 {
 {
-       int              len, i;
 
 
-       if (0 == strcmp(p, "left"))
-               return(0);
-       if (0 == strcmp(p, "indent"))
-               return(INDENT + 1);
-       if (0 == strcmp(p, "indent-two"))
-               return((INDENT + 1) * 2);
+       if (NULL == n->prev || ! (NODE_SYNPRETTY & n->flags))
+               return;
 
 
-       if (0 == (len = (int)strlen(p)))
-               return(0);
+       if (n->prev->tok == n->tok &&
+           MDOC_Fo != n->tok &&
+           MDOC_Ft != n->tok &&
+           MDOC_Fn != n->tok) {
+               print_otag(h, TAG_BR, "");
+               return;
+       }
 
 
-       for (i = 0; i < len - 1; i++) 
-               if ( ! isdigit((u_char)p[i]))
+       switch (n->prev->tok) {
+       case MDOC_Fd:
+       case MDOC_Fn:
+       case MDOC_Fo:
+       case MDOC_In:
+       case MDOC_Vt:
+               break;
+       case MDOC_Ft:
+               if (n->tok != MDOC_Fn && n->tok != MDOC_Fo)
                        break;
                        break;
-
-       if (i == len - 1) 
-               if ('n' == p[len - 1] || 'm' == p[len - 1])
-                       return(atoi(p));
-
-       return(len);
+               /* FALLTHROUGH */
+       default:
+               print_otag(h, TAG_BR, "");
+               return;
+       }
+       html_close_paragraph(h);
+       print_otag(h, TAG_P, "c", "Pp");
 }
 
 }
 
-
-static void
-print_mdoc(MDOC_ARGS)
+void
+html_mdoc(void *arg, const struct roff_meta *mdoc)
 {
 {
-       struct tag      *t;
-       struct htmlpair  tag;
-
-       t = print_otag(h, TAG_HEAD, 0, NULL);
-       print_mdoc_head(m, n, h);
-       print_tagq(h, t);
-
-       t = print_otag(h, TAG_BODY, 0, NULL);
+       struct html             *h;
+       struct roff_node        *n;
+       struct tag              *t;
 
 
-       tag.key = ATTR_CLASS;
-       tag.val = "body";
-       print_otag(h, TAG_DIV, 1, &tag);
+       h = (struct html *)arg;
+       n = mdoc->first->child;
+
+       if ((h->oflags & HTML_FRAGMENT) == 0) {
+               print_gen_decls(h);
+               print_otag(h, TAG_HTML, "");
+               if (n != NULL && n->type == ROFFT_COMMENT)
+                       print_gen_comment(h, n);
+               t = print_otag(h, TAG_HEAD, "");
+               print_mdoc_head(mdoc, h);
+               print_tagq(h, t);
+               print_otag(h, TAG_BODY, "");
+       }
 
 
-       print_mdoc_nodelist(m, n, h);
+       mdoc_root_pre(mdoc, h);
+       t = print_otag(h, TAG_DIV, "c", "manual-text");
+       print_mdoc_nodelist(mdoc, n, h);
        print_tagq(h, t);
        print_tagq(h, t);
+       mdoc_root_post(mdoc, h);
+       print_tagq(h, NULL);
 }
 
 }
 
-
-/* ARGSUSED */
 static void
 static void
-print_mdoc_head(MDOC_ARGS)
+print_mdoc_head(const struct roff_meta *meta, struct html *h)
 {
 {
-       char            b[BUFSIZ];
+       char    *cp;
 
        print_gen_head(h);
 
 
        print_gen_head(h);
 
-       (void)snprintf(b, BUFSIZ - 1, 
-                       "%s(%d)", m->title, m->msec);
-
-       if (m->arch) {
-               (void)strlcat(b, " (", BUFSIZ);
-               (void)strlcat(b, m->arch, BUFSIZ);
-               (void)strlcat(b, ")", BUFSIZ);
-       }
+       if (meta->arch != NULL && meta->msec != NULL)
+               mandoc_asprintf(&cp, "%s(%s) (%s)", meta->title,
+                   meta->msec, meta->arch);
+       else if (meta->msec != NULL)
+               mandoc_asprintf(&cp, "%s(%s)", meta->title, meta->msec);
+       else if (meta->arch != NULL)
+               mandoc_asprintf(&cp, "%s (%s)", meta->title, meta->arch);
+       else
+               cp = mandoc_strdup(meta->title);
 
 
-       print_otag(h, TAG_TITLE, 0, NULL);
-       print_text(h, b);
+       print_otag(h, TAG_TITLE, "");
+       print_text(h, cp);
+       free(cp);
 }
 
 }
 
-
 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)
 {
-       int              child;
        struct tag      *t;
        struct tag      *t;
+       int              child;
 
 
-       child = 1;
-       t = SLIST_FIRST(&h->tags);
+       if (n->type == ROFFT_COMMENT || n->flags & NODE_NOPRT)
+               return;
 
 
-       bufinit();
+       html_fillmode(h, n->flags & NODE_NOFILL ? ROFF_nf : ROFF_fi);
 
 
+       child = 1;
+       n->flags &= ~NODE_ENDED;
        switch (n->type) {
        switch (n->type) {
-       case (MDOC_ROOT):
-               child = mdoc_root_pre(m, n, h);
-               break;
-       case (MDOC_TEXT):
+       case ROFFT_TEXT:
+               t = h->tag;
+               t->refcnt++;
+
+               /* 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 == ' ' && n->flags & NODE_LINE &&
+                   (h->flags & HTML_NONEWLINE) == 0 &&
+                   (n->flags & NODE_NOFILL) == 0)
+                       print_otag(h, TAG_BR, "");
+               if (NODE_DELIMC & n->flags)
+                       h->flags |= HTML_NOSPACE;
                print_text(h, n->string);
                print_text(h, n->string);
+               if (NODE_DELIMO & n->flags)
+                       h->flags |= HTML_NOSPACE;
                break;
                break;
+       case ROFFT_EQN:
+               t = h->tag;
+               t->refcnt++;
+               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:
        default:
-               if (mdocs[n->tok].pre)
-                       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);
+               assert(h->tblt == NULL);
+               t = h->tag;
+               t->refcnt++;
+               if (n->tok < ROFF_MAX) {
+                       roff_html_pre(h, n);
+                       t->refcnt--;
+                       print_stagq(h, t);
+                       return;
+               }
+               assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX);
+               if (mdoc_html_acts[n->tok - MDOC_Dd].pre != NULL &&
+                   (n->end == ENDBODY_NOT || n->child != NULL))
+                       child = (*mdoc_html_acts[n->tok - MDOC_Dd].pre)(meta,
+                           n, h);
                break;
        }
 
                break;
        }
 
-       if (child && n->child)
-               print_mdoc_nodelist(m, n->child, h);
+       if (h->flags & HTML_KEEP && n->flags & NODE_LINE) {
+               h->flags &= ~HTML_KEEP;
+               h->flags |= HTML_PREKEEP;
+       }
+
+       if (child && n->child != NULL)
+               print_mdoc_nodelist(meta, n->child, h);
 
 
+       t->refcnt--;
        print_stagq(h, t);
 
        print_stagq(h, t);
 
-       bufinit();
-
        switch (n->type) {
        switch (n->type) {
-       case (MDOC_ROOT):
-               mdoc_root_post(m, n, h);
-               break;
-       case (MDOC_TEXT):
+       case ROFFT_TEXT:
+       case ROFFT_EQN:
                break;
        default:
                break;
        default:
-               if (mdocs[n->tok].post)
-                       (*mdocs[n->tok].post)(m, n, h);
+               if (mdoc_html_acts[n->tok - MDOC_Dd].post == NULL ||
+                   n->flags & NODE_ENDED)
+                       break;
+               (*mdoc_html_acts[n->tok - MDOC_Dd].post)(meta, n, h);
+               if (n->end != ENDBODY_NOT)
+                       n->body->flags |= NODE_ENDED;
                break;
        }
                break;
        }
-}
 
 
+       if (n->flags & NODE_NOFILL &&
+           (n->next == NULL || n->next->flags & NODE_LINE)) {
+               h->col++;
+               print_endline(h);
+       }
+}
 
 
-/* ARGSUSED */
 static void
 static void
-mdoc_root_post(MDOC_ARGS)
+mdoc_root_post(const struct roff_meta *meta, struct html *h)
 {
 {
-       struct tm        tm;
-       struct htmlpair  tag[2];
        struct tag      *t, *tt;
        struct tag      *t, *tt;
-       char             b[BUFSIZ];
-
-       (void)localtime_r(&m->date, &tm);
 
 
-       if (0 == strftime(b, BUFSIZ - 1, "%B %e, %Y", &tm))
-               err(EXIT_FAILURE, "strftime");
+       t = print_otag(h, TAG_TABLE, "c", "foot");
+       tt = print_otag(h, TAG_TR, "");
 
 
-       tag[0].key = ATTR_CLASS;
-       tag[0].val = "footer";
-       tag[1].key = ATTR_STYLE;
-       tag[1].val = "width: 100%;";
-       t = print_otag(h, TAG_TABLE, 2, tag);
-       tt = print_otag(h, TAG_TR, 0, NULL);
-
-       tag[0].key = ATTR_STYLE;
-       tag[0].val = "width: 50%;";
-       print_otag(h, TAG_TD, 1, tag);
-       print_text(h, b);
+       print_otag(h, TAG_TD, "c", "foot-date");
+       print_text(h, meta->date);
        print_stagq(h, tt);
 
        print_stagq(h, tt);
 
-       tag[0].key = ATTR_STYLE;
-       tag[0].val = "width: 50%; text-align: right;";
-       print_otag(h, TAG_TD, 1, tag);
-       print_text(h, m->os);
+       print_otag(h, TAG_TD, "c", "foot-os");
+       print_text(h, meta->os);
        print_tagq(h, t);
 }
 
        print_tagq(h, t);
 }
 
-
-/* ARGSUSED */
 static int
 static int
-mdoc_root_pre(MDOC_ARGS)
+mdoc_root_pre(const struct roff_meta *meta, struct html *h)
 {
 {
-       struct htmlpair  tag[2];
        struct tag      *t, *tt;
        struct tag      *t, *tt;
-       char             b[BUFSIZ], title[BUFSIZ];
+       char            *volume, *title;
 
 
-       (void)strlcpy(b, m->vol, BUFSIZ);
-
-       if (m->arch) {
-               (void)strlcat(b, " (", BUFSIZ);
-               (void)strlcat(b, m->arch, BUFSIZ);
-               (void)strlcat(b, ")", BUFSIZ);
-       }
+       if (NULL == meta->arch)
+               volume = mandoc_strdup(meta->vol);
+       else
+               mandoc_asprintf(&volume, "%s (%s)",
+                   meta->vol, meta->arch);
 
 
-       (void)snprintf(title, BUFSIZ - 1, 
-                       "%s(%d)", m->title, m->msec);
+       if (NULL == meta->msec)
+               title = mandoc_strdup(meta->title);
+       else
+               mandoc_asprintf(&title, "%s(%s)",
+                   meta->title, meta->msec);
 
 
-       tag[0].key = ATTR_CLASS;
-       tag[0].val = "header";
-       tag[1].key = ATTR_STYLE;
-       tag[1].val = "width: 100%;";
-       t = print_otag(h, TAG_TABLE, 2, tag);
-       tt = print_otag(h, TAG_TR, 0, NULL);
+       t = print_otag(h, TAG_TABLE, "c", "head");
+       tt = print_otag(h, TAG_TR, "");
 
 
-       tag[0].key = ATTR_STYLE;
-       tag[0].val = "width: 33%;";
-       print_otag(h, TAG_TD, 1, tag);
+       print_otag(h, TAG_TD, "c", "head-ltitle");
        print_text(h, title);
        print_stagq(h, tt);
 
        print_text(h, title);
        print_stagq(h, tt);
 
-       tag[0].key = ATTR_STYLE;
-       tag[0].val = "width: 33%; text-align: center;";
-       print_otag(h, TAG_TD, 1, tag);
-       print_text(h, b);
+       print_otag(h, TAG_TD, "c", "head-vol");
+       print_text(h, volume);
        print_stagq(h, tt);
 
        print_stagq(h, tt);
 
-       tag[0].key = ATTR_STYLE;
-       tag[0].val = "width: 33%; text-align: right;";
-       print_otag(h, TAG_TD, 1, tag);
+       print_otag(h, TAG_TD, "c", "head-rtitle");
        print_text(h, title);
        print_tagq(h, t);
 
        print_text(h, title);
        print_tagq(h, t);
 
-       return(1);
+       free(title);
+       free(volume);
+       return 1;
 }
 
 }
 
+static char *
+cond_id(const struct roff_node *n)
+{
+       if (n->child != NULL &&
+           n->child->type == ROFFT_TEXT &&
+           (n->prev == NULL ||
+            (n->prev->type == ROFFT_TEXT &&
+             strcmp(n->prev->string, "|") == 0)) &&
+           (n->parent->tok == MDOC_It ||
+            (n->parent->tok == MDOC_Xo &&
+             n->parent->parent->prev == NULL &&
+             n->parent->parent->parent->tok == MDOC_It)))
+               return html_make_id(n, 1);
+       return NULL;
+}
 
 
-/* ARGSUSED */
 static int
 mdoc_sh_pre(MDOC_ARGS)
 {
 static int
 mdoc_sh_pre(MDOC_ARGS)
 {
-       struct htmlpair          tag[2];
-       const struct mdoc_node  *nn;
+       struct roff_node        *sn, *subn;
+       struct tag              *t, *tsec, *tsub;
+       char                    *id;
+       int                      sc;
 
 
-       if (MDOC_HEAD == n->type) {
-               tag[0].key = ATTR_CLASS;
-               tag[0].val = "sec-head";
-               print_otag(h, TAG_DIV, 1, tag);
-               print_otag(h, TAG_SPAN, 1, tag);
-
-               for (nn = n->child; nn; nn = nn->next) {
-                       bufcat(nn->string);
-                       if (nn->next)
-                               bufcat(" ");
+       switch (n->type) {
+       case ROFFT_BLOCK:
+               html_close_paragraph(h);
+               if ((h->oflags & HTML_TOC) == 0 ||
+                   h->flags & HTML_TOCDONE ||
+                   n->sec <= SEC_SYNOPSIS) {
+                       print_otag(h, TAG_SECTION, "c", "Sh");
+                       break;
                }
                }
-               tag[0].key = ATTR_NAME;
-               tag[0].val = buf;
-               print_otag(h, TAG_A, 1, tag);
-               return(1);
-       } else if (MDOC_BLOCK == n->type) {
-               tag[0].key = ATTR_CLASS;
-               tag[0].val = "sec-block";
-
-               if (n->prev && NULL == n->prev->body->child) {
-                       print_otag(h, TAG_DIV, 1, tag);
-                       return(1);
+               h->flags |= HTML_TOCDONE;
+               sc = 0;
+               for (sn = n->next; sn != NULL; sn = sn->next)
+                       if (sn->sec == SEC_CUSTOM)
+                               if (++sc == 2)
+                                       break;
+               if (sc < 2)
+                       break;
+               t = print_otag(h, TAG_H1, "c", "Sh");
+               print_text(h, "TABLE OF CONTENTS");
+               print_tagq(h, t);
+               t = print_otag(h, TAG_UL, "c", "Bl-compact");
+               for (sn = n; sn != NULL; sn = sn->next) {
+                       tsec = print_otag(h, TAG_LI, "");
+                       id = html_make_id(sn->head, 0);
+                       tsub = print_otag(h, TAG_A, "hR", id);
+                       free(id);
+                       print_mdoc_nodelist(meta, sn->head->child, h);
+                       print_tagq(h, tsub);
+                       tsub = NULL;
+                       for (subn = sn->body->child; subn != NULL;
+                           subn = subn->next) {
+                               if (subn->tok != MDOC_Ss)
+                                       continue;
+                               id = html_make_id(subn->head, 0);
+                               if (id == NULL)
+                                       continue;
+                               if (tsub == NULL)
+                                       print_otag(h, TAG_UL,
+                                           "c", "Bl-compact");
+                               tsub = print_otag(h, TAG_LI, "");
+                               print_otag(h, TAG_A, "hR", id);
+                               free(id);
+                               print_mdoc_nodelist(meta,
+                                   subn->head->child, h);
+                               print_tagq(h, tsub);
+                       }
+                       print_tagq(h, tsec);
                }
                }
-
-               bufcat("margin-top: 1em;");
-               if (NULL == n->next)
-                       bufcat("margin-bottom: 1em;");
-
-               tag[1].key = ATTR_STYLE;
-               tag[1].val = buf;
-
-               print_otag(h, TAG_DIV, 2, tag);
-               return(1);
+               print_tagq(h, t);
+               print_otag(h, TAG_SECTION, "c", "Sh");
+               break;
+       case ROFFT_HEAD:
+               id = html_make_id(n, 1);
+               print_otag(h, TAG_H1, "ci", "Sh", id);
+               if (id != NULL)
+                       print_otag(h, TAG_A, "chR", "permalink", id);
+               break;
+       case ROFFT_BODY:
+               if (n->sec == SEC_AUTHORS)
+                       h->flags &= ~(HTML_SPLIT|HTML_NOSPLIT);
+               break;
+       default:
+               break;
        }
        }
-
-       buffmt("margin-left: %dem;", INDENT);
-       
-       tag[0].key = ATTR_CLASS;
-       tag[0].val = "sec-body";
-       tag[1].key = ATTR_STYLE;
-       tag[1].val = buf;
-
-       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[2];
-       int                      i;
-       const struct mdoc_node  *nn;
-
-       i = 0;
-
-       if (MDOC_BODY == n->type) {
-               tag[i].key = ATTR_CLASS;
-               tag[i++].val = "ssec-body";
-               if (n->parent->next && n->child) {
-                       bufcat("margin-bottom: 1em;");
-                       tag[i].key = ATTR_STYLE;
-                       tag[i++].val = buf;
-               }
-               print_otag(h, TAG_DIV, i, tag);
-               return(1);
-       } else if (MDOC_BLOCK == n->type) {
-               tag[i].key = ATTR_CLASS;
-               tag[i++].val = "ssec-block";
-               if (n->prev) {
-                       bufcat("margin-top: 1em;");
-                       tag[i].key = ATTR_STYLE;
-                       tag[i++].val = buf;
-               }
-               print_otag(h, TAG_DIV, i, tag);
-               return(1);
-       }
+       char    *id;
 
 
-       buffmt("margin-left: -%dem;", INDENT - HALFINDENT);
-
-       tag[0].key = ATTR_CLASS;
-       tag[0].val = "ssec-head";
-       tag[1].key = ATTR_STYLE;
-       tag[1].val = buf;
-
-       print_otag(h, TAG_DIV, 2, tag);
-       print_otag(h, TAG_SPAN, 1, tag);
-
-       bufinit();
-       for (nn = n->child; nn; nn = nn->next) {
-               bufcat(nn->string);
-               if (nn->next)
-                       bufcat(" ");
+       switch (n->type) {
+       case ROFFT_BLOCK:
+               html_close_paragraph(h);
+               print_otag(h, TAG_SECTION, "c", "Ss");
+               return 1;
+       case ROFFT_HEAD:
+               break;
+       case ROFFT_BODY:
+               return 1;
+       default:
+               abort();
        }
        }
-       tag[0].key = ATTR_NAME;
-       tag[0].val = buf;
-       print_otag(h, TAG_A, 1, tag);
 
 
-       return(1);
+       id = html_make_id(n, 1);
+       print_otag(h, TAG_H2, "ci", "Ss", id);
+       if (id != NULL)
+               print_otag(h, TAG_A, "chR", "permalink", id);
+       return 1;
 }
 
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_fl_pre(MDOC_ARGS)
 {
 static int
 mdoc_fl_pre(MDOC_ARGS)
 {
-       struct htmlpair  tag;
+       char    *id;
 
 
-       tag.key = ATTR_CLASS;
-       tag.val = "flag";
+       if ((id = cond_id(n)) != NULL)
+               print_otag(h, TAG_A, "chR", "permalink", id);
+       print_otag(h, TAG_CODE, "ci", "Fl", id);
 
 
-       print_otag(h, TAG_SPAN, 1, &tag);
-       if (MDOC_Fl == n->tok) {
-               print_text(h, "\\-");
+       print_text(h, "\\-");
+       if (!(n->child == NULL &&
+           (n->next == NULL ||
+            n->next->type == ROFFT_TEXT ||
+            n->next->flags & NODE_LINE)))
                h->flags |= HTML_NOSPACE;
                h->flags |= HTML_NOSPACE;
-       }
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-mdoc_nd_pre(MDOC_ARGS)
-{
-       struct htmlpair  tag;
 
 
-       if (MDOC_BODY != n->type)
-               return(1);
-
-       /* XXX - this can contain block elements! */
-       print_text(h, "\\(em");
-       tag.key = ATTR_CLASS;
-       tag.val = "desc-body";
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
+       return 1;
 }
 
 }
 
-
-/* ARGSUSED */
 static int
 static int
-mdoc_op_pre(MDOC_ARGS)
+mdoc_cm_pre(MDOC_ARGS)
 {
 {
-       struct htmlpair  tag;
-
-       if (MDOC_BODY != n->type)
-               return(1);
+       char    *id;
 
 
-       /* XXX - this can contain block elements! */
-       print_text(h, "\\(lB");
-       h->flags |= HTML_NOSPACE;
-       tag.key = ATTR_CLASS;
-       tag.val = "opt";
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
+       if ((id = cond_id(n)) != NULL)
+               print_otag(h, TAG_A, "chR", "permalink", id);
+       print_otag(h, TAG_CODE, "ci", "Cm", id);
+       return 1;
 }
 
 }
 
-
-/* ARGSUSED */
-static void
-mdoc_op_post(MDOC_ARGS)
+static int
+mdoc_nd_pre(MDOC_ARGS)
 {
 {
-
-       if (MDOC_BODY != n->type) 
-               return;
-       h->flags |= HTML_NOSPACE;
-       print_text(h, "\\(rB");
+       switch (n->type) {
+       case ROFFT_BLOCK:
+               html_close_paragraph(h);
+               return 1;
+       case ROFFT_HEAD:
+               return 0;
+       case ROFFT_BODY:
+               break;
+       default:
+               abort();
+       }
+       print_text(h, "\\(em");
+       /* Cannot use TAG_SPAN because it may contain blocks. */
+       print_otag(h, TAG_DIV, "c", "Nd");
+       return 1;
 }
 
 }
 
-
 static int
 mdoc_nm_pre(MDOC_ARGS)
 {
 static int
 mdoc_nm_pre(MDOC_ARGS)
 {
-       struct htmlpair tag;
-
-       if ( ! (HTML_NEWLINE & h->flags))
-               if (SEC_SYNOPSIS == n->sec) {
-                       tag.key = ATTR_STYLE;
-                       tag.val = "clear: both;";
-                       print_otag(h, TAG_BR, 1, &tag);
-               }
-
-       tag.key = ATTR_CLASS;
-       tag.val = "name";
-
-       print_otag(h, TAG_SPAN, 1, &tag);
-       if (NULL == n->child)
-               print_text(h, m->name);
-
-       return(1);
+       switch (n->type) {
+       case ROFFT_BLOCK:
+               break;
+       case ROFFT_HEAD:
+               print_otag(h, TAG_TD, "");
+               /* FALLTHROUGH */
+       case ROFFT_ELEM:
+               print_otag(h, TAG_CODE, "c", "Nm");
+               return 1;
+       case ROFFT_BODY:
+               print_otag(h, TAG_TD, "");
+               return 1;
+       default:
+               abort();
+       }
+       html_close_paragraph(h);
+       synopsis_pre(h, n);
+       print_otag(h, TAG_TABLE, "c", "Nm");
+       print_otag(h, TAG_TR, "");
+       return 1;
 }
 
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_xr_pre(MDOC_ARGS)
 {
 static int
 mdoc_xr_pre(MDOC_ARGS)
 {
-       struct htmlpair          tag[2];
-       const char              *name, *sec;
-       const struct mdoc_node  *nn;
-
-       nn = n->child;
-       name = nn && nn->string ? nn->string : "";
-       nn = nn ? nn->next : NULL;
-       sec = nn && nn->string ? nn->string : "";
+       if (NULL == n->child)
+               return 0;
 
 
-       buffmt("%s%s%s.html", name, name && sec ? "." : "", sec);
+       if (h->base_man1)
+               print_otag(h, TAG_A, "chM", "Xr",
+                   n->child->string, n->child->next == NULL ?
+                   NULL : n->child->next->string);
+       else
+               print_otag(h, TAG_A, "c", "Xr");
 
 
-       tag[0].key = ATTR_CLASS;
-       tag[0].val = "link-man";
-       tag[1].key = ATTR_HREF;
-       tag[1].val = buf;
-       print_otag(h, TAG_A, 2, tag);
+       n = n->child;
+       print_text(h, n->string);
 
 
-       nn = n->child;
-       print_text(h, nn->string);
-       if (NULL == (nn = nn->next))
-               return(0);
+       if (NULL == (n = n->next))
+               return 0;
 
        h->flags |= HTML_NOSPACE;
        print_text(h, "(");
        h->flags |= HTML_NOSPACE;
 
        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, ")");
        h->flags |= HTML_NOSPACE;
        print_text(h, ")");
-
-       return(0);
+       return 0;
 }
 
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_ns_pre(MDOC_ARGS)
 {
 
 static int
 mdoc_ns_pre(MDOC_ARGS)
 {
 
-       h->flags |= HTML_NOSPACE;
-       return(1);
+       if ( ! (NODE_LINE & n->flags))
+               h->flags |= HTML_NOSPACE;
+       return 1;
 }
 
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_ar_pre(MDOC_ARGS)
 {
 static int
 mdoc_ar_pre(MDOC_ARGS)
 {
-       struct htmlpair tag;
-
-       tag.key = ATTR_CLASS;
-       tag.val = "arg";
-
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
+       print_otag(h, TAG_VAR, "c", "Ar");
+       return 1;
 }
 
 }
 
-
-/* ARGSUSED */
 static int
 mdoc_xx_pre(MDOC_ARGS)
 {
 static int
 mdoc_xx_pre(MDOC_ARGS)
 {
-       const char      *pp;
-       struct htmlpair  tag;
+       print_otag(h, TAG_SPAN, "c", "Ux");
+       return 1;
+}
 
 
-       switch (n->tok) {
-       case (MDOC_Bsx):
-               pp = "BSDI BSD/OS";
-               break;
-       case (MDOC_Dx):
-               pp = "DragonFlyBSD";
-               break;
-       case (MDOC_Fx):
-               pp = "FreeBSD";
-               break;
-       case (MDOC_Nx):
-               pp = "NetBSD";
+static int
+mdoc_it_pre(MDOC_ARGS)
+{
+       const struct roff_node  *bl;
+       enum mdoc_list           type;
+
+       bl = n->parent;
+       while (bl->tok != MDOC_Bl)
+               bl = bl->parent;
+       type = bl->norm->Bl.type;
+
+       switch (type) {
+       case LIST_bullet:
+       case LIST_dash:
+       case LIST_hyphen:
+       case LIST_item:
+       case LIST_enum:
+               switch (n->type) {
+               case ROFFT_HEAD:
+                       return 0;
+               case ROFFT_BODY:
+                       print_otag(h, TAG_LI, "");
+                       break;
+               default:
+                       break;
+               }
                break;
                break;
-       case (MDOC_Ox):
-               pp = "OpenBSD";
+       case LIST_diag:
+       case LIST_hang:
+       case LIST_inset:
+       case LIST_ohang:
+               switch (n->type) {
+               case ROFFT_HEAD:
+                       print_otag(h, TAG_DT, "");
+                       break;
+               case ROFFT_BODY:
+                       print_otag(h, TAG_DD, "");
+                       break;
+               default:
+                       break;
+               }
                break;
                break;
-       case (MDOC_Ux):
-               pp = "UNIX";
+       case LIST_tag:
+               switch (n->type) {
+               case ROFFT_HEAD:
+                       print_otag(h, TAG_DT, "");
+                       break;
+               case ROFFT_BODY:
+                       if (n->child == NULL) {
+                               print_otag(h, TAG_DD, "s", "width", "auto");
+                               print_text(h, "\\ ");
+                       } else
+                               print_otag(h, TAG_DD, "");
+                       break;
+               default:
+                       break;
+               }
                break;
                break;
+       case LIST_column:
+               switch (n->type) {
+               case ROFFT_HEAD:
+                       break;
+               case ROFFT_BODY:
+                       print_otag(h, TAG_TD, "");
+                       break;
+               default:
+                       print_otag(h, TAG_TR, "");
+               }
        default:
        default:
-               return(1);
+               break;
        }
 
        }
 
-       tag.key = ATTR_CLASS;
-       tag.val = "unix";
-
-       print_otag(h, TAG_SPAN, 1, &tag);
-       print_text(h, pp);
-       return(1);
+       return 1;
 }
 
 }
 
-
-/* ARGSUSED */
 static int
 static int
-mdoc_tbl_block_pre(MDOC_ARGS, int t, int w, int o, int c)
+mdoc_bl_pre(MDOC_ARGS)
 {
 {
-       struct htmlpair  tag;
+       char             cattr[32];
+       struct mdoc_bl  *bl;
+       enum htmltag     elemtype;
 
 
-       switch (t) {
-       case (MDOC_Column):
-               /* FALLTHROUGH */
-       case (MDOC_Item):
-               /* FALLTHROUGH */
-       case (MDOC_Ohang):
-               buffmt("margin-left: %dem; clear: both;", o);
+       switch (n->type) {
+       case ROFFT_BLOCK:
+               html_close_paragraph(h);
                break;
                break;
+       case ROFFT_HEAD:
+               return 0;
+       case ROFFT_BODY:
+               return 1;
        default:
        default:
-               buffmt("margin-left: %dem; clear: both;", w + o);
-               break;
+               abort();
        }
 
        }
 
-       if ( ! c && MDOC_Column != t) {
-              if (n->prev && n->prev->body->child)
-                      bufcat("padding-top: 1em;");
-              else if (NULL == n->prev)
-                      bufcat("padding-top: 1em;");
+       bl = &n->norm->Bl;
+       switch (bl->type) {
+       case LIST_bullet:
+               elemtype = TAG_UL;
+               (void)strlcpy(cattr, "Bl-bullet", sizeof(cattr));
+               break;
+       case LIST_dash:
+       case LIST_hyphen:
+               elemtype = TAG_UL;
+               (void)strlcpy(cattr, "Bl-dash", sizeof(cattr));
+               break;
+       case LIST_item:
+               elemtype = TAG_UL;
+               (void)strlcpy(cattr, "Bl-item", sizeof(cattr));
+               break;
+       case LIST_enum:
+               elemtype = TAG_OL;
+               (void)strlcpy(cattr, "Bl-enum", sizeof(cattr));
+               break;
+       case LIST_diag:
+               elemtype = TAG_DL;
+               (void)strlcpy(cattr, "Bl-diag", sizeof(cattr));
+               break;
+       case LIST_hang:
+               elemtype = TAG_DL;
+               (void)strlcpy(cattr, "Bl-hang", sizeof(cattr));
+               break;
+       case LIST_inset:
+               elemtype = TAG_DL;
+               (void)strlcpy(cattr, "Bl-inset", sizeof(cattr));
+               break;
+       case LIST_ohang:
+               elemtype = TAG_DL;
+               (void)strlcpy(cattr, "Bl-ohang", sizeof(cattr));
+               break;
+       case LIST_tag:
+               if (bl->offs)
+                       print_otag(h, TAG_DIV, "c", "Bd-indent");
+               print_otag(h, TAG_DL, "c", bl->comp ?
+                   "Bl-tag Bl-compact" : "Bl-tag");
+               return 1;
+       case LIST_column:
+               elemtype = TAG_TABLE;
+               (void)strlcpy(cattr, "Bl-column", sizeof(cattr));
+               break;
+       default:
+               abort();
        }
        }
-
-       tag.key = ATTR_STYLE;
-       tag.val = buf;
-       print_otag(h, TAG_DIV, 1, &tag);
-       return(1);
+       if (bl->offs != NULL)
+               (void)strlcat(cattr, " Bd-indent", sizeof(cattr));
+       if (bl->comp)
+               (void)strlcat(cattr, " Bl-compact", sizeof(cattr));
+       print_otag(h, elemtype, "c", cattr);
+       return 1;
 }
 
 }
 
-
-/* ARGSUSED */
 static int
 static int
-mdoc_tbl_body_pre(MDOC_ARGS, int t, int w)
+mdoc_ex_pre(MDOC_ARGS)
 {
 {
-
-       print_otag(h, TAG_DIV, 0, NULL);
-       return(1);
+       if (n->prev)
+               print_otag(h, TAG_BR, "");
+       return 1;
 }
 
 }
 
-
-/* ARGSUSED */
 static int
 static int
-mdoc_tbl_head_pre(MDOC_ARGS, int t, int w)
+mdoc_st_pre(MDOC_ARGS)
 {
 {
-       struct htmlpair  tag;
-       struct ord      *ord;
-       char             nbuf[BUFSIZ];
+       print_otag(h, TAG_SPAN, "c", "St");
+       return 1;
+}
 
 
-       switch (t) {
-       case (MDOC_Item):
-               /* FALLTHROUGH */
-       case (MDOC_Ohang):
-               print_otag(h, TAG_DIV, 0, NULL);
-               break;
-       case (MDOC_Column):
-               buffmt("min-width: %dem;", w);
-               bufcat("clear: none;");
-               if (n->next && MDOC_HEAD == n->next->type)
-                       bufcat("float: left;");
-               tag.key = ATTR_STYLE;
-               tag.val = buf;
-               print_otag(h, TAG_DIV, 1, &tag);
-               break;
-       default:
-               buffmt("margin-left: -%dem;", w);
-               bufcat("clear: left;");
-               if (n->next && n->next->child)
-                       bufcat("float: left;");
-               bufcat("padding-right: 1em;");
-               tag.key = ATTR_STYLE;
-               tag.val = buf;
-               print_otag(h, TAG_DIV, 1, &tag);
-               break;
-       }
+static int
+mdoc_em_pre(MDOC_ARGS)
+{
+       print_otag(h, TAG_I, "c", "Em");
+       return 1;
+}
 
 
-       switch (t) {
-       case (MDOC_Diag):
-               tag.key = ATTR_CLASS;
-               tag.val = "diag";
-               print_otag(h, TAG_SPAN, 1, &tag);
+static int
+mdoc_d1_pre(MDOC_ARGS)
+{
+       switch (n->type) {
+       case ROFFT_BLOCK:
+               html_close_paragraph(h);
                break;
                break;
-       case (MDOC_Enum):
-               ord = SLIST_FIRST(&h->ords);
-               assert(ord);
-               nbuf[BUFSIZ - 1] = 0;
-               (void)snprintf(nbuf, BUFSIZ - 1, "%d.", ord->pos++);
-               print_text(h, nbuf);
-               return(0);
-       case (MDOC_Dash):
-               print_text(h, "\\(en");
-               return(0);
-       case (MDOC_Hyphen):
-               print_text(h, "\\-");
-               return(0);
-       case (MDOC_Bullet):
-               print_text(h, "\\(bu");
-               return(0);
+       case ROFFT_HEAD:
+               return 0;
+       case ROFFT_BODY:
+               return 1;
        default:
        default:
-               break;
+               abort();
        }
        }
-
-       return(1);
+       print_otag(h, TAG_DIV, "c", "Bd Bd-indent");
+       if (n->tok == MDOC_Dl)
+               print_otag(h, TAG_CODE, "c", "Li");
+       return 1;
 }
 
 }
 
-
 static int
 static int
-mdoc_tbl_pre(MDOC_ARGS, int type)
+mdoc_sx_pre(MDOC_ARGS)
 {
 {
-       int                      i, w, o, c, wp;
-       const struct mdoc_node  *bl, *nn;
+       char    *id;
 
 
-       bl = n->parent->parent;
-       if (MDOC_BLOCK != n->type) 
-               bl = bl->parent;
-
-       /* FIXME: fmt_vspace() equivalent. */
-
-       assert(bl->args);
-
-       w = o = c = 0;
-       wp = -1;
-
-       for (i = 0; i < (int)bl->args->argc; i++) 
-               if (MDOC_Width == bl->args->argv[i].arg) {
-                       assert(bl->args->argv[i].sz);
-                       wp = i;
-                       w = a2width(bl->args->argv[i].value[0]);
-               } else if (MDOC_Offset == bl->args->argv[i].arg) {
-                       assert(bl->args->argv[i].sz);
-                       o = a2offs(bl->args->argv[i].value[0]);
-               } else if (MDOC_Compact == bl->args->argv[i].arg) 
-                       c = 1;
-       
-       if (MDOC_HEAD == n->type && MDOC_Column == type) {
-               nn = n->parent->child;
-               assert(nn && MDOC_HEAD == nn->type);
-               for (i = 0; nn && nn != n; nn = nn->next, i++)
-                       /* Counter... */ ;
-               assert(nn);
-               if (wp >= 0 && i < (int)bl->args[wp].argv->sz)
-                       w = a2width(bl->args->argv[wp].value[i]);
-       }
+       id = html_make_id(n, 0);
+       print_otag(h, TAG_A, "chR", "Sx", id);
+       free(id);
+       return 1;
+}
 
 
-       switch (type) {
-       case (MDOC_Enum):
-               /* FALLTHROUGH */
-       case (MDOC_Dash):
-               /* FALLTHROUGH */
-       case (MDOC_Hyphen):
-               /* FALLTHROUGH */
-       case (MDOC_Bullet):
-               if (w < 4)
-                       w = 4;
-               break;
-       case (MDOC_Inset):
-               /* FALLTHROUGH */
-       case (MDOC_Diag):
-               w = 1;
-               break;
-       default:
-               if (0 == w)
-                       w = 10;
-               break;
-       }
+static int
+mdoc_bd_pre(MDOC_ARGS)
+{
+       char                     buf[16];
+       struct roff_node        *nn;
+       int                      comp;
 
        switch (n->type) {
 
        switch (n->type) {
-       case (MDOC_BLOCK):
+       case ROFFT_BLOCK:
+               html_close_paragraph(h);
+               return 1;
+       case ROFFT_HEAD:
+               return 0;
+       case ROFFT_BODY:
                break;
                break;
-       case (MDOC_HEAD):
-               return(mdoc_tbl_head_pre(m, n, h, type, w));
-       case (MDOC_BODY):
-               return(mdoc_tbl_body_pre(m, n, h, type, w));
        default:
                abort();
        default:
                abort();
-               /* NOTREACHED */
        }
 
        }
 
-       return(mdoc_tbl_block_pre(m, n, h, type, w, o, c));
-}
+       /* Handle preceding whitespace. */
 
 
+       comp = n->norm->Bd.comp;
+       for (nn = n; nn != NULL && comp == 0; nn = nn->parent) {
+               if (nn->type != ROFFT_BLOCK)
+                       continue;
+               if (nn->tok == MDOC_Sh || nn->tok == MDOC_Ss)
+                       comp = 1;
+               if (nn->prev != NULL)
+                       break;
+       }
+       (void)strlcpy(buf, "Bd", sizeof(buf));
+       if (comp == 0)
+               (void)strlcat(buf, " Pp", sizeof(buf));
 
 
-/* ARGSUSED */
-static int
-mdoc_bl_pre(MDOC_ARGS)
-{
-       struct ord      *ord;
+       /* Handle the -offset argument. */
 
 
-       if (MDOC_BLOCK != n->type)
-               return(1);
-       if (MDOC_Enum != a2list(n))
-               return(1);
+       if (n->norm->Bd.offs != NULL &&
+           strcmp(n->norm->Bd.offs, "left") != 0)
+               (void)strlcat(buf, " Bd-indent", sizeof(buf));
 
 
-       ord = malloc(sizeof(struct ord));
-       if (NULL == ord)
-               err(EXIT_FAILURE, "malloc");
-       ord->cookie = n;
-       ord->pos = 1;
-       SLIST_INSERT_HEAD(&h->ords, ord, entry);
+       print_otag(h, TAG_DIV, "c", buf);
+       return 1;
+}
 
 
-       return(1);
+static int
+mdoc_pa_pre(MDOC_ARGS)
+{
+       print_otag(h, TAG_SPAN, "c", "Pa");
+       return 1;
 }
 
 }
 
+static int
+mdoc_ad_pre(MDOC_ARGS)
+{
+       print_otag(h, TAG_SPAN, "c", "Ad");
+       return 1;
+}
 
 
-/* ARGSUSED */
-static void
-mdoc_bl_post(MDOC_ARGS)
+static int
+mdoc_an_pre(MDOC_ARGS)
 {
 {
-       struct ord      *ord;
+       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 (MDOC_BLOCK != n->type)
-               return;
-       if (MDOC_Enum != a2list(n))
-               return;
+       if (h->flags & HTML_SPLIT)
+               print_otag(h, TAG_BR, "");
+
+       if (n->sec == SEC_AUTHORS && ! (h->flags & HTML_NOSPLIT))
+               h->flags |= HTML_SPLIT;
 
 
-       ord = SLIST_FIRST(&h->ords);
-       assert(ord);
-       SLIST_REMOVE_HEAD(&h->ords, entry);
-       free(ord);
+       print_otag(h, TAG_SPAN, "c", "An");
+       return 1;
 }
 
 }
 
+static int
+mdoc_cd_pre(MDOC_ARGS)
+{
+       synopsis_pre(h, n);
+       print_otag(h, TAG_CODE, "c", "Cd");
+       return 1;
+}
 
 static int
 
 static int
-mdoc_it_pre(MDOC_ARGS)
+mdoc_dv_pre(MDOC_ARGS)
 {
 {
-       int              type;
+       char    *id;
 
 
-       if (MDOC_BLOCK == n->type)
-               type = a2list(n->parent->parent);
-       else
-               type = a2list(n->parent->parent->parent);
+       if ((id = cond_id(n)) != NULL)
+               print_otag(h, TAG_A, "chR", "permalink", id);
+       print_otag(h, TAG_CODE, "ci", "Dv", id);
+       return 1;
+}
 
 
-       return(mdoc_tbl_pre(m, n, h, type));
+static int
+mdoc_ev_pre(MDOC_ARGS)
+{
+       char    *id;
+
+       if ((id = cond_id(n)) != NULL)
+               print_otag(h, TAG_A, "chR", "permalink", id);
+       print_otag(h, TAG_CODE, "ci", "Ev", id);
+       return 1;
 }
 
 }
 
+static int
+mdoc_er_pre(MDOC_ARGS)
+{
+       char    *id;
+
+       id = n->sec == SEC_ERRORS &&
+           (n->parent->tok == MDOC_It ||
+            (n->parent->tok == MDOC_Bq &&
+             n->parent->parent->parent->tok == MDOC_It)) ?
+           html_make_id(n, 1) : NULL;
+
+       if (id != NULL)
+               print_otag(h, TAG_A, "chR", "permalink", id);
+       print_otag(h, TAG_CODE, "ci", "Er", id);
+       return 1;
+}
 
 
-/* ARGSUSED */
 static int
 static int
-mdoc_ex_pre(MDOC_ARGS)
+mdoc_fa_pre(MDOC_ARGS)
 {
 {
-       const struct mdoc_node  *nn;
+       const struct roff_node  *nn;
        struct tag              *t;
        struct tag              *t;
-       struct htmlpair          tag;
 
 
-       print_text(h, "The");
-
-       tag.key = ATTR_CLASS;
-       tag.val = "utility";
+       if (n->parent->tok != MDOC_Fo) {
+               print_otag(h, TAG_VAR, "c", "Fa");
+               return 1;
+       }
 
        for (nn = n->child; nn; nn = nn->next) {
 
        for (nn = n->child; nn; nn = nn->next) {
-               t = print_otag(h, TAG_SPAN, 1, &tag);
+               t = print_otag(h, TAG_VAR, "c", "Fa");
                print_text(h, nn->string);
                print_tagq(h, t);
                print_text(h, nn->string);
                print_tagq(h, t);
-
-               h->flags |= HTML_NOSPACE;
-
-               if (nn->next && NULL == nn->next->next)
-                       print_text(h, ", and");
-               else if (nn->next)
+               if (nn->next) {
+                       h->flags |= HTML_NOSPACE;
                        print_text(h, ",");
                        print_text(h, ",");
-               else
-                       h->flags &= ~HTML_NOSPACE;
+               }
        }
 
        }
 
-       if (n->child->next)
-               print_text(h, "utilities exit");
-       else
-               print_text(h, "utility exits");
+       if (n->child && n->next && n->next->tok == MDOC_Fa) {
+               h->flags |= HTML_NOSPACE;
+               print_text(h, ",");
+       }
 
 
-               print_text(h, "0 on success, and >0 if an error occurs.");
-       return(0);
+       return 0;
 }
 
 }
 
-
-/* ARGSUSED */
 static int
 static int
-mdoc_dq_pre(MDOC_ARGS)
+mdoc_fd_pre(MDOC_ARGS)
 {
 {
+       struct tag      *t;
+       char            *buf, *cp;
 
 
-       if (MDOC_BODY != n->type)
-               return(1);
-       print_text(h, "\\(lq");
-       h->flags |= HTML_NOSPACE;
-       return(1);
-}
+       synopsis_pre(h, n);
 
 
+       if (NULL == (n = n->child))
+               return 0;
 
 
-/* ARGSUSED */
-static void
-mdoc_dq_post(MDOC_ARGS)
-{
+       assert(n->type == ROFFT_TEXT);
 
 
-       if (MDOC_BODY != n->type)
-               return;
-       h->flags |= HTML_NOSPACE;
-       print_text(h, "\\(rq");
-}
+       if (strcmp(n->string, "#include")) {
+               print_otag(h, TAG_CODE, "c", "Fd");
+               return 1;
+       }
 
 
+       print_otag(h, TAG_CODE, "c", "In");
+       print_text(h, n->string);
+
+       if (NULL != (n = n->next)) {
+               assert(n->type == ROFFT_TEXT);
+
+               if (h->base_includes) {
+                       cp = n->string;
+                       if (*cp == '<' || *cp == '"')
+                               cp++;
+                       buf = mandoc_strdup(cp);
+                       cp = strchr(buf, '\0') - 1;
+                       if (cp >= buf && (*cp == '>' || *cp == '"'))
+                               *cp = '\0';
+                       t = print_otag(h, TAG_A, "chI", "In", buf);
+                       free(buf);
+               } else
+                       t = print_otag(h, TAG_A, "c", "In");
 
 
-/* ARGSUSED */
-static int
-mdoc_pq_pre(MDOC_ARGS)
-{
+               print_text(h, n->string);
+               print_tagq(h, t);
 
 
-       if (MDOC_BODY != n->type)
-               return(1);
-       print_text(h, "\\&(");
-       h->flags |= HTML_NOSPACE;
-       return(1);
-}
+               n = n->next;
+       }
 
 
+       for ( ; n; n = n->next) {
+               assert(n->type == ROFFT_TEXT);
+               print_text(h, n->string);
+       }
 
 
-/* ARGSUSED */
-static void
-mdoc_pq_post(MDOC_ARGS)
-{
+       return 0;
+}
 
 
-       if (MDOC_BODY != n->type)
-               return;
-       print_text(h, ")");
+static int
+mdoc_vt_pre(MDOC_ARGS)
+{
+       if (n->type == ROFFT_BLOCK) {
+               synopsis_pre(h, n);
+               return 1;
+       } else if (n->type == ROFFT_ELEM) {
+               synopsis_pre(h, n);
+       } else if (n->type == ROFFT_HEAD)
+               return 0;
+
+       print_otag(h, TAG_VAR, "c", "Vt");
+       return 1;
 }
 
 }
 
+static int
+mdoc_ft_pre(MDOC_ARGS)
+{
+       synopsis_pre(h, n);
+       print_otag(h, TAG_VAR, "c", "Ft");
+       return 1;
+}
 
 
-/* ARGSUSED */
 static int
 static int
-mdoc_sq_pre(MDOC_ARGS)
+mdoc_fn_pre(MDOC_ARGS)
 {
 {
+       struct tag      *t;
+       char             nbuf[BUFSIZ];
+       const char      *sp, *ep;
+       int              sz, pretty;
+
+       pretty = NODE_SYNPRETTY & n->flags;
+       synopsis_pre(h, n);
+
+       /* Split apart into type and name. */
+       assert(n->child->string);
+       sp = n->child->string;
+
+       ep = strchr(sp, ' ');
+       if (NULL != ep) {
+               t = print_otag(h, TAG_VAR, "c", "Ft");
+
+               while (ep) {
+                       sz = MIN((int)(ep - sp), BUFSIZ - 1);
+                       (void)memcpy(nbuf, sp, (size_t)sz);
+                       nbuf[sz] = '\0';
+                       print_text(h, nbuf);
+                       sp = ++ep;
+                       ep = strchr(sp, ' ');
+               }
+               print_tagq(h, t);
+       }
 
 
-       if (MDOC_BODY != n->type)
-               return(1);
-       print_text(h, "\\(oq");
-       h->flags |= HTML_NOSPACE;
-       return(1);
-}
+       t = print_otag(h, TAG_CODE, "c", "Fn");
 
 
+       if (sp)
+               print_text(h, sp);
 
 
-/* ARGSUSED */
-static void
-mdoc_sq_post(MDOC_ARGS)
-{
+       print_tagq(h, t);
 
 
-       if (MDOC_BODY != n->type)
-               return;
        h->flags |= HTML_NOSPACE;
        h->flags |= HTML_NOSPACE;
-       print_text(h, "\\(aq");
-}
+       print_text(h, "(");
+       h->flags |= HTML_NOSPACE;
 
 
+       for (n = n->child->next; n; n = n->next) {
+               if (NODE_SYNPRETTY & n->flags)
+                       t = print_otag(h, TAG_VAR, "cs", "Fa",
+                           "white-space", "nowrap");
+               else
+                       t = print_otag(h, TAG_VAR, "c", "Fa");
+               print_text(h, n->string);
+               print_tagq(h, t);
+               if (n->next) {
+                       h->flags |= HTML_NOSPACE;
+                       print_text(h, ",");
+               }
+       }
 
 
-/* ARGSUSED */
-static int
-mdoc_em_pre(MDOC_ARGS)
-{
-       struct htmlpair tag;
+       h->flags |= HTML_NOSPACE;
+       print_text(h, ")");
 
 
-       tag.key = ATTR_CLASS;
-       tag.val = "emph";
+       if (pretty) {
+               h->flags |= HTML_NOSPACE;
+               print_text(h, ";");
+       }
 
 
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
+       return 0;
 }
 
 }
 
-
-/* ARGSUSED */
 static int
 static int
-mdoc_d1_pre(MDOC_ARGS)
+mdoc_sm_pre(MDOC_ARGS)
 {
 {
-       struct htmlpair tag[2];
 
 
-       if (MDOC_BLOCK != n->type)
-               return(1);
+       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;
 
 
-       buffmt("margin-left: %dem;", INDENT);
+       if ( ! (HTML_NONOSPACE & h->flags))
+               h->flags &= ~HTML_NOSPACE;
 
 
-       tag[0].key = ATTR_CLASS;
-       tag[0].val = "lit-block";
-       tag[1].key = ATTR_STYLE;
-       tag[1].val = buf;
+       return 0;
+}
 
 
-       print_otag(h, TAG_DIV, 2, tag);
-       return(1);
+static int
+mdoc_skip_pre(MDOC_ARGS)
+{
+
+       return 0;
 }
 
 }
 
+static int
+mdoc_pp_pre(MDOC_ARGS)
+{
+       if ((n->flags & NODE_NOFILL) == 0) {
+               html_close_paragraph(h);
+               print_otag(h, TAG_P, "c", "Pp");
+       }
+       return 0;
+}
 
 
-/* ARGSUSED */
 static int
 static int
-mdoc_sx_pre(MDOC_ARGS)
+mdoc_lk_pre(MDOC_ARGS)
 {
 {
-       struct htmlpair          tag[2];
-       const struct mdoc_node  *nn;
+       const struct roff_node *link, *descr, *punct;
+       struct tag      *t;
 
 
-       bufcat("#");
-       for (nn = n->child; nn; nn = nn->next) {
-               bufcat(nn->string);
-               if (nn->next)
-                       bufcat(" ");
+       if ((link = n->child) == NULL)
+               return 0;
+
+       /* Find beginning of trailing punctuation. */
+       punct = n->last;
+       while (punct != link && punct->flags & NODE_DELIMC)
+               punct = punct->prev;
+       punct = punct->next;
+
+       /* Link target and link text. */
+       descr = link->next;
+       if (descr == punct)
+               descr = link;  /* no text */
+       t = print_otag(h, TAG_A, "ch", "Lk", link->string);
+       do {
+               if (descr->flags & (NODE_DELIMC | NODE_DELIMO))
+                       h->flags |= HTML_NOSPACE;
+               print_text(h, descr->string);
+               descr = descr->next;
+       } while (descr != punct);
+       print_tagq(h, t);
+
+       /* Trailing punctuation. */
+       while (punct != NULL) {
+               h->flags |= HTML_NOSPACE;
+               print_text(h, punct->string);
+               punct = punct->next;
        }
        }
+       return 0;
+}
 
 
-       tag[0].key = ATTR_HREF;
-       tag[0].val = buf;
-       tag[1].key = ATTR_CLASS;
-       tag[1].val = "link-sec";
+static int
+mdoc_mt_pre(MDOC_ARGS)
+{
+       struct tag      *t;
+       char            *cp;
 
 
-       print_otag(h, TAG_A, 2, tag);
-       return(1);
-}
+       for (n = n->child; n; n = n->next) {
+               assert(n->type == ROFFT_TEXT);
+
+               mandoc_asprintf(&cp, "mailto:%s", n->string);
+               t = print_otag(h, TAG_A, "ch", "Mt", cp);
+               print_text(h, n->string);
+               print_tagq(h, t);
+               free(cp);
+       }
 
 
+       return 0;
+}
 
 
-/* ARGSUSED */
 static int
 static int
-mdoc_aq_pre(MDOC_ARGS)
+mdoc_fo_pre(MDOC_ARGS)
 {
 {
+       struct tag      *t;
 
 
-       if (MDOC_BODY != n->type)
-               return(1);
-       print_text(h, "\\(la");
-       h->flags |= HTML_NOSPACE;
-       return(1);
-}
+       if (n->type == ROFFT_BODY) {
+               h->flags |= HTML_NOSPACE;
+               print_text(h, "(");
+               h->flags |= HTML_NOSPACE;
+               return 1;
+       } else if (n->type == ROFFT_BLOCK) {
+               synopsis_pre(h, n);
+               return 1;
+       }
+
+       if (n->child == NULL)
+               return 0;
 
 
+       assert(n->child->string);
+       t = print_otag(h, TAG_CODE, "c", "Fn");
+       print_text(h, n->child->string);
+       print_tagq(h, t);
+       return 0;
+}
 
 
-/* ARGSUSED */
 static void
 static void
-mdoc_aq_post(MDOC_ARGS)
+mdoc_fo_post(MDOC_ARGS)
 {
 
 {
 
-       if (MDOC_BODY != n->type)
+       if (n->type != ROFFT_BODY)
                return;
        h->flags |= HTML_NOSPACE;
                return;
        h->flags |= HTML_NOSPACE;
-       print_text(h, "\\(ra");
+       print_text(h, ")");
+       h->flags |= HTML_NOSPACE;
+       print_text(h, ";");
 }
 
 }
 
-
-/* ARGSUSED */
 static int
 static int
-mdoc_bd_pre(MDOC_ARGS)
+mdoc_in_pre(MDOC_ARGS)
 {
 {
-       struct htmlpair          tag[2];
-       int                      t, c, o, i;
-       const struct mdoc_node  *bl;
+       struct tag      *t;
 
 
-       /* FIXME: fmt_vspace() shit. */
+       synopsis_pre(h, n);
+       print_otag(h, TAG_CODE, "c", "In");
 
 
-       if (MDOC_BLOCK == n->type)
-               bl = n;
-       else if (MDOC_HEAD == n->type)
-               return(0);
-       else
-               bl = n->parent;
+       /*
+        * 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.
+        */
 
 
-       t = o = c = 0;
+       if (NODE_SYNPRETTY & n->flags && NODE_LINE & n->flags)
+               print_text(h, "#include");
 
 
-       for (i = 0; i < (int)bl->args->argc; i++) 
-               switch (bl->args->argv[i].arg) {
-               case (MDOC_Offset):
-                       assert(bl->args->argv[i].sz);
-                       o = a2offs (bl->args->argv[i].value[0]);
-                       break;
-               case (MDOC_Compact):
-                       c = 1;
-                       break;
-               case (MDOC_Ragged):
-                       /* FALLTHROUGH */
-               case (MDOC_Filled):
-                       /* FALLTHROUGH */
-               case (MDOC_Unfilled):
-                       /* FALLTHROUGH */
-               case (MDOC_Literal):
-                       t = bl->args->argv[i].arg;
-                       break;
-               }
+       print_text(h, "<");
+       h->flags |= HTML_NOSPACE;
 
 
-       if (MDOC_BLOCK == n->type) {
-               if (o)
-                       buffmt("margin-left: %dem;", o);
-               bufcat("margin-top: 1em;");
-               tag[0].key = ATTR_STYLE;
-               tag[0].val = buf;
-               print_otag(h, TAG_DIV, 1, tag);
-               return(1);
-       }
+       if (NULL != (n = n->child)) {
+               assert(n->type == ROFFT_TEXT);
 
 
-       switch (t) {
-       case (MDOC_Unfilled):
-       case (MDOC_Literal):
-               break;
-       default:
-               return(1);
-       }
+               if (h->base_includes)
+                       t = print_otag(h, TAG_A, "chI", "In", n->string);
+               else
+                       t = print_otag(h, TAG_A, "c", "In");
+               print_text(h, n->string);
+               print_tagq(h, t);
 
 
-       bufcat("white-space: pre;");
-       tag[0].key = ATTR_STYLE;
-       tag[0].val = buf;
-       tag[1].key = ATTR_CLASS;
-       tag[1].val = "lit-block";
+               n = n->next;
+       }
 
 
-       print_otag(h, TAG_DIV, 2, tag);
+       h->flags |= HTML_NOSPACE;
+       print_text(h, ">");
 
 
-       for (n = n->child; n; n = n->next) {
-               h->flags |= HTML_NOSPACE;
-               print_mdoc_node(m, n, h);
-               if (n->next)
-                       print_text(h, "\n");
+       for ( ; n; n = n->next) {
+               assert(n->type == ROFFT_TEXT);
+               print_text(h, n->string);
        }
 
        }
 
-       return(0);
+       return 0;
 }
 
 }
 
-
-/* ARGSUSED */
 static int
 static int
-mdoc_pa_pre(MDOC_ARGS)
+mdoc_ic_pre(MDOC_ARGS)
 {
 {
-       struct htmlpair tag;
-
-       tag.key = ATTR_CLASS;
-       tag.val = "file";
+       char    *id;
 
 
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
+       if ((id = cond_id(n)) != NULL)
+               print_otag(h, TAG_A, "chR", "permalink", id);
+       print_otag(h, TAG_CODE, "ci", "Ic", id);
+       return 1;
 }
 
 }
 
-
-/* ARGSUSED */
 static int
 static int
-mdoc_qq_pre(MDOC_ARGS)
+mdoc_va_pre(MDOC_ARGS)
 {
 {
-
-       if (MDOC_BODY != n->type)
-               return(1);
-       print_text(h, "\\*q");
-       h->flags |= HTML_NOSPACE;
-       return(1);
+       print_otag(h, TAG_VAR, "c", "Va");
+       return 1;
 }
 
 }
 
-
-/* ARGSUSED */
-static void
-mdoc_qq_post(MDOC_ARGS)
+static int
+mdoc_ap_pre(MDOC_ARGS)
 {
 
 {
 
-       if (MDOC_BODY != n->type)
-               return;
        h->flags |= HTML_NOSPACE;
        h->flags |= HTML_NOSPACE;
-       print_text(h, "\\*q");
+       print_text(h, "\\(aq");
+       h->flags |= HTML_NOSPACE;
+       return 1;
 }
 
 }
 
-
-/* ARGSUSED */
 static int
 static int
-mdoc_ad_pre(MDOC_ARGS)
+mdoc_bf_pre(MDOC_ARGS)
 {
 {
-       struct htmlpair tag;
+       const char      *cattr;
 
 
-       tag.key = ATTR_CLASS;
-       tag.val = "addr";
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
-}
+       switch (n->type) {
+       case ROFFT_BLOCK:
+               html_close_paragraph(h);
+               return 1;
+       case ROFFT_HEAD:
+               return 0;
+       case ROFFT_BODY:
+               break;
+       default:
+               abort();
+       }
+
+       if (FONT_Em == n->norm->Bf.font)
+               cattr = "Bf Em";
+       else if (FONT_Sy == n->norm->Bf.font)
+               cattr = "Bf Sy";
+       else if (FONT_Li == n->norm->Bf.font)
+               cattr = "Bf Li";
+       else
+               cattr = "Bf No";
 
 
+       /* Cannot use TAG_SPAN because it may contain blocks. */
+       print_otag(h, TAG_DIV, "c", cattr);
+       return 1;
+}
 
 
-/* ARGSUSED */
 static int
 static int
-mdoc_an_pre(MDOC_ARGS)
+mdoc_ms_pre(MDOC_ARGS)
 {
 {
-       struct htmlpair tag;
+       char *id;
 
 
-       tag.key = ATTR_CLASS;
-       tag.val = "author";
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
+       if ((id = cond_id(n)) != NULL)
+               print_otag(h, TAG_A, "chR", "permalink", id);
+       print_otag(h, TAG_SPAN, "ci", "Ms", id);
+       return 1;
 }
 
 }
 
-
-/* ARGSUSED */
 static int
 static int
-mdoc_cd_pre(MDOC_ARGS)
+mdoc_igndelim_pre(MDOC_ARGS)
 {
 {
-       struct htmlpair tag;
 
 
-       tag.key = ATTR_CLASS;
-       tag.val = "config";
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
+       h->flags |= HTML_IGNDELIM;
+       return 1;
 }
 
 }
 
-
-/* ARGSUSED */
-static int
-mdoc_dv_pre(MDOC_ARGS)
+static void
+mdoc_pf_post(MDOC_ARGS)
 {
 {
-       struct htmlpair tag;
 
 
-       tag.key = ATTR_CLASS;
-       tag.val = "define";
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
+       if ( ! (n->next == NULL || n->next->flags & NODE_LINE))
+               h->flags |= HTML_NOSPACE;
 }
 
 }
 
-
-/* ARGSUSED */
 static int
 static int
-mdoc_ev_pre(MDOC_ARGS)
+mdoc_rs_pre(MDOC_ARGS)
 {
 {
-       struct htmlpair tag;
-
-       tag.key = ATTR_CLASS;
-       tag.val = "env";
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
+       switch (n->type) {
+       case ROFFT_BLOCK:
+               if (n->sec == SEC_SEE_ALSO)
+                       html_close_paragraph(h);
+               break;
+       case ROFFT_HEAD:
+               return 0;
+       case ROFFT_BODY:
+               if (n->sec == SEC_SEE_ALSO)
+                       print_otag(h, TAG_P, "c", "Pp");
+               print_otag(h, TAG_CITE, "c", "Rs");
+               break;
+       default:
+               abort();
+       }
+       return 1;
 }
 
 }
 
-
-/* ARGSUSED */
 static int
 static int
-mdoc_er_pre(MDOC_ARGS)
+mdoc_no_pre(MDOC_ARGS)
 {
 {
-       struct htmlpair tag;
+       char *id;
 
 
-       tag.key = ATTR_CLASS;
-       tag.val = "errno";
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
+       if ((id = cond_id(n)) != NULL)
+               print_otag(h, TAG_A, "chR", "permalink", id);
+       print_otag(h, TAG_SPAN, "ci", "No", id);
+       return 1;
 }
 
 }
 
-
-/* ARGSUSED */
 static int
 static int
-mdoc_fa_pre(MDOC_ARGS)
+mdoc_li_pre(MDOC_ARGS)
 {
 {
-       const struct mdoc_node  *nn;
-       struct htmlpair          tag;
-       struct tag              *t;
+       char    *id;
 
 
-       tag.key = ATTR_CLASS;
-       tag.val = "farg";
-
-       if (n->parent->tok != MDOC_Fo) {
-               print_otag(h, TAG_SPAN, 1, &tag);
-               return(1);
-       }
-
-       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);
-               if (nn->next)
-                       print_text(h, ",");
-       }
-
-       if (n->child && n->next && n->next->tok == MDOC_Fa)
-               print_text(h, ",");
-
-       return(0);
+       if ((id = cond_id(n)) != NULL)
+               print_otag(h, TAG_A, "chR", "permalink", id);
+       print_otag(h, TAG_CODE, "ci", "Li", id);
+       return 1;
 }
 
 }
 
-
-/* ARGSUSED */
 static int
 static int
-mdoc_fd_pre(MDOC_ARGS)
+mdoc_sy_pre(MDOC_ARGS)
 {
 {
-       struct htmlpair tag;
-
-       if (SEC_SYNOPSIS == n->sec) {
-               if (n->next && MDOC_Fd != n->next->tok) {
-                       tag.key = ATTR_STYLE;
-                       tag.val = "margin-bottom: 1em;";
-                       print_otag(h, TAG_DIV, 1, &tag);
-               } else
-                       print_otag(h, TAG_DIV, 0, NULL);
-       }
-
-       tag.key = ATTR_CLASS;
-       tag.val = "macro";
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
+       print_otag(h, TAG_B, "c", "Sy");
+       return 1;
 }
 
 }
 
-
-/* ARGSUSED */
 static int
 static int
-mdoc_vt_pre(MDOC_ARGS)
+mdoc_lb_pre(MDOC_ARGS)
 {
 {
-       struct htmlpair tag;
+       if (SEC_LIBRARY == n->sec && NODE_LINE & n->flags && n->prev)
+               print_otag(h, TAG_BR, "");
 
 
-       if (SEC_SYNOPSIS == n->sec) {
-               if (n->next && MDOC_Vt != n->next->tok) {
-                       tag.key = ATTR_STYLE;
-                       tag.val = "margin-bottom: 1em;";
-                       print_otag(h, TAG_DIV, 1, &tag);
-               } else
-                       print_otag(h, TAG_DIV, 0, NULL);
-       }
-
-       tag.key = ATTR_CLASS;
-       tag.val = "type";
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
+       print_otag(h, TAG_SPAN, "c", "Lb");
+       return 1;
 }
 
 }
 
-
-/* ARGSUSED */
 static int
 static int
-mdoc_ft_pre(MDOC_ARGS)
+mdoc__x_pre(MDOC_ARGS)
 {
 {
-       struct htmlpair tag;
+       const char      *cattr;
+       enum htmltag     t;
 
 
-       if (SEC_SYNOPSIS == n->sec) {
-               if (n->prev && MDOC_Fo == n->prev->tok) {
-                       tag.key = ATTR_STYLE;
-                       tag.val = "magin-bottom: 1em;";
-                       print_otag(h, TAG_DIV, 1, &tag);
-               } else
-                       print_otag(h, TAG_DIV, 0, NULL);
+       t = TAG_SPAN;
+
+       switch (n->tok) {
+       case MDOC__A:
+               cattr = "RsA";
+               if (n->prev && MDOC__A == n->prev->tok)
+                       if (NULL == n->next || MDOC__A != n->next->tok)
+                               print_text(h, "and");
+               break;
+       case MDOC__B:
+               t = TAG_I;
+               cattr = "RsB";
+               break;
+       case MDOC__C:
+               cattr = "RsC";
+               break;
+       case MDOC__D:
+               cattr = "RsD";
+               break;
+       case MDOC__I:
+               t = TAG_I;
+               cattr = "RsI";
+               break;
+       case MDOC__J:
+               t = TAG_I;
+               cattr = "RsJ";
+               break;
+       case MDOC__N:
+               cattr = "RsN";
+               break;
+       case MDOC__O:
+               cattr = "RsO";
+               break;
+       case MDOC__P:
+               cattr = "RsP";
+               break;
+       case MDOC__Q:
+               cattr = "RsQ";
+               break;
+       case MDOC__R:
+               cattr = "RsR";
+               break;
+       case MDOC__T:
+               cattr = "RsT";
+               break;
+       case MDOC__U:
+               print_otag(h, TAG_A, "ch", "RsU", n->child->string);
+               return 1;
+       case MDOC__V:
+               cattr = "RsV";
+               break;
+       default:
+               abort();
        }
 
        }
 
-       tag.key = ATTR_CLASS;
-       tag.val = "type";
-       print_otag(h, TAG_SPAN, 1, &tag);
-       return(1);
+       print_otag(h, t, "c", cattr);
+       return 1;
 }
 
 }
 
-
-/* ARGSUSED */
-static int
-mdoc_fn_pre(MDOC_ARGS)
+static void
+mdoc__x_post(MDOC_ARGS)
 {
 {
-       struct tag              *t;
-       struct htmlpair          tag;
-       const struct mdoc_node  *nn;
 
 
-       if (SEC_SYNOPSIS == n->sec) {
-               if (n->next) {
-                       tag.key = ATTR_STYLE;
-                       tag.val = "margin-bottom: 1em";
-                       print_otag(h, TAG_DIV, 1, &tag);
-               } else
-                       print_otag(h, TAG_DIV, 0, NULL);
-       }
+       if (MDOC__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;
 
 
-       tag.key = ATTR_CLASS;
-       tag.val = "type";
+       /* TODO: %U */
 
 
-       t = print_otag(h, TAG_SPAN, 1, &tag);
-       print_text(h, n->child->string);
-       print_tagq(h, t);
+       if (NULL == n->parent || MDOC_Rs != n->parent->tok)
+               return;
 
        h->flags |= HTML_NOSPACE;
 
        h->flags |= HTML_NOSPACE;
-       print_text(h, "(");
-
-       for (nn = n->child->next; nn; nn = nn->next) {
-               tag.key = ATTR_CLASS;
-               tag.val = "farg";
-               t = print_otag(h, TAG_SPAN, 1, &tag);
-               print_text(h, nn->string);
-               print_tagq(h, t);
-               if (nn->next)
-                       print_text(h, ",");
-       }
-
-       print_text(h, ")");
-
-       if (SEC_SYNOPSIS == n->sec)
-               print_text(h, ";");
-
-       return(0);
+       print_text(h, n->next ? "," : ".");
 }
 
 }
 
-
-/* ARGSUSED */
 static int
 static int
-mdoc_sp_pre(MDOC_ARGS)
+mdoc_bk_pre(MDOC_ARGS)
 {
 {
-       int             len;
-       struct htmlpair tag;
 
 
-       switch (n->tok) {
-       case (MDOC_sp):
-               len = n->child ? atoi(n->child->string) : 1;
+       switch (n->type) {
+       case ROFFT_BLOCK:
                break;
                break;
-       case (MDOC_br):
-               len = 0;
+       case ROFFT_HEAD:
+               return 0;
+       case ROFFT_BODY:
+               if (n->parent->args != NULL || n->prev->child == NULL)
+                       h->flags |= HTML_PREKEEP;
                break;
        default:
                break;
        default:
-               len = 1;
-               break;
+               abort();
        }
 
        }
 
-       buffmt("height: %dem", len);
-       tag.key = ATTR_STYLE;
-       tag.val = buf;
-       print_otag(h, TAG_DIV, 1, &tag);
-       return(1);
-
+       return 1;
 }
 
 }
 
+static void
+mdoc_bk_post(MDOC_ARGS)
+{
+
+       if (n->type == ROFFT_BODY)
+               h->flags &= ~(HTML_KEEP | HTML_PREKEEP);
+}
 
 
-/* ARGSUSED */
 static int
 static int
-mdoc_brq_pre(MDOC_ARGS)
+mdoc_quote_pre(MDOC_ARGS)
 {
 {
+       if (n->type != ROFFT_BODY)
+               return 1;
+
+       switch (n->tok) {
+       case MDOC_Ao:
+       case MDOC_Aq:
+               print_text(h, n->child != NULL && n->child->next == NULL &&
+                   n->child->tok == MDOC_Mt ?  "<" : "\\(la");
+               break;
+       case MDOC_Bro:
+       case MDOC_Brq:
+               print_text(h, "\\(lC");
+               break;
+       case MDOC_Bo:
+       case MDOC_Bq:
+               print_text(h, "\\(lB");
+               break;
+       case MDOC_Oo:
+       case MDOC_Op:
+               print_text(h, "\\(lB");
+               /*
+                * Give up on semantic markup for now.
+                * We cannot use TAG_SPAN because .Oo may contain blocks.
+                * We cannot use TAG_IDIV because we might be in a
+                * phrasing context (like .Dl or .Pp); we cannot
+                * close out a .Pp at this point either because
+                * that would break the line.
+                */
+               /* XXX print_otag(h, TAG_???, "c", "Op"); */
+               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:
+       case MDOC_Dq:
+       case MDOC_Qo:
+       case MDOC_Qq:
+               print_text(h, "\\(lq");
+               break;
+       case MDOC_Po:
+       case MDOC_Pq:
+               print_text(h, "(");
+               break;
+       case MDOC_Ql:
+               print_text(h, "\\(oq");
+               h->flags |= HTML_NOSPACE;
+               print_otag(h, TAG_CODE, "c", "Li");
+               break;
+       case MDOC_So:
+       case MDOC_Sq:
+               print_text(h, "\\(oq");
+               break;
+       default:
+               abort();
+       }
 
 
-       if (MDOC_BODY != n->type)
-               return(1);
-       print_text(h, "\\(lC");
        h->flags |= HTML_NOSPACE;
        h->flags |= HTML_NOSPACE;
-       return(1);
+       return 1;
 }
 
 }
 
-
-/* ARGSUSED */
 static void
 static void
-mdoc_brq_post(MDOC_ARGS)
+mdoc_quote_post(MDOC_ARGS)
 {
 
 {
 
-       if (MDOC_BODY != n->type)
+       if (n->type != ROFFT_BODY && n->type != ROFFT_ELEM)
                return;
                return;
+
        h->flags |= HTML_NOSPACE;
        h->flags |= HTML_NOSPACE;
-       print_text(h, "\\(rC");
-}
 
 
+       switch (n->tok) {
+       case MDOC_Ao:
+       case MDOC_Aq:
+               print_text(h, n->child != NULL && n->child->next == NULL &&
+                   n->child->tok == MDOC_Mt ?  ">" : "\\(ra");
+               break;
+       case MDOC_Bro:
+       case MDOC_Brq:
+               print_text(h, "\\(rC");
+               break;
+       case MDOC_Oo:
+       case MDOC_Op:
+       case MDOC_Bo:
+       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:
+       case MDOC_Qq:
+       case MDOC_Do:
+       case MDOC_Dq:
+               print_text(h, "\\(rq");
+               break;
+       case MDOC_Po:
+       case MDOC_Pq:
+               print_text(h, ")");
+               break;
+       case MDOC_Ql:
+       case MDOC_So:
+       case MDOC_Sq:
+               print_text(h, "\\(cq");
+               break;
+       default:
+               abort();
+       }
+}
 
 
-/* ARGSUSED */
 static int
 static int
-mdoc_lk_pre(MDOC_ARGS)
+mdoc_eo_pre(MDOC_ARGS)
 {
 {
-       const struct mdoc_node  *nn;
-       struct htmlpair          tag[2];
 
 
-       nn = n->child;
+       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;
+}
 
 
-       tag[0].key = ATTR_CLASS;
-       tag[0].val = "link-ext";
-       tag[1].key = ATTR_HREF;
-       tag[1].val = nn->string;
+static void
+mdoc_eo_post(MDOC_ARGS)
+{
+       int      body, tail;
 
 
-       print_otag(h, TAG_A, 2, tag);
+       if (n->type != ROFFT_BODY)
+               return;
 
 
-       if (NULL == nn->next)
-               return(1);
+       if (n->end != ENDBODY_NOT) {
+               h->flags &= ~HTML_NOSPACE;
+               return;
+       }
 
 
-       for (nn = nn->next; nn; nn = nn->next) 
-               print_text(h, nn->string);
+       body = n->child != NULL || n->parent->head->child != NULL;
+       tail = n->parent->tail != NULL && n->parent->tail->child != NULL;
 
 
-       return(0);
+       if (body && tail)
+               h->flags |= HTML_NOSPACE;
+       else if ( ! tail)
+               h->flags &= ~HTML_NOSPACE;
 }
 
 }
 
-
-/* ARGSUSED */
 static int
 static int
-mdoc_mt_pre(MDOC_ARGS)
+mdoc_abort_pre(MDOC_ARGS)
 {
 {
-       struct htmlpair          tag[2];
-       struct tag              *t;
-       const struct mdoc_node  *nn;
-
-       tag[0].key = ATTR_CLASS;
-       tag[0].val = "link-mail";
-
-       for (nn = n->child; nn; nn = nn->next) {
-               bufinit();
-               bufcat("mailto:");
-               bufcat(nn->string);
-
-               tag[1].key = ATTR_HREF;
-               tag[1].val = buf;
-
-               t = print_otag(h, TAG_A, 2, tag);
-               print_text(h, nn->string);
-               print_tagq(h, t);
-       }
-       
-       return(0);
+       abort();
 }
 }
A git conversion mirror of mandoc.bsd.lv