Removed TODO that was fixed by parsing escapes in offset strings.

[mandoc.git] / term.c

diff --git a/term.c b/term.c
index 6bfd373d64276f57c079287b13e984538a39f09e..b609b0e8615d65391ec2d53ca41f2509eb298d13 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,6 +1,7 @@
-/*     $Id: term.c,v 1.100 2009/09/16 15:08:31 kristaps Exp $ */
+/*     $Id: term.c,v 1.172 2010/09/23 20:26:00 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -14,97 +15,77 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * 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 <err.h>
+#include <ctype.h>
+#include <stdint.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

+#include "mandoc.h"
+#include "chars.h"
+#include "out.h"

 #include "term.h"
 #include "term.h"

-#include "man.h"
-#include "mdoc.h"
-
-extern void              man_run(struct termp *, 
-                               const struct man *);
-extern void              mdoc_run(struct termp *, 
-                               const struct mdoc *);
+#include "main.h"

 
 

-static struct termp     *term_alloc(enum termenc);
-static void              term_free(struct termp *);
-
-static void              do_escaped(struct termp *, const char **);
-static void              do_special(struct termp *,
-                               const char *, size_t);
-static void              do_reserved(struct termp *,
+static void              spec(struct termp *, enum roffdeco,

                                const char *, size_t);
                                const char *, size_t);

-static void              buffer(struct termp *, char);
-static void              encode(struct termp *, char);
-
-
-void *
-ascii_alloc(void)
-{
-
-       return(term_alloc(TERMENC_ASCII));
-}
+static void              res(struct termp *, const char *, size_t);
+static void              bufferc(struct termp *, char);
+static void              adjbuf(struct termp *p, size_t);
+static void              encode(struct termp *, const char *, size_t);

 
 
 void
 
 
 void

-terminal_man(void *arg, const struct man *man)
+term_free(struct termp *p)

 {
 {

-       struct termp    *p;

 
 

-       p = (struct termp *)arg;
-       if (NULL == p->symtab)
-               p->symtab = term_ascii2htab();
+       if (p->buf)
+               free(p->buf);
+       if (p->symtab)
+               chars_free(p->symtab);

 
 

-       man_run(p, man);
+       free(p);

 }
 
 
 void
 }
 
 
 void

-terminal_mdoc(void *arg, const struct mdoc *mdoc)
+term_begin(struct termp *p, term_margin head, 
+               term_margin foot, const void *arg)

 {
 {

-       struct termp    *p;
-
-       p = (struct termp *)arg;
-       if (NULL == p->symtab)
-               p->symtab = term_ascii2htab();

 
 

-       mdoc_run(p, mdoc);
+       p->headf = head;
+       p->footf = foot;
+       p->argf = arg;
+       (*p->begin)(p);

 }
 
 
 void
 }
 
 
 void

-terminal_free(void *arg)
-{
-
-       term_free((struct termp *)arg);
-}
-
-
-static void
-term_free(struct termp *p)
+term_end(struct termp *p)

 {
 
 {
 

-       if (p->buf)
-               free(p->buf);
-       if (TERMENC_ASCII == p->enc && p->symtab)
-               term_asciifree(p->symtab);
-
-       free(p);
+       (*p->end)(p);

 }
 
 
 }
 
 

-static struct termp *
+struct termp *

 term_alloc(enum termenc enc)
 {
 term_alloc(enum termenc enc)
 {

-       struct termp *p;
+       struct termp    *p;
+
+       p = calloc(1, sizeof(struct termp));
+       if (NULL == p) {
+               perror(NULL);
+               exit((int)MANDOCLEVEL_SYSERR);
+       }

 
 

-       if (NULL == (p = malloc(sizeof(struct termp))))
-               return(NULL);
-       bzero(p, sizeof(struct termp));
-       p->maxrmargin = 78;

        p->enc = enc;
        return(p);
 }
        p->enc = enc;
        return(p);
 }


@@ -114,12 +95,10 @@ term_alloc(enum termenc enc)
  * 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
  * 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.
+ * fragment of a columnar list (`Bl -tag' or `Bl -column'), which does
+ * not have a trailing newline.

  *
  *

- * Specifically, a line is whatever's in p->buf of length p->col, which
- * is zeroed after this function returns.
- *
- * The usage of termp:flags is as follows:
+ * 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
  *
  *  - TERMP_NOLPAD: when beginning to write the line, don't left-pad the
  *    offset value.  This is useful when doing columnar lists where the


@@ -144,51 +123,60 @@ term_alloc(enum termenc enc)
  *  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
  *  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.  Extremely long
- *  lines will cause the system to emit a warning (TODO: hyphenate, if
- *  possible).
+ *  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)
 {
  */
 void
 term_flushln(struct termp *p)
 {

-       int              i, j;
-       size_t           vbl, vsz, vis, maxvis, mmax, bp;
-       static int       overstep = 0;
+       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 */

 
        /*
         * 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
 
        /*
         * 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.
+        * small set of values. 

         */
 
        assert(p->offset < p->rmargin);
         */
 
        assert(p->offset < p->rmargin);

-       assert((int)(p->rmargin - p->offset) - overstep > 0);

 
 

-       maxvis = /* LINTED */
-               p->rmargin - p->offset - overstep;
-       mmax = /* LINTED */
-               p->maxrmargin - p->offset - overstep;
+       maxvis = (int)(p->rmargin - p->offset) - p->overstep < 0 ?
+               /* LINTED */ 
+               0 : p->rmargin - p->offset - p->overstep;
+       mmax = (int)(p->maxrmargin - p->offset) - p->overstep < 0 ?
+               /* LINTED */
+               0 : p->maxrmargin - p->offset - p->overstep;

 
        bp = TERMP_NOBREAK & p->flags ? mmax : maxvis;
 
        bp = TERMP_NOBREAK & p->flags ? mmax : maxvis;

-       vis = 0;
-       overstep = 0;

 
        /*
 
        /*

-        * If in the standard case (left-justified), then begin with our
-        * indentation, otherwise (columns, etc.) just start spitting
-        * out text.
+        * Indent the first line of a paragraph.

         */
         */

+       vbl = p->flags & TERMP_NOLPAD ? 0 : p->offset;

 
 

-       if ( ! (p->flags & TERMP_NOLPAD))
-               /* LINTED */
-               for (j = 0; j < (int)p->offset; j++)
-                       putchar(' ');
+       vis = vend = i = 0;
+
+       while (i < (int)p->col) {
+               /*
+                * Handle literal tab characters: collapse all
+                * subsequent tabs into a single huge set of spaces.
+                */
+               while (i < (int)p->col && '\t' == p->buf[i]) {
+                       vend = (vis / p->tabwidth + 1) * p->tabwidth;
+                       vbl += vend - vis;
+                       vis = vend;
+                       i++;
+               }

 
 

-       for (i = 0; i < (int)p->col; i++) {

                /*
                 * Count up visible word characters.  Control sequences
                 * (starting with the CSI) aren't counted.  A space
                /*
                 * Count up visible word characters.  Control sequences
                 * (starting with the CSI) aren't counted.  A space


@@ -197,65 +185,110 @@ term_flushln(struct termp *p)
                 */
 
                /* LINTED */
                 */
 
                /* LINTED */

-               for (j = i, vsz = 0; j < (int)p->col; j++) {
-                       if (j && ' ' == p->buf[j]) 
+               for (j = i, jhy = 0; j < (int)p->col; j++) {
+                       if ((j && ' ' == p->buf[j]) || '\t' == p->buf[j])

                                break;
                                break;

-                       else if (8 == p->buf[j])
-                               vsz--;
-                       else
-                               vsz++;
-               }

 
 

-               /*
-                * Choose the number of blanks to prepend: no blank at the
-                * beginning of a line, one between words -- but do not
-                * actually write them yet.
-                */
-               vbl = (size_t)(0 == vis ? 0 : 1);
+                       /* 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]);
+               }

 
                /*
                 * Find out whether we would exceed the right margin.
 
                /*
                 * Find out whether we would exceed the right margin.

-                * If so, break to the next line.  (TODO: hyphenate)
-                * Otherwise, write the chosen number of blanks now.
+                * If so, break to the next line.

                 */
                 */

-               if (vis && vis + vbl + vsz > bp) {
-                       putchar('\n');
+               if (vend > bp && 0 == jhy && vis > 0) {
+                       vend -= vis;
+                       (*p->endline)(p);

                        if (TERMP_NOBREAK & p->flags) {
                        if (TERMP_NOBREAK & p->flags) {

-                               for (j = 0; j < (int)p->rmargin; j++)
-                                       putchar(' ');
-                               vis = p->rmargin - p->offset;
+                               p->viscol = p->rmargin;
+                               (*p->advance)(p, p->rmargin);
+                               vend += p->rmargin - p->offset;

                        } else {
                        } else {

-                               for (j = 0; j < (int)p->offset; j++)
-                                       putchar(' ');
-                               vis = 0;
+                               p->viscol = 0;
+                               vbl = p->offset;

                        }
                        }

-               } else {
-                       for (j = 0; j < (int)vbl; j++)
-                               putchar(' ');
-                       vis += vbl;
+
+                       /* Remove the p->overstep width. */
+
+                       bp += (int)/* LINTED */
+                               p->overstep;
+                       p->overstep = 0;

                }
 
                }
 

-               /*
-                * Finally, write out the word.
-                */
+               /* Write out the [remaining] word. */

                for ( ; i < (int)p->col; i++) {
                for ( ; i < (int)p->col; i++) {

-                       if (' ' == p->buf[i])
+                       if (vend > bp && jhy > 0 && i > jhy)
+                               break;
+                       if ('\t' == p->buf[i])

                                break;
                                break;

-                       putchar(p->buf[i]);
+                       if (' ' == p->buf[i]) {
+                               j = i;
+                               while (' ' == p->buf[i])
+                                       i++;
+                               dv = (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 += vsz;
+               vis = vend;

        }
        }

+
+       /*
+        * If there was trailing white space, it was not printed;
+        * so reset the cursor position accordingly.
+        */
+       vis -= vbl;
+

        p->col = 0;
        p->col = 0;

+       p->overstep = 0;

 
        if ( ! (TERMP_NOBREAK & p->flags)) {
 
        if ( ! (TERMP_NOBREAK & p->flags)) {

-               putchar('\n');
+               p->viscol = 0;
+               (*p->endline)(p);

                return;
        }
 
        if (TERMP_HANG & p->flags) {
                /* We need one blank after the tag. */
                return;
        }
 
        if (TERMP_HANG & p->flags) {
                /* We need one blank after the tag. */

-               overstep = /* LINTED */
-                       vis - maxvis + 1;
+               p->overstep = /* LINTED */
+                       vis - maxvis + (*p->width)(p, ' ');

 
                /*
                 * Behave exactly the same way as groff:
 
                /*
                 * Behave exactly the same way as groff:


@@ -267,25 +300,27 @@ term_flushln(struct termp *p)
                 * move it one step LEFT and flag the rest of the line
                 * to be longer.
                 */
                 * move it one step LEFT and flag the rest of the line
                 * to be longer.
                 */

-               if (overstep >= -1) {
-                       assert((int)maxvis + overstep >= 0);
+               if (p->overstep >= -1) {
+                       assert((int)maxvis + p->overstep >= 0);

                        /* LINTED */
                        /* LINTED */

-                       maxvis += overstep;
+                       maxvis += p->overstep;

                } else
                } else

-                       overstep = 0;
+                       p->overstep = 0;

 
        } else if (TERMP_DANGLE & p->flags)
                return;
 
        /* Right-pad. */
        if (maxvis > vis + /* LINTED */
 
        } else if (TERMP_DANGLE & p->flags)
                return;
 
        /* Right-pad. */
        if (maxvis > vis + /* LINTED */

-                       ((TERMP_TWOSPACE & p->flags) ? 1 : 0))  
-               for ( ; vis < maxvis; vis++)
-                       putchar(' ');
-       else {  /* ...or newline break. */
-               putchar('\n');
-               for (i = 0; i < (int)p->rmargin; i++)
-                       putchar(' ');
+                       ((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);

        }
 }
 
        }
 }
 


@@ -300,7 +335,7 @@ term_newln(struct termp *p)
 {
 
        p->flags |= TERMP_NOSPACE;
 {
 
        p->flags |= TERMP_NOSPACE;

-       if (0 == p->col) {
+       if (0 == p->col && 0 == p->viscol) {

                p->flags &= ~TERMP_NOLPAD;
                return;
        }
                p->flags &= ~TERMP_NOLPAD;
                return;
        }


@@ -320,157 +355,99 @@ term_vspace(struct termp *p)
 {
 
        term_newln(p);
 {
 
        term_newln(p);

-       putchar('\n');
+       p->viscol = 0;
+       (*p->endline)(p);

 }
 
 
 static void
 }
 
 
 static void

-do_special(struct termp *p, const char *word, size_t len)
+spec(struct termp *p, enum roffdeco d, const char *word, size_t len)

 {
        const char      *rhs;
        size_t           sz;
 {
        const char      *rhs;
        size_t           sz;

-       int              i;
-
-       rhs = term_a2ascii(p->symtab, word, len, &sz);

 
 

-       if (NULL == rhs) {
-#if 0
-               fputs("Unknown special character: ", stderr);
-               for (i = 0; i < (int)len; i++)
-                       fputc(word[i], stderr);
-               fputc('\n', stderr);
-#endif
-               return;
-       }
-       for (i = 0; i < (int)sz; i++) 
-               encode(p, rhs[i]);
+       rhs = chars_spec2str(p->symtab, word, len, &sz);
+       if (rhs) 
+               encode(p, rhs, sz);
+       else if (DECO_SSPECIAL == d)
+               encode(p, word, len);

 }
 
 
 static void
 }
 
 
 static void

-do_reserved(struct termp *p, const char *word, size_t len)
+res(struct termp *p, const char *word, size_t len)

 {
        const char      *rhs;
        size_t           sz;
 {
        const char      *rhs;
        size_t           sz;

-       int              i;

 
 

-       rhs = term_a2res(p->symtab, word, len, &sz);
+       rhs = chars_res2str(p->symtab, word, len, &sz);
+       if (rhs)
+               encode(p, rhs, sz);
+}
+

 
 

-       if (NULL == rhs) {
-#if 0
-               fputs("Unknown reserved word: ", stderr);
-               for (i = 0; i < (int)len; i++)
-                       fputc(word[i], stderr);
-               fputc('\n', stderr);
-#endif
-               return;
-       }
-       for (i = 0; i < (int)sz; i++) 
-               encode(p, rhs[i]);
+void
+term_fontlast(struct termp *p)
+{
+       enum termfont    f;
+
+       f = p->fontl;
+       p->fontl = p->fontq[p->fonti];
+       p->fontq[p->fonti] = f;

 }
 
 
 }
 
 

-/*
- * Handle an escape sequence: determine its length and pass it to the
- * escape-symbol look table.  Note that we assume mdoc(3) has validated
- * the escape sequence (we assert upon badly-formed escape sequences).
- */
-static void
-do_escaped(struct termp *p, const char **word)
+void
+term_fontrepl(struct termp *p, enum termfont f)

 {
 {

-       int              j, type;
-       const char      *wp;

 
 

-       wp = *word;
-       type = 1;
+       p->fontl = p->fontq[p->fonti];
+       p->fontq[p->fonti] = f;
+}

 
 

-       if (0 == *(++wp)) {
-               *word = wp;
-               return;
-       }

 
 

-       if ('(' == *wp) {
-               wp++;
-               if (0 == *wp || 0 == *(wp + 1)) {
-                       *word = 0 == *wp ? wp : wp + 1;
-                       return;
-               }
+void
+term_fontpush(struct termp *p, enum termfont f)
+{

 
 

-               do_special(p, wp, 2);
-               *word = ++wp;
-               return;
+       assert(p->fonti + 1 < 10);
+       p->fontl = p->fontq[p->fonti];
+       p->fontq[++p->fonti] = f;
+}

 
 

-       } else if ('*' == *wp) {
-               if (0 == *(++wp)) {
-                       *word = wp;
-                       return;
-               }

 
 

-               switch (*wp) {
-               case ('('):
-                       wp++;
-                       if (0 == *wp || 0 == *(wp + 1)) {
-                               *word = 0 == *wp ? wp : wp + 1;
-                               return;
-                       }
+const void *
+term_fontq(struct termp *p)
+{

 
 

-                       do_reserved(p, wp, 2);
-                       *word = ++wp;
-                       return;
-               case ('['):
-                       type = 0;
-                       break;
-               default:
-                       do_reserved(p, wp, 1);
-                       *word = wp;
-                       return;
-               }
-       
-       } else if ('f' == *wp) {
-               if (0 == *(++wp)) {
-                       *word = wp;
-                       return;
-               }
+       return(&p->fontq[p->fonti]);
+}

 
 

-               switch (*wp) {
-               case ('B'):
-                       p->bold++;
-                       break;
-               case ('I'):
-                       p->under++;
-                       break;
-               case ('P'):
-                       /* FALLTHROUGH */
-               case ('R'):
-                       p->bold = p->under = 0;
-                       break;
-               default:
-                       break;
-               }

 
 

-               *word = wp;
-               return;
+enum termfont
+term_fonttop(struct termp *p)
+{

 
 

-       } else if ('[' != *wp) {
-               do_special(p, wp, 1);
-               *word = wp;
-               return;
-       }
+       return(p->fontq[p->fonti]);
+}

 
 

-       wp++;
-       for (j = 0; *wp && ']' != *wp; wp++, j++)
-               /* Loop... */ ;

 
 

-       if (0 == *wp) {
-               *word = wp;
-               return;
-       }
+void
+term_fontpopq(struct termp *p, const void *key)
+{

 
 

-       if (type)
-               do_special(p, wp - j, (size_t)j);
-       else
-               do_reserved(p, wp - j, (size_t)j);
-       *word = wp;
+       while (p->fonti >= 0 && key != &p->fontq[p->fonti])
+               p->fonti--;
+       assert(p->fonti >= 0);
+}
+
+
+void
+term_fontpop(struct termp *p)
+{
+
+       assert(p->fonti);
+       p->fonti--;

 }
 
 
 }
 
 


@@ -482,11 +459,13 @@ do_escaped(struct termp *p, const char **word)
 void
 term_word(struct termp *p, const char *word)
 {
 void
 term_word(struct termp *p, const char *word)
 {

-       const char       *sv;
+       const char      *sv, *seq;
+       size_t           ssz;
+       enum roffdeco    deco;

 
        sv = word;
 
 
        sv = word;
 

-       if (word[0] && 0 == word[1])
+       if (word[0] && '\0' == word[1])

                switch (word[0]) {
                case('.'):
                        /* FALLTHROUGH */
                switch (word[0]) {
                case('.'):
                        /* FALLTHROUGH */


@@ -503,8 +482,6 @@ term_word(struct termp *p, const char *word)
                case(')'):
                        /* FALLTHROUGH */
                case(']'):
                case(')'):
                        /* FALLTHROUGH */
                case(']'):

-                       /* FALLTHROUGH */
-               case('}'):

                        if ( ! (TERMP_IGNDELIM & p->flags))
                                p->flags |= TERMP_NOSPACE;
                        break;
                        if ( ! (TERMP_IGNDELIM & p->flags))
                                p->flags |= TERMP_NOSPACE;
                        break;


@@ -512,25 +489,73 @@ term_word(struct termp *p, const char *word)
                        break;
                }
 
                        break;
                }
 

-       if ( ! (TERMP_NOSPACE & p->flags))
-               buffer(p, ' ');
+       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);
+       }

 
        if ( ! (p->flags & TERMP_NONOSPACE))
                p->flags &= ~TERMP_NOSPACE;
 
        if ( ! (p->flags & TERMP_NONOSPACE))
                p->flags &= ~TERMP_NOSPACE;

+       else
+               p->flags |= TERMP_NOSPACE;
+
+       p->flags &= ~TERMP_SENTENCE;

 
 

-       for ( ; *word; word++)
+       while (*word) {
+               if ((ssz = strcspn(word, "\\")) > 0)
+                       encode(p, word, ssz);
+
+               word += ssz;

                if ('\\' != *word)
                if ('\\' != *word)

-                       encode(p, *word);
-               else
-                       do_escaped(p, &word);
+                       continue;
+
+               seq = ++word;
+               word += a2roffdeco(&deco, &seq, &ssz);
+
+               switch (deco) {
+               case (DECO_RESERVED):
+                       res(p, seq, ssz);
+                       break;
+               case (DECO_SPECIAL):
+                       /* FALLTHROUGH */
+               case (DECO_SSPECIAL):
+                       spec(p, deco, seq, ssz);
+                       break;
+               case (DECO_BOLD):
+                       term_fontrepl(p, TERMFONT_BOLD);
+                       break;
+               case (DECO_ITALIC):
+                       term_fontrepl(p, TERMFONT_UNDER);
+                       break;
+               case (DECO_ROMAN):
+                       term_fontrepl(p, TERMFONT_NONE);
+                       break;
+               case (DECO_PREVIOUS):
+                       term_fontlast(p);
+                       break;
+               default:
+                       break;
+               }
+
+               if (DECO_NOSPACE == deco && '\0' == *word)
+                       p->flags |= TERMP_NOSPACE;
+       }

 
 

-       if (sv[0] && 0 == sv[1])
+       /* 
+        * Note that we don't process the pipe: the parser sees it as
+        * punctuation, but we don't in terms of typography.
+        */
+       if (sv[0] && '\0' == sv[1])

                switch (sv[0]) {
                case('('):
                        /* FALLTHROUGH */
                case('['):
                switch (sv[0]) {
                case('('):
                        /* FALLTHROUGH */
                case('['):

-                       /* FALLTHROUGH */
-               case('{'):

                        p->flags |= TERMP_NOSPACE;
                        break;
                default:
                        p->flags |= TERMP_NOSPACE;
                        break;
                default:


@@ -539,42 +564,179 @@ term_word(struct termp *p, const char *word)
 }
 
 
 }
 
 

-/*
- * Insert a single character into the line-buffer.  If the buffer's
- * space is exceeded, then allocate more space by doubling the buffer
- * size.
- */

 static void
 static void

-buffer(struct termp *p, char c)
+adjbuf(struct termp *p, size_t sz)

 {
 {

-       size_t           s;
-
-       if (p->col + 1 >= p->maxcols) {
-               if (0 == p->maxcols)
-                       p->maxcols = 256;
-               s = p->maxcols * 2;
-               p->buf = realloc(p->buf, s);
-               if (NULL == p->buf)
-                       err(1, "realloc"); /* FIXME: shouldn't be here! */
-               p->maxcols = s;
+
+       if (0 == p->maxcols)
+               p->maxcols = 1024;
+       while (sz >= p->maxcols)
+               p->maxcols <<= 2;
+
+       p->buf = realloc(p->buf, p->maxcols);
+       if (NULL == p->buf) {
+               perror(NULL);
+               exit((int)MANDOCLEVEL_SYSERR);

        }
        }

-       p->buf[(int)(p->col)++] = c;

 }
 
 
 static void
 }
 
 
 static void

-encode(struct termp *p, char c)
+bufferc(struct termp *p, char c)

 {
 {

-       
-       if (' ' != c) {
-               if (p->bold) {
-                       buffer(p, c);
-                       buffer(p, 8);
-               }
-               if (p->under) {
-                       buffer(p, '_');
-                       buffer(p, 8);
+
+       if (p->col + 1 >= p->maxcols)
+               adjbuf(p, p->col + 1);
+
+       p->buf[(int)p->col++] = c;
+}
+
+
+static void
+encode(struct termp *p, const char *word, size_t sz)
+{
+       enum termfont     f;
+       int               i;
+
+       /*
+        * Encode and buffer a string of characters.  If the current
+        * font mode is unset, buffer directly, else encode then buffer
+        * character by character.
+        */
+
+       if (TERMFONT_NONE == (f = term_fonttop(p))) {
+               if (p->col + sz >= p->maxcols) 
+                       adjbuf(p, p->col + sz);
+               memcpy(&p->buf[(int)p->col], word, sz);
+               p->col += sz;
+               return;
+       }
+
+       /* Pre-buffer, assuming worst-case. */
+
+       if (p->col + 1 + (sz * 3) >= p->maxcols)
+               adjbuf(p, p->col + 1 + (sz * 3));
+
+       for (i = 0; i < (int)sz; i++) {
+               if ( ! isgraph((u_char)word[i])) {
+                       p->buf[(int)p->col++] = word[i];
+                       continue;

                }
                }

+
+               if (TERMFONT_UNDER == f)
+                       p->buf[(int)p->col++] = '_';
+               else
+                       p->buf[(int)p->col++] = word[i];
+
+               p->buf[(int)p->col++] = 8;
+               p->buf[(int)p->col++] = word[i];

        }
        }

-       buffer(p, c);
+}
+
+
+size_t
+term_len(const struct termp *p, size_t sz)
+{
+
+       return((*p->width)(p, ' ') * sz);
+}
+
+
+size_t
+term_strlen(const struct termp *p, const char *cp)
+{
+       size_t           sz, ssz, rsz, i;
+       enum roffdeco    d;
+       const char      *seq, *rhs;
+
+       for (sz = 0; '\0' != *cp; )
+               /*
+                * Account for escaped sequences within string length
+                * calculations.  This follows the logic in term_word()
+                * as we must calculate the width of produced strings.
+                */
+               if ('\\' == *cp) {
+                       seq = ++cp;
+                       cp += a2roffdeco(&d, &seq, &ssz);
+
+                       switch (d) {
+                       case (DECO_RESERVED):
+                               rhs = chars_res2str
+                                       (p->symtab, seq, ssz, &rsz);
+                               break;
+                       case (DECO_SPECIAL):
+                               /* FALLTHROUGH */
+                       case (DECO_SSPECIAL):
+                               rhs = chars_spec2str
+                                       (p->symtab, seq, ssz, &rsz);
+
+                               /* Allow for one-char escapes. */
+                               if (DECO_SSPECIAL != d || rhs)
+                                       break;
+
+                               rhs = seq;
+                               rsz = ssz;
+                               break;
+                       default:
+                               rhs = NULL;
+                               break;
+                       }
+
+                       if (rhs)
+                               for (i = 0; i < rsz; i++)
+                                       sz += (*p->width)(p, *rhs++);
+               } else
+                       sz += (*p->width)(p, *cp++);
+
+       return(sz);
+}
+
+
+/* ARGSUSED */
+size_t
+term_vspan(const struct termp *p, const struct roffsu *su)
+{
+       double           r;
+
+       switch (su->unit) {
+       case (SCALE_CM):
+               r = su->scale * 2;
+               break;
+       case (SCALE_IN):
+               r = su->scale * 6;
+               break;
+       case (SCALE_PC):
+               r = su->scale;
+               break;
+       case (SCALE_PT):
+               r = su->scale / 8;
+               break;
+       case (SCALE_MM):
+               r = su->scale / 1000;
+               break;
+       case (SCALE_VS):
+               r = su->scale;
+               break;
+       default:
+               r = su->scale - 1;
+               break;
+       }
+
+       if (r < 0.0)
+               r = 0.0;
+       return(/* LINTED */(size_t)
+                       r);
+}
+
+
+size_t
+term_hspan(const struct termp *p, const struct roffsu *su)
+{
+       double           v;
+
+       v = ((*p->hspan)(p, su));
+       if (v < 0.0)
+               v = 0.0;
+       return((size_t) /* LINTED */
+                       v);

 }
 }