X-Git-Url: https://git.cameronkatri.com/mandoc.git/blobdiff_plain/ab3ccf15eb37629459a92cd73cea7a345c475754..f297e8ee9d6c64721ec4be733153ad885f3fe569:/mdoc_term.c?ds=inline

diff --git a/mdoc_term.c b/mdoc_term.c
index 9105e71c..18f0ff09 100644
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,42 +1,41 @@
-/*	$Id: mdoc_term.c,v 1.151 2010/06/12 12:21:41 kristaps Exp $ */
+/*	$Id: mdoc_term.c,v 1.374 2019/06/27 12:20:18 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010, 2012-2019 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
  * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <sys/types.h>
 
 #include <assert.h>
 #include <ctype.h>
+#include <limits.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "mandoc.h"
+#include "mandoc_aux.h"
+#include "roff.h"
+#include "mdoc.h"
 #include "out.h"
 #include "term.h"
-#include "mdoc.h"
-#include "chars.h"
+#include "tag.h"
 #include "main.h"
 
-#define	INDENT		  5
-#define	HALFINDENT	  3
-
 struct	termpair {
 	struct termpair	 *ppair;
 	int		  count;
@@ -44,70 +43,62 @@ struct	termpair {
 
 #define	DECL_ARGS struct termp *p, \
 		  struct termpair *pair, \
-	  	  const struct mdoc_meta *m, \
-		  const struct mdoc_node *n
+		  const struct roff_meta *meta, \
+		  struct roff_node *n
 
-struct	termact {
+struct	mdoc_term_act {
 	int	(*pre)(DECL_ARGS);
 	void	(*post)(DECL_ARGS);
 };
 
-static	size_t	  a2width(const struct mdoc_argv *, int);
-static	size_t	  a2height(const struct mdoc_node *);
-static	size_t	  a2offs(const char *);
+static	int	  a2width(const struct termp *, const char *);
 
-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	void	  print_bvspace(struct termp *,
-			const struct mdoc_node *,
-			const struct mdoc_node *);
-static	void  	  print_mdoc_node(DECL_ARGS);
+			const struct roff_node *,
+			const struct roff_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	  print_mdoc_head(struct termp *, const struct roff_meta *);
+static	void	  print_mdoc_foot(struct termp *, const struct roff_meta *);
+static	void	  synopsis_pre(struct termp *,
+			const struct roff_node *);
 
 static	void	  termp____post(DECL_ARGS);
-static	void	  termp_an_post(DECL_ARGS);
-static	void	  termp_aq_post(DECL_ARGS);
+static	void	  termp__t_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_bq_post(DECL_ARGS);
-static	void	  termp_brq_post(DECL_ARGS);
-static	void	  termp_bx_post(DECL_ARGS);
-static	void	  termp_d1_post(DECL_ARGS);
-static	void	  termp_dq_post(DECL_ARGS);
-static	int	  termp_fd_pre(DECL_ARGS);
+static	void	  termp_eo_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_op_post(DECL_ARGS);
+static	void	  termp_nm_post(DECL_ARGS);
 static	void	  termp_pf_post(DECL_ARGS);
-static	void	  termp_pq_post(DECL_ARGS);
-static	void	  termp_qq_post(DECL_ARGS);
+static	void	  termp_quote_post(DECL_ARGS);
 static	void	  termp_sh_post(DECL_ARGS);
-static	void	  termp_sq_post(DECL_ARGS);
 static	void	  termp_ss_post(DECL_ARGS);
+static	void	  termp_xx_post(DECL_ARGS);
 
+static	int	  termp__a_pre(DECL_ARGS);
+static	int	  termp__t_pre(DECL_ARGS);
+static	int	  termp_abort_pre(DECL_ARGS);
 static	int	  termp_an_pre(DECL_ARGS);
 static	int	  termp_ap_pre(DECL_ARGS);
-static	int	  termp_aq_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_bq_pre(DECL_ARGS);
-static	int	  termp_brq_pre(DECL_ARGS);
-static	int	  termp_bt_pre(DECL_ARGS);
 static	int	  termp_cd_pre(DECL_ARGS);
 static	int	  termp_d1_pre(DECL_ARGS);
-static	int	  termp_dq_pre(DECL_ARGS);
+static	int	  termp_eo_pre(DECL_ARGS);
+static	int	  termp_em_pre(DECL_ARGS);
+static	int	  termp_er_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);
@@ -119,66 +110,63 @@ 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_op_pre(DECL_ARGS);
-static	int	  termp_pf_pre(DECL_ARGS);
-static	int	  termp_pq_pre(DECL_ARGS);
-static	int	  termp_qq_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_skip_pre(DECL_ARGS);
 static	int	  termp_sm_pre(DECL_ARGS);
-static	int	  termp_sp_pre(DECL_ARGS);
-static	int	  termp_sq_pre(DECL_ARGS);
+static	int	  termp_pp_pre(DECL_ARGS);
 static	int	  termp_ss_pre(DECL_ARGS);
+static	int	  termp_sy_pre(DECL_ARGS);
+static	int	  termp_tag_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 */
+static const struct mdoc_term_act mdoc_term_acts[MDOC_MAX - MDOC_Dd] = {
 	{ NULL, NULL }, /* Dd */
 	{ NULL, NULL }, /* Dt */
 	{ NULL, NULL }, /* Os */
 	{ termp_sh_pre, termp_sh_post }, /* Sh */
-	{ termp_ss_pre, termp_ss_post }, /* Ss */ 
-	{ termp_sp_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_pp_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 */
 	{ termp_bl_pre, termp_bl_post }, /* Bl */
 	{ NULL, NULL }, /* El */
 	{ termp_it_pre, termp_it_post }, /* It */
-	{ NULL, NULL }, /* Ad */ 
-	{ termp_an_pre, termp_an_post }, /* An */
+	{ termp_under_pre, NULL }, /* Ad */
+	{ termp_an_pre, NULL }, /* An */
+	{ termp_ap_pre, NULL }, /* Ap */
 	{ termp_under_pre, NULL }, /* Ar */
 	{ termp_cd_pre, NULL }, /* Cd */
 	{ termp_bold_pre, NULL }, /* Cm */
-	{ NULL, NULL }, /* Dv */ 
-	{ NULL, NULL }, /* Er */ 
-	{ NULL, NULL }, /* Ev */ 
+	{ termp_li_pre, NULL }, /* Dv */
+	{ termp_er_pre, NULL }, /* Er */
+	{ termp_tag_pre, NULL }, /* Ev */
 	{ termp_ex_pre, NULL }, /* Ex */
-	{ termp_fa_pre, NULL }, /* Fa */ 
-	{ termp_fd_pre, NULL }, /* Fd */ 
+	{ termp_fa_pre, NULL }, /* Fa */
+	{ termp_fd_pre, termp_fd_post }, /* Fd */
 	{ termp_fl_pre, NULL }, /* Fl */
-	{ termp_fn_pre, NULL }, /* Fn */ 
-	{ termp_ft_pre, NULL }, /* Ft */ 
-	{ termp_bold_pre, NULL }, /* Ic */ 
-	{ termp_in_pre, termp_in_post }, /* In */ 
+	{ 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, NULL }, /* Nm */ 
-	{ termp_op_pre, termp_op_post }, /* Op */
-	{ NULL, NULL }, /* Ot */
+	{ termp_nd_pre, NULL }, /* Nd */
+	{ termp_nm_pre, termp_nm_post }, /* Nm */
+	{ termp_quote_pre, termp_quote_post }, /* Op */
+	{ termp_abort_pre, NULL }, /* Ot */
 	{ termp_under_pre, NULL }, /* Pa */
-	{ termp_rv_pre, NULL }, /* Rv */
-	{ NULL, NULL }, /* St */ 
+	{ termp_ex_pre, NULL }, /* Rv */
+	{ NULL, NULL }, /* St */
 	{ termp_under_pre, NULL }, /* Va */
 	{ termp_vt_pre, NULL }, /* Vt */
 	{ termp_xr_pre, NULL }, /* Xr */
-	{ NULL, termp____post }, /* %A */
+	{ termp__a_pre, termp____post }, /* %A */
 	{ termp_under_pre, termp____post }, /* %B */
 	{ NULL, termp____post }, /* %D */
 	{ termp_under_pre, termp____post }, /* %I */
@@ -187,177 +175,281 @@ static	const struct termact termacts[MDOC_MAX] = {
 	{ NULL, termp____post }, /* %O */
 	{ NULL, termp____post }, /* %P */
 	{ NULL, termp____post }, /* %R */
-	{ termp_under_pre, termp____post }, /* %T */
+	{ 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_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_xx_pre, NULL }, /* Bsx */
-	{ NULL, termp_bx_post }, /* Bx */
-	{ NULL, NULL }, /* Db */
+	{ termp_bf_pre, NULL }, /* Bf */
+	{ termp_quote_pre, termp_quote_post }, /* Bo */
+	{ termp_quote_pre, termp_quote_post }, /* Bq */
+	{ termp_xx_pre, termp_xx_post }, /* Bsx */
+	{ NULL, NULL }, /* Bx */
+	{ termp_skip_pre, NULL }, /* Db */
 	{ NULL, NULL }, /* Dc */
-	{ termp_dq_pre, termp_dq_post }, /* Do */
-	{ termp_dq_pre, termp_dq_post }, /* Dq */
+	{ termp_quote_pre, termp_quote_post }, /* Do */
+	{ termp_quote_pre, termp_quote_post }, /* Dq */
 	{ NULL, NULL }, /* Ec */ /* FIXME: no space */
 	{ NULL, NULL }, /* Ef */
-	{ termp_under_pre, NULL }, /* Em */ 
-	{ NULL, NULL }, /* Eo */
-	{ termp_xx_pre, NULL }, /* Fx */
-	{ termp_bold_pre, NULL }, /* Ms */ /* FIXME: convert to symbol? */
-	{ NULL, NULL }, /* No */
+	{ termp_em_pre, NULL }, /* Em */
+	{ termp_eo_pre, termp_eo_post }, /* Eo */
+	{ termp_xx_pre, termp_xx_post }, /* Fx */
+	{ termp_bold_pre, NULL }, /* Ms */
+	{ termp_li_pre, NULL }, /* No */
 	{ termp_ns_pre, NULL }, /* Ns */
-	{ termp_xx_pre, NULL }, /* Nx */
-	{ termp_xx_pre, NULL }, /* Ox */
+	{ termp_xx_pre, termp_xx_post }, /* Nx */
+	{ termp_xx_pre, termp_xx_post }, /* 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_under_pre, NULL }, /* Sx */
-	{ termp_bold_pre, NULL }, /* Sy */
+	{ termp_sy_pre, NULL }, /* Sy */
 	{ NULL, NULL }, /* Tn */
-	{ termp_xx_pre, NULL }, /* Ux */
+	{ termp_xx_pre, termp_xx_post }, /* 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 }, /* Bt */
 	{ NULL, NULL }, /* Hf */
-	{ NULL, NULL }, /* Fr */
-	{ termp_ud_pre, NULL }, /* Ud */
+	{ termp_under_pre, NULL }, /* Fr */
+	{ NULL, NULL }, /* Ud */
 	{ NULL, termp_lb_post }, /* Lb */
-	{ termp_sp_pre, NULL }, /* Lp */ 
-	{ termp_lk_pre, NULL }, /* Lk */ 
-	{ termp_under_pre, NULL }, /* Mt */ 
-	{ termp_brq_pre, termp_brq_post }, /* Brq */ 
-	{ termp_brq_pre, termp_brq_post }, /* Bro */ 
-	{ NULL, NULL }, /* Brc */ 
-	{ NULL, termp____post }, /* %C */ 
-	{ NULL, NULL }, /* Es */ /* TODO */
-	{ NULL, NULL }, /* En */ /* TODO */
-	{ termp_xx_pre, NULL }, /* Dx */ 
-	{ NULL, termp____post }, /* %Q */ 
-	{ termp_sp_pre, NULL }, /* br */
-	{ termp_sp_pre, NULL }, /* sp */ 
-	{ termp_under_pre, termp____post }, /* %U */ 
-	{ NULL, NULL }, /* Ta */ 
+	{ termp_abort_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_skip_pre, NULL }, /* Es */
+	{ termp_quote_pre, termp_quote_post }, /* En */
+	{ termp_xx_pre, termp_xx_post }, /* Dx */
+	{ NULL, termp____post }, /* %Q */
+	{ NULL, termp____post }, /* %U */
+	{ NULL, NULL }, /* Ta */
 };
 
+static	int	 fn_prio;
+
 
 void
-terminal_mdoc(void *arg, const struct mdoc *mdoc)
+terminal_mdoc(void *arg, const struct roff_meta *mdoc)
 {
-	const struct mdoc_node	*n;
-	const struct mdoc_meta	*m;
+	struct roff_node	*n, *nn;
 	struct termp		*p;
+	size_t			 save_defindent;
 
 	p = (struct termp *)arg;
-
-	p->overstep = 0;
-	p->maxrmargin = p->defrmargin;
-	p->tabwidth = 5;
-
-	if (NULL == p->symtab)
-		switch (p->enc) {
-		case (TERMENC_ASCII):
-			p->symtab = chars_init(CHARS_ASCII);
-			break;
-		default:
-			abort();
-			/* NOTREACHED */
+	p->tcol->rmargin = p->maxrmargin = p->defrmargin;
+	term_tab_set(p, NULL);
+	term_tab_set(p, "T");
+	term_tab_set(p, ".5i");
+
+	n = mdoc->first->child;
+	if (p->synopsisonly) {
+		for (nn = NULL; n != NULL; n = n->next) {
+			if (n->tok != MDOC_Sh)
+				continue;
+			if (n->sec == SEC_SYNOPSIS)
+				break;
+			if (nn == NULL && n->sec == SEC_NAME)
+				nn = n;
 		}
-
-	n = mdoc_node(mdoc);
-	m = mdoc_meta(mdoc);
-
-	term_begin(p, print_mdoc_head, print_mdoc_foot, m);
-
-	if (n->child)
-		print_mdoc_nodelist(p, NULL, m, n->child);
-
-	term_end(p);
+		if (n == NULL)
+			n = nn;
+		p->flags |= TERMP_NOSPACE;
+		if (n != NULL && (n = n->child->next->child) != NULL)
+			print_mdoc_nodelist(p, NULL, mdoc, n);
+		term_newln(p);
+	} else {
+		save_defindent = p->defindent;
+		if (p->defindent == 0)
+			p->defindent = 5;
+		term_begin(p, print_mdoc_head, print_mdoc_foot, mdoc);
+		while (n != NULL &&
+		    (n->type == ROFFT_COMMENT ||
+		     n->flags & NODE_NOPRT))
+			n = n->next;
+		if (n != NULL) {
+			if (n->tok != MDOC_Sh)
+				term_vspace(p);
+			print_mdoc_nodelist(p, NULL, mdoc, n);
+		}
+		term_end(p);
+		p->defindent = save_defindent;
+	}
 }
 
-
 static void
 print_mdoc_nodelist(DECL_ARGS)
 {
 
-	print_mdoc_node(p, pair, m, n);
-	if (n->next)
-		print_mdoc_nodelist(p, pair, m, n->next);
+	while (n != NULL) {
+		print_mdoc_node(p, pair, meta, n);
+		n = n->next;
+	}
 }
 
-
-/* ARGSUSED */
 static void
 print_mdoc_node(DECL_ARGS)
 {
-	int		 chld;
-	const void	*font;
+	const struct mdoc_term_act *act;
 	struct termpair	 npair;
 	size_t		 offset, rmargin;
+	int		 chld;
+
+	/*
+	 * In no-fill mode, break the output line at the beginning
+	 * of new input lines except after \c, and nowhere else.
+	 */
+
+	if (n->flags & NODE_NOFILL) {
+		if (n->flags & NODE_LINE &&
+		    (p->flags & TERMP_NONEWLINE) == 0)
+			term_newln(p);
+		p->flags |= TERMP_BRNEVER;
+	} else
+		p->flags &= ~TERMP_BRNEVER;
+
+	if (n->type == ROFFT_COMMENT || n->flags & NODE_NOPRT)
+		return;
 
 	chld = 1;
-	offset = p->offset;
-	rmargin = p->rmargin;
-	font = term_fontq(p);
+	offset = p->tcol->offset;
+	rmargin = p->tcol->rmargin;
+	n->flags &= ~NODE_ENDED;
+	n->prev_font = p->fonti;
 
 	memset(&npair, 0, sizeof(struct termpair));
 	npair.ppair = pair;
 
-	if (MDOC_TEXT != n->type) {
-		if (termacts[n->tok].pre)
-			chld = (*termacts[n->tok].pre)(p, &npair, m, n);
-	} else 
-		term_word(p, n->string); 
+	/*
+	 * Keeps only work until the end of a line.  If a keep was
+	 * invoked in a prior line, revert it to PREKEEP.
+	 */
+
+	if (p->flags & TERMP_KEEP && n->flags & NODE_LINE) {
+		p->flags &= ~TERMP_KEEP;
+		p->flags |= TERMP_PREKEEP;
+	}
+
+	/*
+	 * After the keep flags have been set up, we may now
+	 * produce output.  Note that some pre-handlers do so.
+	 */
+
+	act = NULL;
+	switch (n->type) {
+	case ROFFT_TEXT:
+		if (n->flags & NODE_LINE) {
+			switch (*n->string) {
+			case '\0':
+				if (p->flags & TERMP_NONEWLINE)
+					term_newln(p);
+				else
+					term_vspace(p);
+				return;
+			case ' ':
+				if ((p->flags & TERMP_NONEWLINE) == 0)
+					term_newln(p);
+				break;
+			default:
+				break;
+			}
+		}
+		if (NODE_DELIMC & n->flags)
+			p->flags |= TERMP_NOSPACE;
+		term_word(p, n->string);
+		if (NODE_DELIMO & n->flags)
+			p->flags |= TERMP_NOSPACE;
+		break;
+	case ROFFT_EQN:
+		if ( ! (n->flags & NODE_LINE))
+			p->flags |= TERMP_NOSPACE;
+		term_eqn(p, n->eqn);
+		if (n->next != NULL && ! (n->next->flags & NODE_LINE))
+			p->flags |= TERMP_NOSPACE;
+		break;
+	case ROFFT_TBL:
+		if (p->tbl.cols == NULL)
+			term_newln(p);
+		term_tbl(p, n->span);
+		break;
+	default:
+		if (n->tok < ROFF_MAX) {
+			roff_term_pre(p, n);
+			return;
+		}
+		assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX);
+		act = mdoc_term_acts + (n->tok - MDOC_Dd);
+		if (act->pre != NULL &&
+		    (n->end == ENDBODY_NOT || n->child != NULL))
+			chld = (*act->pre)(p, &npair, meta, n);
+		break;
+	}
 
 	if (chld && n->child)
-		print_mdoc_nodelist(p, &npair, m, n->child);
+		print_mdoc_nodelist(p, &npair, meta, n->child);
+
+	term_fontpopq(p,
+	    (ENDBODY_NOT == n->end ? n : n->body)->prev_font);
 
-	term_fontpopq(p, font);
+	switch (n->type) {
+	case ROFFT_TEXT:
+		break;
+	case ROFFT_TBL:
+		break;
+	case ROFFT_EQN:
+		break;
+	default:
+		if (act->post == NULL || n->flags & NODE_ENDED)
+			break;
+		(void)(*act->post)(p, &npair, meta, n);
 
-	if (MDOC_TEXT != n->type)
-		if (termacts[n->tok].post)
-			(*termacts[n->tok].post)(p, &npair, m, 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->body->flags |= NODE_ENDED;
+		break;
+	}
 
-	if (MDOC_EOS & n->flags)
+	if (NODE_EOS & n->flags)
 		p->flags |= TERMP_SENTENCE;
 
-	p->offset = offset;
-	p->rmargin = rmargin;
+	if (n->type != ROFFT_TEXT)
+		p->tcol->offset = offset;
+	p->tcol->rmargin = rmargin;
 }
 
-
 static void
-print_mdoc_foot(struct termp *p, const void *arg)
+print_mdoc_foot(struct termp *p, const struct roff_meta *meta)
 {
-	char		buf[DATESIZ], os[BUFSIZ];
-	const struct mdoc_meta *m;
-
-	m = (const struct mdoc_meta *)arg;
+	size_t sz;
 
 	term_fontrepl(p, TERMFONT_NONE);
 
-	/* 
+	/*
 	 * 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:
@@ -365,49 +457,45 @@ print_mdoc_foot(struct termp *p, const void *arg)
 	 * SYSTEM                  DATE                    SYSTEM
 	 */
 
-	time2a(m->date, buf, DATESIZ);
-	strlcpy(os, m->os, BUFSIZ);
-
 	term_vspace(p);
 
-	p->offset = 0;
-	p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2;
+	p->tcol->offset = 0;
+	sz = term_strlen(p, meta->date);
+	p->tcol->rmargin = p->maxrmargin > sz ?
+	    (p->maxrmargin + term_len(p, 1) - sz) / 2 : 0;
+	p->trailspace = 1;
 	p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
 
-	term_word(p, os);
+	term_word(p, meta->os);
 	term_flushln(p);
 
-	p->offset = p->rmargin;
-	p->rmargin = p->maxrmargin - strlen(os);
-	p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
+	p->tcol->offset = p->tcol->rmargin;
+	sz = term_strlen(p, meta->os);
+	p->tcol->rmargin = p->maxrmargin > sz ? p->maxrmargin - sz : 0;
+	p->flags |= TERMP_NOSPACE;
 
-	term_word(p, buf);
+	term_word(p, meta->date);
 	term_flushln(p);
 
-	p->offset = p->rmargin;
-	p->rmargin = p->maxrmargin;
+	p->tcol->offset = p->tcol->rmargin;
+	p->tcol->rmargin = p->maxrmargin;
+	p->trailspace = 0;
 	p->flags &= ~TERMP_NOBREAK;
-	p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
+	p->flags |= TERMP_NOSPACE;
 
-	term_word(p, os);
+	term_word(p, meta->os);
 	term_flushln(p);
 
-	p->offset = 0;
-	p->rmargin = p->maxrmargin;
+	p->tcol->offset = 0;
+	p->tcol->rmargin = p->maxrmargin;
 	p->flags = 0;
 }
 
-
 static void
-print_mdoc_head(struct termp *p, const void *arg)
+print_mdoc_head(struct termp *p, const struct roff_meta *meta)
 {
-	char		buf[BUFSIZ], title[BUFSIZ];
-	const struct mdoc_meta *m;
-
-	m = (const struct mdoc_meta *)arg;
-
-	p->rmargin = p->maxrmargin;
-	p->offset = 0;
+	char			*volume, *title;
+	size_t			 vollen, titlen;
 
 	/*
 	 * The header is strange.  It has three components, which are
@@ -422,184 +510,120 @@ print_mdoc_head(struct termp *p, const void *arg)
 	 * switches on the manual section.
 	 */
 
-	assert(m->vol);
-	strlcpy(buf, m->vol, BUFSIZ);
-
-	if (m->arch) {
-		strlcat(buf, " (", BUFSIZ);
-		strlcat(buf, m->arch, BUFSIZ);
-		strlcat(buf, ")", BUFSIZ);
-	}
+	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);
 
-	snprintf(title, BUFSIZ, "%s(%s)", m->title, m->msec);
+	if (NULL == meta->msec)
+		title = mandoc_strdup(meta->title);
+	else
+		mandoc_asprintf(&title, "%s(%s)",
+		    meta->title, meta->msec);
+	titlen = term_strlen(p, title);
 
-	p->offset = 0;
-	p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2;
 	p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
+	p->trailspace = 1;
+	p->tcol->offset = 0;
+	p->tcol->rmargin = 2 * (titlen+1) + vollen < p->maxrmargin ?
+	    (p->maxrmargin - vollen + term_len(p, 1)) / 2 :
+	    vollen < p->maxrmargin ?  p->maxrmargin - vollen : 0;
 
 	term_word(p, title);
 	term_flushln(p);
 
-	p->offset = p->rmargin;
-	p->rmargin = p->maxrmargin - strlen(title);
-	p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
+	p->flags |= TERMP_NOSPACE;
+	p->tcol->offset = p->tcol->rmargin;
+	p->tcol->rmargin = p->tcol->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->tcol->rmargin + titlen <= p->maxrmargin) {
+		p->flags |= TERMP_NOSPACE;
+		p->tcol->offset = p->tcol->rmargin;
+		p->tcol->rmargin = p->maxrmargin;
+		term_word(p, title);
+		term_flushln(p);
+	}
 
-	p->offset = 0;
-	p->rmargin = p->maxrmargin;
 	p->flags &= ~TERMP_NOSPACE;
+	p->tcol->offset = 0;
+	p->tcol->rmargin = p->maxrmargin;
+	free(title);
+	free(volume);
 }
 
-
-static size_t
-a2height(const struct mdoc_node *n)
-{
-	struct roffsu	 su;
-
-	assert(MDOC_TEXT == n->type);
-	assert(n->string);
-	if ( ! a2roffsu(n->string, &su, SCALE_VS))
-		SCALE_VS_INIT(&su, strlen(n->string));
-
-	return(term_vspan(&su));
-}
-
-
-static size_t
-a2width(const struct mdoc_argv *arg, int pos)
-{
-	struct roffsu	 su;
-
-	assert(arg->value[pos]);
-	if ( ! a2roffsu(arg->value[pos], &su, SCALE_MAX))
-		SCALE_HS_INIT(&su, strlen(arg->value[pos]));
-
-	return(term_hspan(&su));
-}
-
-
-static size_t
-a2offs(const char *v)
-{
-	struct roffsu	 su;
-
-	if ('\0' == *v)
-		return(0);
-	else if (0 == strcmp(v, "left"))
-		return(0);
-	else if (0 == strcmp(v, "indent"))
-		return(INDENT + 1);
-	else if (0 == strcmp(v, "indent-two"))
-		return((INDENT + 1) * 2);
-	else if ( ! a2roffsu(v, &su, SCALE_MAX))
-		SCALE_HS_INIT(&su, strlen(v));
-
-	return(term_hspan(&su));
-}
-
-
-/*
- * Return 1 if an argument has a particular argument value or 0 if it
- * does not.  See arg_getattr().
- */
-static int
-arg_hasattr(int arg, const struct mdoc_node *n)
-{
-
-	return(-1 != arg_getattr(arg, n));
-}
-
-
-/*
- * Get the index of an argument in a node's argument list or -1 if it
- * does not exist.  See arg_getattrs().
- */
-static int
-arg_getattr(int v, const struct mdoc_node *n)
-{
-	int		 val;
-
-	return(arg_getattrs(&v, &val, 1, n) ? val : -1);
-}
-
-
-/*
- * Walk through the argument list for a node and fill an array "vals"
- * with the positions of the argument structures listed in "keys".
- * Return the number of elements that were written into "vals", which
- * can be zero.
- */
 static int
-arg_getattrs(const int *keys, int *vals, 
-		size_t sz, const struct mdoc_node *n)
+a2width(const struct termp *p, const char *v)
 {
-	int		 i, j, k;
-
-	if (NULL == n->args)
-		return(0);
+	struct roffsu	 su;
+	const char	*end;
 
-	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);
+	end = a2roffsu(v, &su, SCALE_MAX);
+	if (end == NULL || *end != '\0') {
+		SCALE_HS_INIT(&su, term_strlen(p, v));
+		su.scale /= term_strlen(p, "0");
+	}
+	return term_hen(p, &su);
 }
 
-
 /*
  * 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)
+print_bvspace(struct termp *p,
+	const struct roff_node *bl,
+	const struct roff_node *n)
 {
-	const struct mdoc_node	*nn;
+	const struct roff_node	*nn;
+
+	assert(n);
 
 	term_newln(p);
 
-	if (MDOC_Bd == bl->tok && bl->data.Bd.comp)
+	if (MDOC_Bd == bl->tok && bl->norm->Bd.comp)
 		return;
-	if (MDOC_Bl == bl->tok && bl->data.Bl.comp)
+	if (MDOC_Bl == bl->tok && bl->norm->Bl.comp)
 		return;
 
 	/* Do not vspace directly after Ss/Sh. */
 
-	for (nn = n; nn; nn = nn->parent) {
-		if (MDOC_BLOCK != nn->type)
-			continue;
-		if (MDOC_Ss == nn->tok)
-			return;
-		if (MDOC_Sh == nn->tok)
+	nn = n;
+	while (nn->prev != NULL &&
+	    (nn->prev->type == ROFFT_COMMENT ||
+	     nn->prev->flags & NODE_NOPRT))
+		nn = nn->prev;
+	while (nn->prev == NULL) {
+		do {
+			nn = nn->parent;
+			if (nn->type == ROFFT_ROOT)
+				return;
+		} while (nn->type != ROFFT_BLOCK);
+		if (nn->tok == MDOC_Sh || nn->tok == MDOC_Ss)
 			return;
-		if (NULL == nn->prev)
-			continue;
-		break;
+		if (nn->tok == MDOC_It &&
+		    nn->parent->parent->norm->Bl.type != LIST_item)
+			break;
 	}
 
 	/* A `-column' does not assert vspace within the list. */
 
-	if (MDOC_Bl == bl->tok && LIST_column == bl->data.Bl.type)
+	if (MDOC_Bl == bl->tok && LIST_column == bl->norm->Bl.type)
 		if (n->prev && MDOC_It == n->prev->tok)
 			return;
 
 	/* A `-diag' without body does not vspace. */
 
-	if (MDOC_Bl == bl->tok && LIST_diag == bl->data.Bl.type)
+	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)
@@ -610,77 +634,67 @@ print_bvspace(struct termp *p,
 }
 
 
-/* ARGSUSED */
-static int
-termp_dq_pre(DECL_ARGS)
-{
-
-	if (MDOC_BODY != n->type)
-		return(1);
-
-	term_word(p, "\\(lq");
-	p->flags |= TERMP_NOSPACE;
-	return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_dq_post(DECL_ARGS)
-{
-
-	if (MDOC_BODY != n->type)
-		return;
-
-	p->flags |= TERMP_NOSPACE;
-	term_word(p, "\\(rq");
-}
-
-
-/* ARGSUSED */
 static int
 termp_it_pre(DECL_ARGS)
 {
-	const struct mdoc_node *bl, *nn;
-	char		        buf[7];
-	int		        i, keys[3], vals[3];
-	size_t		        width, offset, ncols, dcol;
+	struct roffsu		su;
+	char			buf[24];
+	const struct roff_node *bl, *nn;
+	size_t			ncols, dcol;
+	int			i, offset, width;
 	enum mdoc_list		type;
 
-	if (MDOC_BLOCK == n->type) {
+	if (n->type == ROFFT_BLOCK) {
 		print_bvspace(p, n->parent->parent, n);
-		return(1);
+		return 1;
 	}
 
 	bl = n->parent->parent->parent;
+	type = bl->norm->Bl.type;
 
-	/* Get list width, offset, and list type from argument list. */
-
-	keys[0] = MDOC_Width;
-	keys[1] = MDOC_Offset;
-	keys[2] = MDOC_Column;
-
-	vals[0] = vals[1] = vals[2] = -1;
-
-	arg_getattrs(keys, vals, 3, bl);
+	/*
+	 * Defaults for specific list types.
+	 */
 
-	type = bl->data.Bl.type;
+	switch (type) {
+	case LIST_bullet:
+	case LIST_dash:
+	case LIST_hyphen:
+	case LIST_enum:
+		width = term_len(p, 2);
+		break;
+	case LIST_hang:
+	case LIST_tag:
+		width = term_len(p, 8);
+		break;
+	case LIST_column:
+		width = term_len(p, 10);
+		break;
+	default:
+		width = 0;
+		break;
+	}
+	offset = 0;
 
-	/* 
+	/*
 	 * 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;
-
-	if (vals[1] >= 0) 
-		offset = a2offs(bl->args->argv[vals[1]].value[0]);
+	if (bl->norm->Bl.offs != NULL) {
+		offset = a2width(p, bl->norm->Bl.offs);
+		if (offset < 0 && (size_t)(-offset) > p->tcol->offset)
+			offset = -p->tcol->offset;
+		else if (offset > SHRT_MAX)
+			offset = 0;
+	}
 
 	switch (type) {
-	case (LIST_column):
-		if (MDOC_HEAD == n->type)
+	case LIST_column:
+		if (n->type == ROFFT_HEAD)
 			break;
+
 		/*
 		 * Imitate groff's column handling:
 		 * - For each earlier column, add its width.
@@ -690,21 +704,23 @@ termp_it_pre(DECL_ARGS)
 		 *   column.
 		 * - For more than 5 columns, add only one column.
 		 */
-		ncols = bl->args->argv[vals[2]].sz;
-		/* LINTED */
-		dcol = ncols < 5 ? 4 : ncols == 5 ? 3 : 1;
+		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).
+		 * Calculate the offset by applying all prior ROFFT_BODY,
+		 * so we stop at the ROFFT_HEAD (nn->prev == NULL).
 		 */
 
-		for (i = 0, nn = n->prev; 
-				nn->prev && i < (int)ncols; 
-				nn = nn->prev, i++)
-			offset += dcol + a2width
-				(&bl->args->argv[vals[2]], i);
-
+		for (i = 0, nn = n->prev;
+		    nn->prev && i < (int)ncols;
+		    nn = nn->prev, i++) {
+			SCALE_HS_INIT(&su,
+			    term_strlen(p, bl->norm->Bl.cols[i]));
+			su.scale /= term_strlen(p, "0");
+			offset += term_hen(p, &su) + dcol;
+		}
 
 		/*
 		 * When exceeding the declared number of columns, leave
@@ -719,55 +735,28 @@ termp_it_pre(DECL_ARGS)
 		 * Use the declared column widths, extended as explained
 		 * in the preceding paragraph.
 		 */
-		width = a2width(&bl->args->argv[vals[2]], i) + dcol;
+		SCALE_HS_INIT(&su, term_strlen(p, bl->norm->Bl.cols[i]));
+		su.scale /= term_strlen(p, "0");
+		width = term_hen(p, &su) + dcol;
 		break;
 	default:
-		if (vals[0] < 0) 
+		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.
 		 */
-		width = a2width(&bl->args->argv[vals[0]], 0) + 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 (LIST_bullet):
-		/* FALLTHROUGH */
-	case (LIST_dash):
-		/* FALLTHROUGH */
-	case (LIST_hyphen):
-		if (width < 4)
-			width = 4;
-		break;
-	case (LIST_enum):
-		if (width < 5)
-			width = 5;
-		break;
-	case (LIST_hang):
-		if (0 == width)
-			width = 8;
-		break;
-	case (LIST_column):
-		/* FALLTHROUGH */
-	case (LIST_tag):
-		if (0 == width)
-			width = 10;
-		break;
-	default:
+		width = a2width(p, bl->norm->Bl.width) + term_len(p, 2);
+		if (width < 0 && (size_t)(-width) > p->tcol->offset)
+			width = -p->tcol->offset;
+		else if (width > SHRT_MAX)
+			width = 0;
 		break;
 	}
 
-	/* 
+	/*
 	 * Whitespace control.  Inset bodies need an initial space,
 	 * while diagonal bodies need two.
 	 */
@@ -775,12 +764,12 @@ termp_it_pre(DECL_ARGS)
 	p->flags |= TERMP_NOSPACE;
 
 	switch (type) {
-	case (LIST_diag):
-		if (MDOC_BODY == n->type)
+	case LIST_diag:
+		if (n->type == ROFFT_BODY)
 			term_word(p, "\\ \\ ");
 		break;
-	case (LIST_inset):
-		if (MDOC_BODY == n->type) 
+	case LIST_inset:
+		if (n->type == ROFFT_BODY && n->parent->head->child != NULL)
 			term_word(p, "\\ ");
 		break;
 	default:
@@ -790,8 +779,8 @@ termp_it_pre(DECL_ARGS)
 	p->flags |= TERMP_NOSPACE;
 
 	switch (type) {
-	case (LIST_diag):
-		if (MDOC_HEAD == n->type)
+	case LIST_diag:
+		if (n->type == ROFFT_HEAD)
 			term_fontpush(p, TERMFONT_BOLD);
 		break;
 	default:
@@ -806,205 +795,163 @@ termp_it_pre(DECL_ARGS)
 	 */
 
 	switch (type) {
-	case (LIST_bullet):
-		/* FALLTHROUGH */
-	case (LIST_dash):
-		/* FALLTHROUGH */
-	case (LIST_enum):
-		/* FALLTHROUGH */
-	case (LIST_hyphen):
-		if (MDOC_HEAD == n->type)
-			p->flags |= TERMP_NOBREAK;
-		else
-			p->flags |= TERMP_NOLPAD;
+	case LIST_enum:
+	case LIST_bullet:
+	case LIST_dash:
+	case LIST_hyphen:
+		if (n->type == ROFFT_HEAD) {
+			p->flags |= TERMP_NOBREAK | TERMP_HANG;
+			p->trailspace = 1;
+		} else if (width <= (int)term_len(p, 2))
+			p->flags |= TERMP_NOPAD;
 		break;
-	case (LIST_hang):
-		if (MDOC_HEAD == n->type)
-			p->flags |= TERMP_NOBREAK;
-		else
-			p->flags |= TERMP_NOLPAD;
-
-		if (MDOC_HEAD != n->type)
+	case LIST_hang:
+		if (n->type != ROFFT_HEAD)
 			break;
-
-		/*
-		 * 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)) {
-			p->flags &= ~TERMP_NOBREAK;
-			p->flags &= ~TERMP_NOLPAD;
-		} else
-			p->flags |= TERMP_HANG;
+		p->flags |= TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG;
+		p->trailspace = 1;
 		break;
-	case (LIST_tag):
-		if (MDOC_HEAD == n->type)
-			p->flags |= TERMP_NOBREAK | TERMP_TWOSPACE;
-		else
-			p->flags |= TERMP_NOLPAD;
-
-		if (MDOC_HEAD != n->type)
+	case LIST_tag:
+		if (n->type != ROFFT_HEAD)
 			break;
+
+		p->flags |= TERMP_NOBREAK | TERMP_BRTRSP | TERMP_BRIND;
+		p->trailspace = 2;
+
 		if (NULL == n->next || NULL == n->next->child)
-			p->flags |= TERMP_DANGLE;
+			p->flags |= TERMP_HANG;
 		break;
-	case (LIST_column):
-		if (MDOC_HEAD == n->type)
+	case LIST_column:
+		if (n->type == ROFFT_HEAD)
 			break;
 
-		if (NULL == n->next)
+		if (NULL == n->next) {
 			p->flags &= ~TERMP_NOBREAK;
-		else
+			p->trailspace = 0;
+		} else {
 			p->flags |= TERMP_NOBREAK;
-
-		assert(n->prev);
-		if (MDOC_BODY == n->prev->type) 
-			p->flags |= TERMP_NOLPAD;
+			p->trailspace = 1;
+		}
 
 		break;
-	case (LIST_diag):
-		if (MDOC_HEAD == n->type)
-			p->flags |= TERMP_NOBREAK;
+	case LIST_diag:
+		if (n->type != ROFFT_HEAD)
+			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;
+	p->tcol->offset += offset;
 
 	switch (type) {
-	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 (LIST_dash):
-		/* FALLTHROUGH */
-	case (LIST_enum):
-		/* FALLTHROUGH */
-	case (LIST_hyphen):
-		/* FALLTHROUGH */
-	case (LIST_tag):
-		assert(width);
-		if (MDOC_HEAD == n->type)
-			p->rmargin = p->offset + width;
-		else 
-			p->offset += width;
+	case LIST_bullet:
+	case LIST_dash:
+	case LIST_enum:
+	case LIST_hyphen:
+	case LIST_hang:
+	case LIST_tag:
+		if (n->type == ROFFT_HEAD)
+			p->tcol->rmargin = p->tcol->offset + width;
+		else
+			p->tcol->offset += width;
 		break;
-	case (LIST_column):
+	case LIST_column:
 		assert(width);
-		p->rmargin = p->offset + width;
-		/* 
+		p->tcol->rmargin = p->tcol->offset + width;
+		/*
 		 * XXX - this behaviour is not documented: the
 		 * right-most column is filled to the right margin.
 		 */
-		if (MDOC_HEAD == n->type)
+		if (n->type == ROFFT_HEAD)
 			break;
-		if (NULL == n->next && p->rmargin < p->maxrmargin)
-			p->rmargin = p->maxrmargin;
+		if (n->next == NULL && p->tcol->rmargin < p->maxrmargin)
+			p->tcol->rmargin = p->maxrmargin;
 		break;
 	default:
 		break;
 	}
 
-	/* 
+	/*
 	 * The dash, hyphen, bullet and enum lists all have a special
-	 * HEAD character (temporarily bold, in some cases).  
+	 * HEAD character (temporarily bold, in some cases).
 	 */
 
-	if (MDOC_HEAD == n->type)
+	if (n->type == ROFFT_HEAD)
 		switch (type) {
-		case (LIST_bullet):
+		case LIST_bullet:
 			term_fontpush(p, TERMFONT_BOLD);
 			term_word(p, "\\[bu]");
 			term_fontpop(p);
 			break;
-		case (LIST_dash):
-			/* FALLTHROUGH */
-		case (LIST_hyphen):
+		case LIST_dash:
+		case LIST_hyphen:
 			term_fontpush(p, TERMFONT_BOLD);
-			term_word(p, "\\(hy");
+			term_word(p, "-");
 			term_fontpop(p);
 			break;
-		case (LIST_enum):
+		case LIST_enum:
 			(pair->ppair->ppair->count)++;
-			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 (LIST_bullet):
-		/* FALLTHROUGH */
-	case (LIST_item):
-		/* FALLTHROUGH */
-	case (LIST_dash):
-		/* FALLTHROUGH */
-	case (LIST_hyphen):
-		/* FALLTHROUGH */
-	case (LIST_enum):
-		if (MDOC_HEAD == n->type)
-			return(0);
+	case LIST_bullet:
+	case LIST_item:
+	case LIST_dash:
+	case LIST_hyphen:
+	case LIST_enum:
+		if (n->type == ROFFT_HEAD)
+			return 0;
 		break;
-	case (LIST_column):
-		if (MDOC_HEAD == n->type)
-			return(0);
+	case LIST_column:
+		if (n->type == ROFFT_HEAD)
+			return 0;
+		p->minbl = 0;
 		break;
 	default:
 		break;
 	}
 
-	return(1);
+	return 1;
 }
 
-
-/* ARGSUSED */
 static void
 termp_it_post(DECL_ARGS)
 {
 	enum mdoc_list	   type;
 
-	if (MDOC_BLOCK == n->type)
+	if (n->type == ROFFT_BLOCK)
 		return;
 
-	type = n->parent->parent->parent->data.Bl.type;
+	type = n->parent->parent->parent->norm->Bl.type;
 
 	switch (type) {
-	case (LIST_item):
-		/* FALLTHROUGH */
-	case (LIST_diag):
-		/* FALLTHROUGH */
-	case (LIST_inset):
-		if (MDOC_BODY == n->type)
+	case LIST_item:
+	case LIST_diag:
+	case LIST_inset:
+		if (n->type == ROFFT_BODY)
 			term_newln(p);
 		break;
-	case (LIST_column):
-		if (MDOC_BODY == n->type)
+	case LIST_column:
+		if (n->type == ROFFT_BODY)
 			term_flushln(p);
 		break;
 	default:
@@ -1012,296 +959,233 @@ termp_it_post(DECL_ARGS)
 		break;
 	}
 
-	/* 
+	/*
 	 * 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_DANGLE;
-	p->flags &= ~TERMP_NOBREAK;
-	p->flags &= ~TERMP_TWOSPACE;
-	p->flags &= ~TERMP_NOLPAD;
-	p->flags &= ~TERMP_HANG;
+	p->flags &= ~(TERMP_NOBREAK | TERMP_BRTRSP | TERMP_BRIND | TERMP_HANG);
+	p->trailspace = 0;
 }
 
-
-/* ARGSUSED */
 static int
 termp_nm_pre(DECL_ARGS)
 {
+	const char	*cp;
 
-	if (NULL == n->child && NULL == m->name)
-		return(1);
+	if (n->type == ROFFT_BLOCK) {
+		p->flags |= TERMP_PREKEEP;
+		return 1;
+	}
 
-	synopsis_pre(p, n);
+	if (n->type == ROFFT_BODY) {
+		if (n->child == NULL)
+			return 0;
+		p->flags |= TERMP_NOSPACE;
+		cp = NULL;
+		if (n->prev->child != NULL)
+		    cp = n->prev->child->string;
+		if (cp == NULL)
+			cp = meta->name;
+		if (cp == NULL)
+			p->tcol->offset += term_len(p, 6);
+		else
+			p->tcol->offset += term_len(p, 1) +
+			    term_strlen(p, cp);
+		return 1;
+	}
+
+	if (n->child == NULL)
+		return 0;
+
+	if (n->type == ROFFT_HEAD)
+		synopsis_pre(p, n->parent);
+
+	if (n->type == ROFFT_HEAD &&
+	    n->next != NULL && n->next->child != NULL) {
+		p->flags |= TERMP_NOSPACE | TERMP_NOBREAK | TERMP_BRIND;
+		p->trailspace = 1;
+		p->tcol->rmargin = p->tcol->offset + term_len(p, 1);
+		if (n->child == NULL)
+			p->tcol->rmargin += term_strlen(p, meta->name);
+		else if (n->child->type == ROFFT_TEXT) {
+			p->tcol->rmargin += term_strlen(p, n->child->string);
+			if (n->child->next != NULL)
+				p->flags |= TERMP_HANG;
+		} else {
+			p->tcol->rmargin += term_len(p, 5);
+			p->flags |= TERMP_HANG;
+		}
+	}
 
 	term_fontpush(p, TERMFONT_BOLD);
-	if (NULL == n->child)
-		term_word(p, m->name);
-	return(1);
+	return 1;
 }
 
+static void
+termp_nm_post(DECL_ARGS)
+{
+
+	if (n->type == ROFFT_BLOCK) {
+		p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);
+	} else if (n->type == ROFFT_HEAD &&
+	    NULL != n->next && NULL != n->next->child) {
+		term_flushln(p);
+		p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG);
+		p->trailspace = 0;
+	} else if (n->type == ROFFT_BODY && n->child != NULL)
+		term_flushln(p);
+}
 
-/* ARGSUSED */
 static int
 termp_fl_pre(DECL_ARGS)
 {
 
+	termp_tag_pre(p, pair, meta, n);
 	term_fontpush(p, TERMFONT_BOLD);
 	term_word(p, "\\-");
 
-	if (n->child)
-		p->flags |= TERMP_NOSPACE;
-	else if (n->next && n->next->line == n->line)
+	if (!(n->child == NULL &&
+	    (n->next == NULL ||
+	     n->next->type == ROFFT_TEXT ||
+	     n->next->flags & NODE_LINE)))
 		p->flags |= TERMP_NOSPACE;
 
-	return(1);
+	return 1;
 }
 
+static int
+termp__a_pre(DECL_ARGS)
+{
+
+	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_an_pre(DECL_ARGS)
 {
 
-	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.
-	 */
-	
-	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);
-
-	return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_an_post(DECL_ARGS)
-{
-
-	if (n->child) {
-		if (SEC_AUTHORS == n->sec)
-			p->flags |= TERMP_ANPREC;
-		return;
-	}
-
-	if (arg_hasattr(MDOC_Split, n)) {
+	if (n->norm->An.auth == AUTH_split) {
 		p->flags &= ~TERMP_NOSPLIT;
 		p->flags |= TERMP_SPLIT;
-	} else {
+		return 0;
+	}
+	if (n->norm->An.auth == AUTH_nosplit) {
 		p->flags &= ~TERMP_SPLIT;
 		p->flags |= TERMP_NOSPLIT;
+		return 0;
 	}
 
-}
+	if (p->flags & TERMP_SPLIT)
+		term_newln(p);
+
+	if (n->sec == SEC_AUTHORS && ! (p->flags & TERMP_NOSPLIT))
+		p->flags |= TERMP_SPLIT;
 
+	return 1;
+}
 
-/* ARGSUSED */
 static int
 termp_ns_pre(DECL_ARGS)
 {
 
-	p->flags |= TERMP_NOSPACE;
-	return(1);
+	if ( ! (NODE_LINE & n->flags))
+		p->flags |= TERMP_NOSPACE;
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 termp_rs_pre(DECL_ARGS)
 {
 
 	if (SEC_SEE_ALSO != n->sec)
-		return(1);
-	if (MDOC_BLOCK == n->type && n->prev)
+		return 1;
+	if (n->type == ROFFT_BLOCK && n->prev != NULL)
 		term_vspace(p);
-	return(1);
+	return 1;
 }
 
-
-/* ARGSUSED */
-static int
-termp_rv_pre(DECL_ARGS)
-{
-	const struct mdoc_node	*nn;
-
-	term_newln(p);
-	term_word(p, "The");
-
-	for (nn = n->child; nn; nn = nn->next) {
-		term_fontpush(p, TERMFONT_BOLD);
-		term_word(p, nn->string);
-		term_fontpop(p);
-		p->flags |= TERMP_NOSPACE;
-		if (nn->next && NULL == nn->next->next)
-			term_word(p, "(), and");
-		else if (nn->next)
-			term_word(p, "(),");
-		else
-			term_word(p, "()");
-	}
-
-	if (n->child && n->child->next)
-		term_word(p, "functions return");
-	else
-		term_word(p, "function returns");
-
-       	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");
-	term_fontpop(p);
-
-       	term_word(p, "is set to indicate the error.");
-	p->flags |= TERMP_SENTENCE;
-
-	return(0);
-}
-
-
-/* ARGSUSED */
 static int
 termp_ex_pre(DECL_ARGS)
 {
-	const struct mdoc_node	*nn;
-
-	term_word(p, "The");
-
-	for (nn = n->child; nn; nn = nn->next) {
-		term_fontpush(p, TERMFONT_BOLD);
-		term_word(p, nn->string);
-		term_fontpop(p);
-		p->flags |= TERMP_NOSPACE;
-		if (nn->next && NULL == nn->next->next)
-			term_word(p, ", and");
-		else if (nn->next)
-			term_word(p, ",");
-		else
-			p->flags &= ~TERMP_NOSPACE;
-	}
-
-	if (n->child && n->child->next)
-		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);
+	term_newln(p);
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 termp_nd_pre(DECL_ARGS)
 {
 
-	if (MDOC_BODY != n->type)
-		return(1);
-
-#if defined(__OpenBSD__) || defined(__linux__)
-	term_word(p, "\\(en");
-#else
-	term_word(p, "\\(em");
-#endif
-	return(1);
+	if (n->type == ROFFT_BODY)
+		term_word(p, "\\(en");
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 termp_bl_pre(DECL_ARGS)
 {
 
-	return(MDOC_HEAD != n->type);
+	return n->type != ROFFT_HEAD;
 }
 
-
-/* ARGSUSED */
 static void
 termp_bl_post(DECL_ARGS)
 {
 
-	if (MDOC_BLOCK == n->type)
-		term_newln(p);
-}
-
-
-/* ARGSUSED */
-static void
-termp_op_post(DECL_ARGS)
-{
-
-	if (MDOC_BODY != n->type) 
+	if (n->type != ROFFT_BLOCK)
 		return;
-	p->flags |= TERMP_NOSPACE;
-	term_word(p, "\\(rB");
+	term_newln(p);
+	if (n->tok != MDOC_Bl || n->norm->Bl.type != LIST_column)
+		return;
+	term_tab_set(p, NULL);
+	term_tab_set(p, "T");
+	term_tab_set(p, ".5i");
 }
 
-
-/* ARGSUSED */
 static int
 termp_xr_pre(DECL_ARGS)
 {
-	const struct mdoc_node *nn;
 
-	if (NULL == n->child)
-		return(0);
+	if (NULL == (n = n->child))
+		return 0;
+
+	assert(n->type == ROFFT_TEXT);
+	term_word(p, n->string);
 
-	assert(MDOC_TEXT == n->child->type);
-	nn = n->child;
+	if (NULL == (n = n->next))
+		return 0;
 
-	term_word(p, nn->string);
-	if (NULL == (nn = nn->next)) 
-		return(0);
 	p->flags |= TERMP_NOSPACE;
 	term_word(p, "(");
 	p->flags |= TERMP_NOSPACE;
-	term_word(p, nn->string);
+
+	assert(n->type == ROFFT_TEXT);
+	term_word(p, n->string);
+
 	p->flags |= TERMP_NOSPACE;
 	term_word(p, ")");
 
-	return(0);
+	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)
+synopsis_pre(struct termp *p, const struct roff_node *n)
 {
-	/* 
+	/*
 	 * Obviously, if we're not in a SYNOPSIS or no prior macros
 	 * exist, do nothing.
 	 */
-	if (NULL == n->prev || SEC_SYNOPSIS != n->sec)
+	if (NULL == n->prev || ! (NODE_SYNPRETTY & n->flags))
 		return;
 
 	/*
@@ -1309,10 +1193,10 @@ synopsis_pre(struct termp *p, const struct mdoc_node *n)
 	 * 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) {
+	if (n->prev->tok == n->tok &&
+	    MDOC_Ft != n->tok &&
+	    MDOC_Fo != n->tok &&
+	    MDOC_Fn != n->tok) {
 		term_newln(p);
 		return;
 	}
@@ -1323,18 +1207,14 @@ synopsis_pre(struct termp *p, const struct mdoc_node *n)
 	 * 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):
+	case MDOC_Fd:
+	case MDOC_Fn:
+	case MDOC_Fo:
+	case MDOC_In:
+	case MDOC_Vt:
 		term_vspace(p);
 		break;
-	case (MDOC_Ft):
+	case MDOC_Ft:
 		if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) {
 			term_vspace(p);
 			break;
@@ -1346,504 +1226,363 @@ synopsis_pre(struct termp *p, const struct mdoc_node *n)
 	}
 }
 
-
 static int
 termp_vt_pre(DECL_ARGS)
 {
 
-	if (MDOC_ELEM == n->type) {
+	if (n->type == ROFFT_ELEM) {
 		synopsis_pre(p, n);
-		return(termp_under_pre(p, pair, m, n));
-	} else if (MDOC_BLOCK == n->type) {
+		return termp_under_pre(p, pair, meta, n);
+	} else if (n->type == ROFFT_BLOCK) {
 		synopsis_pre(p, n);
-		return(1);
-	} else if (MDOC_HEAD == n->type)
-		return(0);
+		return 1;
+	} else if (n->type == ROFFT_HEAD)
+		return 0;
 
-	return(termp_under_pre(p, pair, m, n));
+	return termp_under_pre(p, pair, meta, n);
 }
 
-
-/* ARGSUSED */
 static int
 termp_bold_pre(DECL_ARGS)
 {
 
+	termp_tag_pre(p, pair, meta, n);
 	term_fontpush(p, TERMFONT_BOLD);
-	return(1);
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 termp_fd_pre(DECL_ARGS)
 {
 
 	synopsis_pre(p, n);
-	return(termp_bold_pre(p, pair, m, n));
+	return termp_bold_pre(p, pair, meta, n);
 }
 
+static void
+termp_fd_post(DECL_ARGS)
+{
+
+	term_newln(p);
+}
 
-/* ARGSUSED */
 static int
 termp_sh_pre(DECL_ARGS)
 {
 
-	/* 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);
+	case ROFFT_BLOCK:
+		/*
+		 * Vertical space before sections, except
+		 * when the previous section was empty.
+		 */
+		if (n->prev == NULL ||
+		    n->prev->tok != MDOC_Sh ||
+		    (n->prev->body != NULL &&
+		     n->prev->body->child != NULL))
+			term_vspace(p);
 		break;
-	case (MDOC_HEAD):
+	case ROFFT_HEAD:
 		term_fontpush(p, TERMFONT_BOLD);
 		break;
-	case (MDOC_BODY):
-		p->offset = INDENT;
+	case ROFFT_BODY:
+		p->tcol->offset = term_len(p, p->defindent);
+		term_tab_set(p, NULL);
+		term_tab_set(p, "T");
+		term_tab_set(p, ".5i");
+		switch (n->sec) {
+		case SEC_DESCRIPTION:
+			fn_prio = 0;
+			break;
+		case SEC_AUTHORS:
+			p->flags &= ~(TERMP_SPLIT|TERMP_NOSPLIT);
+			break;
+		default:
+			break;
+		}
 		break;
 	default:
 		break;
 	}
-	return(1);
+	return 1;
 }
 
-
-/* ARGSUSED */
 static void
 termp_sh_post(DECL_ARGS)
 {
 
 	switch (n->type) {
-	case (MDOC_HEAD):
+	case ROFFT_HEAD:
 		term_newln(p);
 		break;
-	case (MDOC_BODY):
+	case ROFFT_BODY:
 		term_newln(p);
-		p->offset = 0;
+		p->tcol->offset = 0;
 		break;
 	default:
 		break;
 	}
 }
 
-
-/* ARGSUSED */
-static int
-termp_op_pre(DECL_ARGS)
-{
-
-	switch (n->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.");
-	p->flags |= TERMP_SENTENCE;
-	return(0);
-}
-
-
-/* ARGSUSED */
 static void
 termp_lb_post(DECL_ARGS)
 {
 
-	if (SEC_LIBRARY == n->sec && MDOC_LINE & n->flags)
+	if (SEC_LIBRARY == n->sec && NODE_LINE & n->flags)
 		term_newln(p);
 }
 
-
-/* ARGSUSED */
-static int
-termp_ud_pre(DECL_ARGS)
-{
-
-	term_word(p, "currently under development.");
-	p->flags |= TERMP_SENTENCE;
-	return(0);
-}
-
-
-/* ARGSUSED */
 static int
 termp_d1_pre(DECL_ARGS)
 {
 
-	if (MDOC_BLOCK != n->type)
-		return(1);
-	term_newln(p);
-	p->offset += (INDENT + 1);
-	return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_d1_post(DECL_ARGS)
-{
-
-	if (MDOC_BLOCK != n->type) 
-		return;
+	if (n->type != ROFFT_BLOCK)
+		return 1;
 	term_newln(p);
+	p->tcol->offset += term_len(p, p->defindent + 1);
+	term_tab_set(p, NULL);
+	term_tab_set(p, "T");
+	term_tab_set(p, ".5i");
+	return 1;
 }
 
-
-/* ARGSUSED */
-static int
-termp_aq_pre(DECL_ARGS)
-{
-
-	if (MDOC_BODY != n->type)
-		return(1);
-	term_word(p, "\\(la");
-	p->flags |= TERMP_NOSPACE;
-	return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_aq_post(DECL_ARGS)
-{
-
-	if (MDOC_BODY != n->type)
-		return;
-	p->flags |= TERMP_NOSPACE;
-	term_word(p, "\\(ra");
-}
-
-
-/* ARGSUSED */
 static int
 termp_ft_pre(DECL_ARGS)
 {
 
-	/* NB: MDOC_LINE does not effect this! */
+	/* NB: NODE_LINE does not effect this! */
 	synopsis_pre(p, n);
 	term_fontpush(p, TERMFONT_UNDER);
-	return(1);
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 termp_fn_pre(DECL_ARGS)
 {
-	const struct mdoc_node	*nn;
+	size_t		 rmargin = 0;
+	int		 pretty;
+
+	pretty = NODE_SYNPRETTY & n->flags;
 
 	synopsis_pre(p, n);
 
+	if (NULL == (n = n->child))
+		return 0;
+
+	if (pretty) {
+		rmargin = p->tcol->rmargin;
+		p->tcol->rmargin = p->tcol->offset + term_len(p, 4);
+		p->flags |= TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG;
+	}
+
+	assert(n->type == ROFFT_TEXT);
 	term_fontpush(p, TERMFONT_BOLD);
-	term_word(p, n->child->string);
+	term_word(p, n->string);
 	term_fontpop(p);
 
+	if (n->sec == SEC_DESCRIPTION || n->sec == SEC_CUSTOM)
+		tag_put(n->string, ++fn_prio, p->line);
+
+	if (pretty) {
+		term_flushln(p);
+		p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG);
+		p->flags |= TERMP_NOPAD;
+		p->tcol->offset = p->tcol->rmargin;
+		p->tcol->rmargin = rmargin;
+	}
+
 	p->flags |= TERMP_NOSPACE;
 	term_word(p, "(");
+	p->flags |= TERMP_NOSPACE;
 
-	for (nn = n->child->next; nn; nn = nn->next) {
+	for (n = n->next; n; n = n->next) {
+		assert(n->type == ROFFT_TEXT);
 		term_fontpush(p, TERMFONT_UNDER);
-		term_word(p, nn->string);
+		if (pretty)
+			p->flags |= TERMP_NBRWORD;
+		term_word(p, n->string);
 		term_fontpop(p);
 
-		if (nn->next)
+		if (n->next) {
+			p->flags |= TERMP_NOSPACE;
 			term_word(p, ",");
+		}
 	}
 
+	p->flags |= TERMP_NOSPACE;
 	term_word(p, ")");
 
-	if (SEC_SYNOPSIS == n->sec)
+	if (pretty) {
+		p->flags |= TERMP_NOSPACE;
 		term_word(p, ";");
+		term_flushln(p);
+	}
 
-	return(0);
+	return 0;
 }
 
-
-/* ARGSUSED */
 static int
 termp_fa_pre(DECL_ARGS)
 {
-	const struct mdoc_node	*nn;
+	const struct roff_node	*nn;
 
 	if (n->parent->tok != MDOC_Fo) {
 		term_fontpush(p, TERMFONT_UNDER);
-		return(1);
+		return 1;
 	}
 
 	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)
+		if (nn->next || (n->next && n->next->tok == MDOC_Fa)) {
+			p->flags |= TERMP_NOSPACE;
 			term_word(p, ",");
+		}
 	}
 
-	if (n->child && n->next && n->next->tok == MDOC_Fa)
-		term_word(p, ",");
-
-	return(0);
+	return 0;
 }
 
-
-/* ARGSUSED */
 static int
 termp_bd_pre(DECL_ARGS)
 {
-	size_t			 tabwidth;
-	size_t			 rm, rmax;
-	const struct mdoc_node	*nn;
+	int			 offset;
 
-	if (MDOC_BLOCK == n->type) {
+	if (n->type == ROFFT_BLOCK) {
 		print_bvspace(p, n, n);
-		return(1);
-	} else if (MDOC_HEAD == n->type)
-		return(0);
-
-	if (n->data.Bd.offs)
-		p->offset += a2offs(n->data.Bd.offs);
-
-	/*
-	 * If -ragged or -filled are specified, the block does nothing
-	 * 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 (DISP_literal != n->data.Bd.type && 
-			DISP_unfilled != n->data.Bd.type)
-		return(1);
-
-	tabwidth = p->tabwidth;
-	p->tabwidth = 8;
-	rm = p->rmargin;
-	rmax = p->maxrmargin;
-	p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
-
-	for (nn = n->child; nn; nn = nn->next) {
-		p->flags |= TERMP_NOSPACE;
-		print_mdoc_node(p, pair, m, nn);
-		if (NULL == nn->prev ||
-		    nn->prev->line < nn->line ||
-		    NULL == nn->next)
-			term_flushln(p);
+		return 1;
+	} else if (n->type == ROFFT_HEAD)
+		return 0;
+
+	/* Handle the -offset argument. */
+
+	if (n->norm->Bd.offs == NULL ||
+	    ! strcmp(n->norm->Bd.offs, "left"))
+		/* nothing */;
+	else if ( ! strcmp(n->norm->Bd.offs, "indent"))
+		p->tcol->offset += term_len(p, p->defindent + 1);
+	else if ( ! strcmp(n->norm->Bd.offs, "indent-two"))
+		p->tcol->offset += term_len(p, (p->defindent + 1) * 2);
+	else {
+		offset = a2width(p, n->norm->Bd.offs);
+		if (offset < 0 && (size_t)(-offset) > p->tcol->offset)
+			p->tcol->offset = 0;
+		else if (offset < SHRT_MAX)
+			p->tcol->offset += offset;
 	}
 
-	p->tabwidth = tabwidth;
-	p->rmargin = rm;
-	p->maxrmargin = rmax;
-	return(0);
+	switch (n->norm->Bd.type) {
+	case DISP_literal:
+		term_tab_set(p, NULL);
+		term_tab_set(p, "T");
+		term_tab_set(p, "8n");
+		break;
+	case DISP_centered:
+		p->flags |= TERMP_CENTER;
+		break;
+	default:
+		break;
+	}
+	return 1;
 }
 
-
-/* ARGSUSED */
 static void
 termp_bd_post(DECL_ARGS)
 {
-	size_t		 rm, rmax;
-
-	if (MDOC_BODY != n->type) 
+	if (n->type != ROFFT_BODY)
 		return;
-
-	rm = p->rmargin;
-	rmax = p->maxrmargin;
-
-	if (DISP_literal == n->data.Bd.type || 
-			DISP_unfilled == n->data.Bd.type)
-		p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
-
+	if (n->norm->Bd.type == DISP_unfilled ||
+	    n->norm->Bd.type == DISP_literal)
+		p->flags |= TERMP_BRNEVER;
 	p->flags |= TERMP_NOSPACE;
 	term_newln(p);
-
-	p->rmargin = rm;
-	p->maxrmargin = rmax;
-}
-
-
-/* ARGSUSED */
-static int
-termp_qq_pre(DECL_ARGS)
-{
-
-	if (MDOC_BODY != n->type)
-		return(1);
-	term_word(p, "\"");
-	p->flags |= TERMP_NOSPACE;
-	return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_qq_post(DECL_ARGS)
-{
-
-	if (MDOC_BODY != n->type)
-		return;
-	p->flags |= TERMP_NOSPACE;
-	term_word(p, "\"");
-}
-
-
-/* ARGSUSED */
-static void
-termp_bx_post(DECL_ARGS)
-{
-
-	if (n->child)
-		p->flags |= TERMP_NOSPACE;
-	term_word(p, "BSD");
+	p->flags &= ~TERMP_BRNEVER;
+	if (n->norm->Bd.type == DISP_centered)
+		p->flags &= ~TERMP_CENTER;
 }
 
-
-/* ARGSUSED */
 static int
 termp_xx_pre(DECL_ARGS)
 {
-	const char	*pp;
-
-	pp = NULL;
-	switch (n->tok) {
-	case (MDOC_Bsx):
-		pp = "BSDI 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:
-		break;
-	}
-
-	assert(pp);
-	term_word(p, pp);
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_sq_pre(DECL_ARGS)
-{
-
-	if (MDOC_BODY != n->type)
-		return(1);
-	term_word(p, "\\(oq");
-	p->flags |= TERMP_NOSPACE;
-	return(1);
+	if ((n->aux = p->flags & TERMP_PREKEEP) == 0)
+		p->flags |= TERMP_PREKEEP;
+	return 1;
 }
 
-
-/* ARGSUSED */
 static void
-termp_sq_post(DECL_ARGS)
-{
-
-	if (MDOC_BODY != n->type)
-		return;
-	p->flags |= TERMP_NOSPACE;
-	term_word(p, "\\(aq");
-}
-
-
-/* ARGSUSED */
-static int
-termp_pf_pre(DECL_ARGS)
+termp_xx_post(DECL_ARGS)
 {
-
-	p->flags |= TERMP_IGNDELIM;
-	return(1);
+	if (n->aux == 0)
+		p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);
 }
 
-
-/* ARGSUSED */
 static void
 termp_pf_post(DECL_ARGS)
 {
 
-	p->flags &= ~TERMP_IGNDELIM;
-	p->flags |= TERMP_NOSPACE;
+	if ( ! (n->next == NULL || n->next->flags & NODE_LINE))
+		p->flags |= TERMP_NOSPACE;
 }
 
-
-/* ARGSUSED */
 static int
 termp_ss_pre(DECL_ARGS)
 {
+	struct roff_node *nn;
 
 	switch (n->type) {
-	case (MDOC_BLOCK):
+	case ROFFT_BLOCK:
 		term_newln(p);
-		if (n->prev)
+		for (nn = n->prev; nn != NULL; nn = nn->prev)
+			if (nn->type != ROFFT_COMMENT &&
+			    (nn->flags & NODE_NOPRT) == 0)
+				break;
+		if (nn != NULL)
 			term_vspace(p);
 		break;
-	case (MDOC_HEAD):
+	case ROFFT_HEAD:
 		term_fontpush(p, TERMFONT_BOLD);
-		p->offset = HALFINDENT;
+		p->tcol->offset = term_len(p, (p->defindent+1)/2);
+		break;
+	case ROFFT_BODY:
+		p->tcol->offset = term_len(p, p->defindent);
+		term_tab_set(p, NULL);
+		term_tab_set(p, "T");
+		term_tab_set(p, ".5i");
 		break;
 	default:
 		break;
 	}
 
-	return(1);
+	return 1;
 }
 
-
-/* ARGSUSED */
 static void
 termp_ss_post(DECL_ARGS)
 {
 
-	if (MDOC_HEAD == n->type)
+	if (n->type == ROFFT_HEAD || n->type == ROFFT_BODY)
 		term_newln(p);
 }
 
-
-/* ARGSUSED */
 static int
 termp_cd_pre(DECL_ARGS)
 {
 
 	synopsis_pre(p, n);
 	term_fontpush(p, TERMFONT_BOLD);
-	return(1);
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 termp_in_pre(DECL_ARGS)
 {
 
 	synopsis_pre(p, n);
 
-	if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) {
+	if (NODE_SYNPRETTY & n->flags && NODE_LINE & n->flags) {
 		term_fontpush(p, TERMFONT_BOLD);
 		term_word(p, "#include");
 		term_word(p, "<");
@@ -1853,285 +1592,497 @@ termp_in_pre(DECL_ARGS)
 	}
 
 	p->flags |= TERMP_NOSPACE;
-	return(1);
+	return 1;
 }
 
-
-/* ARGSUSED */
 static void
 termp_in_post(DECL_ARGS)
 {
 
-	if (SEC_SYNOPSIS == n->sec)
+	if (NODE_SYNPRETTY & n->flags)
 		term_fontpush(p, TERMFONT_BOLD);
 
 	p->flags |= TERMP_NOSPACE;
 	term_word(p, ">");
 
-	if (SEC_SYNOPSIS == n->sec)
+	if (NODE_SYNPRETTY & n->flags)
 		term_fontpop(p);
 }
 
-
-/* ARGSUSED */
 static int
-termp_sp_pre(DECL_ARGS)
+termp_pp_pre(DECL_ARGS)
 {
-	size_t		 i, len;
-
-	switch (n->tok) {
-	case (MDOC_sp):
-		len = n->child ? a2height(n->child) : 1;
-		break;
-	case (MDOC_br):
-		len = 0;
-		break;
-	default:
-		len = 1;
-		break;
-	}
-
-	if (0 == len)
-		term_newln(p);
-	for (i = 0; i < len; i++)
-		term_vspace(p);
-
-	return(0);
+	fn_prio = 0;
+	term_vspace(p);
+	return 0;
 }
 
-
-/* ARGSUSED */
 static int
-termp_brq_pre(DECL_ARGS)
+termp_skip_pre(DECL_ARGS)
 {
 
-	if (MDOC_BODY != n->type)
-		return(1);
-	term_word(p, "\\(lC");
-	p->flags |= TERMP_NOSPACE;
-	return(1);
+	return 0;
 }
 
-
-/* ARGSUSED */
-static void
-termp_brq_post(DECL_ARGS)
+static int
+termp_quote_pre(DECL_ARGS)
 {
 
-	if (MDOC_BODY != n->type)
-		return;
-	p->flags |= TERMP_NOSPACE;
-	term_word(p, "\\(rC");
-}
+	if (n->type != ROFFT_BODY && n->type != ROFFT_ELEM)
+		return 1;
 
+	switch (n->tok) {
+	case MDOC_Ao:
+	case MDOC_Aq:
+		term_word(p, n->child != NULL && n->child->next == NULL &&
+		    n->child->tok == MDOC_Mt ? "<" : "\\(la");
+		break;
+	case MDOC_Bro:
+	case MDOC_Brq:
+		term_word(p, "{");
+		break;
+	case MDOC_Oo:
+	case MDOC_Op:
+	case MDOC_Bo:
+	case MDOC_Bq:
+		term_word(p, "[");
+		break;
+	case MDOC__T:
+		/* FALLTHROUGH */
+	case MDOC_Do:
+	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_Po:
+	case MDOC_Pq:
+		term_word(p, "(");
+		break;
+	case MDOC_Qo:
+	case MDOC_Qq:
+		term_word(p, "\"");
+		break;
+	case MDOC_Ql:
+	case MDOC_So:
+	case MDOC_Sq:
+		term_word(p, "\\(oq");
+		break;
+	default:
+		abort();
+	}
 
-/* ARGSUSED */
-static int
-termp_bq_pre(DECL_ARGS)
-{
-
-	if (MDOC_BODY != n->type)
-		return(1);
-	term_word(p, "\\(lB");
 	p->flags |= TERMP_NOSPACE;
-	return(1);
+	return 1;
 }
 
-
-/* ARGSUSED */
 static void
-termp_bq_post(DECL_ARGS)
+termp_quote_post(DECL_ARGS)
 {
 
-	if (MDOC_BODY != n->type)
+	if (n->type != ROFFT_BODY && n->type != ROFFT_ELEM)
 		return;
+
 	p->flags |= TERMP_NOSPACE;
-	term_word(p, "\\(rB");
-}
 
+	switch (n->tok) {
+	case MDOC_Ao:
+	case MDOC_Aq:
+		term_word(p, n->child != NULL && n->child->next == NULL &&
+		    n->child->tok == MDOC_Mt ? ">" : "\\(ra");
+		break;
+	case MDOC_Bro:
+	case MDOC_Brq:
+		term_word(p, "}");
+		break;
+	case MDOC_Oo:
+	case MDOC_Op:
+	case MDOC_Bo:
+	case MDOC_Bq:
+		term_word(p, "]");
+		break;
+	case MDOC__T:
+		/* FALLTHROUGH */
+	case MDOC_Do:
+	case MDOC_Dq:
+		term_word(p, "\\(rq");
+		break;
+	case MDOC_En:
+		if (n->norm->Es == NULL ||
+		    n->norm->Es->child == NULL ||
+		    n->norm->Es->child->next == NULL)
+			p->flags &= ~TERMP_NOSPACE;
+		else
+			term_word(p, n->norm->Es->child->next->string);
+		break;
+	case MDOC_Po:
+	case MDOC_Pq:
+		term_word(p, ")");
+		break;
+	case MDOC_Qo:
+	case MDOC_Qq:
+		term_word(p, "\"");
+		break;
+	case MDOC_Ql:
+	case MDOC_So:
+	case MDOC_Sq:
+		term_word(p, "\\(cq");
+		break;
+	default:
+		abort();
+	}
+}
 
-/* ARGSUSED */
 static int
-termp_pq_pre(DECL_ARGS)
+termp_eo_pre(DECL_ARGS)
 {
 
-	if (MDOC_BODY != n->type)
-		return(1);
-	term_word(p, "\\&(");
-	p->flags |= TERMP_NOSPACE;
-	return(1);
-}
+	if (n->type != ROFFT_BODY)
+		return 1;
 
+	if (n->end == ENDBODY_NOT &&
+	    n->parent->head->child == NULL &&
+	    n->child != NULL &&
+	    n->child->end != ENDBODY_NOT)
+		term_word(p, "\\&");
+	else if (n->end != ENDBODY_NOT ? n->child != NULL :
+	     n->parent->head->child != NULL && (n->child != NULL ||
+	     (n->parent->tail != NULL && n->parent->tail->child != NULL)))
+		p->flags |= TERMP_NOSPACE;
+
+	return 1;
+}
 
-/* ARGSUSED */
 static void
-termp_pq_post(DECL_ARGS)
+termp_eo_post(DECL_ARGS)
 {
+	int	 body, tail;
 
-	if (MDOC_BODY != n->type)
+	if (n->type != ROFFT_BODY)
 		return;
-	term_word(p, ")");
-}
 
+	if (n->end != ENDBODY_NOT) {
+		p->flags &= ~TERMP_NOSPACE;
+		return;
+	}
+
+	body = n->child != NULL || n->parent->head->child != NULL;
+	tail = n->parent->tail != NULL && n->parent->tail->child != NULL;
+
+	if (body && tail)
+		p->flags |= TERMP_NOSPACE;
+	else if ( ! (body || tail))
+		term_word(p, "\\&");
+	else if ( ! tail)
+		p->flags &= ~TERMP_NOSPACE;
+}
 
-/* ARGSUSED */
 static int
 termp_fo_pre(DECL_ARGS)
 {
+	size_t		 rmargin = 0;
+	int		 pretty;
 
-	if (MDOC_BLOCK == n->type) {
+	pretty = NODE_SYNPRETTY & n->flags;
+
+	if (n->type == ROFFT_BLOCK) {
 		synopsis_pre(p, n);
-		return(1);
-	} else if (MDOC_BODY == n->type) {
+		return 1;
+	} else if (n->type == ROFFT_BODY) {
+		if (pretty) {
+			rmargin = p->tcol->rmargin;
+			p->tcol->rmargin = p->tcol->offset + term_len(p, 4);
+			p->flags |= TERMP_NOBREAK | TERMP_BRIND |
+					TERMP_HANG;
+		}
 		p->flags |= TERMP_NOSPACE;
 		term_word(p, "(");
 		p->flags |= TERMP_NOSPACE;
-		return(1);
-	} 
+		if (pretty) {
+			term_flushln(p);
+			p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND |
+					TERMP_HANG);
+			p->flags |= TERMP_NOPAD;
+			p->tcol->offset = p->tcol->rmargin;
+			p->tcol->rmargin = rmargin;
+		}
+		return 1;
+	}
+
+	if (NULL == n->child)
+		return 0;
 
 	/* XXX: we drop non-initial arguments as per groff. */
 
-	assert(n->child);
 	assert(n->child->string);
 	term_fontpush(p, TERMFONT_BOLD);
 	term_word(p, n->child->string);
-	return(0);
+	return 0;
 }
 
-
-/* ARGSUSED */
 static void
 termp_fo_post(DECL_ARGS)
 {
 
-	if (MDOC_BODY != n->type) 
+	if (n->type != ROFFT_BODY)
 		return;
 
 	p->flags |= TERMP_NOSPACE;
 	term_word(p, ")");
 
-	if (SEC_SYNOPSIS == n->sec) {
+	if (NODE_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	*nn;
 
-	if (MDOC_HEAD == n->type)
-		return(0);
-	else if (MDOC_BLOCK != n->type)
-		return(1);
+	if (n->type == ROFFT_HEAD)
+		return 0;
+	else if (n->type != ROFFT_BODY)
+		return 1;
 
-	if (NULL == (nn = n->head->child)) {
-		if (arg_hasattr(MDOC_Emphasis, n))
-			term_fontpush(p, TERMFONT_UNDER);
-		else if (arg_hasattr(MDOC_Symbolic, n))
-			term_fontpush(p, TERMFONT_BOLD);
-		else
-			term_fontpush(p, TERMFONT_NONE);
-
-		return(1);
-	} 
-
-	assert(MDOC_TEXT == nn->type);
-	if (0 == strcmp("Em", nn->string))
+	if (FONT_Em == n->norm->Bf.font)
 		term_fontpush(p, TERMFONT_UNDER);
-	else if (0 == strcmp("Sy", nn->string))
+	else if (FONT_Sy == n->norm->Bf.font)
 		term_fontpush(p, TERMFONT_BOLD);
 	else
 		term_fontpush(p, TERMFONT_NONE);
 
-	return(1);
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 termp_sm_pre(DECL_ARGS)
 {
 
-	assert(n->child && MDOC_TEXT == n->child->type);
-	if (0 == strcmp("on", n->child->string))
+	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;
 
-	return(0);
-}
+	if (p->col && ! (TERMP_NONOSPACE & p->flags))
+		p->flags &= ~TERMP_NOSPACE;
 
+	return 0;
+}
 
-/* ARGSUSED */
 static int
 termp_ap_pre(DECL_ARGS)
 {
 
 	p->flags |= TERMP_NOSPACE;
-	term_word(p, "\\(aq");
+	term_word(p, "'");
 	p->flags |= TERMP_NOSPACE;
-	return(1);
+	return 1;
 }
 
-
-/* ARGSUSED */
 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;
+
 	/* TODO: %U. */
 
+	if (NULL == n->parent || MDOC_Rs != n->parent->tok)
+		return;
+
 	p->flags |= TERMP_NOSPACE;
-	term_word(p, n->next ? "," : ".");
+	if (NULL == n->next) {
+		term_word(p, ".");
+		p->flags |= TERMP_SENTENCE;
+	} else
+		term_word(p, ",");
 }
 
-
-/* ARGSUSED */
 static int
 termp_li_pre(DECL_ARGS)
 {
 
+	termp_tag_pre(p, pair, meta, n);
 	term_fontpush(p, TERMFONT_NONE);
-	return(1);
+	return 1;
 }
 
-
-/* ARGSUSED */
 static int
 termp_lk_pre(DECL_ARGS)
 {
-	const struct mdoc_node *nn;
+	const struct roff_node *link, *descr, *punct;
 
-	term_fontpush(p, TERMFONT_UNDER);
-	nn = n->child;
+	if ((link = n->child) == NULL)
+		return 0;
 
-	if (NULL == nn->next)
-		return(1);
+	/* Find beginning of trailing punctuation. */
+	punct = n->last;
+	while (punct != link && punct->flags & NODE_DELIMC)
+		punct = punct->prev;
+	punct = punct->next;
 
-	term_word(p, nn->string);
-	term_fontpop(p);
-
-	p->flags |= TERMP_NOSPACE;
-	term_word(p, ":");
+	/* Link text. */
+	if ((descr = link->next) != NULL && descr != punct) {
+		term_fontpush(p, TERMFONT_UNDER);
+		while (descr != punct) {
+			if (descr->flags & (NODE_DELIMC | NODE_DELIMO))
+				p->flags |= TERMP_NOSPACE;
+			term_word(p, descr->string);
+			descr = descr->next;
+		}
+		term_fontpop(p);
+		p->flags |= TERMP_NOSPACE;
+		term_word(p, ":");
+	}
 
+	/* Link target. */
 	term_fontpush(p, TERMFONT_BOLD);
-	for (nn = nn->next; nn; nn = nn->next) 
-		term_word(p, nn->string);
+	term_word(p, link->string);
 	term_fontpop(p);
 
-	return(0);
+	/* Trailing punctuation. */
+	while (punct != NULL) {
+		p->flags |= TERMP_NOSPACE;
+		term_word(p, punct->string);
+		punct = punct->next;
+	}
+	return 0;
 }
 
+static int
+termp_bk_pre(DECL_ARGS)
+{
+
+	switch (n->type) {
+	case ROFFT_BLOCK:
+		break;
+	case ROFFT_HEAD:
+		return 0;
+	case ROFFT_BODY:
+		if (n->parent->args != NULL || n->prev->child == NULL)
+			p->flags |= TERMP_PREKEEP;
+		break;
+	default:
+		abort();
+	}
+
+	return 1;
+}
+
+static void
+termp_bk_post(DECL_ARGS)
+{
+
+	if (n->type == ROFFT_BODY)
+		p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);
+}
+
+static void
+termp__t_post(DECL_ARGS)
+{
+
+	/*
+	 * 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);
+}
+
+static int
+termp__t_pre(DECL_ARGS)
+{
+
+	/*
+	 * 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);
+
+	term_fontpush(p, TERMFONT_UNDER);
+	return 1;
+}
 
-/* ARGSUSED */
 static int
 termp_under_pre(DECL_ARGS)
 {
 
 	term_fontpush(p, TERMFONT_UNDER);
-	return(1);
+	return 1;
+}
+
+static int
+termp_em_pre(DECL_ARGS)
+{
+	if (n->child != NULL &&
+	    n->child->type == ROFFT_TEXT)
+		tag_put(n->child->string, 0, p->line);
+	term_fontpush(p, TERMFONT_UNDER);
+	return 1;
+}
+
+static int
+termp_sy_pre(DECL_ARGS)
+{
+	if (n->child != NULL &&
+	    n->child->type == ROFFT_TEXT)
+		tag_put(n->child->string, 0, p->line);
+	term_fontpush(p, TERMFONT_BOLD);
+	return 1;
+}
+
+static int
+termp_er_pre(DECL_ARGS)
+{
+
+	if (n->sec == SEC_ERRORS &&
+	    (n->parent->tok == MDOC_It ||
+	     (n->parent->tok == MDOC_Bq &&
+	      n->parent->parent->parent->tok == MDOC_It)))
+		tag_put(n->child->string, 1, p->line);
+	return 1;
+}
+
+static int
+termp_tag_pre(DECL_ARGS)
+{
+
+	if (n->child != NULL &&
+	    n->child->type == ROFFT_TEXT &&
+	    (n->prev == NULL ||
+	     (n->prev->type == ROFFT_TEXT &&
+	      strcmp(n->prev->string, "|") == 0)) &&
+	    (n->parent->tok == MDOC_It ||
+	     (n->parent->tok == MDOC_Xo &&
+	      n->parent->parent->prev == NULL &&
+	      n->parent->parent->parent->tok == MDOC_It)))
+		tag_put(n->child->string, 1, p->line);
+	return 1;
+}
+
+static int
+termp_abort_pre(DECL_ARGS)
+{
+	abort();
 }