]> git.cameronkatri.com Git - mandoc.git/blobdiff - term.c
git.ckatri.com / mandoc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Use a character-table for quick per-character substitution in `tr'. As
[mandoc.git] / term.c
diff --git a/term.c b/term.c
index 29a3593533075413ca0efcbd80fb8781d765177c..70260bec31a613857102aa7dbd1603ac2a118d3c 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,1151 +1,744 @@
-/* $Id: term.c,v 1.11 2009/02/23 09:46:59 kristaps Exp $ */
+/*     $Id: term.c,v 1.197 2011/05/24 21:31:23 kristaps Exp $ */
 /*
 /*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  *
  * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <sys/types.h>
+
 #include <assert.h>
 #include <assert.h>
+#include <ctype.h>
+#include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 
+#include "mandoc.h"
+#include "out.h"
 #include "term.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. */
-
-#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_NMAX        13
-
-/* 
- * 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 */
-};
-
-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 char *);
-
-/*
- * What follows describes prefix and postfix operations for the abstract
- * syntax tree descent.
- */
+static void             adjbuf(struct termp *p, int);
+static void             bufferc(struct termp *, char);
+static void             encode(struct termp *, const char *, size_t);
+static void             encode1(struct termp *, int);
 
 
-#define        DECL_ARGS \
-       struct termp *p, \
-       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_ar);
-DECL_PREPOST(termp_d1);
-DECL_PREPOST(termp_dq);
-DECL_PREPOST(termp_em);
-DECL_PREPOST(termp_fa);
-DECL_PREPOST(termp_fd);
-DECL_PREPOST(termp_fl);
-DECL_PREPOST(termp_fn);
-DECL_PREPOST(termp_ft);
-DECL_PREPOST(termp_it);
-DECL_PREPOST(termp_nm);
-DECL_PREPOST(termp_op);
-DECL_PREPOST(termp_pa);
-DECL_PREPOST(termp_pf);
-DECL_PREPOST(termp_qo);
-DECL_PREPOST(termp_qq);
-DECL_PREPOST(termp_sh);
-DECL_PREPOST(termp_ss);
-DECL_PREPOST(termp_sq);
-DECL_PREPOST(termp_sx);
-DECL_PREPOST(termp_va);
-DECL_PREPOST(termp_vt);
-
-DECL_PRE(termp_bd);
-DECL_PRE(termp_bx);
-DECL_PRE(termp_ex);
-DECL_PRE(termp_nd);
-DECL_PRE(termp_ns);
-DECL_PRE(termp_nx);
-DECL_PRE(termp_ox);
-DECL_PRE(termp_pp);
-DECL_PRE(termp_ud);
-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, 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_ar_pre, termp_ar_post }, /* Ar */
-       { NULL, NULL }, /* Cd */
-       { NULL, NULL }, /* Cm */
-       { NULL, NULL }, /* Dv */ 
-       { NULL, NULL }, /* Er */ 
-       { NULL, NULL }, /* Ev */ 
-       { termp_ex_pre, NULL }, /* Ex */
-       { termp_fa_pre, termp_fa_post }, /* Fa */ 
-       { termp_fd_pre, termp_fd_post }, /* Fd */ 
-       { termp_fl_pre, termp_fl_post }, /* Fl */
-       { termp_fn_pre, termp_fn_post }, /* Fn */ 
-       { termp_ft_pre, termp_ft_post }, /* Ft */ 
-       { NULL, NULL }, /* Ic */ 
-       { NULL, NULL }, /* In */ 
-       { NULL, NULL }, /* Li */
-       { termp_nd_pre, NULL }, /* Nd */ 
-       { termp_nm_pre, termp_nm_post }, /* Nm */ 
-       { termp_op_pre, termp_op_post }, /* Op */
-       { NULL, NULL }, /* Ot */
-       { termp_pa_pre, termp_pa_post }, /* Pa */
-       { NULL, NULL }, /* Rv */
-       { NULL, NULL }, /* St */ 
-       { termp_va_pre, termp_va_post }, /* 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 */
-       { NULL, NULL }, /* Ao */
-       { termp_aq_pre, termp_aq_post }, /* Aq */
-       { NULL, NULL }, /* At */
-       { NULL, NULL }, /* Bc */
-       { NULL, NULL }, /* Bf */ 
-       { NULL, NULL }, /* Bo */
-       { NULL, NULL }, /* Bq */
-       { NULL, NULL }, /* Bsx */
-       { termp_bx_pre, NULL }, /* Bx */
-       { NULL, NULL }, /* Db */
-       { NULL, NULL }, /* Dc */
-       { NULL, NULL }, /* Do */
-       { termp_dq_pre, termp_dq_post }, /* Dq */
-       { NULL, NULL }, /* Ec */
-       { NULL, NULL }, /* Ef */
-       { termp_em_pre, termp_em_post }, /* Em */ 
-       { NULL, NULL }, /* Eo */
-       { NULL, NULL }, /* Fx */
-       { NULL, 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 */
-       { NULL, NULL }, /* Po */
-       { NULL, NULL }, /* Pq */
-       { NULL, NULL }, /* Qc */
-       { NULL, NULL }, /* Ql */
-       { termp_qo_pre, termp_qo_post }, /* Qo */
-       { termp_qq_pre, termp_qq_post }, /* Qq */
-       { NULL, NULL }, /* Re */
-       { NULL, NULL }, /* Rs */
-       { NULL, NULL }, /* Sc */
-       { NULL, NULL }, /* So */
-       { termp_sq_pre, termp_sq_post }, /* Sq */
-       { NULL, NULL }, /* Sm */
-       { termp_sx_pre, termp_sx_post }, /* 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 */
-       { termp_ud_pre, NULL }, /* Ud */
-};
-
-const struct termact *termacts = __termacts;
-
-
-static size_t
-arg_offset(const char *v)
+void
+term_free(struct termp *p)
 {
 {
-       if (0 == strcmp(v, "indent"))
-               return(INDENT);
-       if (0 == strcmp(v, "indent-two"))
-               return(INDENT * 2);
 
 
-       /* TODO */
-       return(0);
-}
-
-
-static int
-arg_hasattr(int arg, size_t argc, const struct mdoc_arg *argv)
-{
+       if (p->buf)
+               free(p->buf);
+       if (p->symtab)
+               mchars_free(p->symtab);
 
 
-       return(-1 != arg_getattr(arg, argc, argv));
+       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 void *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 line of text.  A "line" is loosely defined as being something
+ * that should be followed by a newline, regardless of whether it's
+ * broken apart by newlines getting there.  A line can also be a
+ * fragment of a columnar list (`Bl -tag' or `Bl -column'), which does
+ * not have a trailing newline.
+ *
+ * The following flags may be specified:
+ *
+ *  - TERMP_NOLPAD: when beginning to write the line, don't left-pad the
+ *    offset value.  This is useful when doing columnar lists where the
+ *    prior column has right-padded.
+ *
+ *  - TERMP_NOBREAK: this is the most important and is used when making
+ *    columns.  In short: don't print a newline and instead pad to the
+ *    right margin.  Used in conjunction with TERMP_NOLPAD.
+ *
+ *  - TERMP_TWOSPACE: when padding, make sure there are at least two
+ *    space characters of padding.  Otherwise, rather break the line.
+ *
+ *  - TERMP_DANGLE: don't newline when TERMP_NOBREAK is specified and
+ *    the line is overrun, and don't pad-right if it's underrun.
+ *
+ *  - TERMP_HANG: like TERMP_DANGLE, but doesn't newline when
+ *    overruning, instead save the position and continue at that point
+ *    when the next invocation.
+ *
+ *  In-line line breaking:
+ *
+ *  If TERMP_NOBREAK is specified and the line overruns the right
+ *  margin, it will break and pad-right to the right margin after
+ *  writing.  If maxrmargin is violated, it will break and continue
+ *  writing from the right-margin, which will lead to the above scenario
+ *  upon exit.  Otherwise, the line will break at the right margin.
+ */
+void
+term_flushln(struct termp *p)
+{
+       int              i;     /* current input position in p->buf */
+       size_t           vis;   /* current visual position on output */
+       size_t           vbl;   /* number of blanks to prepend to output */
+       size_t           vend;  /* end of word visual position on output */
+       size_t           bp;    /* visual right border position */
+       size_t           dv;    /* temporary for visual pos calculations */
+       int              j;     /* temporary loop index for p->buf */
+       int              jhy;   /* last hyph before overflow w/r/t j */
+       size_t           maxvis; /* output position of visible boundary */
+       size_t           mmax; /* used in calculating bp */
 
 
-/* ARGSUSED */
-static void
-termp_dq_post(DECL_ARGS)
-{
-
-       if (MDOC_BODY != node->type)
-               return;
-
-       p->flags |= TERMP_NOSPACE;
-       word(p, "''");
-}
-
+       /*
+        * First, establish the maximum columns of "visible" content.
+        * This is usually the difference between the right-margin and
+        * an indentation, but can be, for tagged lists or columns, a
+        * small set of values. 
+        */
+       assert  (p->rmargin >= p->offset);
+       dv     = p->rmargin - p->offset;
+       maxvis = (int)dv > p->overstep ? dv - (size_t)p->overstep : 0;
+       dv     = p->maxrmargin - p->offset;
+       mmax   = (int)dv > p->overstep ? dv - (size_t)p->overstep : 0;
 
 
-/* ARGSUSED */
-static void
-termp_it_post(DECL_ARGS)
-{
-       const struct mdoc_node *n, *it;
-       const struct mdoc_block *bl;
-       int              i;
-       size_t           width;
+       bp = TERMP_NOBREAK & p->flags ? mmax : maxvis;
 
        /*
 
        /*
-        * This (and termp_it_pre()) are the most complicated functions
-        * here.  They must account for a considerable number of
-        * switches that completely change the output behaviour, like
-        * -tag versus -column.  Yech.
+        * Indent the first line of a paragraph.
         */
         */
+       vbl = p->flags & TERMP_NOLPAD ? (size_t)0 : p->offset;
+
+       vis = vend = 0;
+       i = 0;
+
+       while (i < p->col) {
+               /*
+                * Handle literal tab characters: collapse all
+                * subsequent tabs into a single huge set of spaces.
+                */
+               while (i < p->col && '\t' == p->buf[i]) {
+                       vend = (vis / p->tabwidth + 1) * p->tabwidth;
+                       vbl += vend - vis;
+                       vis = vend;
+                       i++;
+               }
 
 
-       switch (node->type) {
-       case (MDOC_BODY):
-               /* FALLTHROUGH */
-       case (MDOC_HEAD):
-               break;
-       default:
-               return;
-       }
-
-       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;
+               /*
+                * Count up visible word characters.  Control sequences
+                * (starting with the CSI) aren't counted.  A space
+                * generates a non-printing word, which is valid (the
+                * space is printed according to regular spacing rules).
+                */
+
+               for (j = i, jhy = 0; j < p->col; j++) {
+                       if ((j && ' ' == p->buf[j]) || '\t' == p->buf[j])
+                               break;
+
+                       /* Back over the the last printed character. */
+                       if (8 == p->buf[j]) {
+                               assert(j);
+                               vend -= (*p->width)(p, p->buf[j - 1]);
+                               continue;
+                       }
+
+                       /* Regular word. */
+                       /* Break at the hyphen point if we overrun. */
+                       if (vend > vis && vend < bp && 
+                                       ASCII_HYPH == p->buf[j])
+                               jhy = j;
+
+                       vend += (*p->width)(p, p->buf[j]);
                }
                }
-               return;
-       }
 
 
-       if (arg_hasattr(MDOC_Ohang, bl->argc, bl->argv)) {
-               i = arg_getattr(MDOC_Offset, bl->argc, bl->argv);
-               width = 0;
-               if (i >= 0) {
-                       assert(1 == bl->argv[i].sz);
-                       width = arg_offset(*bl->argv[i].value);
+               /*
+                * Find out whether we would exceed the right margin.
+                * If so, break to the next line.
+                */
+               if (vend > bp && 0 == jhy && vis > 0) {
+                       vend -= vis;
+                       (*p->endline)(p);
+                       if (TERMP_NOBREAK & p->flags) {
+                               p->viscol = p->rmargin;
+                               (*p->advance)(p, p->rmargin);
+                               vend += p->rmargin - p->offset;
+                       } else {
+                               p->viscol = 0;
+                               vbl = p->offset;
+                       }
+
+                       /* Remove the p->overstep width. */
+
+                       bp += (size_t)p->overstep;
+                       p->overstep = 0;
                }
 
                }
 
-               flushln(p);
-               p->offset -= width;
-               return;
+               /* Write out the [remaining] word. */
+               for ( ; i < p->col; i++) {
+                       if (vend > bp && jhy > 0 && i > jhy)
+                               break;
+                       if ('\t' == p->buf[i])
+                               break;
+                       if (' ' == p->buf[i]) {
+                               j = i;
+                               while (' ' == p->buf[i])
+                                       i++;
+                               dv = (size_t)(i - j) * (*p->width)(p, ' ');
+                               vbl += dv;
+                               vend += dv;
+                               break;
+                       }
+                       if (ASCII_NBRSP == p->buf[i]) {
+                               vbl += (*p->width)(p, ' ');
+                               continue;
+                       }
+
+                       /*
+                        * Now we definitely know there will be
+                        * printable characters to output,
+                        * so write preceding white space now.
+                        */
+                       if (vbl) {
+                               (*p->advance)(p, vbl);
+                               p->viscol += vbl;
+                               vbl = 0;
+                       }
+
+                       if (ASCII_HYPH == p->buf[i]) {
+                               (*p->letter)(p, '-');
+                               p->viscol += (*p->width)(p, '-');
+                       } else {
+                               (*p->letter)(p, p->buf[i]);
+                               p->viscol += (*p->width)(p, p->buf[i]);
+                       }
+               }
+               vis = vend;
        }
        }
-}
-
-
-/* ARGSUSED */
-static int
-termp_it_pre(DECL_ARGS)
-{
-       const struct mdoc_node *n, *it;
-       const struct mdoc_block *bl;
-       int              i;
-       size_t           width;
 
        /*
 
        /*
-        * Also see termp_it_post() for general comments.
+        * If there was trailing white space, it was not printed;
+        * so reset the cursor position accordingly.
         */
         */
+       vis -= vbl;
 
 
-       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);
-       }
-
-       /* If `-ohang', adjust left-margin. */
+       p->col = 0;
+       p->overstep = 0;
 
 
-       if (arg_hasattr(MDOC_Ohang, bl->argc, bl->argv)) {
-               width = 0;
-               i = arg_getattr(MDOC_Offset, bl->argc, bl->argv);
-               if (i >= 0) {
-                       assert(1 == bl->argv[i].sz);
-                       width = arg_offset(*bl->argv[i].value);
-               } 
-
-               p->flags |= TERMP_NOSPACE;
-               p->offset += width;
-               return(1);
+       if ( ! (TERMP_NOBREAK & p->flags)) {
+               p->viscol = 0;
+               (*p->endline)(p);
+               return;
        }
 
        }
 
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_nm_post(DECL_ARGS)
-{
-
-       p->flags &= ~ttypes[TTYPE_PROG];
-}
-
-
-/* ARGSUSED */
-static void
-termp_fl_post(DECL_ARGS)
-{
-
-       p->flags &= ~ttypes[TTYPE_CMD_FLAG];
-}
-
-
-/* ARGSUSED */
-static int
-termp_ar_pre(DECL_ARGS)
-{
-
-       p->flags |= ttypes[TTYPE_CMD_ARG];
-       if (NULL == node->child)
-               word(p, "...");
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_nm_pre(DECL_ARGS)
-{
-
-       p->flags |= ttypes[TTYPE_PROG];
-       if (NULL == node->child)
-               word(p, meta->name);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_ns_pre(DECL_ARGS)
-{
-
-       p->flags |= TERMP_NOSPACE;
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-termp_pp_pre(DECL_ARGS)
-{
-
-       vspace(p);
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_ar_post(DECL_ARGS)
-{
-
-       p->flags &= ~ttypes[TTYPE_CMD_ARG];
-}
-
-
-/* ARGSUSED */
-static int
-termp_ex_pre(DECL_ARGS)
-{
-       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);
-}
-
-
-/* ARGSUSED */
-static void
-termp_op_post(DECL_ARGS)
-{
+       if (TERMP_HANG & p->flags) {
+               /* We need one blank after the tag. */
+               p->overstep = (int)(vis - maxvis + (*p->width)(p, ' '));
+
+               /*
+                * Behave exactly the same way as groff:
+                * If we have overstepped the margin, temporarily move
+                * it to the right and flag the rest of the line to be
+                * shorter.
+                * If we landed right at the margin, be happy.
+                * If we are one step before the margin, temporarily
+                * move it one step LEFT and flag the rest of the line
+                * to be longer.
+                */
+               if (p->overstep >= -1) {
+                       assert((int)maxvis + p->overstep >= 0);
+                       maxvis += (size_t)p->overstep;
+               } else
+                       p->overstep = 0;
 
 
-       if (MDOC_BODY != node->type) 
+       } else if (TERMP_DANGLE & p->flags)
                return;
                return;
-       p->flags |= TERMP_NOSPACE;
-       word(p, "\\(rB");
-}
-
 
 
-/* ARGSUSED */
-static void
-termp_sh_post(DECL_ARGS)
-{
-
-       switch (node->type) {
-       case (MDOC_HEAD):
-               p->flags &= ~ttypes[TTYPE_SECTION];
-               newln(p);
-               break;
-       case (MDOC_BODY):
-               newln(p);
-               p->offset = 0;
-               break;
-       default:
-               break;
+       /* Right-pad. */
+       if (maxvis > vis +
+           ((TERMP_TWOSPACE & p->flags) ? (*p->width)(p, ' ') : 0)) {
+               p->viscol += maxvis - vis;
+               (*p->advance)(p, maxvis - vis);
+               vis += (maxvis - vis);
+       } else {        /* ...or newline break. */
+               (*p->endline)(p);
+               p->viscol = p->rmargin;
+               (*p->advance)(p, p->rmargin);
        }
 }
 
 
        }
 }
 
 
-/* ARGSUSED */
-static int
-termp_xr_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)
 {
 {
-       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;
        p->flags |= TERMP_NOSPACE;
-       word(p, ")");
-
-       return(0);
-}
-
-
-/* ARGSUSED */
-static int
-termp_vt_pre(DECL_ARGS)
-{
-
-       /* FIXME: this can be "type name". */
-       p->flags |= ttypes[TTYPE_VAR_DECL];
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_vt_post(DECL_ARGS)
-{
-
-       p->flags &= ~ttypes[TTYPE_VAR_DECL];
-       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.
-        */
-       p->flags |= ttypes[TTYPE_FUNC_DECL];
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_fd_post(DECL_ARGS)
-{
-
-       p->flags &= ~ttypes[TTYPE_FUNC_DECL];
-       if (node->sec == SEC_SYNOPSIS)
-               vspace(p);
-
-}
-
-
-/* ARGSUSED */
-static int
-termp_sh_pre(DECL_ARGS)
-{
-
-       switch (node->type) {
-       case (MDOC_HEAD):
-               vspace(p);
-               p->flags |= ttypes[TTYPE_SECTION];
-               break;
-       case (MDOC_BODY):
-               p->offset = INDENT;
-               break;
-       default:
-               break;
+       if (0 == p->col && 0 == p->viscol) {
+               p->flags &= ~TERMP_NOLPAD;
+               return;
        }
        }
-       return(1);
+       term_flushln(p);
+       p->flags &= ~TERMP_NOLPAD;
 }
 
 
 }
 
 
-/* ARGSUSED */
-static int
-termp_op_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)
 {
 
 {
 
-       switch (node->type) {
-       case (MDOC_BODY):
-               word(p, "\\(lB");
-               p->flags |= TERMP_NOSPACE;
-               break;
-       default:
-               break;
-       }
-       return(1);
+       term_newln(p);
+       p->viscol = 0;
+       (*p->endline)(p);
 }
 
 }
 
-
-/* ARGSUSED */
-static int
-termp_ud_pre(DECL_ARGS)
+void
+term_fontlast(struct termp *p)
 {
 {
+       enum termfont    f;
 
 
-       word(p, "currently under development.");
-       return(1);
+       f = p->fontl;
+       p->fontl = p->fontq[p->fonti];
+       p->fontq[p->fonti] = f;
 }
 
 
 }
 
 
-/* ARGSUSED */
-static int
-termp_fl_pre(DECL_ARGS)
+void
+term_fontrepl(struct termp *p, enum termfont f)
 {
 
 {
 
-       p->flags |= ttypes[TTYPE_CMD_FLAG];
-       word(p, "\\-");
-       p->flags |= TERMP_NOSPACE;
-       return(1);
+       p->fontl = p->fontq[p->fonti];
+       p->fontq[p->fonti] = f;
 }
 
 
 }
 
 
-/* ARGSUSED */
-static int
-termp_d1_pre(DECL_ARGS)
+void
+term_fontpush(struct termp *p, enum termfont f)
 {
 
 {
 
-       if (MDOC_BODY != node->type)
-               return(1);
-       newln(p);
-       p->offset += INDENT;
-       return(1);
+       assert(p->fonti + 1 < 10);
+       p->fontl = p->fontq[p->fonti];
+       p->fontq[++p->fonti] = f;
 }
 
 
 }
 
 
-/* ARGSUSED */
-static void
-termp_d1_post(DECL_ARGS)
+const void *
+term_fontq(struct termp *p)
 {
 
 {
 
-       if (MDOC_BODY != node->type) 
-               return;
-       newln(p);
-       p->offset -= INDENT;
+       return(&p->fontq[p->fonti]);
 }
 
 
 }
 
 
-/* ARGSUSED */
-static int
-termp_aq_pre(DECL_ARGS)
+enum termfont
+term_fonttop(struct termp *p)
 {
 
 {
 
-       if (MDOC_BODY != node->type)
-               return(1);
-       word(p, "<");
-       p->flags |= TERMP_NOSPACE;
-       return(1);
+       return(p->fontq[p->fonti]);
 }
 
 
 }
 
 
-/* ARGSUSED */
-static void
-termp_aq_post(DECL_ARGS)
+void
+term_fontpopq(struct termp *p, const void *key)
 {
 
 {
 
-       if (MDOC_BODY != node->type)
-               return;
-       p->flags |= TERMP_NOSPACE;
-       word(p, ">");
+       while (p->fonti >= 0 && key != &p->fontq[p->fonti])
+               p->fonti--;
+       assert(p->fonti >= 0);
 }
 
 
 }
 
 
-/* ARGSUSED */
-static int
-termp_ft_pre(DECL_ARGS)
+void
+term_fontpop(struct termp *p)
 {
 
 {
 
-       p->flags |= ttypes[TTYPE_FUNC_TYPE];
-       return(1);
+       assert(p->fonti);
+       p->fonti--;
 }
 
 }
 
-
-/* ARGSUSED */
-static void
-termp_ft_post(DECL_ARGS)
-{
-
-       p->flags &= ~ttypes[TTYPE_FUNC_TYPE];
-       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];
-
-       p->flags |= TERMP_NOSPACE;
-       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, ",");
+/*
+ * Handle pwords, partial words, which may be either a single word or a
+ * phrase that cannot be broken down (such as a literal string).  This
+ * handles word styling.
+ */
+void
+term_word(struct termp *p, const char *word)
+{
+       const char      *seq, *cp;
+       char             c;
+       int              sz, uc;
+       size_t           ssz;
+       enum mandoc_esc  esc;
+
+       if ( ! (TERMP_NOSPACE & p->flags)) {
+               if ( ! (TERMP_KEEP & p->flags)) {
+                       if (TERMP_PREKEEP & p->flags)
+                               p->flags |= TERMP_KEEP;
+                       bufferc(p, ' ');
+                       if (TERMP_SENTENCE & p->flags)
+                               bufferc(p, ' ');
+               } else
+                       bufferc(p, ASCII_NBRSP);
        }
 
        }
 
-       p->flags |= TERMP_NOSPACE;
-       word(p, ")");
-
-       if (SEC_SYNOPSIS == node->sec)
-               word(p, ";");
+       if ( ! (p->flags & TERMP_NONOSPACE))
+               p->flags &= ~TERMP_NOSPACE;
+       else
+               p->flags |= TERMP_NOSPACE;
 
 
-       return(0);
+       p->flags &= ~(TERMP_SENTENCE | TERMP_IGNDELIM);
+
+       while ('\0' != *word) {
+               if ((ssz = strcspn(word, "\\")) > 0)
+                       encode(p, word, ssz);
+
+               word += (int)ssz;
+               if ('\\' != *word)
+                       continue;
+
+               word++;
+               esc = mandoc_escape(&word, &seq, &sz);
+               if (ESCAPE_ERROR == esc)
+                       break;
+
+               if (TERMENC_ASCII != p->enc)
+                       switch (esc) {
+                       case (ESCAPE_UNICODE):
+                               uc = mchars_num2uc(seq + 1, sz - 1);
+                               if ('\0' == uc)
+                                       break;
+                               encode1(p, uc);
+                               continue;
+                       case (ESCAPE_SPECIAL):
+                               uc = mchars_spec2cp(p->symtab, seq, sz);
+                               if (uc <= 0)
+                                       break;
+                               encode1(p, uc);
+                               continue;
+                       default:
+                               break;
+                       }
+
+               switch (esc) {
+               case (ESCAPE_UNICODE):
+                       encode1(p, '?');
+                       break;
+               case (ESCAPE_NUMBERED):
+                       c = mchars_num2char(seq, sz);
+                       if ('\0' != c)
+                               encode(p, &c, 1);
+                       break;
+               case (ESCAPE_SPECIAL):
+                       cp = mchars_spec2str(p->symtab, seq, sz, &ssz);
+                       if (NULL != cp) 
+                               encode(p, cp, ssz);
+                       else if (1 == ssz)
+                               encode(p, seq, sz);
+                       break;
+               case (ESCAPE_FONTBOLD):
+                       term_fontrepl(p, TERMFONT_BOLD);
+                       break;
+               case (ESCAPE_FONTITALIC):
+                       term_fontrepl(p, TERMFONT_UNDER);
+                       break;
+               case (ESCAPE_FONT):
+                       /* FALLTHROUGH */
+               case (ESCAPE_FONTROMAN):
+                       term_fontrepl(p, TERMFONT_NONE);
+                       break;
+               case (ESCAPE_FONTPREV):
+                       term_fontlast(p);
+                       break;
+               case (ESCAPE_NOSPACE):
+                       if ('\0' == *word)
+                               p->flags |= TERMP_NOSPACE;
+                       break;
+               default:
+                       break;
+               }
+       }
 }
 
 }
 
-
-/* ARGSUSED */
 static void
 static void
-termp_fn_post(DECL_ARGS)
+adjbuf(struct termp *p, int sz)
 {
 
 {
 
-       if (node->sec == SEC_SYNOPSIS)
-               vspace(p);
-
-}
-
-
-/* ARGSUSED */
-static int
-termp_sx_pre(DECL_ARGS)
-{
+       if (0 == p->maxcols)
+               p->maxcols = 1024;
+       while (sz >= p->maxcols)
+               p->maxcols <<= 2;
 
 
-       p->flags |= ttypes[TTYPE_LINK];
-       return(1);
+       p->buf = mandoc_realloc
+               (p->buf, sizeof(int) * (size_t)p->maxcols);
 }
 
 }
 
-
-/* ARGSUSED */
 static void
 static void
-termp_sx_post(DECL_ARGS)
+bufferc(struct termp *p, char c)
 {
 
 {
 
-       p->flags &= ~ttypes[TTYPE_LINK];
-}
-
+       if (p->col + 1 >= p->maxcols)
+               adjbuf(p, p->col + 1);
 
 
-/* ARGSUSED */
-static int
-termp_fa_pre(DECL_ARGS)
-{
-
-       p->flags |= ttypes[TTYPE_FUNC_ARG];
-       return(1);
+       p->buf[p->col++] = c;
 }
 
 }
 
-
-/* ARGSUSED */
+/*
+ * See encode().
+ * Do this for a single (probably unicode) value.
+ * Does not check for non-decorated glyphs.
+ */
 static void
 static void
-termp_fa_post(DECL_ARGS)
+encode1(struct termp *p, int c)
 {
 {
+       enum termfont     f;
 
 
-       p->flags &= ~ttypes[TTYPE_FUNC_ARG];
-}
+       if (p->col + 4 >= p->maxcols)
+               adjbuf(p, p->col + 4);
 
 
+       f = term_fonttop(p);
 
 
-/* ARGSUSED */
-static int
-termp_va_pre(DECL_ARGS)
-{
+       if (TERMFONT_NONE == f) {
+               p->buf[p->col++] = c;
+               return;
+       } else if (TERMFONT_UNDER == f) {
+               p->buf[p->col++] = '_';
+       } else
+               p->buf[p->col++] = c;
 
 
-       p->flags |= ttypes[TTYPE_VAR_DECL];
-       return(1);
+       p->buf[p->col++] = 8;
+       p->buf[p->col++] = c;
 }
 
 }
 
-
-/* ARGSUSED */
 static void
 static void
-termp_va_post(DECL_ARGS)
+encode(struct termp *p, const char *word, size_t sz)
 {
 {
+       enum termfont     f;
+       int               i, len;
 
 
-       p->flags &= ~ttypes[TTYPE_VAR_DECL];
-}
-
-
-/* ARGSUSED */
-static int
-termp_bd_pre(DECL_ARGS)
-{
-       const struct mdoc_block *bl;
-       const struct mdoc_node *n;
-
-       if (MDOC_BLOCK == node->type) {
-               vspace(p);
-               return(1);
-       } else if (MDOC_BODY != node->type)
-               return(1);
-
-       assert(MDOC_BLOCK == node->parent->type);
-
-       bl = &node->parent->data.block;
-       if ( ! arg_hasattr(MDOC_Literal, bl->argc, bl->argv))
-               return(1);
-
-       p->flags |= TERMP_LITERAL;
-
-       for (n = node->child; n; n = n->next) {
-               assert(MDOC_TEXT == n->type); /* FIXME */
-               if ((*n->data.text.string)) {
-                       word(p, n->data.text.string);
-                       flushln(p);
-               } else
-                       vspace(p);
-
-       }
-
-       p->flags &= ~TERMP_LITERAL;
-       return(0);
-}
-
-
-/* ARGSUSED */
-static int
-termp_qq_pre(DECL_ARGS)
-{
+       /* LINTED */
+       len = sz;
 
 
-       if (MDOC_BODY != node->type)
-               return(1);
-       word(p, "\"");
-       p->flags |= TERMP_NOSPACE;
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_qq_post(DECL_ARGS)
-{
+       /*
+        * Encode and buffer a string of characters.  If the current
+        * font mode is unset, buffer directly, else encode then buffer
+        * character by character.
+        */
 
 
-       if (MDOC_BODY != node->type)
+       if (TERMFONT_NONE == (f = term_fonttop(p))) {
+               if (p->col + len >= p->maxcols) 
+                       adjbuf(p, p->col + len);
+               for (i = 0; i < len; i++)
+                       p->buf[p->col++] = word[i];
                return;
                return;
-       p->flags |= TERMP_NOSPACE;
-       word(p, "\"");
-}
-
-
-/* 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);
-}
+       }
 
 
+       /* Pre-buffer, assuming worst-case. */
 
 
-/* ARGSUSED */
-static int
-termp_nx_pre(DECL_ARGS)
-{
-
-       word(p, "NetBSD");
-       return(1);
-}
+       if (p->col + 1 + (len * 3) >= p->maxcols)
+               adjbuf(p, p->col + 1 + (len * 3));
 
 
+       for (i = 0; i < len; i++) {
+               if ( ! isgraph((unsigned char)word[i])) {
+                       p->buf[p->col++] = word[i];
+                       continue;
+               }
 
 
-/* ARGSUSED */
-static int
-termp_sq_pre(DECL_ARGS)
-{
+               if (TERMFONT_UNDER == f)
+                       p->buf[p->col++] = '_';
+               else
+                       p->buf[p->col++] = word[i];
 
 
-       if (MDOC_BODY != node->type)
-               return(1);
-       word(p, "`");
-       p->flags |= TERMP_NOSPACE;
-       return(1);
+               p->buf[p->col++] = 8;
+               p->buf[p->col++] = word[i];
+       }
 }
 
 }
 
-
-/* ARGSUSED */
-static void
-termp_sq_post(DECL_ARGS)
+size_t
+term_len(const struct termp *p, size_t sz)
 {
 
 {
 
-       if (MDOC_BODY != node->type)
-               return;
-       p->flags |= TERMP_NOSPACE;
-       word(p, "\'");
+       return((*p->width)(p, ' ') * sz);
 }
 
 
 }
 
 
-/* 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, c;
+       const char      *seq, *rhs;
+       enum mandoc_esc  esc;
+       static const char rej[] = { '\\', ASCII_HYPH, ASCII_NBRSP, '\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;
+       while ('\0' != *cp) {
+               rsz = strcspn(cp, rej);
+               for (i = 0; i < rsz; i++)
+                       sz += (*p->width)(p, *cp++);
+
+               c = 0;
+               switch (*cp) {
+               case ('\\'):
+                       cp++;
+                       esc = mandoc_escape(&cp, &seq, &ssz);
+                       if (ESCAPE_ERROR == esc)
+                               return(sz);
+
+                       if (TERMENC_ASCII != p->enc)
+                               switch (esc) {
+                               case (ESCAPE_UNICODE):
+                                       c = mchars_num2uc
+                                               (seq + 1, ssz - 1);
+                                       if ('\0' == c)
+                                               break;
+                                       sz += (*p->width)(p, c);
+                                       continue;
+                               case (ESCAPE_SPECIAL):
+                                       c = mchars_spec2cp
+                                               (p->symtab, seq, ssz);
+                                       if (c <= 0)
+                                               break;
+                                       sz += (*p->width)(p, c);
+                                       continue;
+                               default:
+                                       break;
+                               }
+
+                       rhs = NULL;
+
+                       switch (esc) {
+                       case (ESCAPE_UNICODE):
+                               sz += (*p->width)(p, '?');
+                               break;
+                       case (ESCAPE_NUMBERED):
+                               c = mchars_num2char(seq, ssz);
+                               if ('\0' != c)
+                                       sz += (*p->width)(p, c);
+                               break;
+                       case (ESCAPE_SPECIAL):
+                               rhs = mchars_spec2str
+                                       (p->symtab, seq, ssz, &rsz);
+
+                               if (ssz != 1 || rhs)
+                                       break;
+
+                               rhs = seq;
+                               rsz = ssz;
+                               break;
+                       default:
+                               break;
+                       }
+
+                       if (NULL == rhs)
+                               break;
+
+                       for (i = 0; i < rsz; i++)
+                               sz += (*p->width)(p, *rhs++);
+                       break;
+               case (ASCII_NBRSP):
+                       sz += (*p->width)(p, ' ');
+                       cp++;
+                       break;
+               case (ASCII_HYPH):
+                       sz += (*p->width)(p, '-');
+                       cp++;
+                       break;
+               default:
+                       break;
+               }
+       }
 
 
-       p->flags &= ~TERMP_IGNDELIM;
-       p->flags |= TERMP_NOSPACE;
+       return(sz);
 }
 
 }
 
-
 /* ARGSUSED */
 /* ARGSUSED */
-static int
-termp_ss_pre(DECL_ARGS)
+size_t
+term_vspan(const struct termp *p, const struct roffsu *su)
 {
 {
+       double           r;
 
 
-       switch (node->type) {
-       case (MDOC_HEAD):
-               vspace(p);
-               p->flags |= ttypes[TTYPE_SSECTION];
-               p->offset = INDENT / 2;
+       switch (su->unit) {
+       case (SCALE_CM):
+               r = su->scale * 2;
                break;
                break;
-       default:
+       case (SCALE_IN):
+               r = su->scale * 6;
                break;
                break;
-       }
-
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_ss_post(DECL_ARGS)
-{
-
-       switch (node->type) {
-       case (MDOC_HEAD):
-               p->flags &= ~ttypes[TTYPE_SSECTION];
-               newln(p);
-               p->offset = INDENT;
+       case (SCALE_PC):
+               r = su->scale;
+               break;
+       case (SCALE_PT):
+               r = su->scale / 8;
+               break;
+       case (SCALE_MM):
+               r = su->scale / 1000;
+               break;
+       case (SCALE_VS):
+               r = su->scale;
                break;
        default:
                break;
        default:
+               r = su->scale - 1;
                break;
        }
                break;
        }
-}
-
-
-/* ARGSUSED */
-static int
-termp_pa_pre(DECL_ARGS)
-{
-
-       p->flags |= ttypes[TTYPE_FILE];
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_pa_post(DECL_ARGS)
-{
 
 
-       p->flags &= ~ttypes[TTYPE_FILE];
+       if (r < 0.0)
+               r = 0.0;
+       return(/* LINTED */(size_t)
+                       r);
 }
 
 }
 
-
-/* ARGSUSED */
-static int
-termp_qo_pre(DECL_ARGS)
-{
-
-       if (MDOC_BODY != node->type)
-               return(1);
-       word(p, "\"");
-       p->flags |= TERMP_NOSPACE;
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_qo_post(DECL_ARGS)
-{
-
-       if (MDOC_BODY != node->type)
-               return;
-       p->flags |= TERMP_NOSPACE;
-       word(p, "\"");
-}
-
-
-/* ARGSUSED */
-static int
-termp_em_pre(DECL_ARGS)
-{
-
-       p->flags |= ttypes[TTYPE_EMPH];
-       return(1);
-}
-
-
-/* ARGSUSED */
-static void
-termp_em_post(DECL_ARGS)
+size_t
+term_hspan(const struct termp *p, const struct roffsu *su)
 {
 {
+       double           v;
 
 
-       p->flags &= ~ttypes[TTYPE_EMPH];
+       v = ((*p->hspan)(p, su));
+       if (v < 0.0)
+               v = 0.0;
+       return((size_t) /* LINTED */
+                       v);
 }
 }
A git conversion mirror of mandoc.bsd.lv