X-Git-Url: https://git.cameronkatri.com/mandoc.git/blobdiff_plain/df65ac42a497f4acfc4cf57335efee9070d1c8a2..7a9cc4a7da8d626f4484e36248129567b2bef7f8:/term.c

diff --git a/term.c b/term.c
index 66847ea2..15f8812f 100644
--- a/term.c
+++ b/term.c
@@ -1,1541 +1,782 @@
-/* $Id: term.c,v 1.29 2009/02/28 20:13:06 kristaps Exp $ */
+/*	$Id: term.c,v 1.205 2012/07/16 21:30:42 schwarze Exp $ */
 /*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010, 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
+ * 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 WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR 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.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR 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 <err.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "mandoc.h"
+#include "out.h"
 #include "term.h"
+#include "main.h"
 
-#define	INDENT		  6
-
-/*
- * Performs actions on nodes of the abstract syntax tree.  Both pre- and
- * post-fix operations are defined here.
- */
-
-/* FIXME: indent/tab. */
-/* 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_NMAX	  18
-
-/* 
- * These define "styles" for element types, like command arguments or
- * executable names.  This is useful when multiple macros must decorate
- * the same thing (like .Ex -std cmd and .Nm cmd). 
- */
-
-const	int ttypes[TTYPE_NMAX] = {
-	TERMP_BOLD,		/* TTYPE_PROG */
-	TERMP_BOLD,		/* TTYPE_CMD_FLAG */
-	TERMP_UNDERLINE, 	/* TTYPE_CMD_ARG */
-	TERMP_BOLD, 		/* TTYPE_SECTION */
-	TERMP_BOLD,		/* TTYPE_FUNC_DECL */
-	TERMP_UNDERLINE,	/* TTYPE_VAR_DECL */
-	TERMP_UNDERLINE,	/* TTYPE_FUNC_TYPE */
-	TERMP_BOLD, 		/* TTYPE_FUNC_NAME */
-	TERMP_UNDERLINE, 	/* TTYPE_FUNC_ARG */
-	TERMP_UNDERLINE, 	/* TTYPE_LINK */
-	TERMP_BOLD,	 	/* TTYPE_SSECTION */
-	TERMP_UNDERLINE, 	/* TTYPE_FILE */
-	TERMP_UNDERLINE, 	/* TTYPE_EMPH */
-	TERMP_BOLD,	 	/* TTYPE_CONFIG */
-	TERMP_BOLD,	 	/* TTYPE_CMD */
-	TERMP_BOLD,	 	/* TTYPE_INCLUDE */
-	TERMP_BOLD,	 	/* TTYPE_SYMB */
-	TERMP_BOLD	 	/* TTYPE_SYMBOL */
-};
-
-static	int		  arg_hasattr(int, size_t, 
-				const struct mdoc_arg *);
-static	int		  arg_getattr(int, size_t, 
-				const struct mdoc_arg *);
-static	size_t		  arg_offset(const struct mdoc_arg *);
-static	size_t		  arg_width(const struct mdoc_arg *);
-
-/*
- * What follows describes prefix and postfix operations for the abstract
- * syntax tree descent.
- */
-
-#define	DECL_ARGS \
-	struct termp *p, \
-	struct termpair *pair, \
-	const struct mdoc_meta *meta, \
-	const struct mdoc_node *node
-
-#define	DECL_PRE(name) \
-static	int	 	  name##_pre(DECL_ARGS)
-#define	DECL_POST(name) \
-static	void	 	  name##_post(DECL_ARGS)
-#define	DECL_PREPOST(name) \
-DECL_PRE(name); \
-DECL_POST(name);
-
-DECL_PREPOST(termp__t);
-DECL_PREPOST(termp_aq);
-DECL_PREPOST(termp_bd);
-DECL_PREPOST(termp_bq);
-DECL_PREPOST(termp_d1);
-DECL_PREPOST(termp_dq);
-DECL_PREPOST(termp_fd);
-DECL_PREPOST(termp_fn);
-DECL_PREPOST(termp_fo);
-DECL_PREPOST(termp_ft);
-DECL_PREPOST(termp_it);
-DECL_PREPOST(termp_op);
-DECL_PREPOST(termp_pf);
-DECL_PREPOST(termp_pq);
-DECL_PREPOST(termp_qq);
-DECL_PREPOST(termp_sh);
-DECL_PREPOST(termp_ss);
-DECL_PREPOST(termp_sq);
-DECL_PREPOST(termp_vt);
-
-DECL_PRE(termp_ar);
-DECL_PRE(termp_at);
-DECL_PRE(termp_bf);
-DECL_PRE(termp_bsx);
-DECL_PRE(termp_bt);
-DECL_PRE(termp_bx);
-DECL_PRE(termp_cd);
-DECL_PRE(termp_cm);
-DECL_PRE(termp_em);
-DECL_PRE(termp_ex);
-DECL_PRE(termp_fa);
-DECL_PRE(termp_fl);
-DECL_PRE(termp_fx);
-DECL_PRE(termp_ic);
-DECL_PRE(termp_in);
-DECL_PRE(termp_ms);
-DECL_PRE(termp_nd);
-DECL_PRE(termp_nm);
-DECL_PRE(termp_ns);
-DECL_PRE(termp_nx);
-DECL_PRE(termp_ox);
-DECL_PRE(termp_pa);
-DECL_PRE(termp_pp);
-DECL_PRE(termp_rs);
-DECL_PRE(termp_rv);
-DECL_PRE(termp_sm);
-DECL_PRE(termp_st);
-DECL_PRE(termp_sx);
-DECL_PRE(termp_sy);
-DECL_PRE(termp_ud);
-DECL_PRE(termp_ux);
-DECL_PRE(termp_va);
-DECL_PRE(termp_xr);
-
-DECL_POST(termp___);
-DECL_POST(termp_bl);
-
-const	struct termact __termacts[MDOC_MAX] = {
-	{ NULL, NULL }, /* \" */
-	{ NULL, NULL }, /* Dd */
-	{ NULL, NULL }, /* Dt */
-	{ NULL, NULL }, /* Os */
-	{ termp_sh_pre, termp_sh_post }, /* Sh */
-	{ termp_ss_pre, termp_ss_post }, /* Ss */ 
-	{ termp_pp_pre, NULL }, /* Pp */ 
-	{ termp_d1_pre, termp_d1_post }, /* D1 */
-	{ termp_d1_pre, termp_d1_post }, /* Dl */
-	{ termp_bd_pre, termp_bd_post }, /* Bd */
-	{ NULL, NULL }, /* Ed */
-	{ NULL, termp_bl_post }, /* Bl */
-	{ NULL, NULL }, /* El */
-	{ termp_it_pre, termp_it_post }, /* It */
-	{ NULL, NULL }, /* Ad */ 
-	{ NULL, NULL }, /* An */
-	{ termp_ar_pre, NULL }, /* Ar */
-	{ termp_cd_pre, NULL }, /* Cd */
-	{ termp_cm_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_fl_pre, NULL }, /* Fl */
-	{ termp_fn_pre, termp_fn_post }, /* Fn */ 
-	{ termp_ft_pre, termp_ft_post }, /* Ft */ 
-	{ termp_ic_pre, NULL }, /* Ic */ 
-	{ termp_in_pre, NULL }, /* In */ 
-	{ NULL, NULL }, /* Li */
-	{ termp_nd_pre, NULL }, /* Nd */ 
-	{ termp_nm_pre, NULL }, /* Nm */ 
-	{ termp_op_pre, termp_op_post }, /* Op */
-	{ NULL, NULL }, /* Ot */
-	{ termp_pa_pre, NULL }, /* Pa */
-	{ termp_rv_pre, NULL }, /* Rv */
-	{ termp_st_pre, NULL }, /* St */ 
-	{ termp_va_pre, NULL }, /* Va */
-	{ termp_vt_pre, termp_vt_post }, /* Vt */ 
-	{ termp_xr_pre, NULL }, /* Xr */
-	{ NULL, termp____post }, /* %A */
-	{ NULL, termp____post }, /* %B */
-	{ NULL, termp____post }, /* %D */
-	{ NULL, termp____post }, /* %I */
-	{ NULL, 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 */
-	{ NULL, termp____post }, /* %V */
-	{ NULL, NULL }, /* Ac */
-	{ termp_aq_pre, termp_aq_post }, /* Ao */
-	{ termp_aq_pre, termp_aq_post }, /* Aq */
-	{ termp_at_pre, NULL }, /* At */
-	{ NULL, NULL }, /* Bc */
-	{ termp_bf_pre, NULL }, /* Bf */ 
-	{ termp_bq_pre, termp_bq_post }, /* Bo */
-	{ termp_bq_pre, termp_bq_post }, /* Bq */
-	{ termp_bsx_pre, NULL }, /* Bsx */
-	{ termp_bx_pre, NULL }, /* Bx */
-	{ NULL, NULL }, /* Db */
-	{ NULL, NULL }, /* Dc */
-	{ termp_dq_pre, termp_dq_post }, /* Do */
-	{ termp_dq_pre, termp_dq_post }, /* Dq */
-	{ NULL, NULL }, /* Ec */
-	{ NULL, NULL }, /* Ef */
-	{ termp_em_pre, NULL }, /* Em */ 
-	{ NULL, NULL }, /* Eo */
-	{ termp_fx_pre, NULL }, /* Fx */
-	{ termp_ms_pre, NULL }, /* Ms */
-	{ NULL, NULL }, /* No */
-	{ termp_ns_pre, NULL }, /* Ns */
-	{ termp_nx_pre, NULL }, /* Nx */
-	{ termp_ox_pre, NULL }, /* Ox */
-	{ NULL, NULL }, /* Pc */
-	{ termp_pf_pre, termp_pf_post }, /* Pf */
-	{ termp_pq_pre, termp_pq_post }, /* Po */
-	{ termp_pq_pre, termp_pq_post }, /* Pq */
-	{ NULL, NULL }, /* Qc */
-	{ termp_sq_pre, termp_sq_post }, /* Ql */
-	{ termp_qq_pre, termp_qq_post }, /* Qo */
-	{ termp_qq_pre, termp_qq_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_sm_pre, NULL }, /* Sm */
-	{ termp_sx_pre, NULL }, /* Sx */
-	{ termp_sy_pre, NULL }, /* Sy */
-	{ NULL, NULL }, /* Tn */
-	{ termp_ux_pre, NULL }, /* Ux */
-	{ NULL, NULL }, /* Xc */
-	{ NULL, NULL }, /* Xo */
-	{ termp_fo_pre, termp_fo_post }, /* Fo */ 
-	{ NULL, NULL }, /* Fc */ 
-	{ termp_op_pre, termp_op_post }, /* Oo */
-	{ NULL, NULL }, /* Oc */
-	{ NULL, NULL }, /* Bk */
-	{ NULL, NULL }, /* Ek */
-	{ termp_bt_pre, NULL }, /* Bt */
-	{ NULL, NULL }, /* Hf */
-	{ NULL, NULL }, /* Fr */
-	{ termp_ud_pre, NULL }, /* Ud */
-};
-
-const struct termact *termacts = __termacts;
-
-
-static size_t
-arg_width(const struct mdoc_arg *arg)
-{
-	size_t		 v;
-	int		 i, len;
-
-	assert(*arg->value);
-	if (0 == strcmp(*arg->value, "indent"))
-		return(INDENT);
-	if (0 == strcmp(*arg->value, "indent-two"))
-		return(INDENT * 2);
-
-	len = (int)strlen(*arg->value);
-	assert(len > 0);
-
-	for (i = 0; i < len - 1; i++) 
-		if ( ! isdigit((int)(*arg->value)[i]))
-			break;
-
-	if (i == len - 1) {
-		if ('n' == (*arg->value)[len - 1]) {
-			v = (size_t)atoi(*arg->value);
-			return(v);
-		}
-
-	}
-	return(strlen(*arg->value) + 2);
-}
-
-
-static size_t
-arg_offset(const struct mdoc_arg *arg)
-{
-
-	/* TODO */
-	assert(*arg->value);
-	if (0 == strcmp(*arg->value, "indent"))
-		return(INDENT);
-	if (0 == strcmp(*arg->value, "indent-two"))
-		return(INDENT * 2);
-	return(strlen(*arg->value));
-}
-
+static	size_t		 cond_width(const struct termp *, int, int *);
+static	void		 adjbuf(struct termp *p, int);
+static	void		 bufferc(struct termp *, char);
+static	void		 encode(struct termp *, const char *, size_t);
+static	void		 encode1(struct termp *, int);
 
-static int
-arg_hasattr(int arg, size_t argc, const struct mdoc_arg *argv)
+void
+term_free(struct termp *p)
 {
 
-	return(-1 != arg_getattr(arg, argc, argv));
-}
-
-
-static int
-arg_getattr(int arg, size_t argc, const struct mdoc_arg *argv)
-{
-	int		 i;
+	if (p->buf)
+		free(p->buf);
+	if (p->symtab)
+		mchars_free(p->symtab);
 
-	for (i = 0; i < (int)argc; i++) 
-		if (argv[i].arg == arg)
-			return(i);
-	return(-1);
+	free(p);
 }
 
 
-/* ARGSUSED */
-static int
-termp_dq_pre(DECL_ARGS)
+void
+term_begin(struct termp *p, term_margin head, 
+		term_margin foot, const void *arg)
 {
 
-	if (MDOC_BODY != node->type)
-		return(1);
-
-	word(p, "``");
-	p->flags |= TERMP_NOSPACE;
-	return(1);
+	p->headf = head;
+	p->footf = foot;
+	p->argf = arg;
+	(*p->begin)(p);
 }
 
 
-/* ARGSUSED */
-static void
-termp_dq_post(DECL_ARGS)
+void
+term_end(struct termp *p)
 {
 
-	if (MDOC_BODY != node->type)
-		return;
-
-	p->flags |= TERMP_NOSPACE;
-	word(p, "''");
+	(*p->end)(p);
 }
 
+/*
+ * Flush a line of text.  A "line" is loosely defined as being something
+ * that should be followed by a newline, regardless of whether it's
+ * broken apart by newlines getting there.  A line can also be a
+ * fragment of a columnar list (`Bl -tag' or `Bl -column'), which does
+ * not have a trailing newline.
+ *
+ * The following flags may be specified:
+ *
+ *  - TERMP_NOBREAK: this is the most important and is used when making
+ *    columns.  In short: don't print a newline and instead expect the
+ *    next call to do the padding up to the start of the next column.
+ *
+ *  - TERMP_TWOSPACE: make sure there is room for at least two space
+ *    characters of padding.  Otherwise, rather break the line.
+ *
+ *  - TERMP_DANGLE: don't newline when TERMP_NOBREAK is specified and
+ *    the line is overrun, and don't pad-right if it's underrun.
+ *
+ *  - TERMP_HANG: like TERMP_DANGLE, but doesn't newline when
+ *    overrunning, instead save the position and continue at that point
+ *    when the next invocation.
+ *
+ *  In-line line breaking:
+ *
+ *  If TERMP_NOBREAK is specified and the line overruns the right
+ *  margin, it will break and pad-right to the right margin after
+ *  writing.  If maxrmargin is violated, it will break and continue
+ *  writing from the right-margin, which will lead to the above scenario
+ *  upon exit.  Otherwise, the line will break at the right margin.
+ */
+void
+term_flushln(struct termp *p)
+{
+	int		 i;     /* current input position in p->buf */
+	int		 ntab;	/* number of tabs to prepend */
+	size_t		 vis;   /* current visual position on output */
+	size_t		 vbl;   /* number of blanks to prepend to output */
+	size_t		 vend;	/* end of word visual position on output */
+	size_t		 bp;    /* visual right border position */
+	size_t		 dv;    /* temporary for visual pos calculations */
+	int		 j;     /* temporary loop index for p->buf */
+	int		 jhy;	/* last hyph before overflow w/r/t j */
+	size_t		 maxvis; /* output position of visible boundary */
+	size_t		 mmax; /* used in calculating bp */
+
+	/*
+	 * First, establish the maximum columns of "visible" content.
+	 * This is usually the difference between the right-margin and
+	 * an indentation, but can be, for tagged lists or columns, a
+	 * small set of values. 
+	 */
+	assert  (p->rmargin >= p->offset);
+	dv     = p->rmargin - p->offset;
+	maxvis = (int)dv > p->overstep ? dv - (size_t)p->overstep : 0;
+	dv     = p->maxrmargin - p->offset;
+	mmax   = (int)dv > p->overstep ? dv - (size_t)p->overstep : 0;
 
-/* ARGSUSED */
-static int
-termp_it_pre(DECL_ARGS)
-{
-	const struct mdoc_node *n, *it;
-	const struct mdoc_block *bl;
-	char		 buf[7], *tp;
-	int		 i, type;
-	size_t		 width, offset;
-
-	switch (node->type) {
-	case (MDOC_BODY):
-		/* FALLTHROUGH */
-	case (MDOC_HEAD):
-		it = node->parent;
-		break;
-	case (MDOC_BLOCK):
-		it = node;
-		break;
-	default:
-		return(1);
-	}
-
-	n = it->parent->parent;
-	bl = &n->data.block;
-
-	if (MDOC_BLOCK == node->type) {
-		newln(p);
-		if ( ! arg_hasattr(MDOC_Compact, bl->argc, bl->argv))
-			if (node->prev || n->prev)
-				vspace(p);
-		return(1);
-	}
-
-	/* Get our list type. */
+	bp = TERMP_NOBREAK & p->flags ? mmax : maxvis;
 
-	for (type = -1, i = 0; i < (int)bl->argc; i++) 
-		switch (bl->argv[i].arg) {
-		case (MDOC_Bullet):
-			/* FALLTHROUGH */
-		case (MDOC_Dash):
-			/* FALLTHROUGH */
-		case (MDOC_Enum):
-			/* FALLTHROUGH */
-		case (MDOC_Hyphen):
-			/* FALLTHROUGH */
-		case (MDOC_Tag):
-			/* FALLTHROUGH */
-		case (MDOC_Ohang):
-			type = bl->argv[i].arg;
-			i = (int)bl->argc;
-			break;
-		default:
-			errx(1, "list type not supported");
-			/* NOTREACHED */
+	/*
+	 * Calculate the required amount of padding.
+	 */
+	vbl = p->offset + p->overstep > p->viscol ?
+	      p->offset + p->overstep - p->viscol : 0;
+
+	vis = vend = 0;
+	i = 0;
+
+	while (i < p->col) {
+		/*
+		 * Handle literal tab characters: collapse all
+		 * subsequent tabs into a single huge set of spaces.
+		 */
+		ntab = 0;
+		while (i < p->col && '\t' == p->buf[i]) {
+			vend = (vis / p->tabwidth + 1) * p->tabwidth;
+			vbl += vend - vis;
+			vis = vend;
+			ntab++;
+			i++;
 		}
 
-	assert(-1 != type);
-
-	/* Save our existing (inherited) margin and offset. */
-
-	pair->offset = p->offset;
-	pair->rmargin = p->rmargin;
-
-	/* Get list width and offset. */
-
-	i = arg_getattr(MDOC_Width, bl->argc, bl->argv);
-	width = i >= 0 ? arg_width(&bl->argv[i]) : 0;
-
-	i = arg_getattr(MDOC_Offset, bl->argc, bl->argv);
-	offset = i >= 0 ? arg_offset(&bl->argv[i]) : 0;
+		/*
+		 * Count up visible word characters.  Control sequences
+		 * (starting with the CSI) aren't counted.  A space
+		 * generates a non-printing word, which is valid (the
+		 * space is printed according to regular spacing rules).
+		 */
+
+		for (j = i, jhy = 0; j < p->col; j++) {
+			if ((j && ' ' == p->buf[j]) || '\t' == p->buf[j])
+				break;
+
+			/* Back over the the last printed character. */
+			if (8 == p->buf[j]) {
+				assert(j);
+				vend -= (*p->width)(p, p->buf[j - 1]);
+				continue;
+			}
+
+			/* Regular word. */
+			/* Break at the hyphen point if we overrun. */
+			if (vend > vis && vend < bp && 
+					ASCII_HYPH == p->buf[j])
+				jhy = j;
+
+			vend += (*p->width)(p, p->buf[j]);
+		}
 
-	/* Override the width. */
+		/*
+		 * Find out whether we would exceed the right margin.
+		 * If so, break to the next line.
+		 */
+		if (vend > bp && 0 == jhy && vis > 0) {
+			vend -= vis;
+			(*p->endline)(p);
+			p->viscol = 0;
+			if (TERMP_NOBREAK & p->flags) {
+				vbl = p->rmargin;
+				vend += p->rmargin - p->offset;
+			} else
+				vbl = p->offset;
+
+			/* use pending tabs on the new line */
+
+			if (0 < ntab)
+				vbl += ntab * p->tabwidth;
+
+			/* Remove the p->overstep width. */
+
+			bp += (size_t)p->overstep;
+			p->overstep = 0;
+		}
 
-	switch (type) {
-	case (MDOC_Bullet):
-		/* FALLTHROUGH */
-	case (MDOC_Dash):
-		/* FALLTHROUGH */
-	case (MDOC_Enum):
-		/* FALLTHROUGH */
-	case (MDOC_Hyphen):
-		width = width > 6 ? width : 6;
-		break;
-	case (MDOC_Tag):
-		/* FIXME: auto-size. */
-		if (0 == width)
-			errx(1, "need non-zero -width");
-		break;
-	default:
-		break;
+		/* Write out the [remaining] word. */
+		for ( ; i < p->col; i++) {
+			if (vend > bp && jhy > 0 && i > jhy)
+				break;
+			if ('\t' == p->buf[i])
+				break;
+			if (' ' == p->buf[i]) {
+				j = i;
+				while (' ' == p->buf[i])
+					i++;
+				dv = (size_t)(i - j) * (*p->width)(p, ' ');
+				vbl += dv;
+				vend += dv;
+				break;
+			}
+			if (ASCII_NBRSP == p->buf[i]) {
+				vbl += (*p->width)(p, ' ');
+				continue;
+			}
+
+			/*
+			 * Now we definitely know there will be
+			 * printable characters to output,
+			 * so write preceding white space now.
+			 */
+			if (vbl) {
+				(*p->advance)(p, vbl);
+				p->viscol += vbl;
+				vbl = 0;
+			}
+
+			if (ASCII_HYPH == p->buf[i]) {
+				(*p->letter)(p, '-');
+				p->viscol += (*p->width)(p, '-');
+				continue;
+			}
+
+			(*p->letter)(p, p->buf[i]);
+			if (8 == p->buf[i])
+				p->viscol -= (*p->width)(p, p->buf[i-1]);
+			else 
+				p->viscol += (*p->width)(p, p->buf[i]);
+		}
+		vis = vend;
 	}
 
-	/* Word-wrap control. */
+	/*
+	 * If there was trailing white space, it was not printed;
+	 * so reset the cursor position accordingly.
+	 */
+	if (vis)
+		vis -= vbl;
 
-	p->flags |= TERMP_NOSPACE;
+	p->col = 0;
+	p->overstep = 0;
 
-	switch (type) {
-	case (MDOC_Bullet):
-		/* FALLTHROUGH */
-	case (MDOC_Dash):
-		/* FALLTHROUGH */
-	case (MDOC_Enum):
-		/* FALLTHROUGH */
-	case (MDOC_Hyphen):
-		/* FALLTHROUGH */
-	case (MDOC_Tag):
-		if (MDOC_HEAD == node->type)
-			p->flags |= TERMP_NOBREAK;
-		else if (MDOC_BODY == node->type)
-			p->flags |= TERMP_NOLPAD;
-		break;
-	default:
-		break;
+	if ( ! (TERMP_NOBREAK & p->flags)) {
+		p->viscol = 0;
+		(*p->endline)(p);
+		return;
 	}
 
-	/* 
-	 * Get a token to use as the HEAD lead-in.  If NULL, we use the
-	 * HEAD child. 
-	 */
+	if (TERMP_HANG & p->flags) {
+		/* We need one blank after the tag. */
+		p->overstep = (int)(vis - maxvis + (*p->width)(p, ' '));
+
+		/*
+		 * If we have overstepped the margin, temporarily move
+		 * it to the right and flag the rest of the line to be
+		 * shorter.
+		 */
+		if (p->overstep < 0)
+			p->overstep = 0;
+		return;
 
-	tp = NULL;
-
-	if (MDOC_HEAD == node->type) {
-		if (arg_hasattr(MDOC_Bullet, bl->argc, bl->argv))
-			tp = "\\[bu]";
-		if (arg_hasattr(MDOC_Dash, bl->argc, bl->argv))
-			tp = "\\-";
-		if (arg_hasattr(MDOC_Enum, bl->argc, bl->argv)) {
-			(pair->ppair->ppair->count)++;
-			(void)snprintf(buf, sizeof(buf), "%d.", 
-					pair->ppair->ppair->count);
-			tp = buf;
-		}
-		if (arg_hasattr(MDOC_Hyphen, bl->argc, bl->argv))
-			tp = "\\-";
-	}
+	} else if (TERMP_DANGLE & p->flags)
+		return;
 
-	/* Margin control. */
-
-	p->offset += offset;
-
-	switch (type) {
-	case (MDOC_Bullet):
-		/* FALLTHROUGH */
-	case (MDOC_Dash):
-		/* FALLTHROUGH */
-	case (MDOC_Enum):
-		/* FALLTHROUGH */
-	case (MDOC_Hyphen):
-		/* FALLTHROUGH */
-	case (MDOC_Tag):
-		if (MDOC_HEAD == node->type)
-			p->rmargin = p->offset + width;
-		else if (MDOC_BODY == node->type) 
-			p->offset += width;
-		break;
-	default:
-		break;
+	/* If the column was overrun, break the line. */
+	if (maxvis <= vis +
+	    ((TERMP_TWOSPACE & p->flags) ? (*p->width)(p, ' ') : 0)) {
+		(*p->endline)(p);
+		p->viscol = 0;
 	}
-
-	if (NULL == tp)
-		return(1);
-
-	word(p, tp);
-	return(0);
 }
 
 
-/* ARGSUSED */
-static void
-termp_it_post(DECL_ARGS)
+/* 
+ * A newline only breaks an existing line; it won't assert vertical
+ * space.  All data in the output buffer is flushed prior to the newline
+ * assertion.
+ */
+void
+term_newln(struct termp *p)
 {
 
-	if (MDOC_BODY != node->type && MDOC_HEAD != node->type)
-		return;
-
-	flushln(p);
-
-	p->offset = pair->offset;
-	p->rmargin = pair->rmargin;
-
-	if (MDOC_HEAD == node->type) {
-		p->flags &= ~TERMP_NOBREAK;
-		p->flags &= ~TERMP_NORPAD;
-	} else if (MDOC_BODY == node->type)
-		p->flags &= ~TERMP_NOLPAD;
+	p->flags |= TERMP_NOSPACE;
+	if (p->col || p->viscol)
+		term_flushln(p);
 }
 
 
-/* ARGSUSED */
-static int
-termp_nm_pre(DECL_ARGS)
+/*
+ * Asserts a vertical space (a full, empty line-break between lines).
+ * Note that if used twice, this will cause two blank spaces and so on.
+ * All data in the output buffer is flushed prior to the newline
+ * assertion.
+ */
+void
+term_vspace(struct termp *p)
 {
 
-	if (SEC_SYNOPSIS == node->sec)
-		newln(p);
-
-	TERMPAIR_SETFLAG(pair, ttypes[TTYPE_PROG]);
-	if (NULL == node->child)
-		word(p, meta->name);
-	return(1);
+	term_newln(p);
+	p->viscol = 0;
+	if (0 < p->skipvsp)
+		p->skipvsp--;
+	else
+		(*p->endline)(p);
 }
 
-
-/* ARGSUSED */
-static int
-termp_fl_pre(DECL_ARGS)
+void
+term_fontlast(struct termp *p)
 {
+	enum termfont	 f;
 
-	TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD_FLAG]);
-	word(p, "\\-");
-	p->flags |= TERMP_NOSPACE;
-	return(1);
+	f = p->fontl;
+	p->fontl = p->fontq[p->fonti];
+	p->fontq[p->fonti] = f;
 }
 
 
-/* ARGSUSED */
-static int
-termp_ar_pre(DECL_ARGS)
+void
+term_fontrepl(struct termp *p, enum termfont f)
 {
 
-	if (node->child) {
-		TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD_ARG]);
-		return(1);
-	}
-	p->flags |= ttypes[TTYPE_CMD_ARG];
-	word(p, "file");
-	word(p, "...");
-	p->flags &= ~ttypes[TTYPE_CMD_ARG];
-	return(1);
+	p->fontl = p->fontq[p->fonti];
+	p->fontq[p->fonti] = f;
 }
 
 
-/* ARGSUSED */
-static int
-termp_ns_pre(DECL_ARGS)
+void
+term_fontpush(struct termp *p, enum termfont f)
 {
 
-	p->flags |= TERMP_NOSPACE;
-	return(1);
+	assert(p->fonti + 1 < 10);
+	p->fontl = p->fontq[p->fonti];
+	p->fontq[++p->fonti] = f;
 }
 
 
-/* ARGSUSED */
-static int
-termp_pp_pre(DECL_ARGS)
+const void *
+term_fontq(struct termp *p)
 {
 
-	vspace(p);
-	return(1);
+	return(&p->fontq[p->fonti]);
 }
 
 
-/* ARGSUSED */
-static int
-termp_st_pre(DECL_ARGS)
+enum termfont
+term_fonttop(struct termp *p)
 {
-	const char 	*tp;
-
-	assert(1 == node->data.elem.argc);
 
-	tp = mdoc_st2a(node->data.elem.argv[0].arg);
-	word(p, tp);
-
-	return(1);
+	return(p->fontq[p->fonti]);
 }
 
 
-/* ARGSUSED */
-static int
-termp_rs_pre(DECL_ARGS)
+void
+term_fontpopq(struct termp *p, const void *key)
 {
 
-	if (MDOC_BLOCK == node->type)
-		vspace(p);
-	return(1);
+	while (p->fonti >= 0 && key != &p->fontq[p->fonti])
+		p->fonti--;
+	assert(p->fonti >= 0);
 }
 
 
-/* ARGSUSED */
-static int
-termp_rv_pre(DECL_ARGS)
+void
+term_fontpop(struct termp *p)
 {
-	int		 i;
-
-	i = arg_getattr(MDOC_Std, node->data.elem.argc, 
-			node->data.elem.argv);
-	assert(i >= 0);
 
-	newln(p);
-	word(p, "The");
+	assert(p->fonti);
+	p->fonti--;
+}
 
-	p->flags |= ttypes[TTYPE_FUNC_NAME];
-	word(p, *node->data.elem.argv[i].value);
-	p->flags &= ~ttypes[TTYPE_FUNC_NAME];
+/*
+ * Handle pwords, partial words, which may be either a single word or a
+ * phrase that cannot be broken down (such as a literal string).  This
+ * handles word styling.
+ */
+void
+term_word(struct termp *p, const char *word)
+{
+	const char	*seq, *cp;
+	char		 c;
+	int		 sz, uc;
+	size_t		 ssz;
+	enum mandoc_esc	 esc;
+
+	if ( ! (TERMP_NOSPACE & p->flags)) {
+		if ( ! (TERMP_KEEP & p->flags)) {
+			if (TERMP_PREKEEP & p->flags)
+				p->flags |= TERMP_KEEP;
+			bufferc(p, ' ');
+			if (TERMP_SENTENCE & p->flags)
+				bufferc(p, ' ');
+		} else
+			bufferc(p, ASCII_NBRSP);
+	}
 
-       	word(p, "() function returns the value 0 if successful;");
-       	word(p, "otherwise the value -1 is returned and the");
-       	word(p, "global variable");
+	if ( ! (p->flags & TERMP_NONOSPACE))
+		p->flags &= ~TERMP_NOSPACE;
+	else
+		p->flags |= TERMP_NOSPACE;
 
-	p->flags |= ttypes[TTYPE_VAR_DECL];
-	word(p, "errno");
-	p->flags &= ~ttypes[TTYPE_VAR_DECL];
+	p->flags &= ~(TERMP_SENTENCE | TERMP_IGNDELIM);
+
+	while ('\0' != *word) {
+		if ('\\' != *word) {
+			if (TERMP_SKIPCHAR & p->flags) {
+				p->flags &= ~TERMP_SKIPCHAR;
+				word++;
+				continue;
+			}
+			ssz = strcspn(word, "\\");
+			encode(p, word, ssz);
+			word += (int)ssz;
+			continue;
+		}
 
-       	word(p, "is set to indicate the error.");
+		word++;
+		esc = mandoc_escape(&word, &seq, &sz);
+		if (ESCAPE_ERROR == esc)
+			break;
 
-	return(1);
+		if (TERMENC_ASCII != p->enc)
+			switch (esc) {
+			case (ESCAPE_UNICODE):
+				uc = mchars_num2uc(seq + 1, sz - 1);
+				if ('\0' == uc)
+					break;
+				encode1(p, uc);
+				continue;
+			case (ESCAPE_SPECIAL):
+				uc = mchars_spec2cp(p->symtab, seq, sz);
+				if (uc <= 0)
+					break;
+				encode1(p, uc);
+				continue;
+			default:
+				break;
+			}
+
+		switch (esc) {
+		case (ESCAPE_UNICODE):
+			encode1(p, '?');
+			break;
+		case (ESCAPE_NUMBERED):
+			c = mchars_num2char(seq, sz);
+			if ('\0' != c)
+				encode(p, &c, 1);
+			break;
+		case (ESCAPE_SPECIAL):
+			cp = mchars_spec2str(p->symtab, seq, sz, &ssz);
+			if (NULL != cp) 
+				encode(p, cp, ssz);
+			else if (1 == ssz)
+				encode(p, seq, sz);
+			break;
+		case (ESCAPE_FONTBOLD):
+			term_fontrepl(p, TERMFONT_BOLD);
+			break;
+		case (ESCAPE_FONTITALIC):
+			term_fontrepl(p, TERMFONT_UNDER);
+			break;
+		case (ESCAPE_FONT):
+			/* FALLTHROUGH */
+		case (ESCAPE_FONTROMAN):
+			term_fontrepl(p, TERMFONT_NONE);
+			break;
+		case (ESCAPE_FONTPREV):
+			term_fontlast(p);
+			break;
+		case (ESCAPE_NOSPACE):
+			if (TERMP_SKIPCHAR & p->flags)
+				p->flags &= ~TERMP_SKIPCHAR;
+			else if ('\0' == *word)
+				p->flags |= TERMP_NOSPACE;
+			break;
+		case (ESCAPE_SKIPCHAR):
+			p->flags |= TERMP_SKIPCHAR;
+			break;
+		default:
+			break;
+		}
+	}
 }
 
-
-/* ARGSUSED */
-static int
-termp_ex_pre(DECL_ARGS)
+static void
+adjbuf(struct termp *p, int sz)
 {
-	int		 i;
 
-	i = arg_getattr(MDOC_Std, node->data.elem.argc, 
-			node->data.elem.argv);
-	assert(i >= 0);
+	if (0 == p->maxcols)
+		p->maxcols = 1024;
+	while (sz >= p->maxcols)
+		p->maxcols <<= 2;
 
-	word(p, "The");
-	p->flags |= ttypes[TTYPE_PROG];
-	word(p, *node->data.elem.argv[i].value);
-	p->flags &= ~ttypes[TTYPE_PROG];
-       	word(p, "utility exits 0 on success, and >0 if an error occurs.");
-
-	return(1);
+	p->buf = mandoc_realloc
+		(p->buf, sizeof(int) * (size_t)p->maxcols);
 }
 
-
-/* ARGSUSED */
-static int
-termp_nd_pre(DECL_ARGS)
+static void
+bufferc(struct termp *p, char c)
 {
 
-	word(p, "\\-");
-	return(1);
-}
+	if (p->col + 1 >= p->maxcols)
+		adjbuf(p, p->col + 1);
 
+	p->buf[p->col++] = c;
+}
 
-/* ARGSUSED */
+/*
+ * See encode().
+ * Do this for a single (probably unicode) value.
+ * Does not check for non-decorated glyphs.
+ */
 static void
-termp_bl_post(DECL_ARGS)
+encode1(struct termp *p, int c)
 {
+	enum termfont	  f;
 
-	if (MDOC_BLOCK == node->type)
-		newln(p);
-}
+	if (TERMP_SKIPCHAR & p->flags) {
+		p->flags &= ~TERMP_SKIPCHAR;
+		return;
+	}
 
+	if (p->col + 4 >= p->maxcols)
+		adjbuf(p, p->col + 4);
+
+	f = term_fonttop(p);
+
+	if (TERMFONT_NONE == f) {
+		p->buf[p->col++] = c;
+		return;
+	} else if (TERMFONT_UNDER == f) {
+		p->buf[p->col++] = '_';
+	} else
+		p->buf[p->col++] = c;
+
+	p->buf[p->col++] = 8;
+	p->buf[p->col++] = c;
+}
 
-/* ARGSUSED */
 static void
-termp_op_post(DECL_ARGS)
+encode(struct termp *p, const char *word, size_t sz)
 {
+	enum termfont	  f;
+	int		  i, len;
 
-	if (MDOC_BODY != node->type) 
+	if (TERMP_SKIPCHAR & p->flags) {
+		p->flags &= ~TERMP_SKIPCHAR;
 		return;
-	p->flags |= TERMP_NOSPACE;
-	word(p, "\\(rB");
-}
+	}
 
+	/* LINTED */
+	len = sz;
 
-/* ARGSUSED */
-static int
-termp_xr_pre(DECL_ARGS)
-{
-	const struct mdoc_node *n;
+	/*
+	 * Encode and buffer a string of characters.  If the current
+	 * font mode is unset, buffer directly, else encode then buffer
+	 * character by character.
+	 */
 
-	n = node->child;
-	assert(n);
+	if (TERMFONT_NONE == (f = term_fonttop(p))) {
+		if (p->col + len >= p->maxcols) 
+			adjbuf(p, p->col + len);
+		for (i = 0; i < len; i++)
+			p->buf[p->col++] = word[i];
+		return;
+	}
 
-	assert(MDOC_TEXT == n->type);
-	word(p, n->data.text.string);
+	/* Pre-buffer, assuming worst-case. */
 
-	if (NULL == (n = n->next)) 
-		return(0);
+	if (p->col + 1 + (len * 3) >= p->maxcols)
+		adjbuf(p, p->col + 1 + (len * 3));
 
-	assert(MDOC_TEXT == n->type);
-	p->flags |= TERMP_NOSPACE;
-	word(p, "(");
-	p->flags |= TERMP_NOSPACE;
-	word(p, n->data.text.string);
-	p->flags |= TERMP_NOSPACE;
-	word(p, ")");
+	for (i = 0; i < len; i++) {
+		if (ASCII_HYPH != word[i] &&
+		    ! isgraph((unsigned char)word[i])) {
+			p->buf[p->col++] = word[i];
+			continue;
+		}
 
-	return(0);
-}
+		if (TERMFONT_UNDER == f)
+			p->buf[p->col++] = '_';
+		else if (ASCII_HYPH == word[i])
+			p->buf[p->col++] = '-';
+		else
+			p->buf[p->col++] = word[i];
 
+		p->buf[p->col++] = 8;
+		p->buf[p->col++] = word[i];
+	}
+}
 
-/* ARGSUSED */
-static int
-termp_vt_pre(DECL_ARGS)
+size_t
+term_len(const struct termp *p, size_t sz)
 {
 
-	/* FIXME: this can be "type name". */
-	TERMPAIR_SETFLAG(pair, ttypes[TTYPE_VAR_DECL]);
-	return(1);
+	return((*p->width)(p, ' ') * sz);
 }
 
-
-/* ARGSUSED */
-static void
-termp_vt_post(DECL_ARGS)
+static size_t
+cond_width(const struct termp *p, int c, int *skip)
 {
 
-	if (node->sec == SEC_SYNOPSIS)
-		vspace(p);
+	if (*skip) {
+		(*skip) = 0;
+		return(0);
+	} else
+		return((*p->width)(p, c));
 }
 
-
-/* ARGSUSED */
-static int
-termp_fd_pre(DECL_ARGS)
+size_t
+term_strlen(const struct termp *p, const char *cp)
 {
+	size_t		 sz, rsz, i;
+	int		 ssz, skip, c;
+	const char	*seq, *rhs;
+	enum mandoc_esc	 esc;
+	static const char rej[] = { '\\', ASCII_HYPH, ASCII_NBRSP, '\0' };
 
-	/* 
-	 * FIXME: this naming is bad.  This value is used, in general,
-	 * for the #include header or other preprocessor statement.
+	/*
+	 * Account for escaped sequences within string length
+	 * calculations.  This follows the logic in term_word() as we
+	 * must calculate the width of produced strings.
 	 */
-	TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FUNC_DECL]);
-	return(1);
-}
-
 
-/* ARGSUSED */
-static void
-termp_fd_post(DECL_ARGS)
-{
+	sz = 0;
+	skip = 0;
+	while ('\0' != *cp) {
+		rsz = strcspn(cp, rej);
+		for (i = 0; i < rsz; i++)
+			sz += cond_width(p, *cp++, &skip);
+
+		c = 0;
+		switch (*cp) {
+		case ('\\'):
+			cp++;
+			esc = mandoc_escape(&cp, &seq, &ssz);
+			if (ESCAPE_ERROR == esc)
+				return(sz);
+
+			if (TERMENC_ASCII != p->enc)
+				switch (esc) {
+				case (ESCAPE_UNICODE):
+					c = mchars_num2uc
+						(seq + 1, ssz - 1);
+					if ('\0' == c)
+						break;
+					sz += cond_width(p, c, &skip);
+					continue;
+				case (ESCAPE_SPECIAL):
+					c = mchars_spec2cp
+						(p->symtab, seq, ssz);
+					if (c <= 0)
+						break;
+					sz += cond_width(p, c, &skip);
+					continue;
+				default:
+					break;
+				}
+
+			rhs = NULL;
+
+			switch (esc) {
+			case (ESCAPE_UNICODE):
+				sz += cond_width(p, '?', &skip);
+				break;
+			case (ESCAPE_NUMBERED):
+				c = mchars_num2char(seq, ssz);
+				if ('\0' != c)
+					sz += cond_width(p, c, &skip);
+				break;
+			case (ESCAPE_SPECIAL):
+				rhs = mchars_spec2str
+					(p->symtab, seq, ssz, &rsz);
+
+				if (ssz != 1 || rhs)
+					break;
+
+				rhs = seq;
+				rsz = ssz;
+				break;
+			case (ESCAPE_SKIPCHAR):
+				skip = 1;
+				break;
+			default:
+				break;
+			}
+
+			if (NULL == rhs)
+				break;
+
+			if (skip) {
+				skip = 0;
+				break;
+			}
+
+			for (i = 0; i < rsz; i++)
+				sz += (*p->width)(p, *rhs++);
+			break;
+		case (ASCII_NBRSP):
+			sz += cond_width(p, ' ', &skip);
+			cp++;
+			break;
+		case (ASCII_HYPH):
+			sz += cond_width(p, '-', &skip);
+			cp++;
+			break;
+		default:
+			break;
+		}
+	}
 
-	if (node->sec == SEC_SYNOPSIS)
-		vspace(p);
+	return(sz);
 }
 
-
 /* ARGSUSED */
-static int
-termp_sh_pre(DECL_ARGS)
+size_t
+term_vspan(const struct termp *p, const struct roffsu *su)
 {
+	double		 r;
 
-	switch (node->type) {
-	case (MDOC_HEAD):
-		vspace(p);
-		TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SECTION]);
-		break;
-	case (MDOC_BODY):
-		p->offset = INDENT;
+	switch (su->unit) {
+	case (SCALE_CM):
+		r = su->scale * 2;
 		break;
-	default:
+	case (SCALE_IN):
+		r = su->scale * 6;
 		break;
-	}
-	return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_sh_post(DECL_ARGS)
-{
-
-	switch (node->type) {
-	case (MDOC_HEAD):
-		newln(p);
+	case (SCALE_PC):
+		r = su->scale;
 		break;
-	case (MDOC_BODY):
-		newln(p);
-		p->offset = 0;
+	case (SCALE_PT):
+		r = su->scale / 8;
 		break;
-	default:
+	case (SCALE_MM):
+		r = su->scale / 1000;
 		break;
-	}
-}
-
-
-/* ARGSUSED */
-static int
-termp_op_pre(DECL_ARGS)
-{
-
-	switch (node->type) {
-	case (MDOC_BODY):
-		word(p, "\\(lB");
-		p->flags |= TERMP_NOSPACE;
+	case (SCALE_VS):
+		r = su->scale;
 		break;
 	default:
+		r = su->scale - 1;
 		break;
 	}
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_bt_pre(DECL_ARGS)
-{
-
-	word(p, "is currently in beta test.");
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_ud_pre(DECL_ARGS)
-{
-
-	word(p, "currently under development.");
-	return(1);
-}
-
 
-/* ARGSUSED */
-static int
-termp_d1_pre(DECL_ARGS)
-{
-
-	if (MDOC_BODY != node->type)
-		return(1);
-	newln(p);
-	p->offset += (pair->offset = INDENT);
-	return(1);
+	if (r < 0.0)
+		r = 0.0;
+	return(/* LINTED */(size_t)
+			r);
 }
 
-
-/* ARGSUSED */
-static void
-termp_d1_post(DECL_ARGS)
+size_t
+term_hspan(const struct termp *p, const struct roffsu *su)
 {
+	double		 v;
 
-	if (MDOC_BODY != node->type) 
-		return;
-	newln(p);
-	p->offset -= pair->offset;
-}
-
-
-/* ARGSUSED */
-static int
-termp_aq_pre(DECL_ARGS)
-{
-
-	if (MDOC_BODY != node->type)
-		return(1);
-	word(p, "<");
-	p->flags |= TERMP_NOSPACE;
-	return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_aq_post(DECL_ARGS)
-{
-
-	if (MDOC_BODY != node->type)
-		return;
-	p->flags |= TERMP_NOSPACE;
-	word(p, ">");
-}
-
-
-/* ARGSUSED */
-static int
-termp_ft_pre(DECL_ARGS)
-{
-
-	TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FUNC_TYPE]);
-	return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_ft_post(DECL_ARGS)
-{
-
-	if (node->sec == SEC_SYNOPSIS)
-		newln(p);
-}
-
-
-/* ARGSUSED */
-static int
-termp_fn_pre(DECL_ARGS)
-{
-	const struct mdoc_node *n;
-
-	assert(node->child);
-	assert(MDOC_TEXT == node->child->type);
-
-	/* FIXME: can be "type funcname" "type varname"... */
-
-	p->flags |= ttypes[TTYPE_FUNC_NAME];
-	word(p, node->child->data.text.string);
-	p->flags &= ~ttypes[TTYPE_FUNC_NAME];
-
-	word(p, "(");
-
-	p->flags |= TERMP_NOSPACE;
-	for (n = node->child->next; n; n = n->next) {
-		assert(MDOC_TEXT == n->type);
-		p->flags |= ttypes[TTYPE_FUNC_ARG];
-		word(p, n->data.text.string);
-		p->flags &= ~ttypes[TTYPE_FUNC_ARG];
-		if (n->next)
-			word(p, ",");
-	}
-
-	word(p, ")");
-
-	if (SEC_SYNOPSIS == node->sec)
-		word(p, ";");
-
-	return(0);
-}
-
-
-/* ARGSUSED */
-static void
-termp_fn_post(DECL_ARGS)
-{
-
-	if (node->sec == SEC_SYNOPSIS)
-		vspace(p);
-
-}
-
-
-/* ARGSUSED */
-static int
-termp_sx_pre(DECL_ARGS)
-{
-
-	TERMPAIR_SETFLAG(pair, ttypes[TTYPE_LINK]);
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_fa_pre(DECL_ARGS)
-{
-	struct mdoc_node *n;
-
-	if (node->parent->tok != MDOC_Fo) {
-		TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FUNC_ARG]);
-		return(1);
-	}
-
-	for (n = node->child; n; n = n->next) {
-		assert(MDOC_TEXT == n->type);
-
-		p->flags |= ttypes[TTYPE_FUNC_ARG];
-		word(p, n->data.text.string);
-		p->flags &= ~ttypes[TTYPE_FUNC_ARG];
-
-		if (n->next)
-			word(p, ",");
-	}
-
-	if (node->next && node->next->tok == MDOC_Fa)
-		word(p, ",");
-
-	return(0);
-}
-
-
-/* ARGSUSED */
-static int
-termp_va_pre(DECL_ARGS)
-{
-
-	TERMPAIR_SETFLAG(pair, ttypes[TTYPE_VAR_DECL]);
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_bd_pre(DECL_ARGS)
-{
-	const struct mdoc_block *bl;
-	const struct mdoc_node *n;
-	int		 i;
-
-	if (MDOC_BLOCK == node->type) {
-		vspace(p);
-		return(1);
-	} else if (MDOC_BODY != node->type)
-		return(1);
-
-	assert(MDOC_BLOCK == node->parent->type);
-	pair->offset = p->offset;
-
-	bl = &node->parent->data.block;
-
-
-	i = arg_getattr(MDOC_Offset, bl->argc, bl->argv);
-	if (-1 != i) {
-		assert(1 == bl->argv[i].sz);
-		p->offset += arg_offset(&bl->argv[i]);
-	}
-
-	if ( ! arg_hasattr(MDOC_Literal, bl->argc, bl->argv))
-		return(1);
-
-	p->flags |= TERMP_LITERAL;
-
-	for (n = node->child; n; n = n->next) {
-		assert(MDOC_TEXT == n->type); /* FIXME */
-		if ((*n->data.text.string)) {
-			word(p, n->data.text.string);
-			flushln(p);
-		} else
-			vspace(p);
-
-	}
-
-	p->flags &= ~TERMP_LITERAL;
-	return(0);
-}
-
-
-/* ARGSUSED */
-static void
-termp_bd_post(DECL_ARGS)
-{
-
-	if (MDOC_BODY != node->type) 
-		return;
-	newln(p);
-	p->offset = pair->offset;
-}
-
-
-/* ARGSUSED */
-static int
-termp_qq_pre(DECL_ARGS)
-{
-
-	if (MDOC_BODY != node->type)
-		return(1);
-	word(p, "\"");
-	p->flags |= TERMP_NOSPACE;
-	return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_qq_post(DECL_ARGS)
-{
-
-	if (MDOC_BODY != node->type)
-		return;
-	p->flags |= TERMP_NOSPACE;
-	word(p, "\"");
-}
-
-
-/* ARGSUSED */
-static int
-termp_bsx_pre(DECL_ARGS)
-{
-
-	word(p, "BSDI BSD/OS");
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_bx_pre(DECL_ARGS)
-{
-
-	word(p, "BSD");
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_ox_pre(DECL_ARGS)
-{
-
-	word(p, "OpenBSD");
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_ux_pre(DECL_ARGS)
-{
-
-	word(p, "UNIX");
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_fx_pre(DECL_ARGS)
-{
-
-	word(p, "FreeBSD");
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_nx_pre(DECL_ARGS)
-{
-
-	word(p, "NetBSD");
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_sq_pre(DECL_ARGS)
-{
-
-	if (MDOC_BODY != node->type)
-		return(1);
-	word(p, "`");
-	p->flags |= TERMP_NOSPACE;
-	return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_sq_post(DECL_ARGS)
-{
-
-	if (MDOC_BODY != node->type)
-		return;
-	p->flags |= TERMP_NOSPACE;
-	word(p, "\'");
-}
-
-
-/* ARGSUSED */
-static int
-termp_pf_pre(DECL_ARGS)
-{
-
-	p->flags |= TERMP_IGNDELIM;
-	return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_pf_post(DECL_ARGS)
-{
-
-	p->flags &= ~TERMP_IGNDELIM;
-	p->flags |= TERMP_NOSPACE;
-}
-
-
-/* ARGSUSED */
-static int
-termp_ss_pre(DECL_ARGS)
-{
-
-	switch (node->type) {
-	case (MDOC_HEAD):
-		vspace(p);
-		TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SSECTION]);
-		p->offset = INDENT / 2;
-		break;
-	default:
-		break;
-	}
-
-	return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_ss_post(DECL_ARGS)
-{
-
-	switch (node->type) {
-	case (MDOC_HEAD):
-		newln(p);
-		p->offset = INDENT;
-		break;
-	default:
-		break;
-	}
-}
-
-
-/* ARGSUSED */
-static int
-termp_pa_pre(DECL_ARGS)
-{
-
-	TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FILE]);
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_em_pre(DECL_ARGS)
-{
-
-	TERMPAIR_SETFLAG(pair, ttypes[TTYPE_EMPH]);
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_cd_pre(DECL_ARGS)
-{
-
-	TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CONFIG]);
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_cm_pre(DECL_ARGS)
-{
-
-	TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD_FLAG]);
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_ic_pre(DECL_ARGS)
-{
-
-	TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD]);
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_in_pre(DECL_ARGS)
-{
-
-	TERMPAIR_SETFLAG(pair, ttypes[TTYPE_INCLUDE]);
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_at_pre(DECL_ARGS)
-{
-	enum mdoc_att	 c;
-
-	c = ATT_DEFAULT;
-	if (node->child) {
-		assert(MDOC_TEXT == node->child->type);
-		c = mdoc_atoatt(node->child->data.text.string);
-	}
-
-	word(p, mdoc_att2a(c));
-	return(0);
-}
-
-
-/* ARGSUSED */
-static int
-termp_bq_pre(DECL_ARGS)
-{
-
-	if (MDOC_BODY != node->type)
-		return(1);
-	word(p, "\\[");
-	p->flags |= TERMP_NOSPACE;
-	return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_bq_post(DECL_ARGS)
-{
-
-	if (MDOC_BODY != node->type)
-		return;
-	word(p, "]");
-}
-
-
-/* ARGSUSED */
-static int
-termp_pq_pre(DECL_ARGS)
-{
-
-	if (MDOC_BODY != node->type)
-		return(1);
-	word(p, "\\&(");
-	p->flags |= TERMP_NOSPACE;
-	return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_pq_post(DECL_ARGS)
-{
-
-	if (MDOC_BODY != node->type)
-		return;
-	word(p, ")");
-}
-
-
-/* ARGSUSED */
-static int
-termp_fo_pre(DECL_ARGS)
-{
-	const struct mdoc_node *n;
-
-	if (MDOC_BODY == node->type) {
-		word(p, "(");
-		p->flags |= TERMP_NOSPACE;
-		return(1);
-	} else if (MDOC_HEAD != node->type) 
-		return(1);
-
-	/* XXX - groff shows only first parameter */
-
-	p->flags |= ttypes[TTYPE_FUNC_NAME];
-	for (n = node->child; n; n = n->next) {
-		assert(MDOC_TEXT == n->type);
-		word(p, n->data.text.string);
-	}
-	p->flags &= ~ttypes[TTYPE_FUNC_NAME];
-
-	return(0);
-}
-
-
-/* ARGSUSED */
-static void
-termp_fo_post(DECL_ARGS)
-{
-
-	if (MDOC_BODY != node->type)
-		return;
-	word(p, ")");
-	word(p, ";");
-	newln(p);
-}
-
-
-/* ARGSUSED */
-static int
-termp_bf_pre(DECL_ARGS)
-{
-	const struct mdoc_node	*n;
-	const struct mdoc_block	*b;
-
-	/* XXX - we skip over possible trailing HEAD tokens. */
-
-	if (MDOC_HEAD == node->type)
-		return(0);
-	else if (MDOC_BLOCK != node->type)
-		return(1);
-
-	b = &node->data.block;
-
-	if (NULL == (n = b->head->child)) {
-		if (arg_hasattr(MDOC_Emphasis, b->argc, b->argv))
-			TERMPAIR_SETFLAG(pair, ttypes[TTYPE_EMPH]);
-		else if (arg_hasattr(MDOC_Symbolic, b->argc, b->argv))
-			TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SYMB]);
-
-		return(1);
-	} 
-
-	assert(MDOC_TEXT == n->type);
-
-	if (0 == strcmp("Em", n->data.text.string))
-		TERMPAIR_SETFLAG(pair, ttypes[TTYPE_EMPH]);
-	else if (0 == strcmp("Sy", n->data.text.string))
-		TERMPAIR_SETFLAG(pair, ttypes[TTYPE_EMPH]);
-
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_sy_pre(DECL_ARGS)
-{
-
-	TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SYMB]);
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_ms_pre(DECL_ARGS)
-{
-
-	TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SYMBOL]);
-	return(1);
-}
-
-
-
-/* ARGSUSED */
-static int
-termp_sm_pre(DECL_ARGS)
-{
-
-#if notyet
-	assert(node->child);
-	if (0 == strcmp("off", node->child->data.text.string)) {
-		p->flags &= ~TERMP_NONOSPACE;
-		p->flags &= ~TERMP_NOSPACE;
-	} else {
-		p->flags |= TERMP_NONOSPACE;
-		p->flags |= TERMP_NOSPACE;
-	}
-#endif
-
-	return(0);
-}
-
-
-/* ARGSUSED */
-static int
-termp__t_pre(DECL_ARGS)
-{
-
-	word(p, "\"");
-	p->flags |= TERMP_NOSPACE;
-	return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp__t_post(DECL_ARGS)
-{
-
-	p->flags |= TERMP_NOSPACE;
-	word(p, "\"");
-	word(p, node->next ? "," : ".");
-}
-
-
-/* ARGSUSED */
-static void
-termp____post(DECL_ARGS)
-{
-
-	p->flags |= TERMP_NOSPACE;
-	word(p, node->next ? "," : ".");
+	v = ((*p->hspan)(p, su));
+	if (v < 0.0)
+		v = 0.0;
+	return((size_t) /* LINTED */
+			v);
 }