X-Git-Url: https://git.cameronkatri.com/mandoc.git/blobdiff_plain/82f95d740250f9802dd32d845731167161f7ee8e..24ce22505f53c465459aae9ef86b0d767b2d69e7:/term.c?ds=sidebyside

diff --git a/term.c b/term.c
index 2fc3b40e..603a6a34 100644
--- a/term.c
+++ b/term.c
@@ -1,1012 +1,703 @@
-/* $Id: term.c,v 1.4 2009/02/21 15:34:46 kristaps Exp $ */
+/*	$Id: term.c,v 1.165 2010/07/26 21:58:41 kristaps Exp $ */
 /*
- * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010 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 <curses.h>
-#include <err.h>
-#include <stdlib.h>
+#include <stdint.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <term.h>
-#include <unistd.h>
-
-#include "private.h"
-
-enum	termesc {
-	ESC_CLEAR,
-	ESC_BOLD,
-	ESC_UNDERLINE
-};
-
-struct	termp {
-	size_t		  rmargin;
-	size_t		  maxrmargin;
-	size_t		  maxcols;
-	size_t		  offset;
-	size_t		  col;
-	int		  flags;
-#define	TERMP_BOLD	 (1 << 0)	/* Embolden words. */
-#define	TERMP_UNDERLINE	 (1 << 1)	/* Underline words. */
-#define	TERMP_NOSPACE	 (1 << 2)	/* No space before words. */
-#define	TERMP_NOLPAD	 (1 << 3)	/* No left-padding. */
-#define	TERMP_NOBREAK	 (1 << 4)	/* No break after line */
-	char		 *buf;
-};
-
-struct	termact {
-	int		(*pre)(struct termp *,
-				const struct mdoc_meta *,
-				const struct mdoc_node *);
-	int		(*post)(struct termp *,
-				const struct mdoc_meta *,
-				const struct mdoc_node *);
-};
-
-static	void		  termprint_r(struct termp *,
-				const struct mdoc_meta *,
-				const struct mdoc_node *);
-static	void		  termprint_header(struct termp *,
-				const struct mdoc_meta *);
-static	void		  termprint_footer(struct termp *,
-				const struct mdoc_meta *);
-
-static	int		  arg_hasattr(int, size_t, 
-				const struct mdoc_arg *);
-static	int		  arg_getattr(int, size_t, 
-				const struct mdoc_arg *);
-
-static	void		  newln(struct termp *);
-static	void		  vspace(struct termp *);
-static	void		  pword(struct termp *, const char *, size_t);
-static	void		  word(struct termp *, const char *);
-
-#define	decl_prepost(name, suffix) \
-static	int		  name##_##suffix(struct termp *, \
-				const struct mdoc_meta *, \
-				const struct mdoc_node *)
-
-#define	decl_pre(name)	  decl_prepost(name, pre)
-#define	decl_post(name)   decl_prepost(name, post)
-
-decl_pre(termp_fl);
-decl_pre(termp_it);
-decl_pre(termp_nd);
-decl_pre(termp_ns);
-decl_pre(termp_op);
-decl_pre(termp_pp);
-decl_pre(termp_sh);
-decl_pre(termp_xr);
-
-decl_post(termp_bl);
-decl_post(termp_it);
-decl_post(termp_op);
-decl_post(termp_sh);
-
-decl_pre(termp_bold);
-decl_pre(termp_under);
-
-decl_post(termp_bold);
-decl_post(termp_under);
-
-const	struct termact termacts[MDOC_MAX] = {
-	{ NULL, NULL }, /* \" */
-	{ NULL, NULL }, /* Dd */
-	{ NULL, NULL }, /* Dt */
-	{ NULL, NULL }, /* Os */
-	{ termp_sh_pre, termp_sh_post }, /* Sh */
-	{ NULL, NULL }, /* Ss */ 
-	{ termp_pp_pre, NULL }, /* Pp */ 
-	{ NULL, NULL }, /* D1 */
-	{ NULL, NULL }, /* Dl */
-	{ NULL, NULL }, /* 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_under_pre, termp_under_post }, /* Ar */
-	{ NULL, NULL }, /* Cd */
-	{ NULL, NULL }, /* Cm */
-	{ NULL, NULL }, /* Dv */ 
-	{ NULL, NULL }, /* Er */ 
-	{ NULL, NULL }, /* Ev */ 
-	{ NULL, NULL }, /* Ex */
-	{ NULL, NULL }, /* Fa */ 
-	{ NULL, NULL }, /* Fd */ 
-	{ termp_fl_pre, termp_bold_post }, /* Fl */
-	{ NULL, NULL }, /* Fn */ 
-	{ NULL, NULL }, /* Ft */ 
-	{ NULL, NULL }, /* Ic */ 
-	{ NULL, NULL }, /* In */ 
-	{ NULL, NULL }, /* Li */
-	{ termp_nd_pre, NULL }, /* Nd */ 
-	{ termp_bold_pre, termp_bold_post }, /* Nm */ 
-	{ termp_op_pre, termp_op_post }, /* Op */
-	{ NULL, NULL }, /* Ot */
-	{ NULL, NULL }, /* Pa */
-	{ NULL, NULL }, /* Rv */
-	{ NULL, NULL }, /* St */ 
-	{ NULL, NULL }, /* Va */
-	{ NULL, NULL }, /* Vt */ 
-	{ termp_xr_pre, NULL }, /* Xr */
-	{ NULL, NULL }, /* %A */
-	{ NULL, NULL }, /* %B */
-	{ NULL, NULL }, /* %D */
-	{ NULL, NULL }, /* %I */
-	{ NULL, NULL }, /* %J */
-	{ NULL, NULL }, /* %N */
-	{ NULL, NULL }, /* %O */
-	{ NULL, NULL }, /* %P */
-	{ NULL, NULL }, /* %R */
-	{ NULL, NULL }, /* %T */
-	{ NULL, NULL }, /* %V */
-	{ NULL, NULL }, /* Ac */
-	{ NULL, NULL }, /* Ao */
-	{ NULL, NULL }, /* Aq */
-	{ NULL, NULL }, /* At */
-	{ NULL, NULL }, /* Bc */
-	{ NULL, NULL }, /* Bf */ 
-	{ NULL, NULL }, /* Bo */
-	{ NULL, NULL }, /* Bq */
-	{ NULL, NULL }, /* Bsx */
-	{ NULL, NULL }, /* Bx */
-	{ NULL, NULL }, /* Db */
-	{ NULL, NULL }, /* Dc */
-	{ NULL, NULL }, /* Do */
-	{ NULL, NULL }, /* Dq */
-	{ NULL, NULL }, /* Ec */
-	{ NULL, NULL }, /* Ef */
-	{ NULL, NULL }, /* Em */ 
-	{ NULL, NULL }, /* Eo */
-	{ NULL, NULL }, /* Fx */
-	{ NULL, NULL }, /* Ms */
-	{ NULL, NULL }, /* No */
-	{ termp_ns_pre, NULL }, /* Ns */
-	{ NULL, NULL }, /* Nx */
-	{ NULL, NULL }, /* Ox */
-	{ NULL, NULL }, /* Pc */
-	{ NULL, NULL }, /* Pf */
-	{ NULL, NULL }, /* Po */
-	{ NULL, NULL }, /* Pq */
-	{ NULL, NULL }, /* Qc */
-	{ NULL, NULL }, /* Ql */
-	{ NULL, NULL }, /* Qo */
-	{ NULL, NULL }, /* Qq */
-	{ NULL, NULL }, /* Re */
-	{ NULL, NULL }, /* Rs */
-	{ NULL, NULL }, /* Sc */
-	{ NULL, NULL }, /* So */
-	{ NULL, NULL }, /* Sq */
-	{ NULL, NULL }, /* Sm */
-	{ NULL, NULL }, /* Sx */
-	{ NULL, NULL }, /* Sy */
-	{ NULL, NULL }, /* Tn */
-	{ NULL, NULL }, /* Ux */
-	{ NULL, NULL }, /* Xc */
-	{ NULL, NULL }, /* Xo */
-	{ NULL, NULL }, /* Fo */ 
-	{ NULL, NULL }, /* Fc */ 
-	{ NULL, NULL }, /* Oo */
-	{ NULL, NULL }, /* Oc */
-	{ NULL, NULL }, /* Bk */
-	{ NULL, NULL }, /* Ek */
-	{ NULL, NULL }, /* Bt */
-	{ NULL, NULL }, /* Hf */
-	{ NULL, NULL }, /* Fr */
-	{ NULL, NULL }, /* Ud */
-};
-
-
-static int
-arg_hasattr(int arg, size_t argc, const struct mdoc_arg *argv)
-{
-
-	return(-1 != arg_getattr(arg, argc, argv));
-}
 
+#include "mandoc.h"
+#include "chars.h"
+#include "out.h"
+#include "term.h"
+#include "main.h"
 
-static int
-arg_getattr(int arg, size_t argc, const struct mdoc_arg *argv)
-{
-	int		 i;
-
-	for (i = 0; i < (int)argc; i++) 
-		if (argv[i].arg == arg)
-			return(i);
-	return(-1);
-}
+static	void		  spec(struct termp *, enum roffdeco,
+				const char *, size_t);
+static	void		  res(struct termp *, const char *, size_t);
+static	void		  bufferc(struct termp *, char);
+static	void		  adjbuf(struct termp *p, size_t);
+static	void		  encode(struct termp *, const char *, size_t);
 
 
-static void
-flushln(struct termp *p)
+void
+term_free(struct termp *p)
 {
-	size_t		 i, j, vsz, vis, maxvis;
 
-	/*
-	 * 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->offset < p->rmargin);
-	maxvis = p->rmargin - p->offset;
-	vis = 0;
+	if (p->buf)
+		free(p->buf);
+	if (p->symtab)
+		chars_free(p->symtab);
 
-	/*
-	 * If in the standard case (left-justified), then begin with our
-	 * indentation, otherwise (columns, etc.) just start spitting
-	 * out text.
-	 */
-
-	if ( ! (p->flags & TERMP_NOLPAD))
-		/* LINTED */
-		for (j = 0; j < p->offset; j++)
-			putchar(' ');
-
-	for (i = 0; i < p->col; i++) {
-		/*
-		 * Count up visible word characters.  Control sequences
-		 * (starting with the CSI) aren't counted. 
-		 */
-		assert( ! isspace(p->buf[i]));
-
-		/* LINTED */
-		for (j = i, vsz = 0; j < p->col; j++) {
-			if (isspace(p->buf[j]))
-				break;
-			else if (27 == p->buf[j]) {
-				assert(j + 4 <= p->col);
-				j += 3;
-			} else
-				vsz++;
-		}
-		assert(vsz > 0);
-
-		/*
-		 * If a word is too long and we're within a line, put it
-		 * on the next line.  Puke if we're being asked to write
-		 * something that will exceed the right margin (i.e.,
-		 * from a fresh line or when we're not allowed to break
-		 * the line with TERMP_NOBREAK).
-		 */
-
-		if (vis && vis + vsz >= maxvis) {
-			/* FIXME */
-			if (p->flags & TERMP_NOBREAK)
-				errx(1, "word breaks right margin");
-			putchar('\n');
-			for (j = 0; j < p->offset; j++)
-				putchar(' ');
-			vis = 0;
-		} else if (vis + vsz >= maxvis) {
-			/* FIXME */
-			errx(1, "word breaks right margin");
-		}
-
-		/* 
-		 * Write out the word and a trailing space.  Omit the
-		 * space if we're the last word in the line.
-		 */
-
-		for ( ; i < p->col; i++) {
-			if (isspace(p->buf[i]))
-				break;
-			putchar(p->buf[i]);
-		}
-		vis += vsz;
-		if (i < p->col) {
-			putchar(' ');
-			vis++;
-		}
-	}
-
-	/*
-	 * If we're not to right-marginalise it (newline), then instead
-	 * pad to the right margin and stay off.
-	 */
-
-	if (p->flags & TERMP_NOBREAK) {
-		for ( ; vis <= maxvis; vis++)
-			putchar(' ');
-	} else
-		putchar('\n');
-
-	p->col = 0;
-}
-
-
-static void
-newln(struct termp *p)
-{
-
-	/* 
-	 * A newline only breaks an existing line; it won't assert
-	 * vertical space.
-	 */
-	p->flags |= TERMP_NOSPACE;
-	if (0 == p->col) 
-		return;
-	flushln(p);
+	free(p);
 }
 
 
-static void
-vspace(struct termp *p)
+void
+term_begin(struct termp *p, term_margin head, 
+		term_margin foot, const void *arg)
 {
 
-	/*
-	 * Asserts a vertical space (a full, empty line-break between
-	 * lines).
-	 */
-	newln(p);
-	putchar('\n');
+	p->headf = head;
+	p->footf = foot;
+	p->argf = arg;
+	(*p->begin)(p);
 }
 
 
-static void
-chara(struct termp *p, char c)
+void
+term_end(struct termp *p)
 {
 
-	/* TODO: dynamically expand the buffer. */
-	if (p->col + 1 >= p->maxcols)
-		errx(1, "line overrun");
-	p->buf[(p->col)++] = c;
+	(*p->end)(p);
 }
 
 
-static void
-escape(struct termp *p, enum termesc esc)
+struct termp *
+term_alloc(enum termenc enc)
 {
+	struct termp	*p;
 
-	if (p->col + 4 >= p->maxcols)
-		errx(1, "line overrun");
-
-	p->buf[(p->col)++] = 27;
-	p->buf[(p->col)++] = '[';
-	switch (esc) {
-	case (ESC_CLEAR):
-		p->buf[(p->col)++] = '0';
-		break;
-	case (ESC_BOLD):
-		p->buf[(p->col)++] = '1';
-		break;
-	case (ESC_UNDERLINE):
-		p->buf[(p->col)++] = '4';
-		break;
-	default:
-		abort();
-		/* NOTREACHED */
+	p = calloc(1, sizeof(struct termp));
+	if (NULL == p) {
+		perror(NULL);
+		exit(EXIT_FAILURE);
 	}
-	p->buf[(p->col)++] = 'm';
+
+	p->enc = enc;
+	return(p);
 }
 
 
-static void
-pword(struct termp *p, const char *word, size_t len)
+/*
+ * 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_NOLPAD: when beginning to write the line, don't left-pad the
+ *    offset value.  This is useful when doing columnar lists where the
+ *    prior column has right-padded.
+ *
+ *  - TERMP_NOBREAK: this is the most important and is used when making
+ *    columns.  In short: don't print a newline and instead pad to the
+ *    right margin.  Used in conjunction with TERMP_NOLPAD.
+ *
+ *  - TERMP_TWOSPACE: when padding, make sure there are 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
+ *    overruning, 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)
 {
-	size_t		 i;
+	int		 i;     /* current input position in p->buf */
+	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 */
+	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 */
 
-	assert(len > 0);
+	/*
+	 * 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. 
+	 */
 
-	if ( ! (p->flags & TERMP_NOSPACE))
-		chara(p, ' ');
+	assert(p->offset < p->rmargin);
 
-	p->flags &= ~TERMP_NOSPACE;
+	maxvis = (int)(p->rmargin - p->offset) - p->overstep < 0 ?
+		/* LINTED */ 
+		0 : p->rmargin - p->offset - p->overstep;
+	mmax = (int)(p->maxrmargin - p->offset) - p->overstep < 0 ?
+		/* LINTED */
+		0 : p->maxrmargin - p->offset - p->overstep;
 
-	if (p->flags & TERMP_BOLD)
-		escape(p, ESC_BOLD);
-	if (p->flags & TERMP_UNDERLINE)
-		escape(p, ESC_UNDERLINE);
+	bp = TERMP_NOBREAK & p->flags ? mmax : maxvis;
 
-	/* TODO: escape patterns. */
+	/*
+	 * Indent the first line of a paragraph.
+	 */
+	vbl = p->flags & TERMP_NOLPAD ? 0 : p->offset;
 
-	for (i = 0; i < len; i++) 
-		chara(p, word[i]);
+	vis = vend = i = 0;
 
-	if (p->flags & TERMP_BOLD ||
-			p->flags & TERMP_UNDERLINE)
-		escape(p, ESC_CLEAR);
-}
+	while (i < (int)p->col) {
+		/*
+		 * Handle literal tab characters: collapse all
+		 * subsequent tabs into a single huge set of spaces.
+		 */
+		for (j = i; j < (int)p->col; j++) {
+			if ('\t' != p->buf[j])
+				break;
+			vend = (vis / p->tabwidth + 1) * p->tabwidth;
+			vbl += vend - vis;
+			vis = vend;
+		}
 
+		/*
+		 * 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).
+		 */
 
-static void
-word(struct termp *p, const char *word)
-{
-	size_t 		 i, j, len;
+		/* LINTED */
+		for (jhy = 0; j < (int)p->col; j++) {
+			if ((j && ' ' == p->buf[j]) || '\t' == p->buf[j])
+				break;
 
-	if (mdoc_isdelim(word))
-		p->flags |= TERMP_NOSPACE;
+			/* Back over the the last printed character. */
+			if (8 == p->buf[j]) {
+				assert(j);
+				vend -= (*p->width)(p, p->buf[j - 1]);
+				continue;
+			}
 
-	len = strlen(word);
-	assert(len > 0);
+			/* Regular word. */
+			/* Break at the hyphen point if we overrun. */
+			if (vend > vis && vend < bp && 
+					ASCII_HYPH == p->buf[j])
+				jhy = j;
 
-	/* LINTED */
-	for (j = i = 0; i < len; i++) {
-		if ( ! isspace(word[i])) {
-			j++;
-			continue;
+			vend += (*p->width)(p, p->buf[j]);
 		}
-		if (0 == j)
-			continue;
-		assert(i >= j);
-		pword(p, &word[i - j], j);
-		j = 0;
-	}
-	if (j > 0) {
-		assert(i >= j);
-		pword(p, &word[i - j], j);
-	}
-}
 
+		/*
+		 * 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);
+			if (TERMP_NOBREAK & p->flags) {
+				p->viscol = p->rmargin;
+				(*p->advance)(p, p->rmargin);
+				vend += p->rmargin - p->offset;
+			} else {
+				p->viscol = 0;
+				vbl = p->offset;
+			}
 
-/* ARGSUSED */
-static int
-termp_it_post(struct termp *p, const struct mdoc_meta *meta,
-		const struct mdoc_node *node)
-{
-	const struct mdoc_node *n, *it;
-	const struct mdoc_block *bl;
-	int		 i;
-	size_t		 width;
-
-	switch (node->type) {
-	case (MDOC_BODY):
-		/* FALLTHROUGH */
-	case (MDOC_HEAD):
-		break;
-	default:
-		return(1);
-	}
+			/* Remove the p->overstep width. */
 
-	it = node->parent;
-	assert(MDOC_BLOCK == it->type);
-	assert(MDOC_It == it->tok);
-
-	n = it->parent;
-	assert(MDOC_BODY == n->type);
-	assert(MDOC_Bl == n->tok);
-	n = n->parent;
-	bl = &n->data.block;
-
-	/* If `-tag', adjust our margins accordingly. */
-
-	if (arg_hasattr(MDOC_Tag, bl->argc, bl->argv)) {
-		i = arg_getattr(MDOC_Width, bl->argc, bl->argv);
-		assert(i >= 0);
-		assert(1 == bl->argv[i].sz);
-		width = strlen(*bl->argv[i].value); /* XXX */
-
-		if (MDOC_HEAD == node->type) {
-			flushln(p);
-			/* FIXME: nested lists. */
-			p->rmargin = p->maxrmargin;
-			p->flags &= ~TERMP_NOBREAK;
-		} else {
-			flushln(p);
-			p->offset -= width + 1;
-			p->flags &= ~TERMP_NOLPAD;
+			bp += (int)/* LINTED */
+				p->overstep;
+			p->overstep = 0;
 		}
-	}
-
-	return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_it_pre(struct termp *p, const struct mdoc_meta *meta,
-		const struct mdoc_node *node)
-{
-	const struct mdoc_node *n, *it;
-	const struct mdoc_block *bl;
-	int		 i;
-	size_t		 width;
-
-	switch (node->type) {
-	case (MDOC_BODY):
-		/* FALLTHROUGH */
-	case (MDOC_HEAD):
-		it = node->parent;
-		break;
-	case (MDOC_BLOCK):
-		it = node;
-		break;
-	default:
-		return(1);
-	}
 
-	assert(MDOC_BLOCK == it->type);
-	assert(MDOC_It == it->tok);
+		/*
+		 * Skip leading tabs, they were handled above.
+		 */
+		while (i < (int)p->col && '\t' == p->buf[i])
+			i++;
 
-	n = it->parent;
-	assert(MDOC_BODY == n->type);
-	assert(MDOC_Bl == n->tok);
-	n = n->parent;
-	bl = &n->data.block;
+		/* Write out the [remaining] word. */
+		for ( ; i < (int)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++;
+				vbl += (i - j) * (*p->width)(p, ' ');
+				break;
+			}
+			if (ASCII_NBRSP == p->buf[i]) {
+				vbl += (*p->width)(p, ' ');
+				continue;
+			}
 
-	/* If `-compact', don't assert vertical space. */
+			/*
+			 * 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 (MDOC_BLOCK == node->type) {
-		if (arg_hasattr(MDOC_Compact, bl->argc, bl->argv))
-			newln(p);
-		else
-			vspace(p);
-		return(1);
+			if (ASCII_HYPH == p->buf[i]) {
+				(*p->letter)(p, '-');
+				p->viscol += (*p->width)(p, '-');
+			} else {
+				(*p->letter)(p, p->buf[i]);
+				p->viscol += (*p->width)(p, p->buf[i]);
+			}
+		}
+		vend += vbl;
+		vis = vend;
 	}
 
-	assert(MDOC_HEAD == node->type 
-			|| MDOC_BODY == node->type);
+	p->col = 0;
+	p->overstep = 0;
 
-	/* If `-tag', adjust our margins accordingly. */
+	if ( ! (TERMP_NOBREAK & p->flags)) {
+		p->viscol = 0;
+		(*p->endline)(p);
+		return;
+	}
 
-	if (arg_hasattr(MDOC_Tag, bl->argc, bl->argv)) {
-		i = arg_getattr(MDOC_Width, bl->argc, bl->argv);
-		assert(i >= 0); /* XXX */
-		assert(1 == bl->argv[i].sz);
-		width = strlen(*bl->argv[i].value); /* XXX */
+	if (TERMP_HANG & p->flags) {
+		/* We need one blank after the tag. */
+		p->overstep = /* LINTED */
+			vis - maxvis + (*p->width)(p, ' ');
 
-		/* FIXME: nested lists. */
+		/*
+		 * Behave exactly the same way as groff:
+		 * If we have overstepped the margin, temporarily move
+		 * it to the right and flag the rest of the line to be
+		 * shorter.
+		 * If we landed right at the margin, be happy.
+		 * If we are one step before the margin, temporarily
+		 * move it one step LEFT and flag the rest of the line
+		 * to be longer.
+		 */
+		if (p->overstep >= -1) {
+			assert((int)maxvis + p->overstep >= 0);
+			/* LINTED */
+			maxvis += p->overstep;
+		} else
+			p->overstep = 0;
+
+	} else if (TERMP_DANGLE & p->flags)
+		return;
 
-		if (MDOC_HEAD == node->type) {
-			p->flags |= TERMP_NOBREAK;
-			p->flags |= TERMP_NOSPACE;
-			p->rmargin = p->offset + width;
-		} else {
-			p->flags |= TERMP_NOSPACE;
-			p->flags |= TERMP_NOLPAD;
-			p->offset += width + 1;
-		}
+	/* Right-pad. */
+	if (maxvis > vis + /* LINTED */
+			((TERMP_TWOSPACE & p->flags) ? 
+			 (*p->width)(p, ' ') : 0)) {
+		p->viscol += maxvis - vis;
+		(*p->advance)(p, maxvis - vis);
+		vis += (maxvis - vis);
+	} else {	/* ...or newline break. */
+		(*p->endline)(p);
+		p->viscol = p->rmargin;
+		(*p->advance)(p, p->rmargin);
 	}
-
-	return(1);
 }
 
 
-/* ARGSUSED */
-static int
-termp_bold_post(struct termp *p, const struct mdoc_meta *meta,
-		const struct mdoc_node *node)
+/* 
+ * 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)
 {
 
-	p->flags &= ~TERMP_BOLD;
-	return(1);
+	p->flags |= TERMP_NOSPACE;
+	if (0 == p->col && 0 == p->viscol) {
+		p->flags &= ~TERMP_NOLPAD;
+		return;
+	}
+	term_flushln(p);
+	p->flags &= ~TERMP_NOLPAD;
 }
 
 
-/* ARGSUSED */
-static int
-termp_under_pre(struct termp *p, const struct mdoc_meta *meta,
-		const struct mdoc_node *node)
+/*
+ * 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)
 {
 
-	p->flags |= TERMP_UNDERLINE;
-	return(1);
+	term_newln(p);
+	p->viscol = 0;
+	(*p->endline)(p);
 }
 
 
-/* ARGSUSED */
-static int
-termp_bold_pre(struct termp *p, const struct mdoc_meta *meta,
-		const struct mdoc_node *node)
+static void
+spec(struct termp *p, enum roffdeco d, const char *word, size_t len)
 {
-
-	p->flags |= TERMP_BOLD;
-	return(1);
+	const char	*rhs;
+	size_t		 sz;
+
+	rhs = chars_spec2str(p->symtab, word, len, &sz);
+	if (rhs) 
+		encode(p, rhs, sz);
+	else if (DECO_SSPECIAL == d)
+		encode(p, word, len);
 }
 
 
-/* ARGSUSED */
-static int
-termp_ns_pre(struct termp *p, const struct mdoc_meta *meta,
-		const struct mdoc_node *node)
+static void
+res(struct termp *p, const char *word, size_t len)
 {
+	const char	*rhs;
+	size_t		 sz;
 
-	p->flags |= TERMP_NOSPACE;
-	return(1);
+	rhs = chars_res2str(p->symtab, word, len, &sz);
+	if (rhs)
+		encode(p, rhs, sz);
 }
 
 
-/* ARGSUSED */
-static int
-termp_pp_pre(struct termp *p, const struct mdoc_meta *meta,
-		const struct mdoc_node *node)
+void
+term_fontlast(struct termp *p)
 {
+	enum termfont	 f;
 
-	vspace(p);
-	return(1);
+	f = p->fontl;
+	p->fontl = p->fontq[p->fonti];
+	p->fontq[p->fonti] = f;
 }
 
 
-/* ARGSUSED */
-static int
-termp_under_post(struct termp *p, const struct mdoc_meta *meta,
-		const struct mdoc_node *node)
+void
+term_fontrepl(struct termp *p, enum termfont f)
 {
 
-	p->flags &= ~TERMP_UNDERLINE;
-	return(1);
+	p->fontl = p->fontq[p->fonti];
+	p->fontq[p->fonti] = f;
 }
 
 
-/* ARGSUSED */
-static int
-termp_nd_pre(struct termp *p, const struct mdoc_meta *meta,
-		const struct mdoc_node *node)
+void
+term_fontpush(struct termp *p, enum termfont f)
 {
 
-	word(p, "-");
-	return(1);
+	assert(p->fonti + 1 < 10);
+	p->fontl = p->fontq[p->fonti];
+	p->fontq[++p->fonti] = f;
 }
 
 
-/* ARGSUSED */
-static int
-termp_bl_post(struct termp *p, const struct mdoc_meta *meta,
-		const struct mdoc_node *node)
+const void *
+term_fontq(struct termp *p)
 {
 
-	switch (node->type) {
-	case (MDOC_BLOCK):
-		newln(p);
-		break;
-	default:
-		break;
-	}
-	return(1);
+	return(&p->fontq[p->fonti]);
 }
 
 
-/* ARGSUSED */
-static int
-termp_op_post(struct termp *p, const struct mdoc_meta *meta,
-		const struct mdoc_node *node)
+enum termfont
+term_fonttop(struct termp *p)
 {
 
-	switch (node->type) {
-	case (MDOC_BODY):
-		p->flags |= TERMP_NOSPACE;
-		word(p, "\\]");
-		break;
-	default:
-		break;
-	}
-	return(1);
+	return(p->fontq[p->fonti]);
 }
 
 
-/* ARGSUSED */
-static int
-termp_sh_post(struct termp *p, const struct mdoc_meta *meta,
-		const struct mdoc_node *node)
+void
+term_fontpopq(struct termp *p, const void *key)
 {
 
-	switch (node->type) {
-	case (MDOC_HEAD):
-		p->flags &= ~TERMP_BOLD;
-		newln(p);
-		break;
-	case (MDOC_BODY):
-		newln(p);
-		p->offset -= 4;
-		break;
-	default:
-		break;
-	}
-	return(1);
+	while (p->fonti >= 0 && key != &p->fontq[p->fonti])
+		p->fonti--;
+	assert(p->fonti >= 0);
 }
 
 
-/* ARGSUSED */
-static int
-termp_xr_pre(struct termp *p, const struct mdoc_meta *meta,
-		const struct mdoc_node *node)
+void
+term_fontpop(struct termp *p)
 {
-	const struct mdoc_node *n;
 
-	n = node->child;
-	assert(n);
-
-	assert(MDOC_TEXT == n->type);
-	word(p, n->data.text.string);
-
-	if (NULL == (n = n->next)) 
-		return(0);
-
-	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, "\\)");
-
-	return(0);
+	assert(p->fonti);
+	p->fonti--;
 }
 
 
-/* ARGSUSED */
-static int
-termp_sh_pre(struct termp *p, const struct mdoc_meta *meta,
-		const struct mdoc_node *node)
+/*
+ * 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	*sv, *seq;
+	int		 sz;
+	size_t		 ssz;
+	enum roffdeco	 deco;
 
-	switch (node->type) {
-	case (MDOC_HEAD):
-		vspace(p);
-		p->flags |= TERMP_BOLD;
-		break;
-	case (MDOC_BODY):
-		p->offset += 4;
-		break;
-	default:
-		break;
-	}
-	return(1);
-}
+	sv = word;
 
+	if (word[0] && '\0' == word[1])
+		switch (word[0]) {
+		case('.'):
+			/* FALLTHROUGH */
+		case(','):
+			/* FALLTHROUGH */
+		case(';'):
+			/* FALLTHROUGH */
+		case(':'):
+			/* FALLTHROUGH */
+		case('?'):
+			/* FALLTHROUGH */
+		case('!'):
+			/* FALLTHROUGH */
+		case(')'):
+			/* FALLTHROUGH */
+		case(']'):
+			if ( ! (TERMP_IGNDELIM & p->flags))
+				p->flags |= TERMP_NOSPACE;
+			break;
+		default:
+			break;
+		}
 
-/* ARGSUSED */
-static int
-termp_op_pre(struct termp *p, const struct mdoc_meta *meta,
-		const struct mdoc_node *node)
-{
-
-	switch (node->type) {
-	case (MDOC_BODY):
-		word(p, "\\[");
-		p->flags |= TERMP_NOSPACE;
-		break;
-	default:
-		break;
+	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);
 	}
-	return(1);
-}
 
+	if ( ! (p->flags & TERMP_NONOSPACE))
+		p->flags &= ~TERMP_NOSPACE;
 
-/* ARGSUSED */
-static int
-termp_fl_pre(struct termp *p, const struct mdoc_meta *meta,
-		const struct mdoc_node *node)
-{
-
-	p->flags |= TERMP_BOLD;
-	word(p, "-");
-	p->flags |= TERMP_NOSPACE;
-	return(1);
-}
+	p->flags &= ~TERMP_SENTENCE;
 
+	while (*word) {
+		if ((ssz = strcspn(word, "\\")) > 0)
+			encode(p, word, ssz);
 
-static void
-termprint_r(struct termp *p, const struct mdoc_meta *meta,
-		const struct mdoc_node *node)
-{
-	int		 dochild;
-
-	/* Pre-processing ----------------- */
+		word += ssz;
+		if ('\\' != *word)
+			continue;
 
-	dochild = 1;
+		seq = ++word;
+		sz = a2roffdeco(&deco, &seq, &ssz);
 
-	if (MDOC_TEXT != node->type) {
-		if (termacts[node->tok].pre)
-			if ( ! (*termacts[node->tok].pre)(p, meta, node))
-				dochild = 0;
-	} else /* MDOC_TEXT == node->type */
-		word(p, node->data.text.string);
+		switch (deco) {
+		case (DECO_RESERVED):
+			res(p, seq, ssz);
+			break;
+		case (DECO_SPECIAL):
+			/* FALLTHROUGH */
+		case (DECO_SSPECIAL):
+			spec(p, deco, seq, ssz);
+			break;
+		case (DECO_BOLD):
+			term_fontrepl(p, TERMFONT_BOLD);
+			break;
+		case (DECO_ITALIC):
+			term_fontrepl(p, TERMFONT_UNDER);
+			break;
+		case (DECO_ROMAN):
+			term_fontrepl(p, TERMFONT_NONE);
+			break;
+		case (DECO_PREVIOUS):
+			term_fontlast(p);
+			break;
+		default:
+			break;
+		}
 
-	/* Children ---------------------- */
+		word += sz;
+		if (DECO_NOSPACE == deco && '\0' == *word)
+			p->flags |= TERMP_NOSPACE;
+	}
 
-	if (dochild && NULL == node->child) {
-		/* No-child processing. */
-		switch (node->type) {
-		case (MDOC_ELEM):
-			switch (node->tok) {
-			case (MDOC_Nm):
-				word(p, "progname"); /* TODO */
-				break;
-			case (MDOC_Ar):
-				word(p, "..."); 
-				break;
-			default:
-				break;
-			}
+	/* 
+	 * Note that we don't process the pipe: the parser sees it as
+	 * punctuation, but we don't in terms of typography.
+	 */
+	if (sv[0] && '\0' == sv[1])
+		switch (sv[0]) {
+		case('('):
+			/* FALLTHROUGH */
+		case('['):
+			p->flags |= TERMP_NOSPACE;
 			break;
 		default:
 			break;
 		}
-	} else if (dochild)
-		termprint_r(p, meta, node->child);
+}
 
-	/* Post-processing --------------- */
 
-	if (MDOC_TEXT != node->type) {
-		if (termacts[node->tok].post)
-			if ( ! (*termacts[node->tok].post)(p, meta, node))
-				return;
-	} 
+static void
+adjbuf(struct termp *p, size_t sz)
+{
 
-	/* Siblings ---------------------- */
+	if (0 == p->maxcols)
+		p->maxcols = 1024;
+	while (sz >= p->maxcols)
+		p->maxcols <<= 2;
 
-	if (node->next)
-		termprint_r(p, meta, node->next);
+	p->buf = realloc(p->buf, p->maxcols);
+	if (NULL == p->buf) {
+		perror(NULL);
+		exit(EXIT_FAILURE);
+	}
 }
 
 
 static void
-termprint_footer(struct termp *p, const struct mdoc_meta *meta)
+bufferc(struct termp *p, char c)
 {
-	struct tm	*tm;
-	char		*buf, *os;
-	size_t		 sz, osz, ssz, i;
-
-	if (NULL == (buf = malloc(p->rmargin)))
-		err(1, "malloc");
-	if (NULL == (os = malloc(p->rmargin)))
-		err(1, "malloc");
-
-	tm = localtime(&meta->date);
-	if (NULL == strftime(buf, p->rmargin, "%B %d, %Y", tm))
-		err(1, "strftime");
-
-	osz = strlcpy(os, meta->os, p->rmargin);
-
-	sz = strlen(buf);
-	ssz = sz + osz + 1;
-
-	if (ssz > p->rmargin) {
-		ssz -= p->rmargin;
-		assert(ssz <= osz);
-		os[osz - ssz] = 0;
-		ssz = 1;
-	} else
-		ssz = p->rmargin - ssz + 1;
-
-	printf("\n");
-	printf("%s", os);
-	for (i = 0; i < ssz; i++)
-		printf(" ");
-
-	printf("%s\n", buf);
-	fflush(stdout);
-
-	free(buf);
-	free(os);
+
+	if (p->col + 1 >= p->maxcols)
+		adjbuf(p, p->col + 1);
+
+	p->buf[(int)p->col++] = c;
 }
 
 
 static void
-termprint_header(struct termp *p, const struct mdoc_meta *meta)
+encode(struct termp *p, const char *word, size_t sz)
 {
-	char		*msec, *buf, *title, *pp;
-	size_t		 ssz, tsz, ttsz, i;;
+	enum termfont	  f;
+	int		  i;
 
-	if (NULL == (buf = malloc(p->rmargin)))
-		err(1, "malloc");
-	if (NULL == (title = malloc(p->rmargin)))
-		err(1, "malloc");
+	/*
+	 * Encode and buffer a string of characters.  If the current
+	 * font mode is unset, buffer directly, else encode then buffer
+	 * character by character.
+	 */
 
-	if (NULL == (pp = mdoc_vol2a(meta->vol)))
-		switch (meta->msec) {
-		case (MSEC_1):
-			/* FALLTHROUGH */
-		case (MSEC_6):
-			/* FALLTHROUGH */
-		case (MSEC_7):
-			pp = mdoc_vol2a(VOL_URM);
-			break;
-		case (MSEC_8):
-			pp = mdoc_vol2a(VOL_SMM);
-			break;
-		case (MSEC_2):
-			/* FALLTHROUGH */
-		case (MSEC_3):
-			/* FALLTHROUGH */
-		case (MSEC_4):
-			/* FALLTHROUGH */
-		case (MSEC_5):
-			pp = mdoc_vol2a(VOL_PRM);
-			break;
-		case (MSEC_9):
-			pp = mdoc_vol2a(VOL_KM);
-			break;
-		default:
-			/* FIXME: capitalise. */
-			if (NULL == (pp = mdoc_msec2a(meta->msec)))
-				pp = mdoc_msec2a(MSEC_local);
-			break;
-		}
-	assert(pp);
-
-	tsz = strlcpy(buf, pp, p->rmargin);
-	assert(tsz < p->rmargin);
-
-	if ((pp = mdoc_arch2a(meta->arch))) {
-		tsz = strlcat(buf, " (", p->rmargin);
-		assert(tsz < p->rmargin);
-		tsz = strlcat(buf, pp, p->rmargin);
-		assert(tsz < p->rmargin);
-		tsz = strlcat(buf, ")", p->rmargin);
-		assert(tsz < p->rmargin);
+	if (TERMFONT_NONE == (f = term_fonttop(p))) {
+		if (p->col + sz >= p->maxcols) 
+			adjbuf(p, p->col + sz);
+		memcpy(&p->buf[(int)p->col], word, sz);
+		p->col += sz;
+		return;
 	}
 
-	ttsz = strlcpy(title, meta->title, p->rmargin);
-
-	if (NULL == (msec = mdoc_msec2a(meta->msec)))
-		msec = "";
+	/* Pre-buffer, assuming worst-case. */
 
-	ssz = (2 * (ttsz + 2 + strlen(msec))) + tsz + 2;
+	if (p->col + 1 + (sz * 3) >= p->maxcols)
+		adjbuf(p, p->col + 1 + (sz * 3));
 
-	if (ssz > p->rmargin) {
-		if ((ssz -= p->rmargin) % 2)
-			ssz++;
-		ssz /= 2;
-	
-		assert(ssz <= ttsz);
-		title[ttsz - ssz] = 0;
-		ssz = 1;
-	} else
-		ssz = ((p->rmargin - ssz) / 2) + 1;
-
-	printf("%s(%s)", title, msec);
+	for (i = 0; i < (int)sz; i++) {
+		if ( ! isgraph((u_char)word[i])) {
+			p->buf[(int)p->col++] = word[i];
+			continue;
+		}
 
-	for (i = 0; i < ssz; i++)
-		printf(" ");
+		if (TERMFONT_UNDER == f)
+			p->buf[(int)p->col++] = '_';
+		else
+			p->buf[(int)p->col++] = word[i];
 
-	printf("%s", buf);
+		p->buf[(int)p->col++] = 8;
+		p->buf[(int)p->col++] = word[i];
+	}
+}
 
-	for (i = 0; i < ssz; i++)
-		printf(" ");
 
-	printf("%s(%s)\n", title, msec);
-	fflush(stdout);
+size_t
+term_len(const struct termp *p, size_t sz)
+{
 
-	free(title);
-	free(buf);
+	return((*p->width)(p, ' ') * sz);
 }
 
 
-int
-termprint(const struct mdoc_node *node,
-		const struct mdoc_meta *meta)
+size_t
+term_strlen(const struct termp *p, const char *cp)
 {
-	struct termp	 p;
+	size_t		 sz;
 
-	if (ERR == setupterm(NULL, STDOUT_FILENO, NULL))
-		return(0);
+	for (sz = 0; *cp; cp++)
+		sz += (*p->width)(p, *cp);
 
-	p.maxrmargin = columns < 60 ? 60 : (size_t)columns;
-	p.rmargin = p.maxrmargin;
-	p.maxcols = 1024;
-	p.offset = p.col = 0;
-	p.flags = TERMP_NOSPACE;
+	return(sz);
+}
 
-	if (NULL == (p.buf = malloc(p.maxcols)))
-		err(1, "malloc");
 
-	termprint_header(&p, meta);
-	termprint_r(&p, meta, node);
-	termprint_footer(&p, meta);
+/* ARGSUSED */
+size_t
+term_vspan(const struct termp *p, const struct roffsu *su)
+{
+	double		 r;
 
-	free(p.buf);
+	switch (su->unit) {
+	case (SCALE_CM):
+		r = su->scale * 2;
+		break;
+	case (SCALE_IN):
+		r = su->scale * 6;
+		break;
+	case (SCALE_PC):
+		r = su->scale;
+		break;
+	case (SCALE_PT):
+		r = su->scale / 8;
+		break;
+	case (SCALE_MM):
+		r = su->scale / 1000;
+		break;
+	case (SCALE_VS):
+		r = su->scale;
+		break;
+	default:
+		r = su->scale - 1;
+		break;
+	}
 
-	return(1);
+	if (r < 0.0)
+		r = 0.0;
+	return(/* LINTED */(size_t)
+			r);
 }
 
 
+size_t
+term_hspan(const struct termp *p, const struct roffsu *su)
+{
+	double		 v;
+
+	v = ((*p->hspan)(p, su));
+	if (v < 0.0)
+		v = 0.0;
+	return((size_t) /* LINTED */
+			v);
+}