X-Git-Url: https://git.cameronkatri.com/mandoc.git/blobdiff_plain/ff6450df2b770952b864bc2e5ea77ed33f92c934..d9e083236177b894e7e46495fc3b88cb10ee909a:/mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index bdd63db5..1eea180d 100644
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.50 2009/07/21 12:47:52 kristaps Exp $ */
+/*	$Id: mdoc_term.c,v 1.106 2010/01/01 14:32:52 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -18,66 +18,18 @@
 
 #include <assert.h>
 #include <ctype.h>
-#include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "out.h"
 #include "term.h"
 #include "mdoc.h"
+#include "chars.h"
+#include "main.h"
 
-/* FIXME: macro arguments can be escaped. */
-
-#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 */
-};
+#define	INDENT		  5
+#define	HALFINDENT	  3
 
 struct	termpair {
 	struct termpair	 *ppair;
@@ -87,16 +39,38 @@ struct	termpair {
 
 #define	DECL_ARGS struct termp *p, \
 		  struct termpair *pair, \
-	  	  const struct mdoc_meta *meta, \
-		  const struct mdoc_node *node
+	  	  const struct mdoc_meta *m, \
+		  const struct mdoc_node *n
 
 struct	termact {
 	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 struct mdoc_argv *);
+
+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	int	  arg_listtype(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);
+static	void	  print_mdoc_head(DECL_ARGS);
+static	void	  print_mdoc_nodelist(DECL_ARGS);
+static	void	  print_foot(DECL_ARGS);
+
+#ifdef __linux__
+extern	size_t	  strlcpy(char *, const char *, size_t);
+extern	size_t	  strlcat(char *, const char *, size_t);
+#endif
+
 static	void	  termp____post(DECL_ARGS);
-static	void	  termp__t_post(DECL_ARGS);
+static	void	  termp_an_post(DECL_ARGS);
 static	void	  termp_aq_post(DECL_ARGS);
 static	void	  termp_bd_post(DECL_ARGS);
 static	void	  termp_bl_post(DECL_ARGS);
@@ -121,42 +95,34 @@ static	void	  termp_sq_post(DECL_ARGS);
 static	void	  termp_ss_post(DECL_ARGS);
 static	void	  termp_vt_post(DECL_ARGS);
 
-static	int	  termp__j_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_aq_pre(DECL_ARGS);
-static	int	  termp_ar_pre(DECL_ARGS);
 static	int	  termp_bd_pre(DECL_ARGS);
 static	int	  termp_bf_pre(DECL_ARGS);
+static	int	  termp_bold_pre(DECL_ARGS);
 static	int	  termp_bq_pre(DECL_ARGS);
-static	int	  termp_br_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_cm_pre(DECL_ARGS);
 static	int	  termp_d1_pre(DECL_ARGS);
 static	int	  termp_dq_pre(DECL_ARGS);
-static	int	  termp_em_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_ic_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_lk_pre(DECL_ARGS);
-static	int	  termp_ms_pre(DECL_ARGS);
-static	int	  termp_mt_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_pa_pre(DECL_ARGS);
 static	int	  termp_pf_pre(DECL_ARGS);
-static	int	  termp_pp_pre(DECL_ARGS);
 static	int	  termp_pq_pre(DECL_ARGS);
 static	int	  termp_qq_pre(DECL_ARGS);
 static	int	  termp_rs_pre(DECL_ARGS);
@@ -166,22 +132,19 @@ static	int	  termp_sm_pre(DECL_ARGS);
 static	int	  termp_sp_pre(DECL_ARGS);
 static	int	  termp_sq_pre(DECL_ARGS);
 static	int	  termp_ss_pre(DECL_ARGS);
-static	int	  termp_sx_pre(DECL_ARGS);
-static	int	  termp_sy_pre(DECL_ARGS);
+static	int	  termp_under_pre(DECL_ARGS);
 static	int	  termp_ud_pre(DECL_ARGS);
-static	int	  termp_va_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] = {
+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_sp_pre, NULL }, /* Pp */ 
 	{ termp_d1_pre, termp_d1_post }, /* D1 */
 	{ termp_d1_pre, termp_d1_post }, /* Dl */
 	{ termp_bd_pre, termp_bd_post }, /* Bd */
@@ -190,42 +153,42 @@ static const struct termact termacts[MDOC_MAX] = {
 	{ NULL, NULL }, /* El */
 	{ termp_it_pre, termp_it_post }, /* It */
 	{ NULL, NULL }, /* Ad */ 
-	{ NULL, NULL }, /* An */
-	{ termp_ar_pre, NULL }, /* Ar */
+	{ termp_an_pre, termp_an_post }, /* An */
+	{ termp_under_pre, NULL }, /* Ar */
 	{ termp_cd_pre, NULL }, /* Cd */
-	{ termp_cm_pre, NULL }, /* Cm */
+	{ 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_bold_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_bold_pre, NULL }, /* Ic */ 
 	{ termp_in_pre, termp_in_post }, /* In */ 
-	{ NULL, NULL }, /* Li */
+	{ 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_pa_pre, NULL }, /* Pa */
+	{ termp_under_pre, NULL }, /* Pa */
 	{ termp_rv_pre, NULL }, /* Rv */
 	{ NULL, NULL }, /* St */ 
-	{ termp_va_pre, NULL }, /* Va */
-	{ termp_vt_pre, termp_vt_post }, /* Vt */ 
+	{ termp_under_pre, NULL }, /* Va */
+	{ termp_under_pre, termp_vt_post }, /* Vt */
 	{ termp_xr_pre, NULL }, /* Xr */
 	{ NULL, termp____post }, /* %A */
-	{ NULL, termp____post }, /* %B */
+	{ 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 */
 	{ NULL, termp____post }, /* %R */
-	{ termp__t_pre, termp__t_post }, /* %T */
+	{ termp__t_pre, termp____post }, /* %T */
 	{ NULL, termp____post }, /* %V */
 	{ NULL, NULL }, /* Ac */
 	{ termp_aq_pre, termp_aq_post }, /* Ao */
@@ -243,10 +206,10 @@ static const struct termact termacts[MDOC_MAX] = {
 	{ termp_dq_pre, termp_dq_post }, /* Dq */
 	{ NULL, NULL }, /* Ec */
 	{ NULL, NULL }, /* Ef */
-	{ termp_em_pre, NULL }, /* Em */ 
+	{ termp_under_pre, NULL }, /* Em */ 
 	{ NULL, NULL }, /* Eo */
 	{ termp_xx_pre, NULL }, /* Fx */
-	{ termp_ms_pre, NULL }, /* Ms */
+	{ termp_bold_pre, NULL }, /* Ms */ /* FIXME: convert to symbol? */
 	{ NULL, NULL }, /* No */
 	{ termp_ns_pre, NULL }, /* Ns */
 	{ termp_xx_pre, NULL }, /* Nx */
@@ -265,8 +228,8 @@ static const struct termact termacts[MDOC_MAX] = {
 	{ termp_sq_pre, termp_sq_post }, /* So */
 	{ termp_sq_pre, termp_sq_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_xx_pre, NULL }, /* Ux */
 	{ NULL, NULL }, /* Xc */
@@ -282,126 +245,106 @@ static const struct termact termacts[MDOC_MAX] = {
 	{ NULL, NULL }, /* Fr */
 	{ termp_ud_pre, NULL }, /* Ud */
 	{ NULL, termp_lb_post }, /* Lb */
-	{ termp_pp_pre, NULL }, /* Lp */ 
+	{ termp_sp_pre, NULL }, /* Lp */ 
 	{ termp_lk_pre, NULL }, /* Lk */ 
-	{ termp_mt_pre, NULL }, /* Mt */ 
+	{ termp_under_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 */ 
+	{ NULL, termp____post }, /* %C */ 
+	{ NULL, NULL }, /* Es */ /* TODO */
+	{ NULL, NULL }, /* En */ /* TODO */
 	{ termp_xx_pre, NULL }, /* Dx */ 
-	{ NULL, NULL }, /* %Q */ 
-	{ termp_br_pre, NULL }, /* br */
+	{ NULL, termp____post }, /* %Q */ 
+	{ termp_sp_pre, NULL }, /* br */
 	{ termp_sp_pre, NULL }, /* sp */ 
+	{ termp_under_pre, termp____post }, /* %U */ 
 };
 
-#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 *);
+void
+terminal_mdoc(void *arg, const struct mdoc *mdoc)
+{
+	const struct mdoc_node	*n;
+	const struct mdoc_meta	*m;
+	struct termp		*p;
 
+	p = (struct termp *)arg;
 
-int
-mdoc_run(struct termp *p, const struct mdoc *m)
-{
-	/*
-	 * Main output function.  When this is called, assume that the
-	 * tree is properly formed.
-	 */
-	print_head(p, mdoc_meta(m));
-	assert(mdoc_node(m));
-	assert(MDOC_ROOT == mdoc_node(m)->type);
-	if (mdoc_node(m)->child)
-		print_body(p, NULL, mdoc_meta(m), mdoc_node(m)->child);
-	print_foot(p, mdoc_meta(m));
-	return(1);
+	if (NULL == p->symtab)
+		switch (p->enc) {
+		case (TERMENC_ASCII):
+			p->symtab = chars_init(CHARS_ASCII);
+			break;
+		default:
+			abort();
+			/* NOTREACHED */
+		}
+
+	n = mdoc_node(mdoc);
+	m = mdoc_meta(mdoc);
+
+	print_mdoc_head(p, NULL, m, n);
+	if (n->child)
+		print_mdoc_nodelist(p, NULL, m, n->child);
+	print_foot(p, NULL, m, n);
 }
 
 
 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, m, n);
+	if (n->next)
+		print_mdoc_nodelist(p, pair, m, n->next);
 }
 
 
+/* ARGSUSED */
 static void
-print_node(DECL_ARGS)
+print_mdoc_node(DECL_ARGS)
 {
-	int		 dochild;
+	int		 chld;
+	const void	*font;
 	struct termpair	 npair;
 	size_t		 offset, rmargin;
 
-	dochild = 1;
+	chld = 1;
 	offset = p->offset;
 	rmargin = p->rmargin;
+	font = term_fontq(p);
 
+	memset(&npair, 0, sizeof(struct termpair));
 	npair.ppair = pair;
-	npair.flag = 0;
-	npair.count = 0;
-
-	/*
-	 * Note on termpair.  This allows a pre function to set a termp
-	 * flag that is automatically unset after the body, but before
-	 * the post function.  Thus, if a pre uses a termpair flag, it
-	 * must be reapplied in the post for use.
-	 */
-
-	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);
-
-	/* Children. */
 
-	p->flags |= npair.flag;
+	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); 
 
-	if (dochild && node->child)
-		print_body(p, &npair, meta, node->child);
+	if (chld && n->child)
+		print_mdoc_nodelist(p, &npair, m, n->child);
 
-	p->flags &= ~npair.flag;
+	term_fontpopq(p, font);
 
-	/* Post-processing. */
-
-	if (MDOC_TEXT != node->type)
-		if (termacts[node->tok].post)
-			(*termacts[node->tok].post)(p, &npair, meta, node);
+	if (MDOC_TEXT != n->type)
+		if (termacts[n->tok].post)
+			(*termacts[n->tok].post)(p, &npair, m, n);
 
 	p->offset = offset;
 	p->rmargin = rmargin;
 }
 
 
+/* ARGSUSED */
 static void
-print_foot(struct termp *p, const struct mdoc_meta *meta)
+print_foot(DECL_ARGS)
 {
-	struct tm	*tm;
-	char		*buf, *os;
+	char		buf[DATESIZ], os[BUFSIZ];
+
+	term_fontrepl(p, TERMFONT_NONE);
 
 	/* 
 	 * Output the footer in new-groff style, that is, three columns
@@ -411,17 +354,8 @@ print_foot(struct termp *p, const struct mdoc_meta *meta)
 	 * SYSTEM                  DATE                    SYSTEM
 	 */
 
-	if (NULL == (buf = malloc(p->rmargin)))
-		err(1, "malloc");
-	if (NULL == (os = malloc(p->rmargin)))
-		err(1, "malloc");
-
-	tm = localtime(&meta->date);
-
-	if (0 == strftime(buf, p->rmargin, "%B %e, %Y", tm))
-		err(1, "strftime");
-
-	(void)strlcpy(os, meta->os, p->rmargin);
+	time2a(m->date, buf, DATESIZ);
+	strlcpy(os, m->os, BUFSIZ);
 
 	term_vspace(p);
 
@@ -450,25 +384,18 @@ print_foot(struct termp *p, const struct mdoc_meta *meta)
 	p->offset = 0;
 	p->rmargin = p->maxrmargin;
 	p->flags = 0;
-
-	free(buf);
-	free(os);
 }
 
 
+/* ARGSUSED */
 static void
-print_head(struct termp *p, const struct mdoc_meta *meta)
+print_mdoc_head(DECL_ARGS)
 {
-	char		*buf, *title;
+	char		buf[BUFSIZ], title[BUFSIZ];
 
 	p->rmargin = p->maxrmargin;
 	p->offset = 0;
 
-	if (NULL == (buf = malloc(p->rmargin)))
-		err(1, "malloc");
-	if (NULL == (title = malloc(p->rmargin)))
-		err(1, "malloc");
-
 	/*
 	 * The header is strange.  It has three components, which are
 	 * really two with the first duplicated.  It goes like this:
@@ -482,17 +409,16 @@ 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);
+	assert(m->vol);
+	strlcpy(buf, m->vol, BUFSIZ);
 
-	if (meta->arch) {
-		(void)strlcat(buf, " (", p->rmargin);
-		(void)strlcat(buf, meta->arch, p->rmargin);
-		(void)strlcat(buf, ")", p->rmargin);
+	if (m->arch) {
+		strlcat(buf, " (", BUFSIZ);
+		strlcat(buf, m->arch, BUFSIZ);
+		strlcat(buf, ")", BUFSIZ);
 	}
 
-	(void)snprintf(title, p->rmargin, "%s(%d)", 
-			meta->title, meta->msec);
+	snprintf(title, BUFSIZ, "%s(%d)", m->title, m->msec);
 
 	p->offset = 0;
 	p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2;
@@ -519,35 +445,38 @@ print_head(struct termp *p, const struct mdoc_meta *meta)
 	p->offset = 0;
 	p->rmargin = p->maxrmargin;
 	p->flags &= ~TERMP_NOSPACE;
-
-	free(title);
-	free(buf);
 }
 
 
 static size_t
-arg_width(const struct mdoc_argv *arg, int pos)
+a2height(const struct mdoc_node *n)
 {
-	int		 i, len;
-	const char	*p;
+	struct roffsu	 su;
 
-	assert(pos < (int)arg->sz && pos >= 0);
-	assert(arg->value[pos]);
+	assert(MDOC_TEXT == n->type);
+	assert(n->string);
+	if ( ! a2roffsu(n->string, &su, SCALE_VS))
+		SCALE_VS_INIT(&su, strlen(n->string));
 
-	p = arg->value[pos];
+	return(term_vspan(&su));
+}
 
-	if (0 == (len = (int)strlen(p)))
-		return(0);
 
-	for (i = 0; i < len - 1; i++) 
-		if ( ! isdigit((u_char)p[i]))
-			break;
+static size_t
+a2width(const struct mdoc_argv *arg, int pos)
+{
+	struct roffsu	 su;
 
-	if (i == len - 1) 
-		if ('n' == p[len - 1] || 'm' == p[len - 1])
-			return((size_t)atoi(p) + 2);
+	assert(arg->value[pos]);
+	if ( ! a2roffsu(arg->value[pos], &su, SCALE_MAX))
+		SCALE_HS_INIT(&su, strlen(arg->value[pos]));
 
-	return((size_t)len + 2);
+	/*
+	 * This is a bit if a magic number on groff's part.  Be careful
+	 * in changing it, as the MDOC_Column handler will subtract one
+	 * from this for >5 columns (don't go below zero!).
+	 */
+	return(term_hspan(&su) + 2);
 }
 
 
@@ -593,33 +522,22 @@ arg_listtype(const struct mdoc_node *n)
 
 
 static size_t
-arg_offset(const struct mdoc_argv *arg)
+a2offs(const struct mdoc_argv *arg)
 {
-	int		 len, i;
-	const char	*p;
-
-	assert(*arg->value);
-	p = *arg->value;
+	struct roffsu	 su;
 
-	if (0 == strcmp(p, "left"))
+	if ('\0' == arg->value[0][0])
 		return(0);
-	if (0 == strcmp(p, "indent"))
+	else if (0 == strcmp(arg->value[0], "left"))
+		return(0);
+	else if (0 == strcmp(arg->value[0], "indent"))
 		return(INDENT + 1);
-	if (0 == strcmp(p, "indent-two"))
+	else if (0 == strcmp(arg->value[0], "indent-two"))
 		return((INDENT + 1) * 2);
+	else if ( ! a2roffsu(arg->value[0], &su, SCALE_MAX))
+		SCALE_HS_INIT(&su, strlen(arg->value[0]));
 
-	if (0 == (len = (int)strlen(p)))
-		return(0);
-
-	for (i = 0; i < len - 1; i++) 
-		if ( ! isdigit((u_char)p[i]))
-			break;
-
-	if (i == len - 1) 
-		if ('n' == p[len - 1] || 'm' == p[len - 1])
-			return((size_t)atoi(p));
-
-	return((size_t)len);
+	return(term_hspan(&su));
 }
 
 
@@ -659,36 +577,47 @@ arg_getattrs(const int *keys, int *vals,
 }
 
 
-/* ARGSUSED */
-static int
-fmt_block_vspace(struct termp *p, 
+static void
+print_bvspace(struct termp *p, 
 		const struct mdoc_node *bl, 
-		const struct mdoc_node *node)
+		const struct mdoc_node *n)
 {
-	const struct mdoc_node *n;
+	const struct mdoc_node	*nn;
 
 	term_newln(p);
-
 	if (arg_hasattr(MDOC_Compact, bl))
-		return(1);
-	/* XXX - not documented! */
-	else if (arg_hasattr(MDOC_Column, bl))
-		return(1);
+		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 && arg_hasattr(MDOC_Column, bl))
+		if (n->prev && MDOC_It == n->prev->tok)
+			return;
+
+	/* A `-diag' without body does not vspace. */
+
+	if (MDOC_Bl == bl->tok && arg_hasattr(MDOC_Diag, bl)) 
+		if (n->prev && MDOC_It == n->prev->tok) {
+			assert(n->prev->body);
+			if (NULL == n->prev->body->child)
+				return;
+		}
+
+	term_vspace(p);
 }
 
 
@@ -697,7 +626,7 @@ static int
 termp_dq_pre(DECL_ARGS)
 {
 
-	if (MDOC_BODY != node->type)
+	if (MDOC_BODY != n->type)
 		return(1);
 
 	term_word(p, "\\(lq");
@@ -711,7 +640,7 @@ static void
 termp_dq_post(DECL_ARGS)
 {
 
-	if (MDOC_BODY != node->type)
+	if (MDOC_BODY != n->type)
 		return;
 
 	p->flags |= TERMP_NOSPACE;
@@ -723,15 +652,18 @@ termp_dq_post(DECL_ARGS)
 static int
 termp_it_pre(DECL_ARGS)
 {
-	const struct mdoc_node *bl, *n;
+	const struct mdoc_node *bl, *nn;
 	char		        buf[7];
 	int		        i, type, keys[3], vals[3];
-	size_t		        width, offset;
+	size_t		        width, offset, ncols;
+	int			dcol;
 
-	if (MDOC_BLOCK == node->type)
-		return(fmt_block_vspace(p, node->parent->parent, node));
+	if (MDOC_BLOCK == n->type) {
+		print_bvspace(p, n->parent->parent, n);
+		return(1);
+	}
 
-	bl = node->parent->parent->parent;
+	bl = n->parent->parent->parent;
 
 	/* Save parent attributes. */
 
@@ -752,32 +684,55 @@ termp_it_pre(DECL_ARGS)
 	type = arg_listtype(bl);
 	assert(-1 != type);
 
+	if (vals[1] >= 0) 
+		offset = a2offs(&bl->args->argv[vals[1]]);
+
 	/* Calculate real width and offset. */
 
 	switch (type) {
 	case (MDOC_Column):
-		if (MDOC_BODY == node->type)
+		if (MDOC_BODY == n->type)
 			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]]);
+
+		/*
+		 * Imitate groff's column handling.
+		 * For each earlier column, add its width.
+		 * For less than 5 columns, add two more blanks per column.
+		 * For exactly 5 columns, add only one more blank per column.
+		 * For more than 5 columns, SUBTRACT one column.  We can
+		 * do this because a2width() pads exactly 2 spaces.
+		 */
+		ncols = bl->args->argv[vals[2]].sz;
+		dcol = ncols < 5 ? 2 : ncols == 5 ? 1 : -1;
+		for (i=0, nn=n->prev; nn && i < (int)ncols; nn=nn->prev, i++)
+			offset += a2width(&bl->args->argv[vals[2]], i) + 
+				(size_t)dcol;
+
+		/*
+		 * Use the declared column widths,
+		 * extended as explained in the preceding paragraph.
+		 */
+		if (i < (int)ncols)
+			width = a2width(&bl->args->argv[vals[2]], i) + 
+				(size_t)dcol;
+
+		/*
+		 * 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.
+		 */
 		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]]);
+			width = a2width(&bl->args->argv[vals[0]], 0);
 		break;
 	}
 
 	/* 
 	 * List-type can override the width in the case of fixed-head
 	 * values (bullet, dash/hyphen, enum).  Tags need a non-zero
-	 * offset.  FIXME: double-check that correct.
+	 * offset.
 	 */
 
 	switch (type) {
@@ -812,26 +767,27 @@ termp_it_pre(DECL_ARGS)
 	 * while diagonal bodies need two.
 	 */
 
+	p->flags |= TERMP_NOSPACE;
+
 	switch (type) {
+	case (MDOC_Diag):
+		if (MDOC_BODY == n->type)
+			term_word(p, "\\ \\ ");
+		break;
 	case (MDOC_Inset):
-		if (MDOC_BODY == node->type) 
-			p->flags &= ~TERMP_NOSPACE;
-		else
-			p->flags |= TERMP_NOSPACE;
+		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];
+		if (MDOC_HEAD == n->type)
+			term_fontpush(p, TERMFONT_BOLD);
 		break;
 	default:
 		break;
@@ -853,44 +809,58 @@ termp_it_pre(DECL_ARGS)
 	case (MDOC_Enum):
 		/* FALLTHROUGH */
 	case (MDOC_Hyphen):
-		if (MDOC_HEAD == node->type)
+		if (MDOC_HEAD == n->type)
 			p->flags |= TERMP_NOBREAK;
 		else
 			p->flags |= TERMP_NOLPAD;
 		break;
 	case (MDOC_Hang):
-		if (MDOC_HEAD == node->type)
+		if (MDOC_HEAD == n->type)
 			p->flags |= TERMP_NOBREAK;
 		else
 			p->flags |= TERMP_NOLPAD;
 
-		if (MDOC_HEAD == node->type)
+		if (MDOC_HEAD != n->type)
+			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;
 		break;
 	case (MDOC_Tag):
-		if (MDOC_HEAD == node->type)
-			p->flags |= TERMP_NOBREAK;
+		if (MDOC_HEAD == n->type)
+			p->flags |= TERMP_NOBREAK | TERMP_TWOSPACE;
 		else
 			p->flags |= TERMP_NOLPAD;
 
-		if (MDOC_HEAD != node->type)
+		if (MDOC_HEAD != n->type)
 			break;
-		if (NULL == node->next || NULL == node->next->child)
+		if (NULL == n->next || NULL == n->next->child)
 			p->flags |= TERMP_DANGLE;
 		break;
 	case (MDOC_Column):
-		if (MDOC_HEAD == node->type) {
-			assert(node->next);
-			if (MDOC_BODY == node->next->type)
+		if (MDOC_HEAD == n->type) {
+			assert(n->next);
+			if (MDOC_BODY == n->next->type)
 				p->flags &= ~TERMP_NOBREAK;
 			else
 				p->flags |= TERMP_NOBREAK;
-			if (node->prev) 
+			if (n->prev) 
 				p->flags |= TERMP_NOLPAD;
 		}
 		break;
 	case (MDOC_Diag):
-		if (MDOC_HEAD == node->type)
+		if (MDOC_HEAD == n->type)
 			p->flags |= TERMP_NOBREAK;
 		break;
 	default:
@@ -906,6 +876,17 @@ termp_it_pre(DECL_ARGS)
 	p->offset += offset;
 
 	switch (type) {
+	case (MDOC_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 (MDOC_Bullet):
 		/* FALLTHROUGH */
 	case (MDOC_Dash):
@@ -914,11 +895,9 @@ termp_it_pre(DECL_ARGS)
 		/* FALLTHROUGH */
 	case (MDOC_Hyphen):
 		/* FALLTHROUGH */
-	case (MDOC_Hang):
-		/* FALLTHROUGH */
 	case (MDOC_Tag):
 		assert(width);
-		if (MDOC_HEAD == node->type)
+		if (MDOC_HEAD == n->type)
 			p->rmargin = p->offset + width;
 		else 
 			p->offset += width;
@@ -930,8 +909,9 @@ termp_it_pre(DECL_ARGS)
 		 * XXX - this behaviour is not documented: the
 		 * right-most column is filled to the right margin.
 		 */
-		if (MDOC_HEAD == node->type &&
-				MDOC_BODY == node->next->type)
+		if (MDOC_HEAD == n->type &&
+				MDOC_BODY == n->next->type &&
+				p->rmargin < p->maxrmargin)
 			p->rmargin = p->maxrmargin;
 		break;
 	default:
@@ -943,19 +923,19 @@ termp_it_pre(DECL_ARGS)
 	 * HEAD character (temporarily bold, in some cases).  
 	 */
 
-	if (MDOC_HEAD == node->type)
+	if (MDOC_HEAD == n->type)
 		switch (type) {
 		case (MDOC_Bullet):
-			p->flags |= TERMP_BOLD;
+			term_fontpush(p, TERMFONT_BOLD);
 			term_word(p, "\\[bu]");
-			p->flags &= ~TERMP_BOLD;
+			term_fontpop(p);
 			break;
 		case (MDOC_Dash):
 			/* FALLTHROUGH */
 		case (MDOC_Hyphen):
-			p->flags |= TERMP_BOLD;
+			term_fontpush(p, TERMFONT_BOLD);
 			term_word(p, "\\(hy");
-			p->flags &= ~TERMP_BOLD;
+			term_fontpop(p);
 			break;
 		case (MDOC_Enum):
 			(pair->ppair->ppair->count)++;
@@ -981,11 +961,11 @@ termp_it_pre(DECL_ARGS)
 	case (MDOC_Hyphen):
 		/* FALLTHROUGH */
 	case (MDOC_Enum):
-		if (MDOC_HEAD == node->type)
+		if (MDOC_HEAD == n->type)
 			return(0);
 		break;
 	case (MDOC_Column):
-		if (MDOC_BODY == node->type)
+		if (MDOC_BODY == n->type)
 			return(0);
 		break;
 	default:
@@ -1002,24 +982,23 @@ termp_it_post(DECL_ARGS)
 {
 	int		   type;
 
-	if (MDOC_BODY != node->type && MDOC_HEAD != node->type)
+	if (MDOC_BODY != n->type && MDOC_HEAD != n->type)
 		return;
 
-	type = arg_listtype(node->parent->parent->parent);
+	type = arg_listtype(n->parent->parent->parent);
 	assert(-1 != type);
 
 	switch (type) {
-	case (MDOC_Diag):
-		term_word(p, "\\ ");
-		/* FALLTHROUGH */
 	case (MDOC_Item):
 		/* FALLTHROUGH */
+	case (MDOC_Diag):
+		/* FALLTHROUGH */
 	case (MDOC_Inset):
-		if (MDOC_BODY == node->type)
+		if (MDOC_BODY == n->type)
 			term_flushln(p);
 		break;
 	case (MDOC_Column):
-		if (MDOC_HEAD == node->type)
+		if (MDOC_HEAD == n->type)
 			term_flushln(p);
 		break;
 	default:
@@ -1036,15 +1015,13 @@ static int
 termp_nm_pre(DECL_ARGS)
 {
 
-	if (SEC_SYNOPSIS == node->sec)
+	if (SEC_SYNOPSIS == n->sec)
 		term_newln(p);
 
-	pair->flag |= ttypes[TTYPE_PROG];
-	p->flags |= ttypes[TTYPE_PROG];
-
-	if (NULL == node->child)
-		term_word(p, meta->name);
+	term_fontpush(p, TERMFONT_BOLD);
 
+	if (NULL == n->child)
+		term_word(p, m->name);
 	return(1);
 }
 
@@ -1054,40 +1031,82 @@ static int
 termp_fl_pre(DECL_ARGS)
 {
 
-	pair->flag |= ttypes[TTYPE_CMD_FLAG];
-	p->flags |= ttypes[TTYPE_CMD_FLAG];
+	term_fontpush(p, TERMFONT_BOLD);
 	term_word(p, "\\-");
-	p->flags |= TERMP_NOSPACE;
+
+	/* A blank `Fl' should incur a subsequent space. */
+
+	if (n->child)
+		p->flags |= TERMP_NOSPACE;
+
 	return(1);
 }
 
 
 /* ARGSUSED */
 static int
-termp_ar_pre(DECL_ARGS)
+termp_an_pre(DECL_ARGS)
 {
 
-	pair->flag |= ttypes[TTYPE_CMD_ARG];
+	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 int
-termp_ns_pre(DECL_ARGS)
+static void
+termp_an_post(DECL_ARGS)
 {
 
-	p->flags |= TERMP_NOSPACE;
-	return(1);
+	if (n->child) {
+		if (SEC_AUTHORS == n->sec)
+			p->flags |= TERMP_ANPREC;
+		return;
+	}
+
+	if (arg_getattr(MDOC_Split, n) > -1) {
+		p->flags &= ~TERMP_NOSPLIT;
+		p->flags |= TERMP_SPLIT;
+	} else {
+		p->flags &= ~TERMP_SPLIT;
+		p->flags |= TERMP_NOSPLIT;
+	}
+
 }
 
 
 /* ARGSUSED */
 static int
-termp_pp_pre(DECL_ARGS)
+termp_ns_pre(DECL_ARGS)
 {
 
-	term_vspace(p);
+	p->flags |= TERMP_NOSPACE;
 	return(1);
 }
 
@@ -1097,7 +1116,9 @@ 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);
 }
@@ -1107,31 +1128,39 @@ termp_rs_pre(DECL_ARGS)
 static int
 termp_rv_pre(DECL_ARGS)
 {
-	int		 i;
-
-	i = arg_getattr(MDOC_Std, node);
-	assert(-1 != i);
-	assert(node->args->argv[i].sz);
+	const struct mdoc_node	*nn;
 
 	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;
+	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, "()");
+	}
 
-       	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 (n->child->next)
+		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.");
 
-	return(1);
+	return(0);
 }
 
 
@@ -1139,19 +1168,31 @@ termp_rv_pre(DECL_ARGS)
 static int
 termp_ex_pre(DECL_ARGS)
 {
-	int		 i;
-
-	i = arg_getattr(MDOC_Std, node);
-	assert(-1 != i);
-	assert(node->args->argv[i].sz);
+	const struct mdoc_node	*nn;
 
 	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);
+	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->next)
+		term_word(p, "utilities exit");
+	else
+		term_word(p, "utility exits");
+
+       	term_word(p, "0 on success, and >0 if an error occurs.");
+
+	return(0);
 }
 
 
@@ -1160,7 +1201,7 @@ static int
 termp_nd_pre(DECL_ARGS)
 {
 
-	if (MDOC_BODY != node->type)
+	if (MDOC_BODY != n->type)
 		return(1);
 
 #if defined(__OpenBSD__) || defined(__linux__)
@@ -1177,7 +1218,7 @@ static void
 termp_bl_post(DECL_ARGS)
 {
 
-	if (MDOC_BLOCK == node->type)
+	if (MDOC_BLOCK == n->type)
 		term_newln(p);
 }
 
@@ -1187,7 +1228,7 @@ static void
 termp_op_post(DECL_ARGS)
 {
 
-	if (MDOC_BODY != node->type) 
+	if (MDOC_BODY != n->type) 
 		return;
 	p->flags |= TERMP_NOSPACE;
 	term_word(p, "\\(rB");
@@ -1198,32 +1239,22 @@ termp_op_post(DECL_ARGS)
 static int
 termp_xr_pre(DECL_ARGS)
 {
-	const struct mdoc_node *n;
+	const struct mdoc_node *nn;
 
-	assert(node->child && MDOC_TEXT == node->child->type);
-	n = node->child;
+	assert(n->child && MDOC_TEXT == n->child->type);
+	nn = n->child;
 
-	term_word(p, n->string);
-	if (NULL == (n = n->next)) 
+	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, n->string);
+	term_word(p, nn->string);
 	p->flags |= TERMP_NOSPACE;
 	term_word(p, ")");
-	return(0);
-}
-
-
-/* ARGSUSED */
-static int
-termp_vt_pre(DECL_ARGS)
-{
 
-	/* FIXME: this can be "type name". */
-	pair->flag |= ttypes[TTYPE_VAR_DECL];
-	return(1);
+	return(0);
 }
 
 
@@ -1232,21 +1263,21 @@ static void
 termp_vt_post(DECL_ARGS)
 {
 
-	if (node->sec != SEC_SYNOPSIS)
+	if (n->sec != SEC_SYNOPSIS)
 		return;
-	if (node->next && MDOC_Vt == node->next->tok)
+	if (n->next && MDOC_Vt == n->next->tok)
 		term_newln(p);
-	else if (node->next)
+	else if (n->next)
 		term_vspace(p);
 }
 
 
 /* ARGSUSED */
 static int
-termp_fd_pre(DECL_ARGS)
+termp_bold_pre(DECL_ARGS)
 {
 
-	pair->flag |= ttypes[TTYPE_FUNC_DECL];
+	term_fontpush(p, TERMFONT_BOLD);
 	return(1);
 }
 
@@ -1256,11 +1287,11 @@ static void
 termp_fd_post(DECL_ARGS)
 {
 
-	if (node->sec != SEC_SYNOPSIS)
+	if (n->sec != SEC_SYNOPSIS)
 		return;
 
 	term_newln(p);
-	if (node->next && MDOC_Fd != node->next->tok)
+	if (n->next && MDOC_Fd != n->next->tok)
 		term_vspace(p);
 }
 
@@ -1270,10 +1301,17 @@ 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);
-		pair->flag |= ttypes[TTYPE_SECTION];
+		break;
+	case (MDOC_HEAD):
+		term_fontpush(p, TERMFONT_BOLD);
 		break;
 	case (MDOC_BODY):
 		p->offset = INDENT;
@@ -1290,7 +1328,7 @@ static void
 termp_sh_post(DECL_ARGS)
 {
 
-	switch (node->type) {
+	switch (n->type) {
 	case (MDOC_HEAD):
 		term_newln(p);
 		break;
@@ -1309,7 +1347,7 @@ static int
 termp_op_pre(DECL_ARGS)
 {
 
-	switch (node->type) {
+	switch (n->type) {
 	case (MDOC_BODY):
 		term_word(p, "\\(lB");
 		p->flags |= TERMP_NOSPACE;
@@ -1327,7 +1365,7 @@ termp_bt_pre(DECL_ARGS)
 {
 
 	term_word(p, "is currently in beta test.");
-	return(1);
+	return(0);
 }
 
 
@@ -1336,7 +1374,8 @@ static void
 termp_lb_post(DECL_ARGS)
 {
 
-	term_newln(p);
+	if (SEC_LIBRARY == n->sec)
+		term_newln(p);
 }
 
 
@@ -1346,7 +1385,7 @@ termp_ud_pre(DECL_ARGS)
 {
 
 	term_word(p, "currently under development.");
-	return(1);
+	return(0);
 }
 
 
@@ -1355,7 +1394,7 @@ static int
 termp_d1_pre(DECL_ARGS)
 {
 
-	if (MDOC_BLOCK != node->type)
+	if (MDOC_BLOCK != n->type)
 		return(1);
 	term_newln(p);
 	p->offset += (INDENT + 1);
@@ -1368,7 +1407,7 @@ static void
 termp_d1_post(DECL_ARGS)
 {
 
-	if (MDOC_BLOCK != node->type) 
+	if (MDOC_BLOCK != n->type) 
 		return;
 	term_newln(p);
 }
@@ -1379,7 +1418,7 @@ static int
 termp_aq_pre(DECL_ARGS)
 {
 
-	if (MDOC_BODY != node->type)
+	if (MDOC_BODY != n->type)
 		return(1);
 	term_word(p, "\\(la");
 	p->flags |= TERMP_NOSPACE;
@@ -1392,7 +1431,7 @@ static void
 termp_aq_post(DECL_ARGS)
 {
 
-	if (MDOC_BODY != node->type)
+	if (MDOC_BODY != n->type)
 		return;
 	p->flags |= TERMP_NOSPACE;
 	term_word(p, "\\(ra");
@@ -1404,10 +1443,11 @@ static int
 termp_ft_pre(DECL_ARGS)
 {
 
-	if (SEC_SYNOPSIS == node->sec)
-		if (node->prev && MDOC_Fo == node->prev->tok)
+	if (SEC_SYNOPSIS == n->sec)
+		if (n->prev && MDOC_Fo == n->prev->tok)
 			term_vspace(p);
-	pair->flag |= ttypes[TTYPE_FUNC_TYPE];
+
+	term_fontpush(p, TERMFONT_UNDER);
 	return(1);
 }
 
@@ -1417,7 +1457,7 @@ static void
 termp_ft_post(DECL_ARGS)
 {
 
-	if (SEC_SYNOPSIS == node->sec)
+	if (SEC_SYNOPSIS == n->sec)
 		term_newln(p);
 }
 
@@ -1426,30 +1466,27 @@ termp_ft_post(DECL_ARGS)
 static int
 termp_fn_pre(DECL_ARGS)
 {
-	const struct mdoc_node *n;
-
-	assert(node->child && MDOC_TEXT == node->child->type);
+	const struct mdoc_node	*nn;
 
-	/* 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];
+	term_fontpush(p, TERMFONT_BOLD);
+	term_word(p, n->child->string);
+	term_fontpop(p);
 
 	p->flags |= TERMP_NOSPACE;
 	term_word(p, "(");
 
-	for (n = node->child->next; 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->next; nn; nn = nn->next) {
+		term_fontpush(p, TERMFONT_UNDER);
+		term_word(p, nn->string);
+		term_fontpop(p);
+
+		if (nn->next)
 			term_word(p, ",");
 	}
 
 	term_word(p, ")");
 
-	if (SEC_SYNOPSIS == node->sec)
+	if (SEC_SYNOPSIS == n->sec)
 		term_word(p, ";");
 
 	return(0);
@@ -1461,87 +1498,57 @@ static void
 termp_fn_post(DECL_ARGS)
 {
 
-	if (node->sec == SEC_SYNOPSIS && node->next)
+	if (n->sec == SEC_SYNOPSIS && n->next)
 		term_vspace(p);
 }
 
 
-/* ARGSUSED */
-static int
-termp_sx_pre(DECL_ARGS)
-{
-
-	pair->flag |= 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) {
-		pair->flag |= 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);
+		term_word(p, nn->string);
+		term_fontpop(p);
+
+		if (nn->next)
 			term_word(p, ",");
 	}
 
-	if (node->child && node->next && node->next->tok == MDOC_Fa)
+	if (n->child && n->next && n->next->tok == MDOC_Fa)
 		term_word(p, ",");
 
 	return(0);
 }
 
 
-/* ARGSUSED */
-static int
-termp_va_pre(DECL_ARGS)
-{
-
-	pair->flag |= ttypes[TTYPE_VAR_DECL];
-	return(1);
-}
-
-
 /* ARGSUSED */
 static int
 termp_bd_pre(DECL_ARGS)
 {
-	int	         i, type, ln;
+	int	         	 i, type;
+	const struct mdoc_node	*nn;
 
-	/*
-	 * 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.
-	 */
-
-	if (MDOC_BLOCK == node->type)
-		return(fmt_block_vspace(p, node, node));
-	else if (MDOC_BODY != node->type)
+	if (MDOC_BLOCK == n->type) {
+		print_bvspace(p, n, n);
+		return(1);
+	} else if (MDOC_BODY != n->type)
 		return(1);
 
-	/* FIXME: display type should be mandated by parser. */
-
-	if (NULL == node->parent->args)
-		errx(1, "missing display type");
+	nn = n->parent;
 
-	for (type = -1, i = 0; 
-			i < (int)node->parent->args->argc; i++) {
-		switch (node->parent->args->argv[i].arg) {
+	for (type = -1, i = 0; i < (int)nn->args->argc; i++) {
+		switch (nn->args->argv[i].arg) {
+		case (MDOC_Centred):
+			/* FALLTHROUGH */
 		case (MDOC_Ragged):
 			/* FALLTHROUGH */
 		case (MDOC_Filled):
@@ -1549,48 +1556,37 @@ termp_bd_pre(DECL_ARGS)
 		case (MDOC_Unfilled):
 			/* FALLTHROUGH */
 		case (MDOC_Literal):
-			type = node->parent->args->argv[i].arg;
-			i = (int)node->parent->args->argc;
+			type = nn->args->argv[i].arg;
+			break;
+		case (MDOC_Offset):
+			p->offset += a2offs(&nn->args->argv[i]);
 			break;
 		default:
 			break;
 		}
 	}
 
-	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.
+	 * 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.
 	 */
+	
+	assert(type > -1);
+	if (MDOC_Literal != type && MDOC_Unfilled != type)
+		return(1);
 
-	ln = node->child ? node->child->line : 0;
-
-	for (node = node->child; node; node = node->next) {
-		if (ln < node->line) {
+	for (nn = n->child; nn; nn = nn->next) {
+		p->flags |= TERMP_NOSPACE;
+		print_mdoc_node(p, pair, m, nn);
+		if (NULL == nn->next)
+			continue;
+		if (nn->prev && nn->prev->line < nn->line)
+			term_flushln(p);
+		else if (NULL == nn->prev)
 			term_flushln(p);
-			p->flags |= TERMP_NOSPACE;
-		}
-		ln = node->line;
-		print_node(p, pair, meta, node);
 	}
 
 	return(0);
@@ -1602,8 +1598,9 @@ static void
 termp_bd_post(DECL_ARGS)
 {
 
-	if (MDOC_BODY != node->type) 
+	if (MDOC_BODY != n->type) 
 		return;
+	p->flags |= TERMP_NOSPACE;
 	term_flushln(p);
 }
 
@@ -1613,7 +1610,7 @@ static int
 termp_qq_pre(DECL_ARGS)
 {
 
-	if (MDOC_BODY != node->type)
+	if (MDOC_BODY != n->type)
 		return(1);
 	term_word(p, "\"");
 	p->flags |= TERMP_NOSPACE;
@@ -1626,7 +1623,7 @@ static void
 termp_qq_post(DECL_ARGS)
 {
 
-	if (MDOC_BODY != node->type)
+	if (MDOC_BODY != n->type)
 		return;
 	p->flags |= TERMP_NOSPACE;
 	term_word(p, "\"");
@@ -1638,7 +1635,7 @@ static void
 termp_bx_post(DECL_ARGS)
 {
 
-	if (node->child)
+	if (n->child)
 		p->flags |= TERMP_NOSPACE;
 	term_word(p, "BSD");
 }
@@ -1651,12 +1648,12 @@ termp_xx_pre(DECL_ARGS)
 	const char	*pp;
 
 	pp = NULL;
-	switch (node->tok) {
+	switch (n->tok) {
 	case (MDOC_Bsx):
 		pp = "BSDI BSD/OS";
 		break;
 	case (MDOC_Dx):
-		pp = "DragonFlyBSD";
+		pp = "DragonFly";
 		break;
 	case (MDOC_Fx):
 		pp = "FreeBSD";
@@ -1685,7 +1682,7 @@ static int
 termp_sq_pre(DECL_ARGS)
 {
 
-	if (MDOC_BODY != node->type)
+	if (MDOC_BODY != n->type)
 		return(1);
 	term_word(p, "\\(oq");
 	p->flags |= TERMP_NOSPACE;
@@ -1698,7 +1695,7 @@ static void
 termp_sq_post(DECL_ARGS)
 {
 
-	if (MDOC_BODY != node->type)
+	if (MDOC_BODY != n->type)
 		return;
 	p->flags |= TERMP_NOSPACE;
 	term_word(p, "\\(aq");
@@ -1730,14 +1727,14 @@ static int
 termp_ss_pre(DECL_ARGS)
 {
 
-	switch (node->type) {
+	switch (n->type) {
 	case (MDOC_BLOCK):
 		term_newln(p);
-		if (node->prev)
+		if (n->prev)
 			term_vspace(p);
 		break;
 	case (MDOC_HEAD):
-		pair->flag |= ttypes[TTYPE_SSECTION];
+		term_fontpush(p, TERMFONT_BOLD);
 		p->offset = HALFINDENT;
 		break;
 	default:
@@ -1753,71 +1750,29 @@ static void
 termp_ss_post(DECL_ARGS)
 {
 
-	if (MDOC_HEAD == node->type)
+	if (MDOC_HEAD == n->type)
 		term_newln(p);
 }
 
 
-/* ARGSUSED */
-static int
-termp_pa_pre(DECL_ARGS)
-{
-
-	pair->flag |= ttypes[TTYPE_FILE];
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_em_pre(DECL_ARGS)
-{
-
-	pair->flag |= ttypes[TTYPE_EMPH];
-	return(1);
-}
-
-
 /* ARGSUSED */
 static int
 termp_cd_pre(DECL_ARGS)
 {
 
-	pair->flag |= ttypes[TTYPE_CONFIG];
+	term_fontpush(p, TERMFONT_BOLD);
 	term_newln(p);
 	return(1);
 }
 
 
-/* ARGSUSED */
-static int
-termp_cm_pre(DECL_ARGS)
-{
-
-	pair->flag |= ttypes[TTYPE_CMD_FLAG];
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_ic_pre(DECL_ARGS)
-{
-
-	pair->flag |= ttypes[TTYPE_CMD];
-	return(1);
-}
-
-
 /* ARGSUSED */
 static int
 termp_in_pre(DECL_ARGS)
 {
 
-	pair->flag |= ttypes[TTYPE_INCLUDE];
-	p->flags |= ttypes[TTYPE_INCLUDE];
-
-	if (SEC_SYNOPSIS == node->sec)
+	term_fontpush(p, TERMFONT_BOLD);
+	if (SEC_SYNOPSIS == n->sec)
 		term_word(p, "#include");
 
 	term_word(p, "<");
@@ -1831,11 +1786,12 @@ static void
 termp_in_post(DECL_ARGS)
 {
 
-	p->flags |= TERMP_NOSPACE | ttypes[TTYPE_INCLUDE];
+	term_fontpush(p, TERMFONT_BOLD);
+	p->flags |= TERMP_NOSPACE;
 	term_word(p, ">");
-	p->flags &= ~ttypes[TTYPE_INCLUDE];
+	term_fontpop(p);
 
-	if (SEC_SYNOPSIS != node->sec)
+	if (SEC_SYNOPSIS != n->sec)
 		return;
 
 	term_newln(p);
@@ -1845,7 +1801,7 @@ termp_in_post(DECL_ARGS)
 	 * the <foo>; mandoc asserts a vertical space.  Since this
 	 * construction is rarely used, I think it's fine.
 	 */
-	if (node->next && MDOC_In != node->next->tok)
+	if (n->next && MDOC_In != n->next->tok)
 		term_vspace(p);
 }
 
@@ -1854,14 +1810,20 @@ termp_in_post(DECL_ARGS)
 static int
 termp_sp_pre(DECL_ARGS)
 {
-	int		 i, len;
+	size_t		 i, len;
 
-	if (NULL == node->child) {
-		term_vspace(p);
-		return(0);
+	switch (n->tok) {
+	case (MDOC_sp):
+		len = n->child ? a2height(n->child) : 1;
+		break;
+	case (MDOC_br):
+		len = 0;
+		break;
+	default:
+		len = 1;
+		break;
 	}
 
-	len = atoi(node->child->string);
 	if (0 == len)
 		term_newln(p);
 	for (i = 0; i < len; i++)
@@ -1871,22 +1833,12 @@ termp_sp_pre(DECL_ARGS)
 }
 
 
-/* ARGSUSED */
-static int
-termp_br_pre(DECL_ARGS)
-{
-
-	term_newln(p);
-	return(1);
-}
-
-
 /* ARGSUSED */
 static int
 termp_brq_pre(DECL_ARGS)
 {
 
-	if (MDOC_BODY != node->type)
+	if (MDOC_BODY != n->type)
 		return(1);
 	term_word(p, "\\(lC");
 	p->flags |= TERMP_NOSPACE;
@@ -1899,7 +1851,7 @@ static void
 termp_brq_post(DECL_ARGS)
 {
 
-	if (MDOC_BODY != node->type)
+	if (MDOC_BODY != n->type)
 		return;
 	p->flags |= TERMP_NOSPACE;
 	term_word(p, "\\(rC");
@@ -1911,7 +1863,7 @@ static int
 termp_bq_pre(DECL_ARGS)
 {
 
-	if (MDOC_BODY != node->type)
+	if (MDOC_BODY != n->type)
 		return(1);
 	term_word(p, "\\(lB");
 	p->flags |= TERMP_NOSPACE;
@@ -1924,7 +1876,7 @@ static void
 termp_bq_post(DECL_ARGS)
 {
 
-	if (MDOC_BODY != node->type)
+	if (MDOC_BODY != n->type)
 		return;
 	p->flags |= TERMP_NOSPACE;
 	term_word(p, "\\(rB");
@@ -1936,7 +1888,7 @@ static int
 termp_pq_pre(DECL_ARGS)
 {
 
-	if (MDOC_BODY != node->type)
+	if (MDOC_BODY != n->type)
 		return(1);
 	term_word(p, "\\&(");
 	p->flags |= TERMP_NOSPACE;
@@ -1949,7 +1901,7 @@ static void
 termp_pq_post(DECL_ARGS)
 {
 
-	if (MDOC_BODY != node->type)
+	if (MDOC_BODY != n->type)
 		return;
 	term_word(p, ")");
 }
@@ -1959,22 +1911,22 @@ termp_pq_post(DECL_ARGS)
 static int
 termp_fo_pre(DECL_ARGS)
 {
-	const struct mdoc_node *n;
+	const struct mdoc_node *nn;
 
-	if (MDOC_BODY == node->type) {
+	if (MDOC_BODY == n->type) {
 		p->flags |= TERMP_NOSPACE;
 		term_word(p, "(");
 		p->flags |= TERMP_NOSPACE;
 		return(1);
-	} else if (MDOC_HEAD != node->type) 
+	} else if (MDOC_HEAD != n->type) 
 		return(1);
 
-	p->flags |= ttypes[TTYPE_FUNC_NAME];
-	for (n = node->child; n; n = n->next) {
-		assert(MDOC_TEXT == n->type);
-		term_word(p, n->string);
+	term_fontpush(p, TERMFONT_BOLD);
+	for (nn = n->child; nn; nn = nn->next) {
+		assert(MDOC_TEXT == nn->type);
+		term_word(p, nn->string);
 	}
-	p->flags &= ~ttypes[TTYPE_FUNC_NAME];
+	term_fontpop(p);
 
 	return(0);
 }
@@ -1985,7 +1937,7 @@ 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, ")");
@@ -1999,60 +1951,43 @@ termp_fo_post(DECL_ARGS)
 static int
 termp_bf_pre(DECL_ARGS)
 {
-	const struct mdoc_node	*n;
+	const struct mdoc_node	*nn;
 
-	if (MDOC_HEAD == node->type)
+	if (MDOC_HEAD == n->type)
 		return(0);
-	else if (MDOC_BLOCK != node->type)
+	else if (MDOC_BLOCK != n->type)
 		return(1);
 
-	if (NULL == (n = node->head->child)) {
-		if (arg_hasattr(MDOC_Emphasis, node))
-			pair->flag |= ttypes[TTYPE_EMPH];
-		else if (arg_hasattr(MDOC_Symbolic, node))
-			pair->flag |= ttypes[TTYPE_SYMB];
+	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 == n->type);
-	if (0 == strcmp("Em", n->string))
-		pair->flag |= ttypes[TTYPE_EMPH];
-	else if (0 == strcmp("Sy", n->string))
-		pair->flag |= ttypes[TTYPE_SYMB];
-
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_sy_pre(DECL_ARGS)
-{
-
-	pair->flag |= ttypes[TTYPE_SYMB];
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_ms_pre(DECL_ARGS)
-{
+	assert(MDOC_TEXT == nn->type);
+	if (0 == strcmp("Em", nn->string))
+		term_fontpush(p, TERMFONT_UNDER);
+	else if (0 == strcmp("Sy", nn->string))
+		term_fontpush(p, TERMFONT_BOLD);
+	else
+		term_fontpush(p, TERMFONT_NONE);
 
-	pair->flag |= ttypes[TTYPE_SYMBOL];
 	return(1);
 }
 
 
-
 /* ARGSUSED */
 static int
 termp_sm_pre(DECL_ARGS)
 {
 
-	assert(node->child && MDOC_TEXT == node->child->type);
-	if (0 == strcmp("on", node->child->string)) {
+	assert(n->child && MDOC_TEXT == n->child->type);
+	if (0 == strcmp("on", n->child->string)) {
 		p->flags &= ~TERMP_NONOSPACE;
 		p->flags &= ~TERMP_NOSPACE;
 	} else
@@ -2074,45 +2009,33 @@ termp_ap_pre(DECL_ARGS)
 }
 
 
-/* ARGSUSED */
-static int
-termp__j_pre(DECL_ARGS)
-{
-
-	pair->flag |= ttypes[TTYPE_REF_JOURNAL];
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp__t_pre(DECL_ARGS)
-{
-
-	term_word(p, "\"");
-	p->flags |= TERMP_NOSPACE;
-	return(1);
-}
-
-
 /* ARGSUSED */
 static void
-termp__t_post(DECL_ARGS)
+termp____post(DECL_ARGS)
 {
 
+	/* TODO: %U. */
+
 	p->flags |= TERMP_NOSPACE;
-	term_word(p, "\"");
-	termp____post(p, pair, meta, node);
+	switch (n->tok) {
+	case (MDOC__T):
+		term_word(p, "\\(rq");
+		p->flags |= TERMP_NOSPACE;
+		break;
+	default:
+		break;
+	}
+	term_word(p, n->next ? "," : ".");
 }
 
 
 /* ARGSUSED */
-static void
-termp____post(DECL_ARGS)
+static int
+termp_li_pre(DECL_ARGS)
 {
 
-	p->flags |= TERMP_NOSPACE;
-	term_word(p, node->next ? "," : ".");
+	term_fontpush(p, TERMFONT_NONE);
+	return(1);
 }
 
 
@@ -2120,38 +2043,45 @@ termp____post(DECL_ARGS)
 static int
 termp_lk_pre(DECL_ARGS)
 {
-	const struct mdoc_node *n;
+	const struct mdoc_node *nn;
 
-	assert(node->child);
-	n = node->child;
+	term_fontpush(p, TERMFONT_UNDER);
+	nn = n->child;
 
-	if (NULL == n->next) {
-		pair->flag |= ttypes[TTYPE_LINK_ANCHOR];
+	if (NULL == nn->next)
 		return(1);
-	}
 
-	p->flags |= ttypes[TTYPE_LINK_ANCHOR];
-	term_word(p, n->string);
+	term_word(p, nn->string);
+	term_fontpop(p);
+
 	p->flags |= TERMP_NOSPACE;
 	term_word(p, ":");
-	p->flags &= ~ttypes[TTYPE_LINK_ANCHOR];
 
-	p->flags |= ttypes[TTYPE_LINK_TEXT];
-	for (n = n->next; n; n = n->next) 
-		term_word(p, n->string);
+	term_fontpush(p, TERMFONT_BOLD);
+	for (nn = nn->next; nn; nn = nn->next) 
+		term_word(p, nn->string);
+	term_fontpop(p);
 
-	p->flags &= ~ttypes[TTYPE_LINK_TEXT];
 	return(0);
 }
 
 
 /* ARGSUSED */
 static int
-termp_mt_pre(DECL_ARGS)
+termp_under_pre(DECL_ARGS)
 {
 
-	pair->flag |= ttypes[TTYPE_LINK_ANCHOR];
+	term_fontpush(p, TERMFONT_UNDER);
 	return(1);
 }
 
 
+/* ARGSUSED */
+static int
+termp__t_pre(DECL_ARGS)
+{
+
+	term_word(p, "\\(lq");
+	p->flags |= TERMP_NOSPACE;
+	return(1);
+}