]> 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 189513225f8b33bfa00980c0fd413662e6862484..595390b671b44eb8549fadb092d7d3c4214955a6 100644 (file)
--- a/term.c
+++ b/term.c
-/* $Id: term.c,v 1.24 2009/02/26 14:56:27 kristaps Exp $ */
+/*     $Id: term.c,v 1.273 2017/06/14 23:24:18 schwarze Exp $ */
 /*
- * Copyright (c) 2009 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 <err.h>
+#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "mandoc.h"
+#include "mandoc_aux.h"
+#include "out.h"
 #include "term.h"
+#include "main.h"
 
-#define        INDENT            4
-
-/*
- * Performs actions on nodes of the abstract syntax tree.  Both pre- and
- * post-fix operations are defined here.
- */
-
-/* FIXME: indent/tab. */
-/* FIXME: macro arguments can be escaped. */
-
-#define        TTYPE_PROG        0
-#define        TTYPE_CMD_FLAG    1
-#define        TTYPE_CMD_ARG     2
-#define        TTYPE_SECTION     3
-#define        TTYPE_FUNC_DECL   4
-#define        TTYPE_VAR_DECL    5
-#define        TTYPE_FUNC_TYPE   6
-#define        TTYPE_FUNC_NAME   7
-#define        TTYPE_FUNC_ARG    8
-#define        TTYPE_LINK        9
-#define        TTYPE_SSECTION    10
-#define        TTYPE_FILE        11
-#define        TTYPE_EMPH        12
-#define        TTYPE_CONFIG      13
-#define        TTYPE_CMD         14
-#define        TTYPE_INCLUDE     15
-#define        TTYPE_SYMB        16
-#define        TTYPE_SYMBOL      17
-#define        TTYPE_NMAX        18
-
-/* 
- * These define "styles" for element types, like command arguments or
- * executable names.  This is useful when multiple macros must decorate
- * the same thing (like .Ex -std cmd and .Nm cmd). 
- */
-
-const  int ttypes[TTYPE_NMAX] = {
-       TERMP_BOLD,             /* TTYPE_PROG */
-       TERMP_BOLD,             /* TTYPE_CMD_FLAG */
-       TERMP_UNDERLINE,        /* TTYPE_CMD_ARG */
-       TERMP_BOLD,             /* TTYPE_SECTION */
-       TERMP_BOLD,             /* TTYPE_FUNC_DECL */
-       TERMP_UNDERLINE,        /* TTYPE_VAR_DECL */
-       TERMP_UNDERLINE,        /* TTYPE_FUNC_TYPE */
-       TERMP_BOLD,             /* TTYPE_FUNC_NAME */
-       TERMP_UNDERLINE,        /* TTYPE_FUNC_ARG */
-       TERMP_UNDERLINE,        /* TTYPE_LINK */
-       TERMP_BOLD,             /* TTYPE_SSECTION */
-       TERMP_UNDERLINE,        /* TTYPE_FILE */
-       TERMP_UNDERLINE,        /* TTYPE_EMPH */
-       TERMP_BOLD,             /* TTYPE_CONFIG */
-       TERMP_BOLD,             /* TTYPE_CMD */
-       TERMP_BOLD,             /* TTYPE_INCLUDE */
-       TERMP_BOLD,             /* TTYPE_SYMB */
-       TERMP_BOLD              /* TTYPE_SYMBOL */
-};
-
-static int               arg_hasattr(int, size_t, 
-                               const struct mdoc_arg *);
-static int               arg_getattr(int, size_t, 
-                               const struct mdoc_arg *);
-static size_t            arg_offset(const struct mdoc_arg *);
-static size_t            arg_width(const struct mdoc_arg *);
-
-/*
- * What follows describes prefix and postfix operations for the abstract
- * syntax tree descent.
- */
-
-#define        DECL_ARGS \
-       struct termp *p, \
-       struct termpair *pair, \
-       const struct mdoc_meta *meta, \
-       const struct mdoc_node *node
-
-#define        DECL_PRE(name) \
-static int               name##_pre(DECL_ARGS)
-#define        DECL_POST(name) \
-static void              name##_post(DECL_ARGS)
-#define        DECL_PREPOST(name) \
-DECL_PRE(name); \
-DECL_POST(name);
-
-DECL_PREPOST(termp_aq);
-DECL_PREPOST(termp_bd);
-DECL_PREPOST(termp_bq);
-DECL_PREPOST(termp_d1);
-DECL_PREPOST(termp_dq);
-DECL_PREPOST(termp_fd);
-DECL_PREPOST(termp_fn);
-DECL_PREPOST(termp_fo);
-DECL_PREPOST(termp_ft);
-DECL_PREPOST(termp_it);
-DECL_PREPOST(termp_op);
-DECL_PREPOST(termp_pf);
-DECL_PREPOST(termp_pq);
-DECL_PREPOST(termp_qq);
-DECL_PREPOST(termp_sh);
-DECL_PREPOST(termp_ss);
-DECL_PREPOST(termp_sq);
-DECL_PREPOST(termp_vt);
-
-DECL_PRE(termp_ar);
-DECL_PRE(termp_at);
-DECL_PRE(termp_bf);
-DECL_PRE(termp_bsx);
-DECL_PRE(termp_bt);
-DECL_PRE(termp_bx);
-DECL_PRE(termp_cd);
-DECL_PRE(termp_cm);
-DECL_PRE(termp_em);
-DECL_PRE(termp_ex);
-DECL_PRE(termp_fa);
-DECL_PRE(termp_fl);
-DECL_PRE(termp_fx);
-DECL_PRE(termp_ic);
-DECL_PRE(termp_in);
-DECL_PRE(termp_ms);
-DECL_PRE(termp_nd);
-DECL_PRE(termp_nm);
-DECL_PRE(termp_ns);
-DECL_PRE(termp_nx);
-DECL_PRE(termp_ox);
-DECL_PRE(termp_pa);
-DECL_PRE(termp_pp);
-DECL_PRE(termp_rv);
-DECL_PRE(termp_sm);
-DECL_PRE(termp_st);
-DECL_PRE(termp_sx);
-DECL_PRE(termp_sy);
-DECL_PRE(termp_ud);
-DECL_PRE(termp_ux);
-DECL_PRE(termp_va);
-DECL_PRE(termp_xr);
-
-DECL_POST(termp_bl);
-
-const  struct termact __termacts[MDOC_MAX] = {
-       { NULL, NULL }, /* \" */
-       { NULL, NULL }, /* Dd */
-       { NULL, NULL }, /* Dt */
-       { NULL, NULL }, /* Os */
-       { termp_sh_pre, termp_sh_post }, /* Sh */
-       { termp_ss_pre, termp_ss_post }, /* Ss */ 
-       { termp_pp_pre, NULL }, /* Pp */ 
-       { termp_d1_pre, termp_d1_post }, /* D1 */
-       { NULL, NULL }, /* Dl */
-       { termp_bd_pre, termp_bd_post }, /* Bd */
-       { NULL, NULL }, /* Ed */
-       { NULL, termp_bl_post }, /* Bl */
-       { NULL, NULL }, /* El */
-       { termp_it_pre, termp_it_post }, /* It */
-       { NULL, NULL }, /* Ad */ 
-       { NULL, NULL }, /* An */
-       { termp_ar_pre, NULL }, /* Ar */
-       { termp_cd_pre, NULL }, /* Cd */
-       { termp_cm_pre, NULL }, /* Cm */
-       { NULL, NULL }, /* Dv */ 
-       { NULL, NULL }, /* Er */ 
-       { NULL, NULL }, /* Ev */ 
-       { termp_ex_pre, NULL }, /* Ex */
-       { termp_fa_pre, NULL }, /* Fa */ 
-       { termp_fd_pre, termp_fd_post }, /* Fd */ 
-       { termp_fl_pre, NULL }, /* Fl */
-       { termp_fn_pre, termp_fn_post }, /* Fn */ 
-       { termp_ft_pre, termp_ft_post }, /* Ft */ 
-       { termp_ic_pre, NULL }, /* Ic */ 
-       { termp_in_pre, NULL }, /* In */ 
-       { NULL, NULL }, /* Li */
-       { termp_nd_pre, NULL }, /* Nd */ 
-       { termp_nm_pre, NULL }, /* Nm */ 
-       { termp_op_pre, termp_op_post }, /* Op */
-       { NULL, NULL }, /* Ot */
-       { termp_pa_pre, NULL }, /* Pa */
-       { termp_rv_pre, NULL }, /* Rv */
-       { termp_st_pre, NULL }, /* St */ 
-       { termp_va_pre, NULL }, /* Va */
-       { termp_vt_pre, termp_vt_post }, /* Vt */ 
-       { termp_xr_pre, NULL }, /* Xr */
-       { NULL, 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 */
-       { termp_aq_pre, termp_aq_post }, /* Ao */
-       { termp_aq_pre, termp_aq_post }, /* Aq */
-       { termp_at_pre, NULL }, /* At */
-       { NULL, NULL }, /* Bc */
-       { termp_bf_pre, NULL }, /* Bf */ 
-       { termp_bq_pre, termp_bq_post }, /* Bo */
-       { termp_bq_pre, termp_bq_post }, /* Bq */
-       { termp_bsx_pre, NULL }, /* Bsx */
-       { termp_bx_pre, NULL }, /* Bx */
-       { NULL, NULL }, /* Db */
-       { NULL, NULL }, /* Dc */
-       { termp_dq_pre, termp_dq_post }, /* Do */
-       { termp_dq_pre, termp_dq_post }, /* Dq */
-       { NULL, NULL }, /* Ec */
-       { NULL, NULL }, /* Ef */
-       { termp_em_pre, NULL }, /* Em */ 
-       { NULL, NULL }, /* Eo */
-       { termp_fx_pre, NULL }, /* Fx */
-       { termp_ms_pre, NULL }, /* Ms */
-       { NULL, NULL }, /* No */
-       { termp_ns_pre, NULL }, /* Ns */
-       { termp_nx_pre, NULL }, /* Nx */
-       { termp_ox_pre, NULL }, /* Ox */
-       { NULL, NULL }, /* Pc */
-       { termp_pf_pre, termp_pf_post }, /* Pf */
-       { termp_pq_pre, termp_pq_post }, /* Po */
-       { termp_pq_pre, termp_pq_post }, /* Pq */
-       { NULL, NULL }, /* Qc */
-       { termp_sq_pre, termp_sq_post }, /* Ql */
-       { termp_qq_pre, termp_qq_post }, /* Qo */
-       { termp_qq_pre, termp_qq_post }, /* Qq */
-       { NULL, NULL }, /* Re */
-       { NULL, NULL }, /* Rs */
-       { NULL, NULL }, /* Sc */
-       { termp_sq_pre, termp_sq_post }, /* So */
-       { termp_sq_pre, termp_sq_post }, /* Sq */
-       { termp_sm_pre, NULL }, /* Sm */
-       { termp_sx_pre, NULL }, /* Sx */
-       { termp_sy_pre, NULL }, /* Sy */
-       { NULL, NULL }, /* Tn */
-       { termp_ux_pre, NULL }, /* Ux */
-       { NULL, NULL }, /* Xc */
-       { NULL, NULL }, /* Xo */
-       { termp_fo_pre, termp_fo_post }, /* Fo */ 
-       { NULL, NULL }, /* Fc */ 
-       { termp_op_pre, termp_op_post }, /* Oo */
-       { NULL, NULL }, /* Oc */
-       { NULL, NULL }, /* Bk */
-       { NULL, NULL }, /* Ek */
-       { termp_bt_pre, NULL }, /* Bt */
-       { NULL, NULL }, /* Hf */
-       { NULL, NULL }, /* Fr */
-       { termp_ud_pre, NULL }, /* Ud */
-};
-
-const struct termact *termacts = __termacts;
-
-
-static size_t
-arg_width(const struct mdoc_arg *arg)
-{
-
-       /* TODO */
-       assert(*arg->value);
-       return(strlen(*arg->value));
-}
+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 size_t
-arg_offset(const struct mdoc_arg *arg)
+void
+term_setcol(struct termp *p, size_t maxtcol)
 {
-
-       /* TODO */
-       assert(*arg->value);
-       if (0 == strcmp(*arg->value, "indent"))
-               return(INDENT);
-       if (0 == strcmp(*arg->value, "indent-two"))
-               return(INDENT * 2);
-
-       return(strlen(*arg->value));
+       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;
 }
 
-
-static int
-arg_hasattr(int arg, size_t argc, const struct mdoc_arg *argv)
+void
+term_free(struct termp *p)
 {
-
-       return(-1 != arg_getattr(arg, argc, argv));
+       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 int
-arg_getattr(int arg, size_t argc, const struct mdoc_arg *argv)
+void
+term_begin(struct termp *p, term_margin head,
+               term_margin foot, const struct roff_meta *arg)
 {
-       int              i;
 
-       for (i = 0; i < (int)argc; i++) 
-               if (argv[i].arg == arg)
-                       return(i);
-       return(-1);
+       p->headf = head;
+       p->footf = foot;
+       p->argf = arg;
+       (*p->begin)(p);
 }
 
-
-/* ARGSUSED */
-static int
-termp_dq_pre(DECL_ARGS)
+void
+term_end(struct termp *p)
 {
 
-       if (MDOC_BODY != node->type)
-               return(1);
-
-       word(p, "``");
-       p->flags |= TERMP_NOSPACE;
-       return(1);
+       (*p->end)(p);
 }
 
+/*
+ * 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) {
+
+               /*
+                * Handle literal tab characters: collapse all
+                * subsequent tabs into a single huge set of spaces.
+                */
+
+               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++;
+               }
 
-/* ARGSUSED */
-static void
-termp_dq_post(DECL_ARGS)
-{
+               /*
+                * 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).
+                */
+
+               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;
+
+                       /* Back over the last printed character. */
+                       if (p->tcol->buf[j] == '\b') {
+                               assert(j);
+                               vend -= (*p->width)(p, p->tcol->buf[j - 1]);
+                               continue;
+                       }
+
+                       /* 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]);
+               }
 
-       if (MDOC_BODY != node->type)
-               return;
+               /*
+                * Find out whether we would exceed the right margin.
+                * If so, break to the next line.
+                */
 
-       p->flags |= TERMP_NOSPACE;
-       word(p, "''");
-}
+               if (vend > bp && jhy == 0 && vis > 0 &&
+                   (p->flags & TERMP_BRNEVER) == 0) {
+                       if (p->flags & TERMP_MULTICOL)
+                               return;
 
+                       endline(p);
+                       vend -= vis;
 
-/* ARGSUSED */
-static int
-termp_it_pre(DECL_ARGS)
-{
-       const struct mdoc_node *n, *it;
-       const struct mdoc_block *bl;
-       char             buf[7], *tp;
-       int              i, type;
-       size_t           width, offset;
-
-       switch (node->type) {
-       case (MDOC_BODY):
-               /* FALLTHROUGH */
-       case (MDOC_HEAD):
-               it = node->parent;
-               break;
-       case (MDOC_BLOCK):
-               it = node;
-               break;
-       default:
-               return(1);
-       }
+                       /* Use pending tabs on the new line. */
 
-       n = it->parent->parent;
-       bl = &n->data.block;
+                       vbl = 0;
+                       while (ntab--)
+                               vbl = term_tab_next(vbl);
 
-       if (MDOC_BLOCK == node->type) {
-               if (arg_hasattr(MDOC_Compact, bl->argc, bl->argv))
-                       newln(p);
-               else
-                       vspace(p);
-               return(1);
-       }
+                       /* Re-establish indentation. */
 
-       /* Get our list type. */
-
-       for (type = -1, i = 0; i < (int)bl->argc; i++) 
-               switch (bl->argv[i].arg) {
-               case (MDOC_Bullet):
-                       /* FALLTHROUGH */
-               case (MDOC_Dash):
-                       /* FALLTHROUGH */
-               case (MDOC_Enum):
-                       /* FALLTHROUGH */
-               case (MDOC_Hyphen):
-                       /* FALLTHROUGH */
-               case (MDOC_Tag):
-                       /* FALLTHROUGH */
-               case (MDOC_Ohang):
-                       type = bl->argv[i].arg;
-                       i = (int)bl->argc;
-                       break;
-               default:
-                       errx(1, "list type not supported");
-                       /* NOTREACHED */
+                       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;
                }
 
-       assert(-1 != type);
-
-       /* Save our existing (inherited) margin and offset. */
-
-       pair->offset = p->offset;
-       pair->rmargin = p->rmargin;
-
-       /* Get list width and offset. */
-
-       i = arg_getattr(MDOC_Width, bl->argc, bl->argv);
-       width = i >= 0 ? arg_width(&bl->argv[i]) : 0;
+               /*
+                * Write out the rest of the word.
+                */
+
+               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;
 
-       i = arg_getattr(MDOC_Offset, bl->argc, bl->argv);
-       offset = i >= 0 ? arg_offset(&bl->argv[i]) : 0;
+               if (breakline == 0)
+                       continue;
 
-       /* Override the width. */
+               /* Explicitly requested output line break. */
 
-       switch (type) {
-       case (MDOC_Bullet):
-               /* FALLTHROUGH */
-       case (MDOC_Dash):
-               /* FALLTHROUGH */
-       case (MDOC_Enum):
-               /* FALLTHROUGH */
-       case (MDOC_Hyphen):
-               width = width > 6 ? width : 6;
-               break;
-       case (MDOC_Tag):
-               /* FIXME: auto-size. */
-               if (0 == width)
-                       errx(1, "need non-zero -width");
-               break;
-       default:
-               break;
-       }
+               if (p->flags & TERMP_MULTICOL)
+                       return;
 
-       /* Word-wrap control. */
+               endline(p);
+               breakline = 0;
+               vis = vend = 0;
 
-       p->flags |= TERMP_NOSPACE;
+               /* Re-establish indentation. */
 
-       switch (type) {
-       case (MDOC_Bullet):
-               /* FALLTHROUGH */
-       case (MDOC_Dash):
-               /* FALLTHROUGH */
-       case (MDOC_Enum):
-               /* FALLTHROUGH */
-       case (MDOC_Hyphen):
-               /* FALLTHROUGH */
-       case (MDOC_Tag):
-               if (MDOC_HEAD == node->type)
-                       p->flags |= TERMP_NOBREAK;
-               else if (MDOC_BODY == node->type)
-                       p->flags |= TERMP_NOLPAD;
-               break;
-       default:
-               break;
+               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;
        }
 
-       /* 
-        * Get a token to use as the HEAD lead-in.  If NULL, we use the
-        * HEAD child. 
+       /*
+        * If there was trailing white space, it was not printed;
+        * so reset the cursor position accordingly.
         */
 
-       tp = NULL;
-
-       if (MDOC_HEAD == node->type) {
-               if (arg_hasattr(MDOC_Bullet, bl->argc, bl->argv))
-                       tp = "\\[bu]";
-               if (arg_hasattr(MDOC_Dash, bl->argc, bl->argv))
-                       tp = "\\-";
-               if (arg_hasattr(MDOC_Enum, bl->argc, bl->argv)) {
-                       (pair->ppair->ppair->count)++;
-                       (void)snprintf(buf, sizeof(buf), "%d.", 
-                                       pair->ppair->ppair->count);
-                       tp = buf;
-               }
-               if (arg_hasattr(MDOC_Hyphen, bl->argc, bl->argv))
-                       tp = "\\-";
-       }
+       if (vis > vbl)
+               vis -= vbl;
+       else
+               vis = 0;
 
-       /* Margin control. */
-
-       p->offset += offset;
-
-       switch (type) {
-       case (MDOC_Bullet):
-               /* FALLTHROUGH */
-       case (MDOC_Dash):
-               /* FALLTHROUGH */
-       case (MDOC_Enum):
-               /* FALLTHROUGH */
-       case (MDOC_Hyphen):
-               /* FALLTHROUGH */
-       case (MDOC_Tag):
-               if (MDOC_HEAD == node->type)
-                       p->rmargin = p->offset + width;
-               else if (MDOC_BODY == node->type) 
-                       p->offset += width;
-               break;
-       default:
-               break;
-       }
-
-       if (NULL == tp)
-               return(1);
-
-       word(p, tp);
-       return(0);
-}
-
-
-/* ARGSUSED */
-static void
-termp_it_post(DECL_ARGS)
-{
+       p->col = p->tcol->col = p->tcol->lastcol = 0;
+       p->minbl = p->trailspace;
+       p->flags &= ~(TERMP_BACKAFTER | TERMP_BACKBEFORE | TERMP_NOPAD);
 
-       if (MDOC_BODY != node->type && MDOC_HEAD != node->type)
+       if (p->flags & TERMP_MULTICOL)
                return;
 
-       flushln(p);
+       /* Trailing whitespace is significant in some columns. */
 
-       p->offset = pair->offset;
-       p->rmargin = pair->rmargin;
+       if (vis && vbl && (TERMP_BRTRSP & p->flags))
+               vis += vbl;
 
-       if (MDOC_HEAD == node->type) {
-               p->flags &= ~TERMP_NOBREAK;
-               p->flags &= ~TERMP_NORPAD;
-       } else if (MDOC_BODY == node->type)
-               p->flags &= ~TERMP_NOLPAD;
+       /* 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);
 }
 
-
-/* ARGSUSED */
-static int
-termp_nm_pre(DECL_ARGS)
+static void
+endline(struct termp *p)
 {
-
-       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_PROG]);
-       if (NULL == node->child)
-               word(p, meta->name);
-       return(1);
+       if ((p->flags & (TERMP_NEWMC | TERMP_ENDMC)) == TERMP_ENDMC) {
+               p->mc = NULL;
+               p->flags &= ~TERMP_ENDMC;
+       }
+       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_fl_pre(DECL_ARGS)
+/*
+ * A newline only breaks an existing line; it won't assert vertical
+ * space.  All data in the output buffer is flushed prior to the newline
+ * assertion.
+ */
+void
+term_newln(struct termp *p)
 {
 
-       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD_FLAG]);
-       word(p, "\\-");
        p->flags |= TERMP_NOSPACE;
-       return(1);
+       if (p->tcol->lastcol || p->viscol)
+               term_flushln(p);
 }
 
-
-/* ARGSUSED */
-static int
-termp_ar_pre(DECL_ARGS)
-{
-
-       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD_ARG]);
-       if (NULL == node->child)
-               word(p, "...");
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_ns_pre(DECL_ARGS)
+/*
+ * Asserts a vertical space (a full, empty line-break between lines).
+ * Note that if used twice, this will cause two blank spaces and so on.
+ * All data in the output buffer is flushed prior to the newline
+ * assertion.
+ */
+void
+term_vspace(struct termp *p)
 {
 
-       p->flags |= TERMP_NOSPACE;
-       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_pp_pre(DECL_ARGS)
+/* Swap current and previous font; for \fP and .ft P */
+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_st_pre(DECL_ARGS)
+/* Set font, save current, discard previous; for \f, .ft, .B etc. */
+void
+term_fontrepl(struct termp *p, enum termfont f)
 {
-       const char      *tp;
 
-       assert(1 == node->data.elem.argc);
-
-       tp = mdoc_st2a(node->data.elem.argv[0].arg);
-       word(p, tp);
-
-       return(1);
+       p->fontl = p->fontq[p->fonti];
+       p->fontq[p->fonti] = f;
 }
 
-
-/* ARGSUSED */
-static int
-termp_rv_pre(DECL_ARGS)
+/* Set font, save previous. */
+void
+term_fontpush(struct termp *p, enum termfont f)
 {
-       int              i;
 
-       i = arg_getattr(MDOC_Std, node->data.elem.argc, 
-                       node->data.elem.argv);
-       assert(i >= 0);
-
-       newln(p);
-       word(p, "The");
-
-       p->flags |= ttypes[TTYPE_FUNC_NAME];
-       word(p, *node->data.elem.argv[i].value);
-       p->flags &= ~ttypes[TTYPE_FUNC_NAME];
-
-               word(p, "() function returns the value 0 if successful;");
-               word(p, "otherwise the value -1 is returned and the");
-               word(p, "global variable");
-
-       p->flags |= ttypes[TTYPE_VAR_DECL];
-       word(p, "errno");
-       p->flags &= ~ttypes[TTYPE_VAR_DECL];
-
-               word(p, "is set to indicate the error.");
-
-       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_ex_pre(DECL_ARGS)
+/* Flush to make the saved pointer current again. */
+void
+term_fontpopq(struct termp *p, int i)
 {
-       int              i;
 
-       i = arg_getattr(MDOC_Std, node->data.elem.argc, 
-                       node->data.elem.argv);
        assert(i >= 0);
-
-       word(p, "The");
-       p->flags |= ttypes[TTYPE_PROG];
-       word(p, *node->data.elem.argv[i].value);
-       p->flags &= ~ttypes[TTYPE_PROG];
-               word(p, "utility exits 0 on success, and >0 if an error occurs.");
-
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_nd_pre(DECL_ARGS)
-{
-
-       word(p, "\\-");
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_bl_post(DECL_ARGS)
-{
-
-       if (MDOC_BLOCK == node->type)
-               newln(p);
+       if (p->fonti > i)
+               p->fonti = i;
 }
 
-
-/* ARGSUSED */
-static void
-termp_op_post(DECL_ARGS)
-{
-
-       if (MDOC_BODY != node->type) 
-               return;
-       p->flags |= TERMP_NOSPACE;
-       word(p, "\\(rB");
-}
-
-
-/* ARGSUSED */
-static int
-termp_xr_pre(DECL_ARGS)
-{
-       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);
-}
-
-
-/* ARGSUSED */
-static int
-termp_vt_pre(DECL_ARGS)
+/* Pop one font off the stack. */
+void
+term_fontpop(struct termp *p)
 {
 
-       /* FIXME: this can be "type name". */
-       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_VAR_DECL]);
-       return(1);
+       assert(p->fonti);
+       p->fonti--;
 }
 
-
-/* ARGSUSED */
-static void
-termp_vt_post(DECL_ARGS)
-{
-
-       if (node->sec == SEC_SYNOPSIS)
-               vspace(p);
-}
-
-
-/* ARGSUSED */
-static int
-termp_fd_pre(DECL_ARGS)
-{
-
-       /* 
-        * FIXME: this naming is bad.  This value is used, in general,
-        * for the #include header or other preprocessor statement.
-        */
-       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FUNC_DECL]);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_fd_post(DECL_ARGS)
-{
-
-       if (node->sec == SEC_SYNOPSIS)
-               vspace(p);
-}
-
-
-/* ARGSUSED */
-static int
-termp_sh_pre(DECL_ARGS)
-{
-
-       switch (node->type) {
-       case (MDOC_HEAD):
-               vspace(p);
-               TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SECTION]);
-               break;
-       case (MDOC_BODY):
-               p->offset = INDENT;
-               break;
-       default:
-               break;
+/*
+ * 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;
        }
-       return(1);
-}
-
 
-/* ARGSUSED */
-static void
-termp_sh_post(DECL_ARGS)
-{
-
-       switch (node->type) {
-       case (MDOC_HEAD):
-               newln(p);
-               break;
-       case (MDOC_BODY):
-               newln(p);
-               p->offset = 0;
-               break;
-       default:
-               break;
-       }
-}
+       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++;
+               esc = mandoc_escape(&word, &seq, &sz);
+               if (ESCAPE_ERROR == esc)
+                       continue;
 
-/* ARGSUSED */
-static int
-termp_op_pre(DECL_ARGS)
-{
+               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;
+               }
 
-       switch (node->type) {
-       case (MDOC_BODY):
-               word(p, "\\(lB");
-               p->flags |= TERMP_NOSPACE;
-               break;
-       default:
-               break;
+               /*
+                * Common handling for Unicode and numbered
+                * character escape sequences.
+                */
+
+               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);
-}
-
-
-/* ARGSUSED */
-static int
-termp_bt_pre(DECL_ARGS)
-{
-
-       word(p, "is currently in beta test.");
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_ud_pre(DECL_ARGS)
-{
-
-       word(p, "currently under development.");
-       return(1);
+       p->flags &= ~TERMP_NBRWORD;
 }
 
-
-/* ARGSUSED */
-static int
-termp_d1_pre(DECL_ARGS)
-{
-
-       if (MDOC_BODY != node->type)
-               return(1);
-       newln(p);
-       p->offset += (pair->offset = INDENT);
-       return(1);
-}
-
-
-/* ARGSUSED */
 static void
-termp_d1_post(DECL_ARGS)
+adjbuf(struct termp_col *c, size_t sz)
 {
-
-       if (MDOC_BODY != node->type) 
-               return;
-       newln(p);
-       p->offset -= pair->offset;
+       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_aq_pre(DECL_ARGS)
-{
-
-       if (MDOC_BODY != node->type)
-               return(1);
-       word(p, "<");
-       p->flags |= TERMP_NOSPACE;
-       return(1);
-}
-
-
-/* ARGSUSED */
 static void
-termp_aq_post(DECL_ARGS)
+bufferc(struct termp *p, char c)
 {
-
-       if (MDOC_BODY != node->type)
+       if (p->flags & TERMP_NOBUF) {
+               (*p->letter)(p, c);
                return;
-       p->flags |= TERMP_NOSPACE;
-       word(p, ">");
-}
-
-
-/* ARGSUSED */
-static int
-termp_ft_pre(DECL_ARGS)
-{
-
-       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FUNC_TYPE]);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_ft_post(DECL_ARGS)
-{
-
-       if (node->sec == SEC_SYNOPSIS)
-               newln(p);
-}
-
-
-/* ARGSUSED */
-static int
-termp_fn_pre(DECL_ARGS)
-{
-       const struct mdoc_node *n;
-
-       assert(node->child);
-       assert(MDOC_TEXT == node->child->type);
-
-       /* FIXME: can be "type funcname" "type varname"... */
-
-       p->flags |= ttypes[TTYPE_FUNC_NAME];
-       word(p, node->child->data.text.string);
-       p->flags &= ~ttypes[TTYPE_FUNC_NAME];
-
-       word(p, "(");
-
-       p->flags |= TERMP_NOSPACE;
-       for (n = node->child->next; n; n = n->next) {
-               assert(MDOC_TEXT == n->type);
-               p->flags |= ttypes[TTYPE_FUNC_ARG];
-               word(p, n->data.text.string);
-               p->flags &= ~ttypes[TTYPE_FUNC_ARG];
-               if (n->next)
-                       word(p, ",");
        }
-
-       word(p, ")");
-
-       if (SEC_SYNOPSIS == node->sec)
-               word(p, ";");
-
-       return(0);
+       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 */
+/*
+ * See encode().
+ * Do this for a single (probably unicode) value.
+ * Does not check for non-decorated glyphs.
+ */
 static void
-termp_fn_post(DECL_ARGS)
-{
-
-       if (node->sec == SEC_SYNOPSIS)
-               vspace(p);
-
-}
-
-
-/* ARGSUSED */
-static int
-termp_sx_pre(DECL_ARGS)
-{
-
-       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_LINK]);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_fa_pre(DECL_ARGS)
+encode1(struct termp *p, int c)
 {
-       struct mdoc_node *n;
+       enum termfont     f;
 
-       if (node->parent->tok != MDOC_Fo) {
-               TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FUNC_ARG]);
-               return(1);
+       if (p->flags & TERMP_NOBUF) {
+               (*p->letter)(p, c);
+               return;
        }
 
-       for (n = node->child; n; n = n->next) {
-               assert(MDOC_TEXT == n->type);
+       if (p->col + 7 >= p->tcol->maxcols)
+               adjbuf(p->tcol, p->col + 7);
 
-               p->flags |= ttypes[TTYPE_FUNC_ARG];
-               word(p, n->data.text.string);
-               p->flags &= ~ttypes[TTYPE_FUNC_ARG];
+       f = (c == ASCII_HYPH || c > 127 || isgraph(c)) ?
+           p->fontq[p->fonti] : TERMFONT_NONE;
 
-               if (n->next)
-                       word(p, ",");
+       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 (node->next && node->next->tok == MDOC_Fa)
-               word(p, ",");
-
-       return(0);
-}
-
-
-/* ARGSUSED */
-static int
-termp_va_pre(DECL_ARGS)
-{
-
-       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_VAR_DECL]);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_bd_pre(DECL_ARGS)
-{
-       const struct mdoc_block *bl;
-       const struct mdoc_node *n;
-       int              i;
-
-       if (MDOC_BLOCK == node->type) {
-               vspace(p);
-               return(1);
-       } else if (MDOC_BODY != node->type)
-               return(1);
-
-       assert(MDOC_BLOCK == node->parent->type);
-       pair->offset = p->offset;
-
-       bl = &node->parent->data.block;
-
-
-       i = arg_getattr(MDOC_Offset, bl->argc, bl->argv);
-       if (-1 != i) {
-               assert(1 == bl->argv[i].sz);
-               p->offset += arg_offset(&bl->argv[i]);
+       if (f == TERMFONT_UNDER || f == TERMFONT_BI) {
+               p->tcol->buf[p->col++] = '_';
+               p->tcol->buf[p->col++] = '\b';
        }
-
-       if ( ! arg_hasattr(MDOC_Literal, bl->argc, bl->argv))
-               return(1);
-
-       p->flags |= TERMP_LITERAL;
-
-       for (n = node->child; n; n = n->next) {
-               assert(MDOC_TEXT == n->type); /* FIXME */
-               if ((*n->data.text.string)) {
-                       word(p, n->data.text.string);
-                       flushln(p);
-               } else
-                       vspace(p);
-
+       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;
        }
-
-       p->flags &= ~TERMP_LITERAL;
-       return(0);
-}
-
-
-/* ARGSUSED */
-static void
-termp_bd_post(DECL_ARGS)
-{
-
-       if (MDOC_BODY != node->type) 
-               return;
-       newln(p);
-       p->offset = pair->offset;
-}
-
-
-/* ARGSUSED */
-static int
-termp_qq_pre(DECL_ARGS)
-{
-
-       if (MDOC_BODY != node->type)
-               return(1);
-       word(p, "\"");
-       p->flags |= TERMP_NOSPACE;
-       return(1);
 }
 
-
-/* ARGSUSED */
 static void
-termp_qq_post(DECL_ARGS)
+encode(struct termp *p, const char *word, size_t sz)
 {
+       size_t            i;
 
-       if (MDOC_BODY != node->type)
+       if (p->flags & TERMP_NOBUF) {
+               for (i = 0; i < sz; i++)
+                       (*p->letter)(p, word[i]);
                return;
-       p->flags |= TERMP_NOSPACE;
-       word(p, "\"");
-}
-
-
-/* ARGSUSED */
-static int
-termp_bsx_pre(DECL_ARGS)
-{
-
-       word(p, "BSDI BSD/OS");
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_bx_pre(DECL_ARGS)
-{
-
-       word(p, "BSD");
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_ox_pre(DECL_ARGS)
-{
-
-       word(p, "OpenBSD");
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_ux_pre(DECL_ARGS)
-{
-
-       word(p, "UNIX");
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_fx_pre(DECL_ARGS)
-{
+       }
 
-       word(p, "FreeBSD");
-       return(1);
+       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_nx_pre(DECL_ARGS)
+void
+term_setwidth(struct termp *p, const char *wstr)
 {
+       struct roffsu    su;
+       int              iop, width;
 
-       word(p, "NetBSD");
-       return(1);
+       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;
+       }
+       (*p->setwidth)(p, iop, width);
 }
 
-
-/* ARGSUSED */
-static int
-termp_sq_pre(DECL_ARGS)
+size_t
+term_len(const struct termp *p, size_t sz)
 {
 
-       if (MDOC_BODY != node->type)
-               return(1);
-       word(p, "\'");
-       p->flags |= TERMP_NOSPACE;
-       return(1);
+       return (*p->width)(p, ' ') * sz;
 }
 
-
-/* ARGSUSED */
-static void
-termp_sq_post(DECL_ARGS)
+static size_t
+cond_width(const struct termp *p, int c, int *skip)
 {
 
-       if (MDOC_BODY != node->type)
-               return;
-       p->flags |= TERMP_NOSPACE;
-       word(p, "\'");
+       if (*skip) {
+               (*skip) = 0;
+               return 0;
+       } else
+               return (*p->width)(p, c);
 }
 
-
-/* ARGSUSED */
-static int
-termp_pf_pre(DECL_ARGS)
+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' };
 
-       p->flags |= TERMP_IGNDELIM;
-       return(1);
-}
-
+       /*
+        * Account for escaped sequences within string length
+        * calculations.  This follows the logic in term_word() as we
+        * must calculate the width of produced strings.
+        */
 
-/* ARGSUSED */
-static void
-termp_pf_post(DECL_ARGS)
-{
+       sz = 0;
+       skip = 0;
+       while ('\0' != *cp) {
+               rsz = strcspn(cp, rej);
+               for (i = 0; i < rsz; i++)
+                       sz += cond_width(p, *cp++, &skip);
+
+               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 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:
+                               continue;
+                       }
+
+                       /*
+                        * 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;
+                               }
+                       }
+
+                       if (skip) {
+                               skip = 0;
+                               break;
+                       }
+
+                       /*
+                        * Common handling for all escape sequences
+                        * printing more than one character.
+                        */
+
+                       for (i = 0; i < rsz; i++)
+                               sz += (*p->width)(p, *rhs++);
+                       break;
+               case ASCII_NBRSP:
+                       sz += cond_width(p, ' ', &skip);
+                       cp++;
+                       break;
+               case ASCII_HYPH:
+                       sz += cond_width(p, '-', &skip);
+                       cp++;
+                       break;
+               default:
+                       break;
+               }
+       }
 
-       p->flags &= ~TERMP_IGNDELIM;
-       p->flags |= TERMP_NOSPACE;
+       return sz;
 }
 
-
-/* ARGSUSED */
-static int
-termp_ss_pre(DECL_ARGS)
+int
+term_vspan(const struct termp *p, const struct roffsu *su)
 {
+       double           r;
+       int              ri;
 
-       switch (node->type) {
-       case (MDOC_HEAD):
-               vspace(p);
-               TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SSECTION]);
-               p->offset = INDENT / 2;
+       switch (su->unit) {
+       case SCALE_BU:
+               r = su->scale / 40.0;
                break;
-       default:
+       case SCALE_CM:
+               r = su->scale * 6.0 / 2.54;
                break;
-       }
-
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_ss_post(DECL_ARGS)
-{
-
-       switch (node->type) {
-       case (MDOC_HEAD):
-               newln(p);
-               p->offset = INDENT;
+       case SCALE_FS:
+               r = su->scale * 65536.0 / 40.0;
                break;
-       default:
+       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;
 }
 
-
-/* ARGSUSED */
-static int
-termp_pa_pre(DECL_ARGS)
-{
-
-       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FILE]);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_em_pre(DECL_ARGS)
-{
-
-       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_EMPH]);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_cd_pre(DECL_ARGS)
-{
-
-       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CONFIG]);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_cm_pre(DECL_ARGS)
-{
-
-       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD_FLAG]);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_ic_pre(DECL_ARGS)
-{
-
-       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD]);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_in_pre(DECL_ARGS)
-{
-
-       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_INCLUDE]);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_at_pre(DECL_ARGS)
-{
-       enum mdoc_att    c;
-
-       c = ATT_DEFAULT;
-       if (node->child) {
-               assert(MDOC_TEXT == node->child->type);
-               c = mdoc_atoatt(node->child->data.text.string);
-       }
-
-       word(p, mdoc_att2a(c));
-       return(0);
-}
-
-
-/* ARGSUSED */
-static int
-termp_bq_pre(DECL_ARGS)
-{
-
-       if (MDOC_BODY != node->type)
-               return(1);
-       word(p, "[");
-       p->flags |= TERMP_NOSPACE;
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_bq_post(DECL_ARGS)
-{
-
-       if (MDOC_BODY != node->type)
-               return;
-       word(p, "]");
-}
-
-
-/* ARGSUSED */
-static int
-termp_pq_pre(DECL_ARGS)
-{
-
-       if (MDOC_BODY != node->type)
-               return(1);
-       word(p, "(");
-       p->flags |= TERMP_NOSPACE;
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_pq_post(DECL_ARGS)
-{
-
-       if (MDOC_BODY != node->type)
-               return;
-       word(p, ")");
-}
-
-
-/* ARGSUSED */
-static int
-termp_fo_pre(DECL_ARGS)
-{
-       const struct mdoc_node *n;
-
-       if (MDOC_BODY == node->type) {
-               word(p, "(");
-               p->flags |= TERMP_NOSPACE;
-               return(1);
-       } else if (MDOC_HEAD != node->type) 
-               return(1);
-
-       /* XXX - groff shows only first parameter */
-
-       p->flags |= ttypes[TTYPE_FUNC_NAME];
-       for (n = node->child; n; n = n->next) {
-               assert(MDOC_TEXT == n->type);
-               word(p, n->data.text.string);
-       }
-       p->flags &= ~ttypes[TTYPE_FUNC_NAME];
-
-       return(0);
-}
-
-
-/* ARGSUSED */
-static void
-termp_fo_post(DECL_ARGS)
-{
-
-       if (MDOC_BODY != node->type)
-               return;
-       word(p, ")");
-       word(p, ";");
-       newln(p);
-}
-
-
-/* ARGSUSED */
-static int
-termp_bf_pre(DECL_ARGS)
-{
-       const struct mdoc_node  *n;
-       const struct mdoc_block *b;
-
-       /* XXX - we skip over possible trailing HEAD tokens. */
-
-       if (MDOC_HEAD == node->type)
-               return(0);
-       else if (MDOC_BLOCK != node->type)
-               return(1);
-
-       b = &node->data.block;
-
-       if (NULL == (n = b->head->child)) {
-               if (arg_hasattr(MDOC_Emphasis, b->argc, b->argv))
-                       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_EMPH]);
-               else if (arg_hasattr(MDOC_Symbolic, b->argc, b->argv))
-                       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SYMB]);
-
-               return(1);
-       } 
-
-       assert(MDOC_TEXT == n->type);
-
-       if (0 == strcmp("Em", n->data.text.string))
-               TERMPAIR_SETFLAG(pair, ttypes[TTYPE_EMPH]);
-       else if (0 == strcmp("Sy", n->data.text.string))
-               TERMPAIR_SETFLAG(pair, ttypes[TTYPE_EMPH]);
-
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_sy_pre(DECL_ARGS)
-{
-
-       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SYMB]);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_ms_pre(DECL_ARGS)
+/*
+ * Convert a scaling width to basic units, rounding towards 0.
+ */
+int
+term_hspan(const struct termp *p, const struct roffsu *su)
 {
 
-       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SYMBOL]);
-       return(1);
+       return (*p->hspan)(p, su);
 }
 
-
-
-/* ARGSUSED */
-static int
-termp_sm_pre(DECL_ARGS)
+/*
+ * Convert a scaling width to basic units, rounding to closest.
+ */
+int
+term_hen(const struct termp *p, const struct roffsu *su)
 {
+       int bu;
 
-#if notyet
-       assert(node->child);
-       if (0 == strcmp("off", node->child->data.text.string)) {
-               p->flags &= ~TERMP_NONOSPACE;
-               p->flags &= ~TERMP_NOSPACE;
-       } else {
-               p->flags |= TERMP_NONOSPACE;
-               p->flags |= TERMP_NOSPACE;
-       }
-#endif
-
-       return(0);
+       if ((bu = (*p->hspan)(p, su)) >= 0)
+               return (bu + 11) / 24;
+       else
+               return -((-bu + 11) / 24);
 }