]> git.cameronkatri.com Git - mandoc.git/blobdiff - term.c
1. Eliminate struct eqn, instead use the existing members
[mandoc.git] / term.c
diff --git a/term.c b/term.c
index 2fc3b40e401704479c4b33f1bf569b6b63d59827..595390b671b44eb8549fadb092d7d3c4214955a6 100644 (file)
--- a/term.c
+++ b/term.c
-/* $Id: term.c,v 1.4 2009/02/21 15:34:46 kristaps Exp $ */
+/*     $Id: term.c,v 1.273 2017/06/14 23:24:18 schwarze Exp $ */
 /*
- * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010-2017 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 AUTHORS DISCLAIM ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include "config.h"
+
+#include <sys/types.h>
+
 #include <assert.h>
 #include <ctype.h>
-#include <curses.h>
-#include <err.h>
-#include <stdlib.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 "mandoc_aux.h"
+#include "out.h"
+#include "term.h"
+#include "main.h"
 
+static size_t           cond_width(const struct termp *, int, int *);
+static void             adjbuf(struct termp_col *, size_t);
+static void             bufferc(struct termp *, char);
+static void             encode(struct termp *, const char *, size_t);
+static void             encode1(struct termp *, int);
+static void             endline(struct termp *);
 
-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);
+void
+term_setcol(struct termp *p, size_t maxtcol)
+{
+       if (maxtcol > p->maxtcol) {
+               p->tcols = mandoc_recallocarray(p->tcols,
+                   p->maxtcol, maxtcol, sizeof(*p->tcols));
+               p->maxtcol = maxtcol;
+       }
+       p->lasttcol = maxtcol - 1;
+       p->tcol = p->tcols;
 }
 
+void
+term_free(struct termp *p)
+{
+       for (p->tcol = p->tcols; p->tcol < p->tcols + p->maxtcol; p->tcol++)
+               free(p->tcol->buf);
+       free(p->tcols);
+       free(p->fontq);
+       free(p);
+}
 
-static void
-flushln(struct termp *p)
+void
+term_begin(struct termp *p, term_margin head,
+               term_margin foot, const struct roff_meta *arg)
 {
-       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.
-        */
+       p->headf = head;
+       p->footf = foot;
+       p->argf = arg;
+       (*p->begin)(p);
+}
 
-       assert(p->offset < p->rmargin);
-       maxvis = p->rmargin - p->offset;
-       vis = 0;
+void
+term_end(struct termp *p)
+{
 
-       /*
-        * If in the standard case (left-justified), then begin with our
-        * indentation, otherwise (columns, etc.) just start spitting
-        * out text.
-        */
+       (*p->end)(p);
+}
 
-       if ( ! (p->flags & TERMP_NOLPAD))
-               /* LINTED */
-               for (j = 0; j < p->offset; j++)
-                       putchar(' ');
+/*
+ * Flush a chunk of text.  By default, break the output line each time
+ * the right margin is reached, and continue output on the next line
+ * at the same offset as the chunk itself.  By default, also break the
+ * output line at the end of the chunk.
+ * The following flags may be specified:
+ *
+ *  - TERMP_NOBREAK: Do not break the output line at the right margin,
+ *    but only at the max right margin.  Also, do not break the output
+ *    line at the end of the chunk, such that the next call can pad to
+ *    the next column.  However, if less than p->trailspace blanks,
+ *    which can be 0, 1, or 2, remain to the right margin, the line
+ *    will be broken.
+ *  - TERMP_BRTRSP: Consider trailing whitespace significant
+ *    when deciding whether the chunk fits or not.
+ *  - TERMP_BRIND: If the chunk does not fit and the output line has
+ *    to be broken, start the next line at the right margin instead
+ *    of at the offset.  Used together with TERMP_NOBREAK for the tags
+ *    in various kinds of tagged lists.
+ *  - TERMP_HANG: Do not break the output line at the right margin,
+ *    append the next chunk after it even if this one is too long.
+ *    To be used together with TERMP_NOBREAK.
+ *  - TERMP_NOPAD: Start writing at the current position,
+ *    do not pad with blank characters up to the offset.
+ */
+void
+term_flushln(struct termp *p)
+{
+       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 */
+       size_t           j;     /* temporary loop index for p->tcol->buf */
+       size_t           jhy;   /* last hyph before overflow w/r/t j */
+       size_t           maxvis; /* output position of visible boundary */
+       int              ntab;  /* number of tabs to prepend */
+       int              breakline; /* after this word */
+
+       vbl = (p->flags & TERMP_NOPAD) || p->tcol->offset < p->viscol ?
+           0 : p->tcol->offset - p->viscol;
+       if (p->minbl && vbl < p->minbl)
+               vbl = p->minbl;
+       maxvis = p->tcol->rmargin > p->viscol + vbl ?
+           p->tcol->rmargin - p->viscol - vbl : 0;
+       bp = !(p->flags & TERMP_NOBREAK) ? maxvis :
+           p->maxrmargin > p->viscol + vbl ?
+           p->maxrmargin - p->viscol - vbl : 0;
+       vis = vend = 0;
+
+       if ((p->flags && TERMP_MULTICOL) == 0)
+               p->tcol->col = 0;
+       while (p->tcol->col < p->tcol->lastcol) {
 
-       for (i = 0; i < p->col; i++) {
                /*
-                * Count up visible word characters.  Control sequences
-                * (starting with the CSI) aren't counted. 
+                * Handle literal tab characters: collapse all
+                * subsequent tabs into a single huge set of spaces.
                 */
-               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++;
+               ntab = 0;
+               while (p->tcol->col < p->tcol->lastcol &&
+                   p->tcol->buf[p->tcol->col] == '\t') {
+                       vend = term_tab_next(vis);
+                       vbl += vend - vis;
+                       vis = vend;
+                       ntab++;
+                       p->tcol->col++;
                }
-               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).
+                * 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).
                 */
 
-               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");
-               }
+               jhy = 0;
+               breakline = 0;
+               for (j = p->tcol->col; j < p->tcol->lastcol; j++) {
+                       if (p->tcol->buf[j] == '\n') {
+                               if ((p->flags & TERMP_BRIND) == 0)
+                                       breakline = 1;
+                               continue;
+                       }
+                       if (p->tcol->buf[j] == ' ' || p->tcol->buf[j] == '\t')
+                               break;
 
-               /* 
-                * Write out the word and a trailing space.  Omit the
-                * space if we're the last word in the line.
-                */
+                       /* Back over the last printed character. */
+                       if (p->tcol->buf[j] == '\b') {
+                               assert(j);
+                               vend -= (*p->width)(p, p->tcol->buf[j - 1]);
+                               continue;
+                       }
 
-               for ( ; i < p->col; i++) {
-                       if (isspace(p->buf[i]))
-                               break;
-                       putchar(p->buf[i]);
+                       /* Regular word. */
+                       /* Break at the hyphen point if we overrun. */
+                       if (vend > vis && vend < bp &&
+                           (p->tcol->buf[j] == ASCII_HYPH||
+                            p->tcol->buf[j] == ASCII_BREAK))
+                               jhy = j;
+
+                       /*
+                        * Hyphenation now decided, put back a real
+                        * hyphen such that we get the correct width.
+                        */
+                       if (p->tcol->buf[j] == ASCII_HYPH)
+                               p->tcol->buf[j] = '-';
+
+                       vend += (*p->width)(p, p->tcol->buf[j]);
                }
-               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.
-        */
+               /*
+                * Find out whether we would exceed the right margin.
+                * If so, break to the next line.
+                */
 
-       if (p->flags & TERMP_NOBREAK) {
-               for ( ; vis <= maxvis; vis++)
-                       putchar(' ');
-       } else
-               putchar('\n');
+               if (vend > bp && jhy == 0 && vis > 0 &&
+                   (p->flags & TERMP_BRNEVER) == 0) {
+                       if (p->flags & TERMP_MULTICOL)
+                               return;
 
-       p->col = 0;
-}
+                       endline(p);
+                       vend -= vis;
 
+                       /* Use pending tabs on the new line. */
 
-static void
-newln(struct termp *p)
-{
+                       vbl = 0;
+                       while (ntab--)
+                               vbl = term_tab_next(vbl);
 
-       /* 
-        * A newline only breaks an existing line; it won't assert
-        * vertical space.
-        */
-       p->flags |= TERMP_NOSPACE;
-       if (0 == p->col) 
-               return;
-       flushln(p);
-}
+                       /* Re-establish indentation. */
 
+                       if (p->flags & TERMP_BRIND)
+                               vbl += p->tcol->rmargin;
+                       else
+                               vbl += p->tcol->offset;
+                       maxvis = p->tcol->rmargin > vbl ?
+                           p->tcol->rmargin - vbl : 0;
+                       bp = !(p->flags & TERMP_NOBREAK) ? maxvis :
+                           p->maxrmargin > vbl ?  p->maxrmargin - vbl : 0;
+               }
 
-static void
-vspace(struct termp *p)
-{
+               /*
+                * Write out the rest of the word.
+                */
 
-       /*
-        * Asserts a vertical space (a full, empty line-break between
-        * lines).
-        */
-       newln(p);
-       putchar('\n');
-}
+               for ( ; p->tcol->col < p->tcol->lastcol; p->tcol->col++) {
+                       if (vend > bp && jhy > 0 && p->tcol->col > jhy)
+                               break;
+                       if (p->tcol->buf[p->tcol->col] == '\n')
+                               continue;
+                       if (p->tcol->buf[p->tcol->col] == '\t')
+                               break;
+                       if (p->tcol->buf[p->tcol->col] == ' ') {
+                               j = p->tcol->col;
+                               while (p->tcol->col < p->tcol->lastcol &&
+                                   p->tcol->buf[p->tcol->col] == ' ')
+                                       p->tcol->col++;
+                               dv = (p->tcol->col - j) * (*p->width)(p, ' ');
+                               vbl += dv;
+                               vend += dv;
+                               break;
+                       }
+                       if (p->tcol->buf[p->tcol->col] == ASCII_NBRSP) {
+                               vbl += (*p->width)(p, ' ');
+                               continue;
+                       }
+                       if (p->tcol->buf[p->tcol->col] == ASCII_BREAK)
+                               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;
+                       }
 
+                       (*p->letter)(p, p->tcol->buf[p->tcol->col]);
+                       if (p->tcol->buf[p->tcol->col] == '\b')
+                               p->viscol -= (*p->width)(p,
+                                   p->tcol->buf[p->tcol->col - 1]);
+                       else
+                               p->viscol += (*p->width)(p,
+                                   p->tcol->buf[p->tcol->col]);
+               }
+               vis = vend;
 
-static void
-chara(struct termp *p, char c)
-{
+               if (breakline == 0)
+                       continue;
 
-       /* TODO: dynamically expand the buffer. */
-       if (p->col + 1 >= p->maxcols)
-               errx(1, "line overrun");
-       p->buf[(p->col)++] = c;
-}
+               /* Explicitly requested output line break. */
 
+               if (p->flags & TERMP_MULTICOL)
+                       return;
 
-static void
-escape(struct termp *p, enum termesc esc)
-{
+               endline(p);
+               breakline = 0;
+               vis = vend = 0;
 
-       if (p->col + 4 >= p->maxcols)
-               errx(1, "line overrun");
+               /* Re-establish indentation. */
 
-       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 */
+               vbl = p->tcol->offset;
+               maxvis = p->tcol->rmargin > vbl ?
+                   p->tcol->rmargin - vbl : 0;
+               bp = !(p->flags & TERMP_NOBREAK) ? maxvis :
+                   p->maxrmargin > vbl ?  p->maxrmargin - vbl : 0;
        }
-       p->buf[(p->col)++] = 'm';
-}
-
-
-static void
-pword(struct termp *p, const char *word, size_t len)
-{
-       size_t           i;
 
-       assert(len > 0);
+       /*
+        * If there was trailing white space, it was not printed;
+        * so reset the cursor position accordingly.
+        */
 
-       if ( ! (p->flags & TERMP_NOSPACE))
-               chara(p, ' ');
+       if (vis > vbl)
+               vis -= vbl;
+       else
+               vis = 0;
 
-       p->flags &= ~TERMP_NOSPACE;
+       p->col = p->tcol->col = p->tcol->lastcol = 0;
+       p->minbl = p->trailspace;
+       p->flags &= ~(TERMP_BACKAFTER | TERMP_BACKBEFORE | TERMP_NOPAD);
 
-       if (p->flags & TERMP_BOLD)
-               escape(p, ESC_BOLD);
-       if (p->flags & TERMP_UNDERLINE)
-               escape(p, ESC_UNDERLINE);
+       if (p->flags & TERMP_MULTICOL)
+               return;
 
-       /* TODO: escape patterns. */
+       /* Trailing whitespace is significant in some columns. */
 
-       for (i = 0; i < len; i++) 
-               chara(p, word[i]);
+       if (vis && vbl && (TERMP_BRTRSP & p->flags))
+               vis += vbl;
 
-       if (p->flags & TERMP_BOLD ||
-                       p->flags & TERMP_UNDERLINE)
-               escape(p, ESC_CLEAR);
+       /* If the column was overrun, break the line. */
+       if ((p->flags & TERMP_NOBREAK) == 0 ||
+           ((p->flags & TERMP_HANG) == 0 &&
+            vis + p->trailspace * (*p->width)(p, ' ') > maxvis))
+               endline(p);
 }
 
-
 static void
-word(struct termp *p, const char *word)
+endline(struct termp *p)
 {
-       size_t           i, j, len;
-
-       if (mdoc_isdelim(word))
-               p->flags |= TERMP_NOSPACE;
-
-       len = strlen(word);
-       assert(len > 0);
-
-       /* LINTED */
-       for (j = i = 0; i < len; i++) {
-               if ( ! isspace(word[i])) {
-                       j++;
-                       continue;
-               }
-               if (0 == j)
-                       continue;
-               assert(i >= j);
-               pword(p, &word[i - j], j);
-               j = 0;
+       if ((p->flags & (TERMP_NEWMC | TERMP_ENDMC)) == TERMP_ENDMC) {
+               p->mc = NULL;
+               p->flags &= ~TERMP_ENDMC;
        }
-       if (j > 0) {
-               assert(i >= j);
-               pword(p, &word[i - j], j);
+       if (p->mc != NULL) {
+               if (p->viscol && p->maxrmargin >= p->viscol)
+                       (*p->advance)(p, p->maxrmargin - p->viscol + 1);
+               p->flags |= TERMP_NOBUF | TERMP_NOSPACE;
+               term_word(p, p->mc);
+               p->flags &= ~(TERMP_NOBUF | TERMP_NEWMC);
        }
+       p->viscol = 0;
+       p->minbl = 0;
+       (*p->endline)(p);
 }
 
-
-/* ARGSUSED */
-static int
-termp_it_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)
 {
-       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);
-       }
 
-       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;
-               }
-       }
-
-       return(1);
+       p->flags |= TERMP_NOSPACE;
+       if (p->tcol->lastcol || p->viscol)
+               term_flushln(p);
 }
 
-
-/* ARGSUSED */
-static int
-termp_it_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)
 {
-       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);
-
-       n = it->parent;
-       assert(MDOC_BODY == n->type);
-       assert(MDOC_Bl == n->tok);
-       n = n->parent;
-       bl = &n->data.block;
-
-       /* If `-compact', don't assert vertical space. */
-
-       if (MDOC_BLOCK == node->type) {
-               if (arg_hasattr(MDOC_Compact, bl->argc, bl->argv))
-                       newln(p);
-               else
-                       vspace(p);
-               return(1);
-       }
-
-       assert(MDOC_HEAD == node->type 
-                       || MDOC_BODY == node->type);
-
-       /* 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); /* XXX */
-               assert(1 == bl->argv[i].sz);
-               width = strlen(*bl->argv[i].value); /* XXX */
 
-               /* FIXME: nested lists. */
-
-               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;
-               }
-       }
-
-       return(1);
+       term_newln(p);
+       p->viscol = 0;
+       p->minbl = 0;
+       if (0 < p->skipvsp)
+               p->skipvsp--;
+       else
+               (*p->endline)(p);
 }
 
-
-/* ARGSUSED */
-static int
-termp_bold_post(struct termp *p, const struct mdoc_meta *meta,
-               const struct mdoc_node *node)
+/* Swap current and previous font; for \fP and .ft P */
+void
+term_fontlast(struct termp *p)
 {
+       enum termfont    f;
 
-       p->flags &= ~TERMP_BOLD;
-       return(1);
+       f = p->fontl;
+       p->fontl = p->fontq[p->fonti];
+       p->fontq[p->fonti] = f;
 }
 
-
-/* ARGSUSED */
-static int
-termp_under_pre(struct termp *p, const struct mdoc_meta *meta,
-               const struct mdoc_node *node)
+/* Set font, save current, discard previous; for \f, .ft, .B etc. */
+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_bold_pre(struct termp *p, const struct mdoc_meta *meta,
-               const struct mdoc_node *node)
+/* Set font, save previous. */
+void
+term_fontpush(struct termp *p, enum termfont f)
 {
 
-       p->flags |= TERMP_BOLD;
-       return(1);
+       p->fontl = p->fontq[p->fonti];
+       if (++p->fonti == p->fontsz) {
+               p->fontsz += 8;
+               p->fontq = mandoc_reallocarray(p->fontq,
+                   p->fontsz, sizeof(*p->fontq));
+       }
+       p->fontq[p->fonti] = f;
 }
 
-
-/* ARGSUSED */
-static int
-termp_ns_pre(struct termp *p, const struct mdoc_meta *meta,
-               const struct mdoc_node *node)
+/* Flush to make the saved pointer current again. */
+void
+term_fontpopq(struct termp *p, int i)
 {
 
-       p->flags |= TERMP_NOSPACE;
-       return(1);
+       assert(i >= 0);
+       if (p->fonti > i)
+               p->fonti = i;
 }
 
-
-/* ARGSUSED */
-static int
-termp_pp_pre(struct termp *p, const struct mdoc_meta *meta,
-               const struct mdoc_node *node)
+/* Pop one font off the stack. */
+void
+term_fontpop(struct termp *p)
 {
 
-       vspace(p);
-       return(1);
+       assert(p->fonti);
+       p->fonti--;
 }
 
-
-/* ARGSUSED */
-static int
-termp_under_post(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)
 {
+       struct roffsu    su;
+       const char       nbrsp[2] = { ASCII_NBRSP, 0 };
+       const char      *seq, *cp;
+       int              sz, uc;
+       size_t           csz, lsz, ssz;
+       enum mandoc_esc  esc;
+
+       if ((p->flags & TERMP_NOBUF) == 0) {
+               if ((p->flags & TERMP_NOSPACE) == 0) {
+                       if ((p->flags & TERMP_KEEP) == 0) {
+                               bufferc(p, ' ');
+                               if (p->flags & TERMP_SENTENCE)
+                                       bufferc(p, ' ');
+                       } else
+                               bufferc(p, ASCII_NBRSP);
+               }
+               if (p->flags & TERMP_PREKEEP)
+                       p->flags |= TERMP_KEEP;
+               if (p->flags & TERMP_NONOSPACE)
+                       p->flags |= TERMP_NOSPACE;
+               else
+                       p->flags &= ~TERMP_NOSPACE;
+               p->flags &= ~(TERMP_SENTENCE | TERMP_NONEWLINE);
+               p->skipvsp = 0;
+       }
 
-       p->flags &= ~TERMP_UNDERLINE;
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_nd_pre(struct termp *p, const struct mdoc_meta *meta,
-               const struct mdoc_node *node)
-{
+       while ('\0' != *word) {
+               if ('\\' != *word) {
+                       if (TERMP_NBRWORD & p->flags) {
+                               if (' ' == *word) {
+                                       encode(p, nbrsp, 1);
+                                       word++;
+                                       continue;
+                               }
+                               ssz = strcspn(word, "\\ ");
+                       } else
+                               ssz = strcspn(word, "\\");
+                       encode(p, word, ssz);
+                       word += (int)ssz;
+                       continue;
+               }
 
-       word(p, "-");
-       return(1);
-}
+               word++;
+               esc = mandoc_escape(&word, &seq, &sz);
+               if (ESCAPE_ERROR == esc)
+                       continue;
 
+               switch (esc) {
+               case ESCAPE_UNICODE:
+                       uc = mchars_num2uc(seq + 1, sz - 1);
+                       break;
+               case ESCAPE_NUMBERED:
+                       uc = mchars_num2char(seq, sz);
+                       if (uc < 0)
+                               continue;
+                       break;
+               case ESCAPE_SPECIAL:
+                       if (p->enc == TERMENC_ASCII) {
+                               cp = mchars_spec2str(seq, sz, &ssz);
+                               if (cp != NULL)
+                                       encode(p, cp, ssz);
+                       } else {
+                               uc = mchars_spec2cp(seq, sz);
+                               if (uc > 0)
+                                       encode1(p, uc);
+                       }
+                       continue;
+               case ESCAPE_FONTBOLD:
+                       term_fontrepl(p, TERMFONT_BOLD);
+                       continue;
+               case ESCAPE_FONTITALIC:
+                       term_fontrepl(p, TERMFONT_UNDER);
+                       continue;
+               case ESCAPE_FONTBI:
+                       term_fontrepl(p, TERMFONT_BI);
+                       continue;
+               case ESCAPE_FONT:
+               case ESCAPE_FONTROMAN:
+                       term_fontrepl(p, TERMFONT_NONE);
+                       continue;
+               case ESCAPE_FONTPREV:
+                       term_fontlast(p);
+                       continue;
+               case ESCAPE_BREAK:
+                       bufferc(p, '\n');
+                       continue;
+               case ESCAPE_NOSPACE:
+                       if (p->flags & TERMP_BACKAFTER)
+                               p->flags &= ~TERMP_BACKAFTER;
+                       else if (*word == '\0')
+                               p->flags |= (TERMP_NOSPACE | TERMP_NONEWLINE);
+                       continue;
+               case ESCAPE_HORIZ:
+                       if (*seq == '|') {
+                               seq++;
+                               uc = -p->col;
+                       } else
+                               uc = 0;
+                       if (a2roffsu(seq, &su, SCALE_EM) == NULL)
+                               continue;
+                       uc += term_hen(p, &su);
+                       if (uc > 0)
+                               while (uc-- > 0)
+                                       bufferc(p, ASCII_NBRSP);
+                       else if (p->col > (size_t)(-uc))
+                               p->col += uc;
+                       else {
+                               uc += p->col;
+                               p->col = 0;
+                               if (p->tcol->offset > (size_t)(-uc)) {
+                                       p->ti += uc;
+                                       p->tcol->offset += uc;
+                               } else {
+                                       p->ti -= p->tcol->offset;
+                                       p->tcol->offset = 0;
+                               }
+                       }
+                       continue;
+               case ESCAPE_HLINE:
+                       if ((cp = a2roffsu(seq, &su, SCALE_EM)) == NULL)
+                               continue;
+                       uc = term_hen(p, &su);
+                       if (uc <= 0) {
+                               if (p->tcol->rmargin <= p->tcol->offset)
+                                       continue;
+                               lsz = p->tcol->rmargin - p->tcol->offset;
+                       } else
+                               lsz = uc;
+                       if (*cp == seq[-1])
+                               uc = -1;
+                       else if (*cp == '\\') {
+                               seq = cp + 1;
+                               esc = mandoc_escape(&seq, &cp, &sz);
+                               switch (esc) {
+                               case ESCAPE_UNICODE:
+                                       uc = mchars_num2uc(cp + 1, sz - 1);
+                                       break;
+                               case ESCAPE_NUMBERED:
+                                       uc = mchars_num2char(cp, sz);
+                                       break;
+                               case ESCAPE_SPECIAL:
+                                       uc = mchars_spec2cp(cp, sz);
+                                       break;
+                               default:
+                                       uc = -1;
+                                       break;
+                               }
+                       } else
+                               uc = *cp;
+                       if (uc < 0x20 || (uc > 0x7E && uc < 0xA0))
+                               uc = '_';
+                       if (p->enc == TERMENC_ASCII) {
+                               cp = ascii_uc2str(uc);
+                               csz = term_strlen(p, cp);
+                               ssz = strlen(cp);
+                       } else
+                               csz = (*p->width)(p, uc);
+                       while (lsz >= csz) {
+                               if (p->enc == TERMENC_ASCII)
+                                       encode(p, cp, ssz);
+                               else
+                                       encode1(p, uc);
+                               lsz -= csz;
+                       }
+                       continue;
+               case ESCAPE_SKIPCHAR:
+                       p->flags |= TERMP_BACKAFTER;
+                       continue;
+               case ESCAPE_OVERSTRIKE:
+                       cp = seq + sz;
+                       while (seq < cp) {
+                               if (*seq == '\\') {
+                                       mandoc_escape(&seq, NULL, NULL);
+                                       continue;
+                               }
+                               encode1(p, *seq++);
+                               if (seq < cp) {
+                                       if (p->flags & TERMP_BACKBEFORE)
+                                               p->flags |= TERMP_BACKAFTER;
+                                       else
+                                               p->flags |= TERMP_BACKBEFORE;
+                               }
+                       }
+                       /* Trim trailing backspace/blank pair. */
+                       if (p->tcol->lastcol > 2 &&
+                           (p->tcol->buf[p->tcol->lastcol - 1] == ' ' ||
+                            p->tcol->buf[p->tcol->lastcol - 1] == '\t'))
+                               p->tcol->lastcol -= 2;
+                       if (p->col > p->tcol->lastcol)
+                               p->col = p->tcol->lastcol;
+                       continue;
+               default:
+                       continue;
+               }
 
-/* ARGSUSED */
-static int
-termp_bl_post(struct termp *p, const struct mdoc_meta *meta,
-               const struct mdoc_node *node)
-{
+               /*
+                * Common handling for Unicode and numbered
+                * character escape sequences.
+                */
 
-       switch (node->type) {
-       case (MDOC_BLOCK):
-               newln(p);
-               break;
-       default:
-               break;
+               if (p->enc == TERMENC_ASCII) {
+                       cp = ascii_uc2str(uc);
+                       encode(p, cp, strlen(cp));
+               } else {
+                       if ((uc < 0x20 && uc != 0x09) ||
+                           (uc > 0x7E && uc < 0xA0))
+                               uc = 0xFFFD;
+                       encode1(p, uc);
+               }
        }
-       return(1);
+       p->flags &= ~TERMP_NBRWORD;
 }
 
-
-/* ARGSUSED */
-static int
-termp_op_post(struct termp *p, const struct mdoc_meta *meta,
-               const struct mdoc_node *node)
+static void
+adjbuf(struct termp_col *c, size_t sz)
 {
-
-       switch (node->type) {
-       case (MDOC_BODY):
-               p->flags |= TERMP_NOSPACE;
-               word(p, "\\]");
-               break;
-       default:
-               break;
-       }
-       return(1);
+       if (c->maxcols == 0)
+               c->maxcols = 1024;
+       while (c->maxcols <= sz)
+               c->maxcols <<= 2;
+       c->buf = mandoc_reallocarray(c->buf, c->maxcols, sizeof(*c->buf));
 }
 
-
-/* ARGSUSED */
-static int
-termp_sh_post(struct termp *p, const struct mdoc_meta *meta,
-               const struct mdoc_node *node)
+static void
+bufferc(struct termp *p, char c)
 {
-
-       switch (node->type) {
-       case (MDOC_HEAD):
-               p->flags &= ~TERMP_BOLD;
-               newln(p);
-               break;
-       case (MDOC_BODY):
-               newln(p);
-               p->offset -= 4;
-               break;
-       default:
-               break;
+       if (p->flags & TERMP_NOBUF) {
+               (*p->letter)(p, c);
+               return;
        }
-       return(1);
+       if (p->col + 1 >= p->tcol->maxcols)
+               adjbuf(p->tcol, p->col + 1);
+       if (p->tcol->lastcol <= p->col || (c != ' ' && c != ASCII_NBRSP))
+               p->tcol->buf[p->col] = c;
+       if (p->tcol->lastcol < ++p->col)
+               p->tcol->lastcol = p->col;
 }
 
-
-/* ARGSUSED */
-static int
-termp_xr_pre(struct termp *p, const struct mdoc_meta *meta,
-               const struct mdoc_node *node)
+/*
+ * See encode().
+ * Do this for a single (probably unicode) value.
+ * Does not check for non-decorated glyphs.
+ */
+static void
+encode1(struct termp *p, int c)
 {
-       const struct mdoc_node *n;
+       enum termfont     f;
 
-       n = node->child;
-       assert(n);
+       if (p->flags & TERMP_NOBUF) {
+               (*p->letter)(p, c);
+               return;
+       }
 
-       assert(MDOC_TEXT == n->type);
-       word(p, n->data.text.string);
+       if (p->col + 7 >= p->tcol->maxcols)
+               adjbuf(p->tcol, p->col + 7);
 
-       if (NULL == (n = n->next)) 
-               return(0);
+       f = (c == ASCII_HYPH || c > 127 || isgraph(c)) ?
+           p->fontq[p->fonti] : TERMFONT_NONE;
 
-       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);
+       if (p->flags & TERMP_BACKBEFORE) {
+               if (p->tcol->buf[p->col - 1] == ' ' ||
+                   p->tcol->buf[p->col - 1] == '\t')
+                       p->col--;
+               else
+                       p->tcol->buf[p->col++] = '\b';
+               p->flags &= ~TERMP_BACKBEFORE;
+       }
+       if (f == TERMFONT_UNDER || f == TERMFONT_BI) {
+               p->tcol->buf[p->col++] = '_';
+               p->tcol->buf[p->col++] = '\b';
+       }
+       if (f == TERMFONT_BOLD || f == TERMFONT_BI) {
+               if (c == ASCII_HYPH)
+                       p->tcol->buf[p->col++] = '-';
+               else
+                       p->tcol->buf[p->col++] = c;
+               p->tcol->buf[p->col++] = '\b';
+       }
+       if (p->tcol->lastcol <= p->col || (c != ' ' && c != ASCII_NBRSP))
+               p->tcol->buf[p->col] = c;
+       if (p->tcol->lastcol < ++p->col)
+               p->tcol->lastcol = p->col;
+       if (p->flags & TERMP_BACKAFTER) {
+               p->flags |= TERMP_BACKBEFORE;
+               p->flags &= ~TERMP_BACKAFTER;
+       }
 }
 
-
-/* ARGSUSED */
-static int
-termp_sh_pre(struct termp *p, const struct mdoc_meta *meta,
-               const struct mdoc_node *node)
+static void
+encode(struct termp *p, const char *word, size_t sz)
 {
+       size_t            i;
 
-       switch (node->type) {
-       case (MDOC_HEAD):
-               vspace(p);
-               p->flags |= TERMP_BOLD;
-               break;
-       case (MDOC_BODY):
-               p->offset += 4;
-               break;
-       default:
-               break;
+       if (p->flags & TERMP_NOBUF) {
+               for (i = 0; i < sz; i++)
+                       (*p->letter)(p, word[i]);
+               return;
        }
-       return(1);
-}
 
+       if (p->col + 2 + (sz * 5) >= p->tcol->maxcols)
+               adjbuf(p->tcol, p->col + 2 + (sz * 5));
+
+       for (i = 0; i < sz; i++) {
+               if (ASCII_HYPH == word[i] ||
+                   isgraph((unsigned char)word[i]))
+                       encode1(p, word[i]);
+               else {
+                       if (p->tcol->lastcol <= p->col ||
+                           (word[i] != ' ' && word[i] != ASCII_NBRSP))
+                               p->tcol->buf[p->col] = word[i];
+                       p->col++;
+
+                       /*
+                        * Postpone the effect of \z while handling
+                        * an overstrike sequence from ascii_uc2str().
+                        */
+
+                       if (word[i] == '\b' &&
+                           (p->flags & TERMP_BACKBEFORE)) {
+                               p->flags &= ~TERMP_BACKBEFORE;
+                               p->flags |= TERMP_BACKAFTER;
+                       }
+               }
+       }
+       if (p->tcol->lastcol < p->col)
+               p->tcol->lastcol = p->col;
+}
 
-/* ARGSUSED */
-static int
-termp_op_pre(struct termp *p, const struct mdoc_meta *meta,
-               const struct mdoc_node *node)
+void
+term_setwidth(struct termp *p, const char *wstr)
 {
-
-       switch (node->type) {
-       case (MDOC_BODY):
-               word(p, "\\[");
-               p->flags |= TERMP_NOSPACE;
-               break;
-       default:
-               break;
+       struct roffsu    su;
+       int              iop, width;
+
+       iop = 0;
+       width = 0;
+       if (NULL != wstr) {
+               switch (*wstr) {
+               case '+':
+                       iop = 1;
+                       wstr++;
+                       break;
+               case '-':
+                       iop = -1;
+                       wstr++;
+                       break;
+               default:
+                       break;
+               }
+               if (a2roffsu(wstr, &su, SCALE_MAX) != NULL)
+                       width = term_hspan(p, &su);
+               else
+                       iop = 0;
        }
-       return(1);
+       (*p->setwidth)(p, iop, width);
 }
 
-
-/* ARGSUSED */
-static int
-termp_fl_pre(struct termp *p, const struct mdoc_meta *meta,
-               const struct mdoc_node *node)
+size_t
+term_len(const struct termp *p, size_t sz)
 {
 
-       p->flags |= TERMP_BOLD;
-       word(p, "-");
-       p->flags |= TERMP_NOSPACE;
-       return(1);
+       return (*p->width)(p, ' ') * sz;
 }
 
-
-static void
-termprint_r(struct termp *p, const struct mdoc_meta *meta,
-               const struct mdoc_node *node)
+static size_t
+cond_width(const struct termp *p, int c, int *skip)
 {
-       int              dochild;
-
-       /* Pre-processing ----------------- */
 
-       dochild = 1;
+       if (*skip) {
+               (*skip) = 0;
+               return 0;
+       } else
+               return (*p->width)(p, c);
+}
 
-       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);
+size_t
+term_strlen(const struct termp *p, const char *cp)
+{
+       size_t           sz, rsz, i;
+       int              ssz, skip, uc;
+       const char      *seq, *rhs;
+       enum mandoc_esc  esc;
+       static const char rej[] = { '\\', ASCII_NBRSP, ASCII_HYPH,
+                       ASCII_BREAK, '\0' };
 
-       /* Children ---------------------- */
+       /*
+        * Account for escaped sequences within string length
+        * calculations.  This follows the logic in term_word() as we
+        * must calculate the width of produced strings.
+        */
 
-       if (dochild && NULL == node->child) {
-               /* No-child processing. */
-               switch (node->type) {
-               case (MDOC_ELEM):
-                       switch (node->tok) {
-                       case (MDOC_Nm):
-                               word(p, "progname"); /* TODO */
+       sz = 0;
+       skip = 0;
+       while ('\0' != *cp) {
+               rsz = strcspn(cp, rej);
+               for (i = 0; i < rsz; i++)
+                       sz += cond_width(p, *cp++, &skip);
+
+               switch (*cp) {
+               case '\\':
+                       cp++;
+                       esc = mandoc_escape(&cp, &seq, &ssz);
+                       if (ESCAPE_ERROR == esc)
+                               continue;
+
+                       rhs = NULL;
+
+                       switch (esc) {
+                       case ESCAPE_UNICODE:
+                               uc = mchars_num2uc(seq + 1, ssz - 1);
                                break;
-                       case (MDOC_Ar):
-                               word(p, "..."); 
+                       case ESCAPE_NUMBERED:
+                               uc = mchars_num2char(seq, ssz);
+                               if (uc < 0)
+                                       continue;
                                break;
+                       case ESCAPE_SPECIAL:
+                               if (p->enc == TERMENC_ASCII) {
+                                       rhs = mchars_spec2str(seq, ssz, &rsz);
+                                       if (rhs != NULL)
+                                               break;
+                               } else {
+                                       uc = mchars_spec2cp(seq, ssz);
+                                       if (uc > 0)
+                                               sz += cond_width(p, uc, &skip);
+                               }
+                               continue;
+                       case ESCAPE_SKIPCHAR:
+                               skip = 1;
+                               continue;
+                       case ESCAPE_OVERSTRIKE:
+                               rsz = 0;
+                               rhs = seq + ssz;
+                               while (seq < rhs) {
+                                       if (*seq == '\\') {
+                                               mandoc_escape(&seq, NULL, NULL);
+                                               continue;
+                                       }
+                                       i = (*p->width)(p, *seq++);
+                                       if (rsz < i)
+                                               rsz = i;
+                               }
+                               sz += rsz;
+                               continue;
                        default:
-                               break;
+                               continue;
                        }
-                       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;
-       } 
 
-       /* Siblings ---------------------- */
-
-       if (node->next)
-               termprint_r(p, meta, node->next);
-}
-
-
-static void
-termprint_footer(struct termp *p, const struct mdoc_meta *meta)
-{
-       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);
+                       /*
+                        * Common handling for Unicode and numbered
+                        * character escape sequences.
+                        */
+
+                       if (rhs == NULL) {
+                               if (p->enc == TERMENC_ASCII) {
+                                       rhs = ascii_uc2str(uc);
+                                       rsz = strlen(rhs);
+                               } else {
+                                       if ((uc < 0x20 && uc != 0x09) ||
+                                           (uc > 0x7E && uc < 0xA0))
+                                               uc = 0xFFFD;
+                                       sz += cond_width(p, uc, &skip);
+                                       continue;
+                               }
+                       }
 
-       free(buf);
-       free(os);
-}
+                       if (skip) {
+                               skip = 0;
+                               break;
+                       }
 
+                       /*
+                        * Common handling for all escape sequences
+                        * printing more than one character.
+                        */
 
-static void
-termprint_header(struct termp *p, const struct mdoc_meta *meta)
-{
-       char            *msec, *buf, *title, *pp;
-       size_t           ssz, tsz, ttsz, i;;
-
-       if (NULL == (buf = malloc(p->rmargin)))
-               err(1, "malloc");
-       if (NULL == (title = malloc(p->rmargin)))
-               err(1, "malloc");
-
-       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);
+                       for (i = 0; i < rsz; i++)
+                               sz += (*p->width)(p, *rhs++);
                        break;
-               case (MSEC_2):
-                       /* FALLTHROUGH */
-               case (MSEC_3):
-                       /* FALLTHROUGH */
-               case (MSEC_4):
-                       /* FALLTHROUGH */
-               case (MSEC_5):
-                       pp = mdoc_vol2a(VOL_PRM);
+               case ASCII_NBRSP:
+                       sz += cond_width(p, ' ', &skip);
+                       cp++;
                        break;
-               case (MSEC_9):
-                       pp = mdoc_vol2a(VOL_KM);
+               case ASCII_HYPH:
+                       sz += cond_width(p, '-', &skip);
+                       cp++;
                        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);
        }
 
-       ttsz = strlcpy(title, meta->title, p->rmargin);
-
-       if (NULL == (msec = mdoc_msec2a(meta->msec)))
-               msec = "";
-
-       ssz = (2 * (ttsz + 2 + strlen(msec))) + tsz + 2;
-
-       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 < ssz; i++)
-               printf(" ");
-
-       printf("%s", buf);
-
-       for (i = 0; i < ssz; i++)
-               printf(" ");
-
-       printf("%s(%s)\n", title, msec);
-       fflush(stdout);
-
-       free(title);
-       free(buf);
+       return sz;
 }
 
-
 int
-termprint(const struct mdoc_node *node,
-               const struct mdoc_meta *meta)
+term_vspan(const struct termp *p, const struct roffsu *su)
 {
-       struct termp     p;
-
-       if (ERR == setupterm(NULL, STDOUT_FILENO, NULL))
-               return(0);
-
-       p.maxrmargin = columns < 60 ? 60 : (size_t)columns;
-       p.rmargin = p.maxrmargin;
-       p.maxcols = 1024;
-       p.offset = p.col = 0;
-       p.flags = TERMP_NOSPACE;
+       double           r;
+       int              ri;
 
-       if (NULL == (p.buf = malloc(p.maxcols)))
-               err(1, "malloc");
-
-       termprint_header(&p, meta);
-       termprint_r(&p, meta, node);
-       termprint_footer(&p, meta);
+       switch (su->unit) {
+       case SCALE_BU:
+               r = su->scale / 40.0;
+               break;
+       case SCALE_CM:
+               r = su->scale * 6.0 / 2.54;
+               break;
+       case SCALE_FS:
+               r = su->scale * 65536.0 / 40.0;
+               break;
+       case SCALE_IN:
+               r = su->scale * 6.0;
+               break;
+       case SCALE_MM:
+               r = su->scale * 0.006;
+               break;
+       case SCALE_PC:
+               r = su->scale;
+               break;
+       case SCALE_PT:
+               r = su->scale / 12.0;
+               break;
+       case SCALE_EN:
+       case SCALE_EM:
+               r = su->scale * 0.6;
+               break;
+       case SCALE_VS:
+               r = su->scale;
+               break;
+       default:
+               abort();
+       }
+       ri = r > 0.0 ? r + 0.4995 : r - 0.4995;
+       return ri < 66 ? ri : 1;
+}
 
-       free(p.buf);
+/*
+ * Convert a scaling width to basic units, rounding towards 0.
+ */
+int
+term_hspan(const struct termp *p, const struct roffsu *su)
+{
 
-       return(1);
+       return (*p->hspan)(p, su);
 }
 
+/*
+ * Convert a scaling width to basic units, rounding to closest.
+ */
+int
+term_hen(const struct termp *p, const struct roffsu *su)
+{
+       int bu;
 
+       if ((bu = (*p->hspan)(p, su)) >= 0)
+               return (bu + 11) / 24;
+       else
+               return -((-bu + 11) / 24);
+}