]> git.cameronkatri.com Git - mandoc.git/blobdiff - mdoc_term.c
When .Sm is called without an argument, groff toggles the spacing mode,
[mandoc.git] / mdoc_term.c
index c64eb5d1c06564fd1c2329528e6e814b58d6f034..7a007e8440c6f97ce77418c94dd1dcc0d7344a46 100644 (file)
@@ -1,6 +1,8 @@
-/*     $Id: mdoc_term.c,v 1.6 2009/04/12 19:45:26 kristaps Exp $ */
+/*     $Id: mdoc_term.c,v 1.269 2014/07/02 19:55:10 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
+ * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/types.h>
 
 #include <assert.h>
 #include <ctype.h>
-#include <err.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "mandoc.h"
+#include "mandoc_aux.h"
+#include "out.h"
 #include "term.h"
 #include "mdoc.h"
-
-/* FIXME: macro arguments can be escaped. */
-/* FIXME: support more offset/width tokens. */
-
-#define        TTYPE_PROG        0
-#define        TTYPE_CMD_FLAG    1
-#define        TTYPE_CMD_ARG     2
-#define        TTYPE_SECTION     3
-#define        TTYPE_FUNC_DECL   4
-#define        TTYPE_VAR_DECL    5
-#define        TTYPE_FUNC_TYPE   6
-#define        TTYPE_FUNC_NAME   7
-#define        TTYPE_FUNC_ARG    8
-#define        TTYPE_LINK        9
-#define        TTYPE_SSECTION    10
-#define        TTYPE_FILE        11
-#define        TTYPE_EMPH        12
-#define        TTYPE_CONFIG      13
-#define        TTYPE_CMD         14
-#define        TTYPE_INCLUDE     15
-#define        TTYPE_SYMB        16
-#define        TTYPE_SYMBOL      17
-#define        TTYPE_DIAG        18
-#define        TTYPE_LINK_ANCHOR 19
-#define        TTYPE_LINK_TEXT   20
-#define        TTYPE_REF_JOURNAL 21
-#define        TTYPE_LIST        22
-#define        TTYPE_NMAX        23
-
-const  int ttypes[TTYPE_NMAX] = {
-       TERMP_BOLD,             /* TTYPE_PROG */
-       TERMP_BOLD,             /* TTYPE_CMD_FLAG */
-       TERMP_UNDER,            /* TTYPE_CMD_ARG */
-       TERMP_BOLD,             /* TTYPE_SECTION */
-       TERMP_BOLD,             /* TTYPE_FUNC_DECL */
-       TERMP_UNDER,            /* TTYPE_VAR_DECL */
-       TERMP_UNDER,            /* TTYPE_FUNC_TYPE */
-       TERMP_BOLD,             /* TTYPE_FUNC_NAME */
-       TERMP_UNDER,            /* TTYPE_FUNC_ARG */
-       TERMP_UNDER,            /* TTYPE_LINK */
-       TERMP_BOLD,             /* TTYPE_SSECTION */
-       TERMP_UNDER,            /* TTYPE_FILE */
-       TERMP_UNDER,            /* TTYPE_EMPH */
-       TERMP_BOLD,             /* TTYPE_CONFIG */
-       TERMP_BOLD,             /* TTYPE_CMD */
-       TERMP_BOLD,             /* TTYPE_INCLUDE */
-       TERMP_BOLD,             /* TTYPE_SYMB */
-       TERMP_BOLD,             /* TTYPE_SYMBOL */
-       TERMP_BOLD,             /* TTYPE_DIAG */
-       TERMP_UNDER,            /* TTYPE_LINK_ANCHOR */
-       TERMP_BOLD,             /* TTYPE_LINK_TEXT */
-       TERMP_UNDER,            /* TTYPE_REF_JOURNAL */
-       TERMP_BOLD              /* TTYPE_LIST */
-};
-
-/* XXX - clean this up. */
+#include "main.h"
 
 struct termpair {
        struct termpair  *ppair;
-       int               type;
-#define        TERMPAIR_FLAG    (1 << 0)
-       int               flag;
-       size_t            offset;
-       size_t            rmargin;
        int               count;
 };
 
-#define        TERMPAIR_SETFLAG(termp, p, fl) \
-       do { \
-               assert(! (TERMPAIR_FLAG & (p)->type)); \
-               (termp)->flags |= (fl); \
-               (p)->flag = (fl); \
-               (p)->type |= TERMPAIR_FLAG; \
-       } while ( /* CONSTCOND */ 0)
-
-#define        DECL_ARGS \
-       struct termp *p, struct termpair *pair, \
-       const struct mdoc_meta *meta, \
-       const struct mdoc_node *node
-
-#define        DECL_PRE(name) \
-static int               name##_pre(DECL_ARGS)
-#define        DECL_POST(name) \
-static void              name##_post(DECL_ARGS)
-#define        DECL_PREPOST(name) \
-DECL_PRE(name); \
-DECL_POST(name);
-
-DECL_PREPOST(termp__t);
-DECL_PREPOST(termp_aq);
-DECL_PREPOST(termp_bd);
-DECL_PREPOST(termp_bq);
-DECL_PREPOST(termp_brq);
-DECL_PREPOST(termp_d1);
-DECL_PREPOST(termp_dq);
-DECL_PREPOST(termp_fd);
-DECL_PREPOST(termp_fn);
-DECL_PREPOST(termp_fo);
-DECL_PREPOST(termp_ft);
-DECL_PREPOST(termp_in);
-DECL_PREPOST(termp_it);
-DECL_PREPOST(termp_lb);
-DECL_PREPOST(termp_op);
-DECL_PREPOST(termp_pf);
-DECL_PREPOST(termp_pq);
-DECL_PREPOST(termp_qq);
-DECL_PREPOST(termp_sh);
-DECL_PREPOST(termp_ss);
-DECL_PREPOST(termp_sq);
-DECL_PREPOST(termp_vt);
-
-DECL_PRE(termp__j);
-DECL_PRE(termp_ap);
-DECL_PRE(termp_ar);
-DECL_PRE(termp_at);
-DECL_PRE(termp_bf);
-DECL_PRE(termp_bsx);
-DECL_PRE(termp_bt);
-DECL_PRE(termp_cd);
-DECL_PRE(termp_cm);
-DECL_PRE(termp_dx);
-DECL_PRE(termp_em);
-DECL_PRE(termp_ex);
-DECL_PRE(termp_fa);
-DECL_PRE(termp_fl);
-DECL_PRE(termp_fx);
-DECL_PRE(termp_ic);
-DECL_PRE(termp_lk);
-DECL_PRE(termp_ms);
-DECL_PRE(termp_mt);
-DECL_PRE(termp_nd);
-DECL_PRE(termp_nm);
-DECL_PRE(termp_ns);
-DECL_PRE(termp_nx);
-DECL_PRE(termp_ox);
-DECL_PRE(termp_pa);
-DECL_PRE(termp_pp);
-DECL_PRE(termp_rs);
-DECL_PRE(termp_rv);
-DECL_PRE(termp_sm);
-DECL_PRE(termp_st);
-DECL_PRE(termp_sx);
-DECL_PRE(termp_sy);
-DECL_PRE(termp_ud);
-DECL_PRE(termp_ux);
-DECL_PRE(termp_va);
-DECL_PRE(termp_xr);
-
-DECL_POST(termp___);
-DECL_POST(termp_bl);
-DECL_POST(termp_bx);
+#define        DECL_ARGS struct termp *p, \
+                 struct termpair *pair, \
+                 const struct mdoc_meta *meta, \
+                 struct mdoc_node *n
 
 struct termact {
        int     (*pre)(DECL_ARGS);
        void    (*post)(DECL_ARGS);
 };
 
-static const struct termact termacts[MDOC_MAX] = {
-       { NULL, NULL }, /* \" */
+static size_t    a2width(const struct termp *, const char *);
+static size_t    a2height(const struct termp *, const char *);
+static size_t    a2offs(const struct termp *, const char *);
+
+static void      print_bvspace(struct termp *,
+                       const struct mdoc_node *,
+                       const struct mdoc_node *);
+static void      print_mdoc_node(DECL_ARGS);
+static void      print_mdoc_nodelist(DECL_ARGS);
+static void      print_mdoc_head(struct termp *, const void *);
+static void      print_mdoc_foot(struct termp *, const void *);
+static void      synopsis_pre(struct termp *,
+                       const struct mdoc_node *);
+
+static void      termp____post(DECL_ARGS);
+static void      termp__t_post(DECL_ARGS);
+static void      termp_an_post(DECL_ARGS);
+static void      termp_bd_post(DECL_ARGS);
+static void      termp_bk_post(DECL_ARGS);
+static void      termp_bl_post(DECL_ARGS);
+static void      termp_fd_post(DECL_ARGS);
+static void      termp_fo_post(DECL_ARGS);
+static void      termp_in_post(DECL_ARGS);
+static void      termp_it_post(DECL_ARGS);
+static void      termp_lb_post(DECL_ARGS);
+static void      termp_nm_post(DECL_ARGS);
+static void      termp_pf_post(DECL_ARGS);
+static void      termp_quote_post(DECL_ARGS);
+static void      termp_sh_post(DECL_ARGS);
+static void      termp_ss_post(DECL_ARGS);
+
+static int       termp__a_pre(DECL_ARGS);
+static int       termp__t_pre(DECL_ARGS);
+static int       termp_an_pre(DECL_ARGS);
+static int       termp_ap_pre(DECL_ARGS);
+static int       termp_bd_pre(DECL_ARGS);
+static int       termp_bf_pre(DECL_ARGS);
+static int       termp_bk_pre(DECL_ARGS);
+static int       termp_bl_pre(DECL_ARGS);
+static int       termp_bold_pre(DECL_ARGS);
+static int       termp_bt_pre(DECL_ARGS);
+static int       termp_bx_pre(DECL_ARGS);
+static int       termp_cd_pre(DECL_ARGS);
+static int       termp_d1_pre(DECL_ARGS);
+static int       termp_es_pre(DECL_ARGS);
+static int       termp_ex_pre(DECL_ARGS);
+static int       termp_fa_pre(DECL_ARGS);
+static int       termp_fd_pre(DECL_ARGS);
+static int       termp_fl_pre(DECL_ARGS);
+static int       termp_fn_pre(DECL_ARGS);
+static int       termp_fo_pre(DECL_ARGS);
+static int       termp_ft_pre(DECL_ARGS);
+static int       termp_in_pre(DECL_ARGS);
+static int       termp_it_pre(DECL_ARGS);
+static int       termp_li_pre(DECL_ARGS);
+static int       termp_ll_pre(DECL_ARGS);
+static int       termp_lk_pre(DECL_ARGS);
+static int       termp_nd_pre(DECL_ARGS);
+static int       termp_nm_pre(DECL_ARGS);
+static int       termp_ns_pre(DECL_ARGS);
+static int       termp_quote_pre(DECL_ARGS);
+static int       termp_rs_pre(DECL_ARGS);
+static int       termp_rv_pre(DECL_ARGS);
+static int       termp_sh_pre(DECL_ARGS);
+static int       termp_sm_pre(DECL_ARGS);
+static int       termp_sp_pre(DECL_ARGS);
+static int       termp_ss_pre(DECL_ARGS);
+static int       termp_under_pre(DECL_ARGS);
+static int       termp_ud_pre(DECL_ARGS);
+static int       termp_vt_pre(DECL_ARGS);
+static int       termp_xr_pre(DECL_ARGS);
+static int       termp_xx_pre(DECL_ARGS);
+
+static const struct termact termacts[MDOC_MAX] = {
+       { termp_ap_pre, NULL }, /* Ap */
        { NULL, NULL }, /* Dd */
        { NULL, NULL }, /* Dt */
        { NULL, NULL }, /* Os */
        { termp_sh_pre, termp_sh_post }, /* Sh */
-       { termp_ss_pre, termp_ss_post }, /* Ss */ 
-       { termp_pp_pre, NULL }, /* Pp */ 
-       { termp_d1_pre, termp_d1_post }, /* D1 */
-       { termp_d1_pre, termp_d1_post }, /* Dl */
+       { termp_ss_pre, termp_ss_post }, /* Ss */
+       { termp_sp_pre, NULL }, /* Pp */
+       { termp_d1_pre, termp_bl_post }, /* D1 */
+       { termp_d1_pre, termp_bl_post }, /* Dl */
        { termp_bd_pre, termp_bd_post }, /* Bd */
        { NULL, NULL }, /* Ed */
-       { NULL, termp_bl_post }, /* Bl */
+       { termp_bl_pre, termp_bl_post }, /* Bl */
        { NULL, NULL }, /* El */
        { termp_it_pre, termp_it_post }, /* It */
-       { NULL, NULL }, /* Ad */ 
-       { NULL, NULL }, /* An */
-       { termp_ar_pre, NULL }, /* Ar */
+       { termp_under_pre, NULL }, /* Ad */
+       { termp_an_pre, termp_an_post }, /* An */
+       { termp_under_pre, NULL }, /* Ar */
        { termp_cd_pre, NULL }, /* Cd */
-       { termp_cm_pre, NULL }, /* Cm */
-       { NULL, NULL }, /* Dv */ 
-       { NULL, NULL }, /* Er */ 
-       { NULL, NULL }, /* Ev */ 
+       { termp_bold_pre, NULL }, /* Cm */
+       { NULL, NULL }, /* Dv */
+       { NULL, NULL }, /* Er */
+       { NULL, NULL }, /* Ev */
        { termp_ex_pre, NULL }, /* Ex */
-       { termp_fa_pre, NULL }, /* Fa */ 
-       { termp_fd_pre, termp_fd_post }, /* Fd */ 
+       { termp_fa_pre, NULL }, /* Fa */
+       { termp_fd_pre, termp_fd_post }, /* Fd */
        { termp_fl_pre, NULL }, /* Fl */
-       { termp_fn_pre, termp_fn_post }, /* Fn */ 
-       { termp_ft_pre, termp_ft_post }, /* Ft */ 
-       { termp_ic_pre, NULL }, /* Ic */ 
-       { termp_in_pre, termp_in_post }, /* In */ 
-       { NULL, NULL }, /* Li */
-       { termp_nd_pre, NULL }, /* Nd */ 
-       { termp_nm_pre, NULL }, /* Nm */ 
-       { termp_op_pre, termp_op_post }, /* Op */
-       { NULL, NULL }, /* Ot */
-       { termp_pa_pre, NULL }, /* Pa */
+       { termp_fn_pre, NULL }, /* Fn */
+       { termp_ft_pre, NULL }, /* Ft */
+       { termp_bold_pre, NULL }, /* Ic */
+       { termp_in_pre, termp_in_post }, /* In */
+       { termp_li_pre, NULL }, /* Li */
+       { termp_nd_pre, NULL }, /* Nd */
+       { termp_nm_pre, termp_nm_post }, /* Nm */
+       { termp_quote_pre, termp_quote_post }, /* Op */
+       { termp_ft_pre, NULL }, /* Ot */
+       { termp_under_pre, NULL }, /* Pa */
        { termp_rv_pre, NULL }, /* Rv */
-       { termp_st_pre, NULL }, /* St */ 
-       { termp_va_pre, NULL }, /* Va */
-       { termp_vt_pre, termp_vt_post }, /* Vt */ 
+       { NULL, NULL }, /* St */
+       { termp_under_pre, NULL }, /* Va */
+       { termp_vt_pre, NULL }, /* Vt */
        { termp_xr_pre, NULL }, /* Xr */
-       { NULL, termp____post }, /* %A */
-       { NULL, termp____post }, /* %B */
+       { termp__a_pre, termp____post }, /* %A */
+       { termp_under_pre, termp____post }, /* %B */
        { NULL, termp____post }, /* %D */
-       { NULL, termp____post }, /* %I */
-       { termp__j_pre, termp____post }, /* %J */
+       { termp_under_pre, termp____post }, /* %I */
+       { termp_under_pre, termp____post }, /* %J */
        { NULL, termp____post }, /* %N */
        { NULL, termp____post }, /* %O */
        { NULL, termp____post }, /* %P */
@@ -236,228 +178,276 @@ static const struct termact termacts[MDOC_MAX] = {
        { termp__t_pre, termp__t_post }, /* %T */
        { NULL, termp____post }, /* %V */
        { NULL, NULL }, /* Ac */
-       { termp_aq_pre, termp_aq_post }, /* Ao */
-       { termp_aq_pre, termp_aq_post }, /* Aq */
-       { termp_at_pre, NULL }, /* At */
+       { termp_quote_pre, termp_quote_post }, /* Ao */
+       { termp_quote_pre, termp_quote_post }, /* Aq */
+       { NULL, NULL }, /* At */
        { NULL, NULL }, /* Bc */
-       { termp_bf_pre, NULL }, /* Bf */ 
-       { termp_bq_pre, termp_bq_post }, /* Bo */
-       { termp_bq_pre, termp_bq_post }, /* Bq */
-       { termp_bsx_pre, NULL }, /* Bsx */
-       { NULL, termp_bx_post }, /* Bx */
+       { termp_bf_pre, NULL }, /* Bf */
+       { termp_quote_pre, termp_quote_post }, /* Bo */
+       { termp_quote_pre, termp_quote_post }, /* Bq */
+       { termp_xx_pre, NULL }, /* Bsx */
+       { termp_bx_pre, NULL }, /* Bx */
        { NULL, NULL }, /* Db */
        { NULL, NULL }, /* Dc */
-       { termp_dq_pre, termp_dq_post }, /* Do */
-       { termp_dq_pre, termp_dq_post }, /* Dq */
-       { NULL, NULL }, /* Ec */
+       { termp_quote_pre, termp_quote_post }, /* Do */
+       { termp_quote_pre, termp_quote_post }, /* Dq */
+       { NULL, NULL }, /* Ec */ /* FIXME: no space */
        { NULL, NULL }, /* Ef */
-       { termp_em_pre, NULL }, /* Em */ 
-       { NULL, NULL }, /* Eo */
-       { termp_fx_pre, NULL }, /* Fx */
-       { termp_ms_pre, NULL }, /* Ms */
+       { termp_under_pre, NULL }, /* Em */
+       { termp_quote_pre, termp_quote_post }, /* Eo */
+       { termp_xx_pre, NULL }, /* Fx */
+       { termp_bold_pre, NULL }, /* Ms */
        { NULL, NULL }, /* No */
        { termp_ns_pre, NULL }, /* Ns */
-       { termp_nx_pre, NULL }, /* Nx */
-       { termp_ox_pre, NULL }, /* Ox */
+       { termp_xx_pre, NULL }, /* Nx */
+       { termp_xx_pre, NULL }, /* Ox */
        { NULL, NULL }, /* Pc */
-       { termp_pf_pre, termp_pf_post }, /* Pf */
-       { termp_pq_pre, termp_pq_post }, /* Po */
-       { termp_pq_pre, termp_pq_post }, /* Pq */
+       { NULL, termp_pf_post }, /* Pf */
+       { termp_quote_pre, termp_quote_post }, /* Po */
+       { termp_quote_pre, termp_quote_post }, /* Pq */
        { NULL, NULL }, /* Qc */
-       { termp_sq_pre, termp_sq_post }, /* Ql */
-       { termp_qq_pre, termp_qq_post }, /* Qo */
-       { termp_qq_pre, termp_qq_post }, /* Qq */
+       { termp_quote_pre, termp_quote_post }, /* Ql */
+       { termp_quote_pre, termp_quote_post }, /* Qo */
+       { termp_quote_pre, termp_quote_post }, /* Qq */
        { NULL, NULL }, /* Re */
        { termp_rs_pre, NULL }, /* Rs */
        { NULL, NULL }, /* Sc */
-       { termp_sq_pre, termp_sq_post }, /* So */
-       { termp_sq_pre, termp_sq_post }, /* Sq */
+       { termp_quote_pre, termp_quote_post }, /* So */
+       { termp_quote_pre, termp_quote_post }, /* Sq */
        { termp_sm_pre, NULL }, /* Sm */
-       { termp_sx_pre, NULL }, /* Sx */
-       { termp_sy_pre, NULL }, /* Sy */
+       { termp_under_pre, NULL }, /* Sx */
+       { termp_bold_pre, NULL }, /* Sy */
        { NULL, NULL }, /* Tn */
-       { termp_ux_pre, NULL }, /* Ux */
+       { termp_xx_pre, NULL }, /* Ux */
        { NULL, NULL }, /* Xc */
        { NULL, NULL }, /* Xo */
-       { termp_fo_pre, termp_fo_post }, /* Fo */ 
-       { NULL, NULL }, /* Fc */ 
-       { termp_op_pre, termp_op_post }, /* Oo */
+       { termp_fo_pre, termp_fo_post }, /* Fo */
+       { NULL, NULL }, /* Fc */
+       { termp_quote_pre, termp_quote_post }, /* Oo */
        { NULL, NULL }, /* Oc */
-       { NULL, NULL }, /* Bk */
+       { termp_bk_pre, termp_bk_post }, /* Bk */
        { NULL, NULL }, /* Ek */
        { termp_bt_pre, NULL }, /* Bt */
        { NULL, NULL }, /* Hf */
-       { NULL, NULL }, /* Fr */
+       { termp_under_pre, NULL }, /* Fr */
        { termp_ud_pre, NULL }, /* Ud */
-       { termp_lb_pre, termp_lb_post }, /* Lb */
-       { termp_ap_pre, NULL }, /* Lb */
-       { termp_pp_pre, NULL }, /* Pp */ 
-       { termp_lk_pre, NULL }, /* Lk */ 
-       { termp_mt_pre, NULL }, /* Mt */ 
-       { termp_brq_pre, termp_brq_post }, /* Brq */ 
-       { termp_brq_pre, termp_brq_post }, /* Bro */ 
-       { NULL, NULL }, /* Brc */ 
-       { NULL, NULL }, /* %C */ 
-       { NULL, NULL }, /* Es */ 
-       { NULL, NULL }, /* En */ 
-       { termp_dx_pre, NULL }, /* Dx */ 
-       { NULL, NULL }, /* %Q */ 
+       { NULL, termp_lb_post }, /* Lb */
+       { termp_sp_pre, NULL }, /* Lp */
+       { termp_lk_pre, NULL }, /* Lk */
+       { termp_under_pre, NULL }, /* Mt */
+       { termp_quote_pre, termp_quote_post }, /* Brq */
+       { termp_quote_pre, termp_quote_post }, /* Bro */
+       { NULL, NULL }, /* Brc */
+       { NULL, termp____post }, /* %C */
+       { termp_es_pre, NULL }, /* Es */
+       { termp_quote_pre, termp_quote_post }, /* En */
+       { termp_xx_pre, NULL }, /* Dx */
+       { NULL, termp____post }, /* %Q */
+       { termp_sp_pre, NULL }, /* br */
+       { termp_sp_pre, NULL }, /* sp */
+       { NULL, termp____post }, /* %U */
+       { NULL, NULL }, /* Ta */
+       { termp_ll_pre, NULL }, /* ll */
 };
 
-#ifdef __linux__
-extern size_t            strlcpy(char *, const char *, size_t);
-extern size_t            strlcat(char *, const char *, size_t);
-#endif
 
-static int       arg_hasattr(int, const struct mdoc_node *);
-static int       arg_getattrs(const int *, int *, size_t,
-                       const struct mdoc_node *);
-static int       arg_getattr(int, const struct mdoc_node *);
-static size_t    arg_offset(const struct mdoc_argv *);
-static size_t    arg_width(const struct mdoc_argv *, int);
-static int       arg_listtype(const struct mdoc_node *);
-static int       fmt_block_vspace(struct termp *,
-                       const struct mdoc_node *,
-                       const struct mdoc_node *);
-static void      print_node(DECL_ARGS);
-static void      print_head(struct termp *, 
-                       const struct mdoc_meta *);
-static void      print_body(DECL_ARGS);
-static void      print_foot(struct termp *, 
-                       const struct mdoc_meta *);
-static void      sanity(const struct mdoc_node *);
+void
+terminal_mdoc(void *arg, const struct mdoc *mdoc)
+{
+       const struct mdoc_node  *n;
+       const struct mdoc_meta  *meta;
+       struct termp            *p;
 
+       p = (struct termp *)arg;
 
-int
-mdoc_run(struct termp *p, const struct mdoc *m)
-{
+       if (0 == p->defindent)
+               p->defindent = 5;
 
-       print_head(p, mdoc_meta(m));
-       print_body(p, NULL, mdoc_meta(m), mdoc_node(m));
-       print_foot(p, mdoc_meta(m));
-       return(1);
-}
+       p->overstep = 0;
+       p->maxrmargin = p->defrmargin;
+       p->tabwidth = term_len(p, 5);
+
+       if (NULL == p->symtab)
+               p->symtab = mchars_alloc();
 
+       n = mdoc_node(mdoc);
+       meta = mdoc_meta(mdoc);
+
+       term_begin(p, print_mdoc_head, print_mdoc_foot, meta);
+
+       if (n->child)
+               print_mdoc_nodelist(p, NULL, meta, n->child);
+
+       term_end(p);
+}
 
 static void
-print_body(DECL_ARGS)
+print_mdoc_nodelist(DECL_ARGS)
 {
 
-       print_node(p, pair, meta, node);
-       if ( ! node->next)
-               return;
-       print_body(p, pair, meta, node->next);
+       print_mdoc_node(p, pair, meta, n);
+       if (n->next)
+               print_mdoc_nodelist(p, pair, meta, n->next);
 }
 
-
 static void
-print_node(DECL_ARGS)
+print_mdoc_node(DECL_ARGS)
 {
-       int              dochild;
+       int              chld;
        struct termpair  npair;
+       size_t           offset, rmargin;
 
-       /* Some quick sanity-checking. */
+       chld = 1;
+       offset = p->offset;
+       rmargin = p->rmargin;
+       n->prev_font = term_fontq(p);
 
-       sanity(node);
+       memset(&npair, 0, sizeof(struct termpair));
+       npair.ppair = pair;
 
-       /* Pre-processing. */
+       /*
+        * Keeps only work until the end of a line.  If a keep was
+        * invoked in a prior line, revert it to PREKEEP.
+        */
 
-       dochild = 1;
-       npair.ppair = pair;
-       npair.type = 0;
-       npair.offset = npair.rmargin = 0;
-       npair.flag = 0;
-       npair.count = 0;
+       if (TERMP_KEEP & p->flags) {
+               if (n->prev ? (n->prev->lastline != n->line) :
+                   (n->parent && n->parent->line != n->line)) {
+                       p->flags &= ~TERMP_KEEP;
+                       p->flags |= TERMP_PREKEEP;
+               }
+       }
 
-       if (MDOC_TEXT != node->type) {
-               if (termacts[node->tok].pre)
-                       if ( ! (*termacts[node->tok].pre)(p, &npair, meta, node))
-                               dochild = 0;
-       } else /* MDOC_TEXT == node->type */
-               term_word(p, node->string);
+       /*
+        * After the keep flags have been set up, we may now
+        * produce output.  Note that some pre-handlers do so.
+        */
 
-       /* Children. */
+       switch (n->type) {
+       case MDOC_TEXT:
+               if (' ' == *n->string && MDOC_LINE & n->flags)
+                       term_newln(p);
+               if (MDOC_DELIMC & n->flags)
+                       p->flags |= TERMP_NOSPACE;
+               term_word(p, n->string);
+               if (MDOC_DELIMO & n->flags)
+                       p->flags |= TERMP_NOSPACE;
+               break;
+       case MDOC_EQN:
+               term_eqn(p, n->eqn);
+               break;
+       case MDOC_TBL:
+               term_tbl(p, n->span);
+               break;
+       default:
+               if (termacts[n->tok].pre && ENDBODY_NOT == n->end)
+                       chld = (*termacts[n->tok].pre)
+                               (p, &npair, meta, n);
+               break;
+       }
 
-       if (TERMPAIR_FLAG & npair.type)
-               p->flags |= npair.flag;
+       if (chld && n->child)
+               print_mdoc_nodelist(p, &npair, meta, n->child);
 
-       if (dochild && node->child)
-               print_body(p, &npair, meta, node->child);
+       term_fontpopq(p,
+           (ENDBODY_NOT == n->end ? n : n->pending)->prev_font);
 
-       if (TERMPAIR_FLAG & npair.type)
-               p->flags &= ~npair.flag;
+       switch (n->type) {
+       case MDOC_TEXT:
+               break;
+       case MDOC_TBL:
+               break;
+       case MDOC_EQN:
+               break;
+       default:
+               if ( ! termacts[n->tok].post || MDOC_ENDED & n->flags)
+                       break;
+               (void)(*termacts[n->tok].post)(p, &npair, meta, n);
+
+               /*
+                * Explicit end tokens not only call the post
+                * handler, but also tell the respective block
+                * that it must not call the post handler again.
+                */
+               if (ENDBODY_NOT != n->end)
+                       n->pending->flags |= MDOC_ENDED;
+
+               /*
+                * End of line terminating an implicit block
+                * while an explicit block is still open.
+                * Continue the explicit block without spacing.
+                */
+               if (ENDBODY_NOSPACE == n->end)
+                       p->flags |= TERMP_NOSPACE;
+               break;
+       }
 
-       /* Post-processing. */
+       if (MDOC_EOS & n->flags)
+               p->flags |= TERMP_SENTENCE;
 
-       if (MDOC_TEXT != node->type)
-               if (termacts[node->tok].post)
-                       (*termacts[node->tok].post)(p, &npair, meta, node);
+       if (MDOC_ll != n->tok) {
+               p->offset = offset;
+               p->rmargin = rmargin;
+       }
 }
 
-
 static void
-print_foot(struct termp *p, const struct mdoc_meta *meta)
+print_mdoc_foot(struct termp *p, const void *arg)
 {
-       struct tm       *tm;
-       char            *buf, *os;
-
-       if (NULL == (buf = malloc(p->rmargin)))
-               err(1, "malloc");
-       if (NULL == (os = malloc(p->rmargin)))
-               err(1, "malloc");
+       const struct mdoc_meta *meta;
 
-       tm = localtime(&meta->date);
+       meta = (const struct mdoc_meta *)arg;
 
-#ifdef __OpenBSD__
-       if (NULL == strftime(buf, p->rmargin, "%B %d, %Y", tm))
-#else
-       if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm))
-#endif
-               err(1, "strftime");
-
-       (void)strlcpy(os, meta->os, p->rmargin);
+       term_fontrepl(p, TERMFONT_NONE);
 
        /*
-        * This is /slightly/ different from regular groff output
-        * because we don't have page numbers.  Print the following:
+        * Output the footer in new-groff style, that is, three columns
+        * with the middle being the manual date and flanking columns
+        * being the operating system:
         *
-        * OS                                            MDOCDATE
+        * SYSTEM                  DATE                    SYSTEM
         */
 
        term_vspace(p);
 
-       p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
-       p->rmargin = p->maxrmargin - strlen(buf);
        p->offset = 0;
+       p->rmargin = (p->maxrmargin -
+           term_strlen(p, meta->date) + term_len(p, 1)) / 2;
+       p->trailspace = 1;
+       p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
+
+       term_word(p, meta->os);
+       term_flushln(p);
+
+       p->offset = p->rmargin;
+       p->rmargin = p->maxrmargin - term_strlen(p, meta->os);
+       p->flags |= TERMP_NOSPACE;
 
-       term_word(p, os);
+       term_word(p, meta->date);
        term_flushln(p);
 
-       p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
        p->offset = p->rmargin;
        p->rmargin = p->maxrmargin;
+       p->trailspace = 0;
        p->flags &= ~TERMP_NOBREAK;
+       p->flags |= TERMP_NOSPACE;
 
-       term_word(p, buf);
+       term_word(p, meta->os);
        term_flushln(p);
 
-       free(buf);
-       free(os);
+       p->offset = 0;
+       p->rmargin = p->maxrmargin;
+       p->flags = 0;
 }
 
-
 static void
-print_head(struct termp *p, const struct mdoc_meta *meta)
+print_mdoc_head(struct termp *p, const void *arg)
 {
-       char            *buf, *title;
-
-       p->rmargin = p->maxrmargin;
-       p->offset = 0;
+       const struct mdoc_meta  *meta;
+       char                    *volume, *title;
+       size_t                   vollen, titlen;
 
-       if (NULL == (buf = malloc(p->rmargin)))
-               err(1, "malloc");
-       if (NULL == (title = malloc(p->rmargin)))
-               err(1, "malloc");
+       meta = (const struct mdoc_meta *)arg;
 
        /*
         * The header is strange.  It has three components, which are
@@ -472,571 +462,488 @@ print_head(struct termp *p, const struct mdoc_meta *meta)
         * switches on the manual section.
         */
 
-       assert(meta->vol);
-       (void)strlcpy(buf, meta->vol, p->rmargin);
+       p->offset = 0;
+       p->rmargin = p->maxrmargin;
 
-       if (meta->arch) {
-               (void)strlcat(buf, " (", p->rmargin);
-               (void)strlcat(buf, meta->arch, p->rmargin);
-               (void)strlcat(buf, ")", p->rmargin);
-       }
+       assert(meta->vol);
+       if (NULL == meta->arch)
+               volume = mandoc_strdup(meta->vol);
+       else
+               mandoc_asprintf(&volume, "%s (%s)",
+                   meta->vol, meta->arch);
+       vollen = term_strlen(p, volume);
 
-       (void)snprintf(title, p->rmargin, "%s(%d)", 
-                       meta->title, meta->msec);
+       mandoc_asprintf(&title, "%s(%s)", meta->title, meta->msec);
+       titlen = term_strlen(p, title);
 
-       p->offset = 0;
-       p->rmargin = (p->maxrmargin - strlen(buf)) / 2;
        p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
+       p->trailspace = 1;
+       p->offset = 0;
+       p->rmargin = 2 * (titlen+1) + vollen < p->maxrmargin ?
+           (p->maxrmargin - vollen + term_len(p, 1)) / 2 :
+           p->maxrmargin - vollen;
 
        term_word(p, title);
        term_flushln(p);
 
-       p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
+       p->flags |= TERMP_NOSPACE;
        p->offset = p->rmargin;
-       p->rmargin = p->maxrmargin - strlen(title);
+       p->rmargin = p->offset + vollen + titlen < p->maxrmargin ?
+           p->maxrmargin - titlen : p->maxrmargin;
 
-       term_word(p, buf);
+       term_word(p, volume);
        term_flushln(p);
 
-       p->offset = p->rmargin;
-       p->rmargin = p->maxrmargin;
        p->flags &= ~TERMP_NOBREAK;
-       p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
-
-       term_word(p, title);
-       term_flushln(p);
+       p->trailspace = 0;
+       if (p->rmargin + titlen <= p->maxrmargin) {
+               p->flags |= TERMP_NOSPACE;
+               p->offset = p->rmargin;
+               p->rmargin = p->maxrmargin;
+               term_word(p, title);
+               term_flushln(p);
+       }
 
-       p->rmargin = p->maxrmargin;
-       p->offset = 0;
        p->flags &= ~TERMP_NOSPACE;
-
+       p->offset = 0;
+       p->rmargin = p->maxrmargin;
        free(title);
-       free(buf);
-}
-
-
-static void
-sanity(const struct mdoc_node *n)
-{
-       char            *p;
-
-       p = "regular form violated";
-
-       switch (n->type) {
-       case (MDOC_TEXT):
-               if (n->child) 
-                       errx(1, p);
-               if (NULL == n->parent) 
-                       errx(1, p);
-               if (NULL == n->string)
-                       errx(1, p);
-               switch (n->parent->type) {
-               case (MDOC_TEXT):
-                       /* FALLTHROUGH */
-               case (MDOC_ROOT):
-                       errx(1, p);
-                       /* NOTREACHED */
-               default:
-                       break;
-               }
-               break;
-       case (MDOC_ELEM):
-               if (NULL == n->parent)
-                       errx(1, p);
-               switch (n->parent->type) {
-               case (MDOC_TAIL):
-                       /* FALLTHROUGH */
-               case (MDOC_BODY):
-                       /* FALLTHROUGH */
-               case (MDOC_HEAD):
-                       break;
-               default:
-                       errx(1, p);
-                       /* NOTREACHED */
-               }
-               if (n->child) switch (n->child->type) {
-               case (MDOC_TEXT):
-                       break;
-               default:
-                       errx(1, p);
-                       /* NOTREACHED */
-               }
-               break;
-       case (MDOC_HEAD):
-               /* FALLTHROUGH */
-       case (MDOC_BODY):
-               /* FALLTHROUGH */
-       case (MDOC_TAIL):
-               if (NULL == n->parent)
-                       errx(1, p);
-               if (MDOC_BLOCK != n->parent->type)
-                       errx(1, p);
-               if (n->child) switch (n->child->type) {
-               case (MDOC_BLOCK):
-                       /* FALLTHROUGH */
-               case (MDOC_ELEM):
-                       /* FALLTHROUGH */
-               case (MDOC_TEXT):
-                       break;
-               default:
-                       errx(1, p);
-                       /* NOTREACHED */
-               }
-               break;
-       case (MDOC_BLOCK):
-               if (NULL == n->parent)
-                       errx(1, p);
-               if (NULL == n->child)
-                       errx(1, p);
-               switch (n->parent->type) {
-               case (MDOC_ROOT):
-                       /* FALLTHROUGH */
-               case (MDOC_HEAD):
-                       /* FALLTHROUGH */
-               case (MDOC_BODY):
-                       /* FALLTHROUGH */
-               case (MDOC_TAIL):
-                       break;
-               default:
-                       errx(1, p);
-                       /* NOTREACHED */
-               }
-               switch (n->child->type) {
-               case (MDOC_ROOT):
-                       /* FALLTHROUGH */
-               case (MDOC_ELEM):
-                       errx(1, p);
-                       /* NOTREACHED */
-               default:
-                       break;
-               }
-               break;
-       case (MDOC_ROOT):
-               if (n->parent)
-                       errx(1, p);
-               if (NULL == n->child)
-                       errx(1, p);
-               switch (n->child->type) {
-               case (MDOC_BLOCK):
-                       break;
-               default:
-                       errx(1, p);
-                       /* NOTREACHED */
-               }
-               break;
-       }
+       free(volume);
 }
 
-
 static size_t
-arg_width(const struct mdoc_argv *arg, int pos)
-{
-       size_t           v;
-       int              i, len;
-
-       assert(pos < (int)arg->sz && pos >= 0);
-       assert(arg->value[pos]);
-       if (0 == strcmp(arg->value[pos], "indent"))
-               return(INDENT);
-       if (0 == strcmp(arg->value[pos], "indent-two"))
-               return(INDENT * 2);
-
-       if (0 == (len = (int)strlen(arg->value[pos])))
-               return(0);
-
-       for (i = 0; i < len - 1; i++) 
-               if ( ! isdigit((u_char)arg->value[pos][i]))
-                       break;
-
-       if (i == len - 1) {
-               if ('n' == arg->value[pos][len - 1]) {
-                       v = (size_t)atoi(arg->value[pos]);
-                       return(v);
-               }
-
-       }
-       return(strlen(arg->value[pos]) + 1);
-}
-
-
-static int
-arg_listtype(const struct mdoc_node *n)
+a2height(const struct termp *p, const char *v)
 {
-       int              i, len;
-
-       assert(MDOC_BLOCK == n->type);
+       struct roffsu    su;
 
-       len = (int)(n->args ? n->args->argc : 0);
 
-       for (i = 0; i < len; i++) 
-               switch (n->args->argv[i].arg) {
-               case (MDOC_Bullet):
-                       /* FALLTHROUGH */
-               case (MDOC_Dash):
-                       /* FALLTHROUGH */
-               case (MDOC_Enum):
-                       /* FALLTHROUGH */
-               case (MDOC_Hyphen):
-                       /* FALLTHROUGH */
-               case (MDOC_Tag):
-                       /* 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;
-               }
+       assert(v);
+       if ( ! a2roffsu(v, &su, SCALE_VS))
+               SCALE_VS_INIT(&su, atoi(v));
 
-       errx(1, "list type not supported");
-       /* NOTREACHED */
+       return(term_vspan(p, &su));
 }
 
-
 static size_t
-arg_offset(const struct mdoc_argv *arg)
-{
-
-       assert(*arg->value);
-       if (0 == strcmp(*arg->value, "indent"))
-               return(INDENT);
-       if (0 == strcmp(*arg->value, "indent-two"))
-               return(INDENT * 2);
-       return(strlen(*arg->value));
-}
-
-
-static int
-arg_hasattr(int arg, const struct mdoc_node *n)
+a2width(const struct termp *p, const char *v)
 {
+       struct roffsu    su;
 
-       return(-1 != arg_getattr(arg, n));
-}
-
-
-static int
-arg_getattr(int v, const struct mdoc_node *n)
-{
-       int              val;
+       assert(v);
+       if ( ! a2roffsu(v, &su, SCALE_MAX))
+               SCALE_HS_INIT(&su, term_strlen(p, v));
 
-       return(arg_getattrs(&v, &val, 1, n) ? val : -1);
+       return(term_hspan(p, &su));
 }
 
-
-static int
-arg_getattrs(const int *keys, int *vals, 
-               size_t sz, const struct mdoc_node *n)
+static size_t
+a2offs(const struct termp *p, const char *v)
 {
-       int              i, j, k;
+       struct roffsu    su;
 
-       if (NULL == n->args)
+       if ('\0' == *v)
+               return(0);
+       else if (0 == strcmp(v, "left"))
                return(0);
+       else if (0 == strcmp(v, "indent"))
+               return(term_len(p, p->defindent + 1));
+       else if (0 == strcmp(v, "indent-two"))
+               return(term_len(p, (p->defindent + 1) * 2));
+       else if ( ! a2roffsu(v, &su, SCALE_MAX))
+               SCALE_HS_INIT(&su, term_strlen(p, v));
 
-       for (k = i = 0; i < (int)n->args->argc; i++) 
-               for (j = 0; j < (int)sz; j++)
-                       if (n->args->argv[i].arg == keys[j]) {
-                               vals[j] = i;
-                               k++;
-                       }
-       return(k);
+       return(term_hspan(p, &su));
 }
 
-
-/* ARGSUSED */
-static int
-fmt_block_vspace(struct termp *p, 
-               const struct mdoc_node *bl, 
-               const struct mdoc_node *node)
+/*
+ * Determine how much space to print out before block elements of `It'
+ * (and thus `Bl') and `Bd'.  And then go ahead and print that space,
+ * too.
+ */
+static void
+print_bvspace(struct termp *p,
+       const struct mdoc_node *bl,
+       const struct mdoc_node *n)
 {
-       const struct mdoc_node *n;
+       const struct mdoc_node  *nn;
+
+       assert(n);
 
        term_newln(p);
 
-       if (arg_hasattr(MDOC_Compact, bl))
-               return(1);
+       if (MDOC_Bd == bl->tok && bl->norm->Bd.comp)
+               return;
+       if (MDOC_Bl == bl->tok && bl->norm->Bl.comp)
+               return;
+
+       /* Do not vspace directly after Ss/Sh. */
 
-       for (n = node; n; n = n->parent) {
-               if (MDOC_BLOCK != n->type)
+       for (nn = n; nn; nn = nn->parent) {
+               if (MDOC_BLOCK != nn->type)
                        continue;
-               if (MDOC_Ss == n->tok)
-                       break;
-               if (MDOC_Sh == n->tok)
-                       break;
-               if (NULL == n->prev)
+               if (MDOC_Ss == nn->tok)
+                       return;
+               if (MDOC_Sh == nn->tok)
+                       return;
+               if (NULL == nn->prev)
                        continue;
-               term_vspace(p);
                break;
        }
 
-       return(1);
-}
+       /* A `-column' does not assert vspace within the list. */
 
+       if (MDOC_Bl == bl->tok && LIST_column == bl->norm->Bl.type)
+               if (n->prev && MDOC_It == n->prev->tok)
+                       return;
 
-/* ARGSUSED */
-static int
-termp_dq_pre(DECL_ARGS)
-{
+       /* A `-diag' without body does not vspace. */
 
-       if (MDOC_BODY != node->type)
-               return(1);
+       if (MDOC_Bl == bl->tok && LIST_diag == bl->norm->Bl.type)
+               if (n->prev && MDOC_It == n->prev->tok) {
+                       assert(n->prev->body);
+                       if (NULL == n->prev->body->child)
+                               return;
+               }
 
-       term_word(p, "\\(lq");
-       p->flags |= TERMP_NOSPACE;
-       return(1);
+       term_vspace(p);
 }
 
 
-/* ARGSUSED */
-static void
-termp_dq_post(DECL_ARGS)
+static int
+termp_ll_pre(DECL_ARGS)
 {
 
-       if (MDOC_BODY != node->type)
-               return;
-
-       p->flags |= TERMP_NOSPACE;
-       term_word(p, "\\(rq");
+       term_setwidth(p, n->nchild ? n->child->string : NULL);
+       return(0);
 }
 
-
-/* ARGSUSED */
 static int
 termp_it_pre(DECL_ARGS)
 {
-       const struct mdoc_node *bl, *n;
-       char                    buf[7];
-       int                     i, type, keys[3], vals[3];
-       size_t                  width, offset;
-
-       if (MDOC_BLOCK == node->type)
-               return(fmt_block_vspace(p, node->parent->parent, node));
+       const struct mdoc_node *bl, *nn;
+       char                    buf[24];
+       int                     i;
+       size_t                  width, offset, ncols, dcol;
+       enum mdoc_list          type;
 
-       bl = node->parent->parent->parent;
-
-       /* Save parent attributes. */
-
-       pair->offset = p->offset;
-       pair->rmargin = p->rmargin;
-       pair->flag = p->flags;
-
-       /* Get list width and offset. */
+       if (MDOC_BLOCK == n->type) {
+               print_bvspace(p, n->parent->parent, n);
+               return(1);
+       }
 
-       keys[0] = MDOC_Width;
-       keys[1] = MDOC_Offset;
-       keys[2] = MDOC_Column;
+       bl = n->parent->parent->parent;
+       type = bl->norm->Bl.type;
 
-       vals[0] = vals[1] = vals[2] = -1;
+       /*
+        * First calculate width and offset.  This is pretty easy unless
+        * we're a -column list, in which case all prior columns must
+        * be accounted for.
+        */
 
        width = offset = 0;
 
-       (void)arg_getattrs(keys, vals, 3, bl);
-
-       type = arg_listtype(bl);
-
-       /* Calculate real width and offset. */
+       if (bl->norm->Bl.offs)
+               offset = a2offs(p, bl->norm->Bl.offs);
 
        switch (type) {
-       case (MDOC_Column):
-               if (MDOC_BODY == node->type)
+       case LIST_column:
+               if (MDOC_HEAD == n->type)
+                       break;
+
+               /*
+                * Imitate groff's column handling:
+                * - For each earlier column, add its width.
+                * - For less than 5 columns, add four more blanks per
+                *   column.
+                * - For exactly 5 columns, add three more blank per
+                *   column.
+                * - For more than 5 columns, add only one column.
+                */
+               ncols = bl->norm->Bl.ncols;
+               dcol = ncols < 5 ? term_len(p, 4) :
+                   ncols == 5 ? term_len(p, 3) : term_len(p, 1);
+
+               /*
+                * Calculate the offset by applying all prior MDOC_BODY,
+                * so we stop at the MDOC_HEAD (NULL == nn->prev).
+                */
+
+               for (i = 0, nn = n->prev;
+                   nn->prev && i < (int)ncols;
+                   nn = nn->prev, i++)
+                       offset += dcol + a2width(p,
+                           bl->norm->Bl.cols[i]);
+
+               /*
+                * When exceeding the declared number of columns, leave
+                * the remaining widths at 0.  This will later be
+                * adjusted to the default width of 10, or, for the last
+                * column, stretched to the right margin.
+                */
+               if (i >= (int)ncols)
                        break;
-               for (i = 0, n = node->prev; n; n = n->prev, i++)
-                       offset += arg_width 
-                               (&bl->args->argv[vals[2]], i);
-               assert(i < (int)bl->args->argv[vals[2]].sz);
-               width = arg_width(&bl->args->argv[vals[2]], i);
-               if (vals[1] >= 0) 
-                       offset += arg_offset(&bl->args->argv[vals[1]]);
+
+               /*
+                * Use the declared column widths, extended as explained
+                * in the preceding paragraph.
+                */
+               width = a2width(p, bl->norm->Bl.cols[i]) + dcol;
                break;
        default:
-               if (vals[0] >= 0) 
-                       width = arg_width(&bl->args->argv[vals[0]], 0);
-               if (vals[1] >= 0) 
-                       offset = arg_offset(&bl->args->argv[vals[1]]);
+               if (NULL == bl->norm->Bl.width)
+                       break;
+
+               /*
+                * Note: buffer the width by 2, which is groff's magic
+                * number for buffering single arguments.  See the above
+                * handling for column for how this changes.
+                */
+               assert(bl->norm->Bl.width);
+               width = a2width(p, bl->norm->Bl.width) + term_len(p, 2);
                break;
        }
 
-       /* 
+       /*
         * List-type can override the width in the case of fixed-head
         * values (bullet, dash/hyphen, enum).  Tags need a non-zero
         * offset.
         */
 
        switch (type) {
-       case (MDOC_Bullet):
+       case LIST_bullet:
                /* FALLTHROUGH */
-       case (MDOC_Dash):
+       case LIST_dash:
                /* FALLTHROUGH */
-       case (MDOC_Enum):
+       case LIST_hyphen:
                /* FALLTHROUGH */
-       case (MDOC_Hyphen):
-               if (width < 4)
-                       width = 4;
+       case LIST_enum:
+               if (width < term_len(p, 2))
+                       width = term_len(p, 2);
+               break;
+       case LIST_hang:
+               if (0 == width)
+                       width = term_len(p, 8);
                break;
-       case (MDOC_Tag):
+       case LIST_column:
+               /* FALLTHROUGH */
+       case LIST_tag:
                if (0 == width)
-                       width = 10;
+                       width = term_len(p, 10);
                break;
        default:
                break;
        }
 
-       /* 
-        * Whitespace control.  Inset bodies need an initial space.
+       /*
+        * Whitespace control.  Inset bodies need an initial space,
+        * while diagonal bodies need two.
         */
 
+       p->flags |= TERMP_NOSPACE;
+
        switch (type) {
-       case (MDOC_Diag):
-               /* FALLTHROUGH */
-       case (MDOC_Inset):
-               if (MDOC_BODY == node->type) 
-                       p->flags &= ~TERMP_NOSPACE;
-               else
-                       p->flags |= TERMP_NOSPACE;
+       case LIST_diag:
+               if (MDOC_BODY == n->type)
+                       term_word(p, "\\ \\ ");
+               break;
+       case LIST_inset:
+               if (MDOC_BODY == n->type)
+                       term_word(p, "\\ ");
                break;
        default:
-               p->flags |= TERMP_NOSPACE;
                break;
        }
 
-       /*
-        * Style flags.  Diagnostic heads need TTYPE_DIAG.
-        */
+       p->flags |= TERMP_NOSPACE;
 
        switch (type) {
-       case (MDOC_Diag):
-               if (MDOC_HEAD == node->type)
-                       p->flags |= ttypes[TTYPE_DIAG];
+       case LIST_diag:
+               if (MDOC_HEAD == n->type)
+                       term_fontpush(p, TERMFONT_BOLD);
                break;
        default:
                break;
        }
 
        /*
-        * Pad and break control.  This is the tricker part.  Lists with
-        * set right-margins for the head get TERMP_NOBREAK because, if
-        * they overrun the margin, they wrap to the new margin.
-        * Correspondingly, the body for these types don't left-pad, as
-        * the head will pad out to to the right.
+        * Pad and break control.  This is the tricky part.  These flags
+        * are documented in term_flushln() in term.c.  Note that we're
+        * going to unset all of these flags in termp_it_post() when we
+        * exit.
         */
 
        switch (type) {
-       case (MDOC_Bullet):
+       case LIST_enum:
+               /*
+                * Weird special case.
+                * Very narrow enum lists actually hang.
+                */
+               if (width == term_len(p, 2))
+                       p->flags |= TERMP_HANG;
                /* FALLTHROUGH */
-       case (MDOC_Dash):
+       case LIST_bullet:
                /* FALLTHROUGH */
-       case (MDOC_Enum):
+       case LIST_dash:
                /* FALLTHROUGH */
-       case (MDOC_Hyphen):
-               /* FALLTHROUGH */
-       case (MDOC_Tag):
-               if (MDOC_HEAD == node->type)
-                       p->flags |= TERMP_NOBREAK;
-               else
-                       p->flags |= TERMP_NOLPAD;
-               if (MDOC_HEAD == node->type && MDOC_Tag == type)
-                       if (NULL == node->next ||
-                                       NULL == node->next->child)
-                               p->flags |= TERMP_NONOBREAK;
-               break;
-       case (MDOC_Column):
-               if (MDOC_HEAD == node->type) {
-                       assert(node->next);
-                       if (MDOC_BODY == node->next->type)
-                               p->flags &= ~TERMP_NOBREAK;
-                       else
-                               p->flags |= TERMP_NOBREAK;
-                       if (node->prev) 
-                               p->flags |= TERMP_NOLPAD;
-               }
-               break;
-       case (MDOC_Diag):
-               if (MDOC_HEAD == node->type)
-                       p->flags |= TERMP_NOBREAK;
-               break;
-       default:
+       case LIST_hyphen:
+               if (MDOC_HEAD != n->type)
+                       break;
+               p->flags |= TERMP_NOBREAK;
+               p->trailspace = 1;
                break;
-       }
+       case LIST_hang:
+               if (MDOC_HEAD != n->type)
+                       break;
 
-       /* 
-        * Margin control.  Set-head-width lists have their right
-        * margins shortened.  The body for these lists has the offset
+               /*
+                * This is ugly.  If `-hang' is specified and the body
+                * is a `Bl' or `Bd', then we want basically to nullify
+                * the "overstep" effect in term_flushln() and treat
+                * this as a `-ohang' list instead.
+                */
+               if (n->next->child &&
+                   (MDOC_Bl == n->next->child->tok ||
+                    MDOC_Bd == n->next->child->tok))
+                       break;
+
+               p->flags |= TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG;
+               p->trailspace = 1;
+               break;
+       case LIST_tag:
+               if (MDOC_HEAD != n->type)
+                       break;
+
+               p->flags |= TERMP_NOBREAK | TERMP_BRIND;
+               p->trailspace = 2;
+
+               if (NULL == n->next || NULL == n->next->child)
+                       p->flags |= TERMP_DANGLE;
+               break;
+       case LIST_column:
+               if (MDOC_HEAD == n->type)
+                       break;
+
+               if (NULL == n->next) {
+                       p->flags &= ~TERMP_NOBREAK;
+                       p->trailspace = 0;
+               } else {
+                       p->flags |= TERMP_NOBREAK;
+                       p->trailspace = 1;
+               }
+
+               break;
+       case LIST_diag:
+               if (MDOC_HEAD != n->type)
+                       break;
+               p->flags |= TERMP_NOBREAK | TERMP_BRIND;
+               p->trailspace = 1;
+               break;
+       default:
+               break;
+       }
+
+       /*
+        * Margin control.  Set-head-width lists have their right
+        * margins shortened.  The body for these lists has the offset
         * necessarily lengthened.  Everybody gets the offset.
         */
 
        p->offset += offset;
 
        switch (type) {
-       case (MDOC_Bullet):
+       case LIST_hang:
+               /*
+                * Same stipulation as above, regarding `-hang'.  We
+                * don't want to recalculate rmargin and offsets when
+                * using `Bd' or `Bl' within `-hang' overstep lists.
+                */
+               if (MDOC_HEAD == n->type && n->next->child &&
+                   (MDOC_Bl == n->next->child->tok ||
+                    MDOC_Bd == n->next->child->tok))
+                       break;
+               /* FALLTHROUGH */
+       case LIST_bullet:
                /* FALLTHROUGH */
-       case (MDOC_Dash):
+       case LIST_dash:
                /* FALLTHROUGH */
-       case (MDOC_Enum):
+       case LIST_enum:
                /* FALLTHROUGH */
-       case (MDOC_Hyphen):
+       case LIST_hyphen:
                /* FALLTHROUGH */
-       case (MDOC_Tag):
-               if (MDOC_HEAD == node->type)
+       case LIST_tag:
+               assert(width);
+               if (MDOC_HEAD == n->type)
                        p->rmargin = p->offset + width;
-               else 
+               else {
                        p->offset += width;
+                       if (p->rmargin < p->offset)
+                               p->rmargin = p->offset;
+               }
                break;
-       case (MDOC_Column):
+       case LIST_column:
+               assert(width);
                p->rmargin = p->offset + width;
+               /*
+                * XXX - this behaviour is not documented: the
+                * right-most column is filled to the right margin.
+                */
+               if (MDOC_HEAD == n->type)
+                       break;
+               if (NULL == n->next && p->rmargin < p->maxrmargin)
+                       p->rmargin = p->maxrmargin;
                break;
        default:
                break;
        }
 
-       /* 
+       /*
         * The dash, hyphen, bullet and enum lists all have a special
-        * HEAD character.  Print it now.
+        * HEAD character (temporarily bold, in some cases).
         */
 
-       if (MDOC_HEAD == node->type)
+       if (MDOC_HEAD == n->type)
                switch (type) {
-               case (MDOC_Bullet):
+               case LIST_bullet:
+                       term_fontpush(p, TERMFONT_BOLD);
                        term_word(p, "\\[bu]");
+                       term_fontpop(p);
                        break;
-               case (MDOC_Dash):
+               case LIST_dash:
                        /* FALLTHROUGH */
-               case (MDOC_Hyphen):
-                       term_word(p, "\\-");
+               case LIST_hyphen:
+                       term_fontpush(p, TERMFONT_BOLD);
+                       term_word(p, "\\(hy");
+                       term_fontpop(p);
                        break;
-               case (MDOC_Enum):
+               case LIST_enum:
                        (pair->ppair->ppair->count)++;
-                       (void)snprintf(buf, sizeof(buf), "%d.", 
-                                       pair->ppair->ppair->count);
+                       (void)snprintf(buf, sizeof(buf), "%d.",
+                           pair->ppair->ppair->count);
                        term_word(p, buf);
                        break;
                default:
                        break;
                }
 
-       /* 
+       /*
         * If we're not going to process our children, indicate so here.
         */
 
        switch (type) {
-       case (MDOC_Bullet):
+       case LIST_bullet:
                /* FALLTHROUGH */
-       case (MDOC_Item):
+       case LIST_item:
                /* FALLTHROUGH */
-       case (MDOC_Dash):
+       case LIST_dash:
                /* FALLTHROUGH */
-       case (MDOC_Hyphen):
+       case LIST_hyphen:
                /* FALLTHROUGH */
-       case (MDOC_Enum):
-               if (MDOC_HEAD == node->type)
+       case LIST_enum:
+               if (MDOC_HEAD == n->type)
                        return(0);
                break;
-       case (MDOC_Column):
-               if (MDOC_BODY == node->type)
+       case LIST_column:
+               if (MDOC_HEAD == n->type)
                        return(0);
                break;
        default:
@@ -1046,290 +953,461 @@ termp_it_pre(DECL_ARGS)
        return(1);
 }
 
-
-/* ARGSUSED */
 static void
 termp_it_post(DECL_ARGS)
 {
-       int                type;
+       enum mdoc_list     type;
 
-       if (MDOC_BODY != node->type && MDOC_HEAD != node->type)
+       if (MDOC_BLOCK == n->type)
                return;
 
-       type = arg_listtype(node->parent->parent->parent);
+       type = n->parent->parent->parent->norm->Bl.type;
 
        switch (type) {
-       case (MDOC_Diag):
+       case LIST_item:
                /* FALLTHROUGH */
-       case (MDOC_Item):
+       case LIST_diag:
                /* FALLTHROUGH */
-       case (MDOC_Inset):
-               if (MDOC_BODY == node->type)
-                       term_flushln(p);
+       case LIST_inset:
+               if (MDOC_BODY == n->type)
+                       term_newln(p);
                break;
-       case (MDOC_Column):
-               if (MDOC_HEAD == node->type)
+       case LIST_column:
+               if (MDOC_BODY == n->type)
                        term_flushln(p);
                break;
        default:
-               term_flushln(p);
+               term_newln(p);
                break;
        }
 
-       p->offset = pair->offset;
-       p->rmargin = pair->rmargin;
-       p->flags = pair->flag;
-}
+       /*
+        * Now that our output is flushed, we can reset our tags.  Since
+        * only `It' sets these flags, we're free to assume that nobody
+        * has munged them in the meanwhile.
+        */
 
+       p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND |
+                       TERMP_DANGLE | TERMP_HANG);
+       p->trailspace = 0;
+}
 
-/* ARGSUSED */
 static int
 termp_nm_pre(DECL_ARGS)
 {
 
-       if (SEC_SYNOPSIS == node->sec)
-               term_newln(p);
+       if (MDOC_BLOCK == n->type) {
+               p->flags |= TERMP_PREKEEP;
+               return(1);
+       }
 
-       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_PROG]);
-       if (NULL == node->child)
-               term_word(p, meta->name);
+       if (MDOC_BODY == n->type) {
+               if (NULL == n->child)
+                       return(0);
+               p->flags |= TERMP_NOSPACE;
+               p->offset += term_len(p, 1) +
+                   (NULL == n->prev->child ?
+                    term_strlen(p, meta->name) :
+                    MDOC_TEXT == n->prev->child->type ?
+                    term_strlen(p, n->prev->child->string) :
+                    term_len(p, 5));
+               if (p->rmargin < p->offset)
+                       p->rmargin = p->offset;
+               return(1);
+       }
+
+       if (NULL == n->child && NULL == meta->name)
+               return(0);
+
+       if (MDOC_HEAD == n->type)
+               synopsis_pre(p, n->parent);
+
+       if (MDOC_HEAD == n->type && n->next->child) {
+               p->flags |= TERMP_NOSPACE | TERMP_NOBREAK | TERMP_BRIND;
+               p->trailspace = 1;
+               p->rmargin = p->offset + term_len(p, 1);
+               if (NULL == n->child) {
+                       p->rmargin += term_strlen(p, meta->name);
+               } else if (MDOC_TEXT == n->child->type) {
+                       p->rmargin += term_strlen(p, n->child->string);
+                       if (n->child->next)
+                               p->flags |= TERMP_HANG;
+               } else {
+                       p->rmargin += term_len(p, 5);
+                       p->flags |= TERMP_HANG;
+               }
+       }
 
+       term_fontpush(p, TERMFONT_BOLD);
+       if (NULL == n->child)
+               term_word(p, meta->name);
        return(1);
 }
 
+static void
+termp_nm_post(DECL_ARGS)
+{
+
+       if (MDOC_BLOCK == n->type) {
+               p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);
+       } else if (MDOC_HEAD == n->type && n->next->child) {
+               term_flushln(p);
+               p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG);
+               p->trailspace = 0;
+       } else if (MDOC_BODY == n->type && n->child)
+               term_flushln(p);
+}
 
-/* ARGSUSED */
 static int
 termp_fl_pre(DECL_ARGS)
 {
 
-       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD_FLAG]);
+       term_fontpush(p, TERMFONT_BOLD);
        term_word(p, "\\-");
-       p->flags |= TERMP_NOSPACE;
+
+       if (n->child)
+               p->flags |= TERMP_NOSPACE;
+       else if (n->next && n->next->line == n->line)
+               p->flags |= TERMP_NOSPACE;
+
        return(1);
 }
 
-
-/* ARGSUSED */
 static int
-termp_ar_pre(DECL_ARGS)
+termp__a_pre(DECL_ARGS)
 {
 
-       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD_ARG]);
+       if (n->prev && MDOC__A == n->prev->tok)
+               if (NULL == n->next || MDOC__A != n->next->tok)
+                       term_word(p, "and");
+
        return(1);
 }
 
-
-/* ARGSUSED */
 static int
-termp_ns_pre(DECL_ARGS)
+termp_an_pre(DECL_ARGS)
 {
 
-       p->flags |= TERMP_NOSPACE;
-       return(1);
-}
+       if (NULL == n->child)
+               return(1);
 
+       /*
+        * If not in the AUTHORS section, `An -split' will cause
+        * newlines to occur before the author name.  If in the AUTHORS
+        * section, by default, the first `An' invocation is nosplit,
+        * then all subsequent ones, regardless of whether interspersed
+        * with other macros/text, are split.  -split, in this case,
+        * will override the condition of the implied first -nosplit.
+        */
 
-/* ARGSUSED */
-static int
-termp_pp_pre(DECL_ARGS)
-{
+       if (n->sec == SEC_AUTHORS) {
+               if ( ! (TERMP_ANPREC & p->flags)) {
+                       if (TERMP_SPLIT & p->flags)
+                               term_newln(p);
+                       return(1);
+               }
+               if (TERMP_NOSPLIT & p->flags)
+                       return(1);
+               term_newln(p);
+               return(1);
+       }
+
+       if (TERMP_SPLIT & p->flags)
+               term_newln(p);
 
-       term_vspace(p);
        return(1);
 }
 
+static void
+termp_an_post(DECL_ARGS)
+{
+
+       if (n->child) {
+               if (SEC_AUTHORS == n->sec)
+                       p->flags |= TERMP_ANPREC;
+               return;
+       }
+
+       if (AUTH_split == n->norm->An.auth) {
+               p->flags &= ~TERMP_NOSPLIT;
+               p->flags |= TERMP_SPLIT;
+       } else if (AUTH_nosplit == n->norm->An.auth) {
+               p->flags &= ~TERMP_SPLIT;
+               p->flags |= TERMP_NOSPLIT;
+       }
+
+}
 
-/* ARGSUSED */
 static int
-termp_st_pre(DECL_ARGS)
+termp_ns_pre(DECL_ARGS)
 {
-       const char      *cp;
 
-       if (node->child && (cp = mdoc_a2st(node->child->string)))
-               term_word(p, cp);
-       return(0);
+       if ( ! (MDOC_LINE & n->flags))
+               p->flags |= TERMP_NOSPACE;
+       return(1);
 }
 
-
-/* ARGSUSED */
 static int
 termp_rs_pre(DECL_ARGS)
 {
 
-       if (MDOC_BLOCK == node->type && node->prev)
+       if (SEC_SEE_ALSO != n->sec)
+               return(1);
+       if (MDOC_BLOCK == n->type && n->prev)
                term_vspace(p);
        return(1);
 }
 
-
-/* ARGSUSED */
 static int
 termp_rv_pre(DECL_ARGS)
 {
-       int              i;
-
-       if (-1 == (i = arg_getattr(MDOC_Std, node)))
-               errx(1, "expected -std argument");
-       if (1 != node->args->argv[i].sz)
-               errx(1, "expected -std argument");
+       int              nchild;
 
        term_newln(p);
        term_word(p, "The");
 
-       p->flags |= ttypes[TTYPE_FUNC_NAME];
-       term_word(p, *node->args->argv[i].value);
-       p->flags &= ~ttypes[TTYPE_FUNC_NAME];
-       p->flags |= TERMP_NOSPACE;
+       nchild = n->nchild;
+       for (n = n->child; n; n = n->next) {
+               term_fontpush(p, TERMFONT_BOLD);
+               term_word(p, n->string);
+               term_fontpop(p);
+
+               p->flags |= TERMP_NOSPACE;
+               term_word(p, "()");
+
+               if (nchild > 2 && n->next) {
+                       p->flags |= TERMP_NOSPACE;
+                       term_word(p, ",");
+               }
+
+               if (n->next && NULL == n->next->next)
+                       term_word(p, "and");
+       }
 
-               term_word(p, "() function returns the value 0 if successful;");
-               term_word(p, "otherwise the value -1 is returned and the");
-               term_word(p, "global variable");
+       if (nchild > 1)
+               term_word(p, "functions return");
+       else
+               term_word(p, "function returns");
 
-       p->flags |= ttypes[TTYPE_VAR_DECL];
+       term_word(p, "the value 0 if successful; otherwise the "
+           "value -1 is returned and the global variable");
+
+       term_fontpush(p, TERMFONT_UNDER);
        term_word(p, "errno");
-       p->flags &= ~ttypes[TTYPE_VAR_DECL];
+       term_fontpop(p);
 
-               term_word(p, "is set to indicate the error.");
+       term_word(p, "is set to indicate the error.");
+       p->flags |= TERMP_SENTENCE;
 
-       return(1);
+       return(0);
 }
 
-
-/* ARGSUSED */
 static int
 termp_ex_pre(DECL_ARGS)
 {
-       int              i;
-
-       if (-1 == (i = arg_getattr(MDOC_Std, node)))
-               errx(1, "expected -std argument");
-       if (1 != node->args->argv[i].sz)
-               errx(1, "expected -std argument");
+       int              nchild;
 
+       term_newln(p);
        term_word(p, "The");
-       p->flags |= ttypes[TTYPE_PROG];
-       term_word(p, *node->args->argv[i].value);
-       p->flags &= ~ttypes[TTYPE_PROG];
-               term_word(p, "utility exits 0 on success, and >0 if an error occurs.");
 
-       return(1);
-}
+       nchild = n->nchild;
+       for (n = n->child; n; n = n->next) {
+               term_fontpush(p, TERMFONT_BOLD);
+               term_word(p, n->string);
+               term_fontpop(p);
+
+               if (nchild > 2 && n->next) {
+                       p->flags |= TERMP_NOSPACE;
+                       term_word(p, ",");
+               }
+
+               if (n->next && NULL == n->next->next)
+                       term_word(p, "and");
+       }
+
+       if (nchild > 1)
+               term_word(p, "utilities exit");
+       else
+               term_word(p, "utility exits");
 
+       term_word(p, "0 on success, and >0 if an error occurs.");
+
+       p->flags |= TERMP_SENTENCE;
+       return(0);
+}
 
-/* ARGSUSED */
 static int
 termp_nd_pre(DECL_ARGS)
 {
 
-       term_word(p, "\\-");
+       if (MDOC_BODY != n->type)
+               return(1);
+
+#if defined(__OpenBSD__) || defined(__linux__)
+       term_word(p, "\\(en");
+#else
+       term_word(p, "\\(em");
+#endif
        return(1);
 }
 
-
-/* ARGSUSED */
-static void
-termp_bl_post(DECL_ARGS)
+static int
+termp_bl_pre(DECL_ARGS)
 {
 
-       if (MDOC_BLOCK == node->type)
-               term_newln(p);
+       return(MDOC_HEAD != n->type);
 }
 
-
-/* ARGSUSED */
 static void
-termp_op_post(DECL_ARGS)
+termp_bl_post(DECL_ARGS)
 {
 
-       if (MDOC_BODY != node->type) 
-               return;
-       p->flags |= TERMP_NOSPACE;
-       term_word(p, "\\(rB");
+       if (MDOC_BLOCK == n->type)
+               term_newln(p);
 }
 
-
-/* ARGSUSED */
 static int
 termp_xr_pre(DECL_ARGS)
 {
-       const struct mdoc_node *n;
 
-       if (NULL == (n = node->child))
-               errx(1, "expected text line argument");
+       if (NULL == (n = n->child))
+               return(0);
+
+       assert(MDOC_TEXT == n->type);
        term_word(p, n->string);
-       if (NULL == (n = n->next)) 
+
+       if (NULL == (n = n->next))
                return(0);
+
        p->flags |= TERMP_NOSPACE;
        term_word(p, "(");
        p->flags |= TERMP_NOSPACE;
+
+       assert(MDOC_TEXT == n->type);
        term_word(p, n->string);
+
        p->flags |= TERMP_NOSPACE;
        term_word(p, ")");
+
        return(0);
 }
 
+/*
+ * This decides how to assert whitespace before any of the SYNOPSIS set
+ * of macros (which, as in the case of Ft/Fo and Ft/Fn, may contain
+ * macro combos).
+ */
+static void
+synopsis_pre(struct termp *p, const struct mdoc_node *n)
+{
+       /*
+        * Obviously, if we're not in a SYNOPSIS or no prior macros
+        * exist, do nothing.
+        */
+       if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags))
+               return;
+
+       /*
+        * If we're the second in a pair of like elements, emit our
+        * newline and return.  UNLESS we're `Fo', `Fn', `Fn', in which
+        * case we soldier on.
+        */
+       if (n->prev->tok == n->tok &&
+           MDOC_Ft != n->tok &&
+           MDOC_Fo != n->tok &&
+           MDOC_Fn != n->tok) {
+               term_newln(p);
+               return;
+       }
+
+       /*
+        * If we're one of the SYNOPSIS set and non-like pair-wise after
+        * another (or Fn/Fo, which we've let slip through) then assert
+        * vertical space, else only newline and move on.
+        */
+       switch (n->prev->tok) {
+       case MDOC_Fd:
+               /* FALLTHROUGH */
+       case MDOC_Fn:
+               /* FALLTHROUGH */
+       case MDOC_Fo:
+               /* FALLTHROUGH */
+       case MDOC_In:
+               /* FALLTHROUGH */
+       case MDOC_Vt:
+               term_vspace(p);
+               break;
+       case MDOC_Ft:
+               if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) {
+                       term_vspace(p);
+                       break;
+               }
+               /* FALLTHROUGH */
+       default:
+               term_newln(p);
+               break;
+       }
+}
 
-/* ARGSUSED */
 static int
 termp_vt_pre(DECL_ARGS)
 {
 
-       /* FIXME: this can be "type name". */
-       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_VAR_DECL]);
-       return(1);
-}
+       if (MDOC_ELEM == n->type) {
+               synopsis_pre(p, n);
+               return(termp_under_pre(p, pair, meta, n));
+       } else if (MDOC_BLOCK == n->type) {
+               synopsis_pre(p, n);
+               return(1);
+       } else if (MDOC_HEAD == n->type)
+               return(0);
 
+       return(termp_under_pre(p, pair, meta, n));
+}
 
-/* ARGSUSED */
-static void
-termp_vt_post(DECL_ARGS)
+static int
+termp_bold_pre(DECL_ARGS)
 {
 
-       if (node->sec == SEC_SYNOPSIS)
-               term_vspace(p);
+       term_fontpush(p, TERMFONT_BOLD);
+       return(1);
 }
 
-
-/* ARGSUSED */
 static int
 termp_fd_pre(DECL_ARGS)
 {
 
-       /* 
-        * FIXME: this naming is bad.  This value is used, in general,
-        * for the #include header or other preprocessor statement.
-        */
-       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FUNC_DECL]);
-       return(1);
+       synopsis_pre(p, n);
+       return(termp_bold_pre(p, pair, meta, n));
 }
 
-
-/* ARGSUSED */
 static void
 termp_fd_post(DECL_ARGS)
 {
 
-       if (node->sec != SEC_SYNOPSIS)
-               return;
        term_newln(p);
-       if (node->next && MDOC_Fd != node->next->tok)
-               term_vspace(p);
 }
 
-
-/* ARGSUSED */
 static int
 termp_sh_pre(DECL_ARGS)
 {
 
-       switch (node->type) {
-       case (MDOC_HEAD):
+       /* No vspace between consecutive `Sh' calls. */
+
+       switch (n->type) {
+       case MDOC_BLOCK:
+               if (n->prev && MDOC_Sh == n->prev->tok)
+                       if (NULL == n->prev->body->child)
+                               break;
                term_vspace(p);
-               TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SECTION]);
                break;
-       case (MDOC_BODY):
-               p->offset = INDENT;
+       case MDOC_HEAD:
+               term_fontpush(p, TERMFONT_BOLD);
+               break;
+       case MDOC_BODY:
+               p->offset = term_len(p, p->defindent);
+               if (SEC_AUTHORS == n->sec)
+                       p->flags &= ~(TERMP_SPLIT|TERMP_NOSPLIT);
                break;
        default:
                break;
@@ -1337,17 +1415,15 @@ termp_sh_pre(DECL_ARGS)
        return(1);
 }
 
-
-/* ARGSUSED */
 static void
 termp_sh_post(DECL_ARGS)
 {
 
-       switch (node->type) {
-       case (MDOC_HEAD):
+       switch (n->type) {
+       case MDOC_HEAD:
                term_newln(p);
                break;
-       case (MDOC_BODY):
+       case MDOC_BODY:
                term_newln(p);
                p->offset = 0;
                break;
@@ -1356,491 +1432,320 @@ termp_sh_post(DECL_ARGS)
        }
 }
 
-
-/* ARGSUSED */
-static int
-termp_op_pre(DECL_ARGS)
-{
-
-       switch (node->type) {
-       case (MDOC_BODY):
-               term_word(p, "\\(lB");
-               p->flags |= TERMP_NOSPACE;
-               break;
-       default:
-               break;
-       }
-       return(1);
-}
-
-
-/* ARGSUSED */
 static int
 termp_bt_pre(DECL_ARGS)
 {
 
        term_word(p, "is currently in beta test.");
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_lb_pre(DECL_ARGS)
-{
-       const char      *lb;
-
-       if (NULL == node->child)
-               errx(1, "expected text line argument");
-       if ((lb = mdoc_a2lib(node->child->string))) {
-               term_word(p, lb);
-               return(0);
-       }
-       term_word(p, "library");
-       return(1);
+       p->flags |= TERMP_SENTENCE;
+       return(0);
 }
 
-
-/* ARGSUSED */
 static void
 termp_lb_post(DECL_ARGS)
 {
 
-       term_newln(p);
+       if (SEC_LIBRARY == n->sec && MDOC_LINE & n->flags)
+               term_newln(p);
 }
 
-
-/* ARGSUSED */
 static int
 termp_ud_pre(DECL_ARGS)
 {
 
        term_word(p, "currently under development.");
-       return(1);
+       p->flags |= TERMP_SENTENCE;
+       return(0);
 }
 
-
-/* ARGSUSED */
 static int
 termp_d1_pre(DECL_ARGS)
 {
 
-       if (MDOC_BLOCK != node->type)
+       if (MDOC_BLOCK != n->type)
                return(1);
        term_newln(p);
-       p->offset += (pair->offset = INDENT);
+       p->offset += term_len(p, p->defindent + 1);
        return(1);
 }
 
-
-/* ARGSUSED */
-static void
-termp_d1_post(DECL_ARGS)
+static int
+termp_ft_pre(DECL_ARGS)
 {
 
-       if (MDOC_BLOCK != node->type) 
-               return;
-       term_newln(p);
-       p->offset -= pair->offset;
+       /* NB: MDOC_LINE does not effect this! */
+       synopsis_pre(p, n);
+       term_fontpush(p, TERMFONT_UNDER);
+       return(1);
 }
 
-
-/* ARGSUSED */
 static int
-termp_aq_pre(DECL_ARGS)
+termp_fn_pre(DECL_ARGS)
 {
+       size_t           rmargin = 0;
+       int              pretty;
 
-       if (MDOC_BODY != node->type)
-               return(1);
-       term_word(p, "\\(la");
-       p->flags |= TERMP_NOSPACE;
-       return(1);
-}
+       pretty = MDOC_SYNPRETTY & n->flags;
 
+       synopsis_pre(p, n);
 
-/* ARGSUSED */
-static void
-termp_aq_post(DECL_ARGS)
-{
+       if (NULL == (n = n->child))
+               return(0);
 
-       if (MDOC_BODY != node->type)
-               return;
-       p->flags |= TERMP_NOSPACE;
-       term_word(p, "\\(ra");
-}
+       if (pretty) {
+               rmargin = p->rmargin;
+               p->rmargin = p->offset + term_len(p, 4);
+               p->flags |= TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG;
+       }
 
+       assert(MDOC_TEXT == n->type);
+       term_fontpush(p, TERMFONT_BOLD);
+       term_word(p, n->string);
+       term_fontpop(p);
 
-/* ARGSUSED */
-static int
-termp_ft_pre(DECL_ARGS)
-{
-
-       if (SEC_SYNOPSIS == node->sec)
-               if (node->prev && MDOC_Fo == node->prev->tok)
-                       term_vspace(p);
-       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FUNC_TYPE]);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_ft_post(DECL_ARGS)
-{
-
-       if (SEC_SYNOPSIS == node->sec)
-               term_newln(p);
-}
-
-
-/* ARGSUSED */
-static int
-termp_fn_pre(DECL_ARGS)
-{
-       const struct mdoc_node *n;
-
-       if (NULL == node->child)
-               errx(1, "expected text line arguments");
-
-       /* FIXME: can be "type funcname" "type varname"... */
-
-       p->flags |= ttypes[TTYPE_FUNC_NAME];
-       term_word(p, node->child->string);
-       p->flags &= ~ttypes[TTYPE_FUNC_NAME];
+       if (pretty) {
+               term_flushln(p);
+               p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG);
+               p->offset = p->rmargin;
+               p->rmargin = rmargin;
+       }
 
        p->flags |= TERMP_NOSPACE;
        term_word(p, "(");
+       p->flags |= TERMP_NOSPACE;
 
-       for (n = node->child->next; n; n = n->next) {
-               p->flags |= ttypes[TTYPE_FUNC_ARG];
+       for (n = n->next; n; n = n->next) {
+               assert(MDOC_TEXT == n->type);
+               term_fontpush(p, TERMFONT_UNDER);
+               if (pretty)
+                       p->flags |= TERMP_NBRWORD;
                term_word(p, n->string);
-               p->flags &= ~ttypes[TTYPE_FUNC_ARG];
-               if (n->next)
+               term_fontpop(p);
+
+               if (n->next) {
+                       p->flags |= TERMP_NOSPACE;
                        term_word(p, ",");
+               }
        }
 
+       p->flags |= TERMP_NOSPACE;
        term_word(p, ")");
 
-       if (SEC_SYNOPSIS == node->sec)
+       if (pretty) {
+               p->flags |= TERMP_NOSPACE;
                term_word(p, ";");
+               term_flushln(p);
+       }
 
        return(0);
 }
 
-
-/* ARGSUSED */
-static void
-termp_fn_post(DECL_ARGS)
-{
-
-       if (node->sec == SEC_SYNOPSIS && node->next)
-               term_vspace(p);
-
-}
-
-
-/* ARGSUSED */
-static int
-termp_sx_pre(DECL_ARGS)
-{
-
-       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_LINK]);
-       return(1);
-}
-
-
-/* ARGSUSED */
 static int
 termp_fa_pre(DECL_ARGS)
 {
-       struct mdoc_node *n;
+       const struct mdoc_node  *nn;
 
-       if (node->parent->tok != MDOC_Fo) {
-               TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FUNC_ARG]);
+       if (n->parent->tok != MDOC_Fo) {
+               term_fontpush(p, TERMFONT_UNDER);
                return(1);
        }
 
-       for (n = node->child; n; n = n->next) {
-               p->flags |= ttypes[TTYPE_FUNC_ARG];
-               term_word(p, n->string);
-               p->flags &= ~ttypes[TTYPE_FUNC_ARG];
-               if (n->next)
+       for (nn = n->child; nn; nn = nn->next) {
+               term_fontpush(p, TERMFONT_UNDER);
+               p->flags |= TERMP_NBRWORD;
+               term_word(p, nn->string);
+               term_fontpop(p);
+
+               if (nn->next || (n->next && n->next->tok == MDOC_Fa)) {
+                       p->flags |= TERMP_NOSPACE;
                        term_word(p, ",");
+               }
        }
 
-       if (node->child && node->next && node->next->tok == MDOC_Fa)
-               term_word(p, ",");
-
        return(0);
 }
 
-
-/* ARGSUSED */
 static int
-termp_va_pre(DECL_ARGS)
+termp_bd_pre(DECL_ARGS)
 {
+       size_t                   tabwidth, rm, rmax;
+       struct mdoc_node        *nn;
 
-       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_VAR_DECL]);
-       return(1);
-}
-
+       if (MDOC_BLOCK == n->type) {
+               print_bvspace(p, n, n);
+               return(1);
+       } else if (MDOC_HEAD == n->type)
+               return(0);
 
-/* ARGSUSED */
-static int
-termp_bd_pre(DECL_ARGS)
-{
-       int              i, type, ln;
+       if (n->norm->Bd.offs)
+               p->offset += a2offs(p, n->norm->Bd.offs);
 
        /*
-        * This is fairly tricky due primarily to crappy documentation.
         * If -ragged or -filled are specified, the block does nothing
-        * but change the indentation.
-        *
-        * If, on the other hand, -unfilled or -literal are specified,
-        * then the game changes.  Text is printed exactly as entered in
-        * the display: if a macro line, a newline is appended to the
-        * line.  Blank lines are allowed.
+        * but change the indentation.  If -unfilled or -literal are
+        * specified, text is printed exactly as entered in the display:
+        * for macro lines, a newline is appended to the line.  Blank
+        * lines are allowed.
         */
 
-       if (MDOC_BLOCK == node->type)
-               return(fmt_block_vspace(p, node, node));
-       else if (MDOC_BODY != node->type)
+       if (DISP_literal != n->norm->Bd.type &&
+           DISP_unfilled != n->norm->Bd.type)
                return(1);
 
-       if (NULL == node->parent->args)
-               errx(1, "missing display type");
-
-       pair->offset = p->offset;
-
-       for (type = -1, i = 0; 
-                       i < (int)node->parent->args->argc; i++) {
-               switch (node->parent->args->argv[i].arg) {
-               case (MDOC_Ragged):
+       tabwidth = p->tabwidth;
+       if (DISP_literal == n->norm->Bd.type)
+               p->tabwidth = term_len(p, 8);
+
+       rm = p->rmargin;
+       rmax = p->maxrmargin;
+       p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
+
+       for (nn = n->child; nn; nn = nn->next) {
+               print_mdoc_node(p, pair, meta, nn);
+               /*
+                * If the printed node flushes its own line, then we
+                * needn't do it here as well.  This is hacky, but the
+                * notion of selective eoln whitespace is pretty dumb
+                * anyway, so don't sweat it.
+                */
+               switch (nn->tok) {
+               case MDOC_Sm:
                        /* FALLTHROUGH */
-               case (MDOC_Filled):
+               case MDOC_br:
                        /* FALLTHROUGH */
-               case (MDOC_Unfilled):
+               case MDOC_sp:
                        /* FALLTHROUGH */
-               case (MDOC_Literal):
-                       type = node->parent->args->argv[i].arg;
-                       i = (int)node->parent->args->argc;
-                       break;
+               case MDOC_Bl:
+                       /* FALLTHROUGH */
+               case MDOC_D1:
+                       /* FALLTHROUGH */
+               case MDOC_Dl:
+                       /* FALLTHROUGH */
+               case MDOC_Lp:
+                       /* FALLTHROUGH */
+               case MDOC_Pp:
+                       continue;
                default:
                        break;
                }
+               if (nn->next && nn->next->line == nn->line)
+                       continue;
+               term_flushln(p);
+               p->flags |= TERMP_NOSPACE;
        }
 
-       if (NULL == node->parent->args)
-               errx(1, "missing display type");
-
-       i = arg_getattr(MDOC_Offset, node->parent);
-       if (-1 != i) {
-               if (1 != node->parent->args->argv[i].sz)
-                       errx(1, "expected single value");
-               p->offset += arg_offset(&node->parent->args->argv[i]);
-       }
-
-       switch (type) {
-       case (MDOC_Literal):
-               /* FALLTHROUGH */
-       case (MDOC_Unfilled):
-               break;
-       default:
-               return(1);
-       }
-
-       /*
-        * Tricky.  Iterate through all children.  If we're on a
-        * different parse line, append a newline and then the contents.
-        * Ew.
-        */
-
-       p->flags |= TERMP_LITERAL;
-       ln = node->child ? node->child->line : 0;
-
-       for (node = node->child; node; node = node->next) {
-               if (ln < node->line) {
-                       term_flushln(p);
-                       p->flags |= TERMP_NOSPACE;
-               }
-               ln = node->line;
-               print_node(p, pair, meta, node);
-       }
-
+       p->tabwidth = tabwidth;
+       p->rmargin = rm;
+       p->maxrmargin = rmax;
        return(0);
 }
 
-
-/* ARGSUSED */
 static void
 termp_bd_post(DECL_ARGS)
 {
+       size_t           rm, rmax;
 
-       if (MDOC_BODY != node->type) 
+       if (MDOC_BODY != n->type)
                return;
 
-       term_flushln(p);
-       p->flags &= ~TERMP_LITERAL;
-       p->offset = pair->offset;
-       p->flags |= TERMP_NOSPACE;
-}
+       rm = p->rmargin;
+       rmax = p->maxrmargin;
 
+       if (DISP_literal == n->norm->Bd.type ||
+           DISP_unfilled == n->norm->Bd.type)
+               p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
 
-/* ARGSUSED */
-static int
-termp_qq_pre(DECL_ARGS)
-{
-
-       if (MDOC_BODY != node->type)
-               return(1);
-       term_word(p, "\"");
        p->flags |= TERMP_NOSPACE;
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_qq_post(DECL_ARGS)
-{
+       term_newln(p);
 
-       if (MDOC_BODY != node->type)
-               return;
-       p->flags |= TERMP_NOSPACE;
-       term_word(p, "\"");
+       p->rmargin = rm;
+       p->maxrmargin = rmax;
 }
 
-
-/* ARGSUSED */
 static int
-termp_bsx_pre(DECL_ARGS)
-{
-
-       term_word(p, "BSDI BSD/OS");
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_bx_post(DECL_ARGS)
+termp_bx_pre(DECL_ARGS)
 {
 
-       if (node->child)
+       if (NULL != (n = n->child)) {
+               term_word(p, n->string);
                p->flags |= TERMP_NOSPACE;
-       term_word(p, "BSD");
-}
-
-
-/* ARGSUSED */
-static int
-termp_ox_pre(DECL_ARGS)
-{
-
-       term_word(p, "OpenBSD");
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_dx_pre(DECL_ARGS)
-{
-
-       term_word(p, "DragonFly");
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_ux_pre(DECL_ARGS)
-{
-
-       term_word(p, "UNIX");
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_fx_pre(DECL_ARGS)
-{
-
-       term_word(p, "FreeBSD");
-       return(1);
-}
-
+               term_word(p, "BSD");
+       } else {
+               term_word(p, "BSD");
+               return(0);
+       }
 
-/* ARGSUSED */
-static int
-termp_nx_pre(DECL_ARGS)
-{
+       if (NULL != (n = n->next)) {
+               p->flags |= TERMP_NOSPACE;
+               term_word(p, "-");
+               p->flags |= TERMP_NOSPACE;
+               term_word(p, n->string);
+       }
 
-       term_word(p, "NetBSD");
-       return(1);
+       return(0);
 }
 
-
-/* ARGSUSED */
 static int
-termp_sq_pre(DECL_ARGS)
+termp_xx_pre(DECL_ARGS)
 {
+       const char      *pp;
+       int              flags;
 
-       if (MDOC_BODY != node->type)
-               return(1);
-       term_word(p, "\\(oq");
-       p->flags |= TERMP_NOSPACE;
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_sq_post(DECL_ARGS)
-{
-
-       if (MDOC_BODY != node->type)
-               return;
-       p->flags |= TERMP_NOSPACE;
-       term_word(p, "\\(aq");
-}
-
-
-/* ARGSUSED */
-static int
-termp_pf_pre(DECL_ARGS)
-{
+       pp = NULL;
+       switch (n->tok) {
+       case MDOC_Bsx:
+               pp = "BSD/OS";
+               break;
+       case MDOC_Dx:
+               pp = "DragonFly";
+               break;
+       case MDOC_Fx:
+               pp = "FreeBSD";
+               break;
+       case MDOC_Nx:
+               pp = "NetBSD";
+               break;
+       case MDOC_Ox:
+               pp = "OpenBSD";
+               break;
+       case MDOC_Ux:
+               pp = "UNIX";
+               break;
+       default:
+               abort();
+               /* NOTREACHED */
+       }
 
-       p->flags |= TERMP_IGNDELIM;
-       return(1);
+       term_word(p, pp);
+       if (n->child) {
+               flags = p->flags;
+               p->flags |= TERMP_KEEP;
+               term_word(p, n->child->string);
+               p->flags = flags;
+       }
+       return(0);
 }
 
-
-/* ARGSUSED */
 static void
 termp_pf_post(DECL_ARGS)
 {
 
-       p->flags &= ~TERMP_IGNDELIM;
        p->flags |= TERMP_NOSPACE;
 }
 
-
-/* ARGSUSED */
 static int
 termp_ss_pre(DECL_ARGS)
 {
 
-       switch (node->type) {
-       case (MDOC_BLOCK):
+       switch (n->type) {
+       case MDOC_BLOCK:
                term_newln(p);
-               if (node->prev)
+               if (n->prev)
                        term_vspace(p);
                break;
-       case (MDOC_HEAD):
-               TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SSECTION]);
-               p->offset = HALFINDENT;
+       case MDOC_HEAD:
+               term_fontpush(p, TERMFONT_BOLD);
+               p->offset = term_len(p, (p->defindent+1)/2);
                break;
        default:
                break;
@@ -1849,394 +1754,456 @@ termp_ss_pre(DECL_ARGS)
        return(1);
 }
 
-
-/* ARGSUSED */
 static void
 termp_ss_post(DECL_ARGS)
 {
 
-       switch (node->type) {
-       case (MDOC_HEAD):
+       if (MDOC_HEAD == n->type)
                term_newln(p);
-               p->offset = INDENT;
-               break;
-       default:
-               break;
-       }
-}
-
-
-/* ARGSUSED */
-static int
-termp_pa_pre(DECL_ARGS)
-{
-
-       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FILE]);
-       return(1);
 }
 
-
-/* ARGSUSED */
-static int
-termp_em_pre(DECL_ARGS)
-{
-
-       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]);
-       return(1);
-}
-
-
-/* ARGSUSED */
 static int
 termp_cd_pre(DECL_ARGS)
 {
 
-       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CONFIG]);
-       term_newln(p);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_cm_pre(DECL_ARGS)
-{
-
-       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD_FLAG]);
+       synopsis_pre(p, n);
+       term_fontpush(p, TERMFONT_BOLD);
        return(1);
 }
 
-
-/* ARGSUSED */
 static int
-termp_ic_pre(DECL_ARGS)
+termp_in_pre(DECL_ARGS)
 {
 
-       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD]);
-       return(1);
-}
-
+       synopsis_pre(p, n);
 
-/* ARGSUSED */
-static int
-termp_in_pre(DECL_ARGS)
-{
+       if (MDOC_SYNPRETTY & n->flags && MDOC_LINE & n->flags) {
+               term_fontpush(p, TERMFONT_BOLD);
+               term_word(p, "#include");
+               term_word(p, "<");
+       } else {
+               term_word(p, "<");
+               term_fontpush(p, TERMFONT_UNDER);
+       }
 
-       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_INCLUDE]);
-       term_word(p, "#include");
-       term_word(p, "<");
        p->flags |= TERMP_NOSPACE;
        return(1);
 }
 
-
-/* ARGSUSED */
 static void
 termp_in_post(DECL_ARGS)
 {
 
+       if (MDOC_SYNPRETTY & n->flags)
+               term_fontpush(p, TERMFONT_BOLD);
+
        p->flags |= TERMP_NOSPACE;
        term_word(p, ">");
 
-       term_newln(p);
-       if (SEC_SYNOPSIS != node->sec)
-               return;
-       if (node->next && MDOC_In != node->next->tok)
-               term_vspace(p);
+       if (MDOC_SYNPRETTY & n->flags)
+               term_fontpop(p);
 }
 
-
-/* ARGSUSED */
 static int
-termp_at_pre(DECL_ARGS)
+termp_sp_pre(DECL_ARGS)
 {
-       const char      *att;
+       size_t           i, len;
 
-       att = NULL;
+       switch (n->tok) {
+       case MDOC_sp:
+               len = n->child ? a2height(p, n->child->string) : 1;
+               break;
+       case MDOC_br:
+               len = 0;
+               break;
+       default:
+               len = 1;
+               break;
+       }
 
-       if (node->child)
-               att = mdoc_a2att(node->child->string);
-       if (NULL == att)
-               att = "AT&T UNIX";
+       if (0 == len)
+               term_newln(p);
+       for (i = 0; i < len; i++)
+               term_vspace(p);
 
-       term_word(p, att);
        return(0);
 }
 
-
-/* ARGSUSED */
 static int
-termp_brq_pre(DECL_ARGS)
+termp_es_pre(DECL_ARGS)
 {
 
-       if (MDOC_BODY != node->type)
-               return(1);
-       term_word(p, "\\(lC");
-       p->flags |= TERMP_NOSPACE;
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_brq_post(DECL_ARGS)
-{
-
-       if (MDOC_BODY != node->type)
-               return;
-       p->flags |= TERMP_NOSPACE;
-       term_word(p, "\\(rC");
+       return(0);
 }
 
-
-/* ARGSUSED */
 static int
-termp_bq_pre(DECL_ARGS)
+termp_quote_pre(DECL_ARGS)
 {
 
-       if (MDOC_BODY != node->type)
+       if (MDOC_BODY != n->type && MDOC_ELEM != n->type)
                return(1);
-       term_word(p, "\\(lB");
-       p->flags |= TERMP_NOSPACE;
-       return(1);
-}
 
+       switch (n->tok) {
+       case MDOC_Ao:
+               /* FALLTHROUGH */
+       case MDOC_Aq:
+               term_word(p, "<");
+               break;
+       case MDOC_Bro:
+               /* FALLTHROUGH */
+       case MDOC_Brq:
+               term_word(p, "{");
+               break;
+       case MDOC_Oo:
+               /* FALLTHROUGH */
+       case MDOC_Op:
+               /* FALLTHROUGH */
+       case MDOC_Bo:
+               /* FALLTHROUGH */
+       case MDOC_Bq:
+               term_word(p, "[");
+               break;
+       case MDOC_Do:
+               /* FALLTHROUGH */
+       case MDOC_Dq:
+               term_word(p, "\\(lq");
+               break;
+       case MDOC_En:
+               if (NULL == n->norm->Es ||
+                   NULL == n->norm->Es->child)
+                       return(1);
+               term_word(p, n->norm->Es->child->string);
+               break;
+       case MDOC_Eo:
+               break;
+       case MDOC_Po:
+               /* FALLTHROUGH */
+       case MDOC_Pq:
+               term_word(p, "(");
+               break;
+       case MDOC__T:
+               /* FALLTHROUGH */
+       case MDOC_Qo:
+               /* FALLTHROUGH */
+       case MDOC_Qq:
+               term_word(p, "\"");
+               break;
+       case MDOC_Ql:
+               /* FALLTHROUGH */
+       case MDOC_So:
+               /* FALLTHROUGH */
+       case MDOC_Sq:
+               term_word(p, "\\(oq");
+               break;
+       default:
+               abort();
+               /* NOTREACHED */
+       }
 
-/* ARGSUSED */
-static void
-termp_bq_post(DECL_ARGS)
-{
-
-       if (MDOC_BODY != node->type)
-               return;
-       p->flags |= TERMP_NOSPACE;
-       term_word(p, "\\(rB");
-}
-
-
-/* ARGSUSED */
-static int
-termp_pq_pre(DECL_ARGS)
-{
-
-       if (MDOC_BODY != node->type)
-               return(1);
-       term_word(p, "\\&(");
        p->flags |= TERMP_NOSPACE;
        return(1);
 }
 
-
-/* ARGSUSED */
 static void
-termp_pq_post(DECL_ARGS)
+termp_quote_post(DECL_ARGS)
 {
 
-       if (MDOC_BODY != node->type)
+       if (MDOC_BODY != n->type && MDOC_ELEM != n->type)
                return;
-       term_word(p, ")");
-}
 
+       if (MDOC_En != n->tok)
+               p->flags |= TERMP_NOSPACE;
+
+       switch (n->tok) {
+       case MDOC_Ao:
+               /* FALLTHROUGH */
+       case MDOC_Aq:
+               term_word(p, ">");
+               break;
+       case MDOC_Bro:
+               /* FALLTHROUGH */
+       case MDOC_Brq:
+               term_word(p, "}");
+               break;
+       case MDOC_Oo:
+               /* FALLTHROUGH */
+       case MDOC_Op:
+               /* FALLTHROUGH */
+       case MDOC_Bo:
+               /* FALLTHROUGH */
+       case MDOC_Bq:
+               term_word(p, "]");
+               break;
+       case MDOC_Do:
+               /* FALLTHROUGH */
+       case MDOC_Dq:
+               term_word(p, "\\(rq");
+               break;
+       case MDOC_En:
+               if (NULL != n->norm->Es &&
+                   NULL != n->norm->Es->child &&
+                   NULL != n->norm->Es->child->next) {
+                       p->flags |= TERMP_NOSPACE;
+                       term_word(p, n->norm->Es->child->next->string);
+               }
+               break;
+       case MDOC_Eo:
+               break;
+       case MDOC_Po:
+               /* FALLTHROUGH */
+       case MDOC_Pq:
+               term_word(p, ")");
+               break;
+       case MDOC__T:
+               /* FALLTHROUGH */
+       case MDOC_Qo:
+               /* FALLTHROUGH */
+       case MDOC_Qq:
+               term_word(p, "\"");
+               break;
+       case MDOC_Ql:
+               /* FALLTHROUGH */
+       case MDOC_So:
+               /* FALLTHROUGH */
+       case MDOC_Sq:
+               term_word(p, "\\(cq");
+               break;
+       default:
+               abort();
+               /* NOTREACHED */
+       }
+}
 
-/* ARGSUSED */
 static int
 termp_fo_pre(DECL_ARGS)
 {
-       const struct mdoc_node *n;
+       size_t           rmargin = 0;
+       int              pretty;
+
+       pretty = MDOC_SYNPRETTY & n->flags;
 
-       if (MDOC_BODY == node->type) {
+       if (MDOC_BLOCK == n->type) {
+               synopsis_pre(p, n);
+               return(1);
+       } else if (MDOC_BODY == n->type) {
+               if (pretty) {
+                       rmargin = p->rmargin;
+                       p->rmargin = p->offset + term_len(p, 4);
+                       p->flags |= TERMP_NOBREAK | TERMP_BRIND |
+                                       TERMP_HANG;
+               }
+               p->flags |= TERMP_NOSPACE;
                term_word(p, "(");
                p->flags |= TERMP_NOSPACE;
+               if (pretty) {
+                       term_flushln(p);
+                       p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND |
+                                       TERMP_HANG);
+                       p->offset = p->rmargin;
+                       p->rmargin = rmargin;
+               }
                return(1);
-       } else if (MDOC_HEAD != node->type) 
-               return(1);
+       }
 
-       /* XXX - groff shows only first parameter */
+       if (NULL == n->child)
+               return(0);
 
-       p->flags |= ttypes[TTYPE_FUNC_NAME];
-       for (n = node->child; n; n = n->next) {
-               if (MDOC_TEXT != n->type)
-                       errx(1, "expected text line argument");
-               term_word(p, n->string);
-       }
-       p->flags &= ~ttypes[TTYPE_FUNC_NAME];
+       /* XXX: we drop non-initial arguments as per groff. */
 
+       assert(n->child->string);
+       term_fontpush(p, TERMFONT_BOLD);
+       term_word(p, n->child->string);
        return(0);
 }
 
-
-/* ARGSUSED */
 static void
 termp_fo_post(DECL_ARGS)
 {
 
-       if (MDOC_BODY != node->type)
+       if (MDOC_BODY != n->type)
                return;
+
        p->flags |= TERMP_NOSPACE;
        term_word(p, ")");
-       p->flags |= TERMP_NOSPACE;
-       term_word(p, ";");
-       term_newln(p);
-}
 
+       if (MDOC_SYNPRETTY & n->flags) {
+               p->flags |= TERMP_NOSPACE;
+               term_word(p, ";");
+               term_flushln(p);
+       }
+}
 
-/* ARGSUSED */
 static int
 termp_bf_pre(DECL_ARGS)
 {
-       const struct mdoc_node  *n;
 
-       if (MDOC_HEAD == node->type) {
+       if (MDOC_HEAD == n->type)
                return(0);
-       } else if (MDOC_BLOCK != node->type)
-               return(1);
-
-       if (NULL == (n = node->head->child)) {
-               if (arg_hasattr(MDOC_Emphasis, node))
-                       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]);
-               else if (arg_hasattr(MDOC_Symbolic, node))
-                       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SYMB]);
-
+       else if (MDOC_BODY != n->type)
                return(1);
-       } 
-
-       if (MDOC_TEXT != n->type)
-               errx(1, "expected text line arguments");
 
-       if (0 == strcmp("Em", n->string))
-               TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]);
-       else if (0 == strcmp("Sy", n->string))
-               TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]);
+       if (FONT_Em == n->norm->Bf.font)
+               term_fontpush(p, TERMFONT_UNDER);
+       else if (FONT_Sy == n->norm->Bf.font)
+               term_fontpush(p, TERMFONT_BOLD);
+       else
+               term_fontpush(p, TERMFONT_NONE);
 
        return(1);
 }
 
-
-/* ARGSUSED */
 static int
-termp_sy_pre(DECL_ARGS)
+termp_sm_pre(DECL_ARGS)
 {
 
-       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SYMB]);
-       return(1);
-}
+       if (NULL == n->child)
+               p->flags ^= TERMP_NONOSPACE;
+       else if (0 == strcmp("on", n->child->string))
+               p->flags &= ~TERMP_NONOSPACE;
+       else
+               p->flags |= TERMP_NONOSPACE;
+
+       if (p->col && ! (TERMP_NONOSPACE & p->flags))
+               p->flags &= ~TERMP_NOSPACE;
 
+       return(0);
+}
 
-/* ARGSUSED */
 static int
-termp_ms_pre(DECL_ARGS)
+termp_ap_pre(DECL_ARGS)
 {
 
-       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SYMBOL]);
+       p->flags |= TERMP_NOSPACE;
+       term_word(p, "'");
+       p->flags |= TERMP_NOSPACE;
        return(1);
 }
 
+static void
+termp____post(DECL_ARGS)
+{
 
+       /*
+        * Handle lists of authors.  In general, print each followed by
+        * a comma.  Don't print the comma if there are only two
+        * authors.
+        */
+       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;
 
-/* ARGSUSED */
-static int
-termp_sm_pre(DECL_ARGS)
-{
+       /* TODO: %U. */
 
-       if (NULL == node->child || MDOC_TEXT != node->child->type)
-               errx(1, "expected boolean line argument");
+       if (NULL == n->parent || MDOC_Rs != n->parent->tok)
+               return;
 
-       if (0 == strcmp("on", node->child->string)) {
-               p->flags &= ~TERMP_NONOSPACE;
-               p->flags &= ~TERMP_NOSPACE;
+       p->flags |= TERMP_NOSPACE;
+       if (NULL == n->next) {
+               term_word(p, ".");
+               p->flags |= TERMP_SENTENCE;
        } else
-               p->flags |= TERMP_NONOSPACE;
-
-       return(0);
+               term_word(p, ",");
 }
 
-
-/* ARGSUSED */
 static int
-termp_ap_pre(DECL_ARGS)
+termp_li_pre(DECL_ARGS)
 {
 
-       p->flags |= TERMP_NOSPACE;
-       term_word(p, "\\(aq");
-       p->flags |= TERMP_NOSPACE;
+       term_fontpush(p, TERMFONT_NONE);
        return(1);
 }
 
-
-/* ARGSUSED */
 static int
-termp__j_pre(DECL_ARGS)
+termp_lk_pre(DECL_ARGS)
 {
+       const struct mdoc_node *link, *descr;
 
-       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_REF_JOURNAL]);
-       return(1);
-}
+       if (NULL == (link = n->child))
+               return(0);
 
+       if (NULL != (descr = link->next)) {
+               term_fontpush(p, TERMFONT_UNDER);
+               while (NULL != descr) {
+                       term_word(p, descr->string);
+                       descr = descr->next;
+               }
+               p->flags |= TERMP_NOSPACE;
+               term_word(p, ":");
+               term_fontpop(p);
+       }
+
+       term_fontpush(p, TERMFONT_BOLD);
+       term_word(p, link->string);
+       term_fontpop(p);
+
+       return(0);
+}
 
-/* ARGSUSED */
 static int
-termp__t_pre(DECL_ARGS)
+termp_bk_pre(DECL_ARGS)
 {
 
-       term_word(p, "\"");
-       p->flags |= TERMP_NOSPACE;
+       switch (n->type) {
+       case MDOC_BLOCK:
+               break;
+       case MDOC_HEAD:
+               return(0);
+       case MDOC_BODY:
+               if (n->parent->args || 0 == n->prev->nchild)
+                       p->flags |= TERMP_PREKEEP;
+               break;
+       default:
+               abort();
+               /* NOTREACHED */
+       }
+
        return(1);
 }
 
-
-/* ARGSUSED */
 static void
-termp__t_post(DECL_ARGS)
+termp_bk_post(DECL_ARGS)
 {
 
-       p->flags |= TERMP_NOSPACE;
-       term_word(p, "\"");
-       termp____post(p, pair, meta, node);
+       if (MDOC_BODY == n->type)
+               p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);
 }
 
-
-/* ARGSUSED */
 static void
-termp____post(DECL_ARGS)
+termp__t_post(DECL_ARGS)
 {
 
-       p->flags |= TERMP_NOSPACE;
-       term_word(p, node->next ? "," : ".");
-}
+       /*
+        * If we're in an `Rs' and there's a journal present, then quote
+        * us instead of underlining us (for disambiguation).
+        */
+       if (n->parent && MDOC_Rs == n->parent->tok &&
+           n->parent->norm->Rs.quote_T)
+               termp_quote_post(p, pair, meta, n);
 
+       termp____post(p, pair, meta, n);
+}
 
-/* ARGSUSED */
 static int
-termp_lk_pre(DECL_ARGS)
+termp__t_pre(DECL_ARGS)
 {
-       const struct mdoc_node *n;
 
-       if (NULL == (n = node->child))
-               errx(1, "expected line argument");
-
-       p->flags |= ttypes[TTYPE_LINK_ANCHOR];
-       term_word(p, n->string);
-       p->flags &= ~ttypes[TTYPE_LINK_ANCHOR];
-       p->flags |= TERMP_NOSPACE;
-       term_word(p, ":");
-
-       p->flags |= ttypes[TTYPE_LINK_TEXT];
-       for ( ; n; n = n->next) {
-               term_word(p, n->string);
-       }
-       p->flags &= ~ttypes[TTYPE_LINK_TEXT];
+       /*
+        * If we're in an `Rs' and there's a journal present, then quote
+        * us instead of underlining us (for disambiguation).
+        */
+       if (n->parent && MDOC_Rs == n->parent->tok &&
+           n->parent->norm->Rs.quote_T)
+               return(termp_quote_pre(p, pair, meta, n));
 
-       return(0);
+       term_fontpush(p, TERMFONT_UNDER);
+       return(1);
 }
 
-
-/* ARGSUSED */
 static int
-termp_mt_pre(DECL_ARGS)
+termp_under_pre(DECL_ARGS)
 {
 
-       TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_LINK_ANCHOR]);
+       term_fontpush(p, TERMFONT_UNDER);
        return(1);
 }
-
-