Correctly print `Lk' arguments in -Tascii. Issue raised by Aldis Berzoja.

[mandoc.git] / term.c

diff --git a/term.c b/term.c
index 40bb4dbc7d384dfb05a22fb68afd44315cefd1ed..c0507cdab142bb9be4216def6a8a012b621d40f9 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,509 +1,705 @@
-/* $Id: term.c,v 1.6 2009/02/21 21:00:06 kristaps Exp $ */
+/*     $Id: term.c,v 1.166 2010/07/26 22:26:05 kristaps 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
  *
  * Permission to use, copy, modify, and distribute this software for any

- * purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.

  *
  *

- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

  */
  */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <sys/types.h>
+

 #include <assert.h>
 #include <ctype.h>
 #include <assert.h>
 #include <ctype.h>

-#include <err.h>
-#include <stdlib.h>
+#include <stdint.h>

 #include <stdio.h>
 #include <stdio.h>

+#include <stdlib.h>

 #include <string.h>
 #include <string.h>

-#include <unistd.h>

 
 

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

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

+#include "main.h"
+
+static void              spec(struct termp *, enum roffdeco,
+                               const char *, size_t);
+static void              res(struct termp *, const char *, size_t);
+static void              bufferc(struct termp *, char);
+static void              adjbuf(struct termp *p, size_t);
+static void              encode(struct termp *, const char *, size_t);
+
+
+void
+term_free(struct termp *p)
+{
+
+       if (p->buf)
+               free(p->buf);
+       if (p->symtab)
+               chars_free(p->symtab);
+
+       free(p);
+}
+

 
 

-enum   termstyle {
-       STYLE_CLEAR,
-       STYLE_BOLD,
-       STYLE_UNDERLINE
-};
+void
+term_begin(struct termp *p, term_margin head, 
+               term_margin foot, const void *arg)
+{
+
+       p->headf = head;
+       p->footf = foot;
+       p->argf = arg;
+       (*p->begin)(p);
+}
+
+
+void
+term_end(struct termp *p)
+{
+
+       (*p->end)(p);
+}
+
+
+struct termp *
+term_alloc(enum termenc enc)
+{
+       struct termp    *p;

 
 

-static void              termprint_r(struct termp *,
-                               const struct mdoc_meta *,
-                               const struct mdoc_node *);
-static void              termprint_header(struct termp *,
-                               const struct mdoc_meta *);
-static void              termprint_footer(struct termp *,
-                               const struct mdoc_meta *);
+       p = calloc(1, sizeof(struct termp));
+       if (NULL == p) {
+               perror(NULL);
+               exit(EXIT_FAILURE);
+       }

 
 

-static void              pword(struct termp *, const char *, size_t);
-static void              pescape(struct termp *, 
-                               const char *, size_t *, size_t);
-static void              chara(struct termp *, char);
-static void              style(struct termp *, enum termstyle);
+       p->enc = enc;
+       return(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
 void

-flushln(struct termp *p)
+term_flushln(struct termp *p)

 {
 {

-       size_t           i, j, vsz, vis, maxvis;
+       int              i;     /* current input position in p->buf */
+       size_t           vis;   /* current visual position on output */
+       size_t           vbl;   /* number of blanks to prepend to output */
+       size_t           vend;  /* end of word visual position on output */
+       size_t           bp;    /* visual right border position */
+       int              j;     /* temporary loop index for p->buf */
+       int              jhy;   /* last hyph before overflow w/r/t j */
+       size_t           maxvis; /* output position of visible boundary */
+       size_t           mmax; /* used in calculating bp */

 
        /*
         * 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);

-       maxvis = p->rmargin - p->offset;
-       vis = 0;
+
+       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;

 
        /*
 
        /*

-        * 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 < 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.
+                */
+               for (j = i; j < (int)p->col; j++) {
+                       if ('\t' != p->buf[j])
+                               break;
+                       vend = (vis / p->tabwidth + 1) * p->tabwidth;
+                       vbl += vend - vis;
+                       vis = vend;
+               }

 
 

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

                /*
                 * Count up visible word characters.  Control sequences
                /*
                 * Count up visible word characters.  Control sequences

-                * (starting with the CSI) aren't counted. 
+                * (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).

                 */
                 */

-               assert( ! isspace(p->buf[i]));

 
                /* LINTED */
 
                /* LINTED */

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

                                break;
                                break;

-                       else if (27 == p->buf[j]) {
-                               assert(j + 4 <= p->col);
-                               j += 3;
-                       } else
-                               vsz++;
+
+                       /* 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]);

                }
                }

-               assert(vsz > 0);

 
                /*
 
                /*

-                * If a word is too long and we're within a line, put it
-                * on the next line.  Puke if we're being asked to write
-                * something that will exceed the right margin (i.e.,
-                * from a fresh line or when we're not allowed to break
-                * the line with TERMP_NOBREAK).
+                * Find out whether we would exceed the right margin.
+                * If so, break to the next line.

                 */
                 */

-
-               if (vis && vis + vsz >= maxvis) {
-                       /* FIXME */
-                       if (p->flags & TERMP_NOBREAK)
-                               errx(1, "word breaks right margin");
-                       putchar('\n');
-                       for (j = 0; j < p->offset; j++)
-                               putchar(' ');
-                       vis = 0;
-               } else if (vis + vsz >= maxvis) {
-                       /* FIXME */
-                       errx(1, "word breaks right margin");
+               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 += (int)/* LINTED */
+                               p->overstep;
+                       p->overstep = 0;

                }
 
                }
 

-               /* 
-                * Write out the word and a trailing space.  Omit the
-                * space if we're the last word in the line.
+               /*
+                * Skip leading tabs, they were handled above.

                 */
                 */

+               while (i < (int)p->col && '\t' == p->buf[i])
+                       i++;

 
 

-               for ( ; i < p->col; i++) {
-                       if (isspace(p->buf[i]))
+               /* Write out the [remaining] word. */
+               for ( ; i < (int)p->col; i++) {
+                       if (vend > bp && jhy > 0 && i > jhy)

                                break;
                                break;

-                       putchar(p->buf[i]);
-               }
-               vis += vsz;
-               if (i < p->col) {
-                       putchar(' ');
-                       vis++;
+                       if ('\t' == p->buf[i])
+                               break;
+                       if (' ' == p->buf[i]) {
+                               j = i;
+                               while (' ' == p->buf[i])
+                                       i++;
+                               vbl += (i - j) * (*p->width)(p, ' ');
+                               break;
+                       }
+                       if (ASCII_NBRSP == p->buf[i]) {
+                               vbl += (*p->width)(p, ' ');
+                               continue;
+                       }
+
+                       /*
+                        * 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]);
+                       }

                }
                }

+               vend += vbl;
+               vis = vend;

        }
 
        }
 

-       /*
-        * If we're not to right-marginalise it (newline), then instead
-        * pad to the right margin and stay off.
-        */
+       p->col = 0;
+       p->overstep = 0;

 
 

-       if (p->flags & TERMP_NOBREAK) {
-               for ( ; vis <= maxvis; vis++)
-                       putchar(' ');
-       } else
-               putchar('\n');
+       if ( ! (TERMP_NOBREAK & p->flags)) {
+               p->viscol = 0;
+               (*p->endline)(p);
+               return;
+       }

 
 

-       p->col = 0;
+       if (TERMP_HANG & p->flags) {
+               /* We need one blank after the tag. */
+               p->overstep = /* LINTED */
+                       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);
+                       /* LINTED */
+                       maxvis += p->overstep;
+               } else
+                       p->overstep = 0;
+
+       } else if (TERMP_DANGLE & p->flags)
+               return;
+
+       /* Right-pad. */
+       if (maxvis > vis + /* LINTED */
+                       ((TERMP_TWOSPACE & p->flags) ? 
+                        (*p->width)(p, ' ') : 0)) {
+               p->viscol += maxvis - vis;
+               (*p->advance)(p, maxvis - vis);
+               vis += (maxvis - vis);
+       } else {        /* ...or newline break. */
+               (*p->endline)(p);
+               p->viscol = p->rmargin;
+               (*p->advance)(p, p->rmargin);
+       }

 }
 
 
 }
 
 

+/* 
+ * 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
 void

-newln(struct termp *p)
+term_newln(struct termp *p)

 {
 
 {
 

-       /* 
-        * A newline only breaks an existing line; it won't assert
-        * vertical space.
-        */

        p->flags |= TERMP_NOSPACE;
        p->flags |= TERMP_NOSPACE;

-       if (0 == p->col) 
+       if (0 == p->col && 0 == p->viscol) {
+               p->flags &= ~TERMP_NOLPAD;

                return;
                return;

-       flushln(p);
+       }
+       term_flushln(p);
+       p->flags &= ~TERMP_NOLPAD;

 }
 
 
 }
 
 

+/*
+ * 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
 void

-vspace(struct termp *p)
+term_vspace(struct termp *p)

 {
 
 {
 

-       /*
-        * Asserts a vertical space (a full, empty line-break between
-        * lines).
-        */
-       newln(p);
-       putchar('\n');
+       term_newln(p);
+       p->viscol = 0;
+       (*p->endline)(p);

 }
 
 
 static void
 }
 
 
 static void

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

 {
 {

-
-       /* TODO: dynamically expand the buffer. */
-       if (p->col + 1 >= p->maxcols)
-               errx(1, "line overrun");
-       p->buf[(p->col)++] = c;
+       const char      *rhs;
+       size_t           sz;
+
+       rhs = chars_spec2str(p->symtab, word, len, &sz);
+       if (rhs) 
+               encode(p, rhs, sz);
+       else if (DECO_SSPECIAL == d)
+               encode(p, word, len);

 }
 
 
 static void
 }
 
 
 static void

-style(struct termp *p, enum termstyle esc)
+res(struct termp *p, const char *word, size_t len)

 {
 {

+       const char      *rhs;
+       size_t           sz;

 
 

-       if (p->col + 4 >= p->maxcols)
-               errx(1, "line overrun");
-
-       p->buf[(p->col)++] = 27;
-       p->buf[(p->col)++] = '[';
-       switch (esc) {
-       case (STYLE_CLEAR):
-               p->buf[(p->col)++] = '0';
-               break;
-       case (STYLE_BOLD):
-               p->buf[(p->col)++] = '1';
-               break;
-       case (STYLE_UNDERLINE):
-               p->buf[(p->col)++] = '4';
-               break;
-       default:
-               abort();
-               /* NOTREACHED */
-       }
-       p->buf[(p->col)++] = 'm';
+       rhs = chars_res2str(p->symtab, word, len, &sz);
+       if (rhs)
+               encode(p, rhs, sz);

 }
 
 
 }
 
 

-static void
-pescape(struct termp *p, const char *word, size_t *i, size_t len)
+void
+term_fontlast(struct termp *p)

 {
 {

+       enum termfont    f;

 
 

-       (*i)++;
-       assert(*i < len);
+       f = p->fontl;
+       p->fontl = p->fontq[p->fonti];
+       p->fontq[p->fonti] = f;
+}

 
 

-       if ('(' == word[*i]) {
-               /* Two-character escapes. */
-               (*i)++;
-               assert(*i + 1 < len);

 
 

-               if ('r' == word[*i] && 'B' == word[*i + 1])
-                       chara(p, ']');
-               else if ('l' == word[*i] && 'B' == word[*i + 1])
-                       chara(p, '[');
+void
+term_fontrepl(struct termp *p, enum termfont f)
+{

 
 

-               (*i)++;
-               return;
+       p->fontl = p->fontq[p->fonti];
+       p->fontq[p->fonti] = f;
+}

 
 

-       } else if ('[' != word[*i]) {
-               /* One-character escapes. */
-               switch (word[*i]) {
-               case ('\\'):
-                       /* FALLTHROUGH */
-               case ('\''):
-                       /* FALLTHROUGH */
-               case ('`'):
-                       /* FALLTHROUGH */
-               case ('-'):
-                       /* FALLTHROUGH */
-               case ('.'):
-                       chara(p, word[*i]);
-               default:
-                       break;
-               }
-               return;
-       }
-       /* n-character escapes. */
+
+void
+term_fontpush(struct termp *p, enum termfont f)
+{
+
+       assert(p->fonti + 1 < 10);
+       p->fontl = p->fontq[p->fonti];
+       p->fontq[++p->fonti] = f;

 }
 
 
 }
 
 

-static void
-pword(struct termp *p, const char *word, size_t len)
+const void *
+term_fontq(struct termp *p)

 {
 {

-       size_t           i;

 
 

-       assert(len > 0);
+       return(&p->fontq[p->fonti]);
+}

 
 

-       if ( ! (p->flags & TERMP_NOSPACE))
-               chara(p, ' ');

 
 

-       p->flags &= ~TERMP_NOSPACE;
+enum termfont
+term_fonttop(struct termp *p)
+{

 
 

-       if (p->flags & TERMP_BOLD)
-               style(p, STYLE_BOLD);
-       if (p->flags & TERMP_UNDERLINE)
-               style(p, STYLE_UNDERLINE);
+       return(p->fontq[p->fonti]);
+}

 
 

-       for (i = 0; i < len; i++) {
-               if ('\\' == word[i]) {
-                       pescape(p, word, &i, len);
-                       continue;
-               }
-               chara(p, word[i]);
-       }

 
 

-       if (p->flags & TERMP_BOLD ||
-                       p->flags & TERMP_UNDERLINE)
-               style(p, STYLE_CLEAR);
+void
+term_fontpopq(struct termp *p, const void *key)
+{
+
+       while (p->fonti >= 0 && key != &p->fontq[p->fonti])
+               p->fonti--;
+       assert(p->fonti >= 0);

 }
 
 
 void
 }
 
 
 void

-word(struct termp *p, const char *word)
+term_fontpop(struct termp *p)

 {
 {

-       size_t           i, j, len;

 
 

-       if (mdoc_isdelim(word))
-               p->flags |= TERMP_NOSPACE;
+       assert(p->fonti);
+       p->fonti--;
+}

 
 

-       len = strlen(word);
-       assert(len > 0);

 
 

-       /* LINTED */
-       for (j = i = 0; i < len; i++) {
-               if ( ! isspace(word[i])) {
-                       j++;
-                       continue;
+/*
+ * Handle pwords, partial words, which may be either a single word or a
+ * phrase that cannot be broken down (such as a literal string).  This
+ * handles word styling.
+ */
+void
+term_word(struct termp *p, const char *word)
+{
+       const char      *sv, *seq;
+       int              sz;
+       size_t           ssz;
+       enum roffdeco    deco;
+
+       sv = word;
+
+       if (word[0] && '\0' == word[1])
+               switch (word[0]) {
+               case('.'):
+                       /* FALLTHROUGH */
+               case(','):
+                       /* FALLTHROUGH */
+               case(';'):
+                       /* FALLTHROUGH */
+               case(':'):
+                       /* FALLTHROUGH */
+               case('?'):
+                       /* FALLTHROUGH */
+               case('!'):
+                       /* FALLTHROUGH */
+               case(')'):
+                       /* FALLTHROUGH */
+               case(']'):
+                       if ( ! (TERMP_IGNDELIM & p->flags))
+                               p->flags |= TERMP_NOSPACE;
+                       break;
+               default:
+                       break;

                }
                }

-               if (0 == j)
-                       continue;
-               assert(i >= j);
-               pword(p, &word[i - j], j);
-               j = 0;
-       }
-       if (j > 0) {
-               assert(i >= j);
-               pword(p, &word[i - j], j);
+
+       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;
+       else
+               p->flags |= TERMP_NOSPACE;

 
 

-static void
-termprint_r(struct termp *p, const struct mdoc_meta *meta,
-               const struct mdoc_node *node)
-{
-       int              dochild;
+       p->flags &= ~TERMP_SENTENCE;

 
 

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

 
 

-       dochild = 1;
+               word += ssz;
+               if ('\\' != *word)
+                       continue;

 
 

-       if (MDOC_TEXT != node->type) {
-               if (termacts[node->tok].pre)
-                       if ( ! (*termacts[node->tok].pre)(p, meta, node))
-                               dochild = 0;
-       } else /* MDOC_TEXT == node->type */
-               word(p, node->data.text.string);
+               seq = ++word;
+               sz = a2roffdeco(&deco, &seq, &ssz);

 
 

-       /* Children. */
+               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;
+               }
+
+               word += sz;
+               if (DECO_NOSPACE == deco && '\0' == *word)
+                       p->flags |= TERMP_NOSPACE;
+       }

 
 

-       if (dochild && node->child)
-               termprint_r(p, meta, node->child);
+       /* 
+        * Note that we don't process the pipe: the parser sees it as
+        * punctuation, but we don't in terms of typography.
+        */
+       if (sv[0] && '\0' == sv[1])
+               switch (sv[0]) {
+               case('('):
+                       /* FALLTHROUGH */
+               case('['):
+                       p->flags |= TERMP_NOSPACE;
+                       break;
+               default:
+                       break;
+               }
+}

 
 

-       /* Post-processing. */

 
 

-       if (MDOC_TEXT != node->type)
-               if (termacts[node->tok].post)
-                       (*termacts[node->tok].post)(p, meta, node);
+static void
+adjbuf(struct termp *p, size_t sz)
+{

 
 

-       /* Siblings. */
+       if (0 == p->maxcols)
+               p->maxcols = 1024;
+       while (sz >= p->maxcols)
+               p->maxcols <<= 2;

 
 

-       if (node->next)
-               termprint_r(p, meta, node->next);
+       p->buf = realloc(p->buf, p->maxcols);
+       if (NULL == p->buf) {
+               perror(NULL);
+               exit(EXIT_FAILURE);
+       }

 }
 
 
 static void
 }
 
 
 static void

-termprint_footer(struct termp *p, const struct mdoc_meta *meta)
+bufferc(struct termp *p, char c)

 {
 {

-       struct tm       *tm;
-       char            *buf, *os;
-       size_t           sz, osz, ssz, i;
-
-       if (NULL == (buf = malloc(p->rmargin)))
-               err(1, "malloc");
-       if (NULL == (os = malloc(p->rmargin)))
-               err(1, "malloc");
-
-       tm = localtime(&meta->date);
-       if (NULL == strftime(buf, p->rmargin, "%B %d, %Y", tm))
-               err(1, "strftime");
-
-       osz = strlcpy(os, meta->os, p->rmargin);
-
-       sz = strlen(buf);
-       ssz = sz + osz + 1;
-
-       if (ssz > p->rmargin) {
-               ssz -= p->rmargin;
-               assert(ssz <= osz);
-               os[osz - ssz] = 0;
-               ssz = 1;
-       } else
-               ssz = p->rmargin - ssz + 1;
-
-       printf("\n");
-       printf("%s", os);
-       for (i = 0; i < ssz; i++)
-               printf(" ");
-
-       printf("%s\n", buf);
-       fflush(stdout);
-
-       free(buf);
-       free(os);
+
+       if (p->col + 1 >= p->maxcols)
+               adjbuf(p, p->col + 1);
+
+       p->buf[(int)p->col++] = c;

 }
 
 
 static void
 }
 
 
 static void

-termprint_header(struct termp *p, const struct mdoc_meta *meta)
+encode(struct termp *p, const char *word, size_t sz)

 {
 {

-       char            *buf, *title;
-       const char      *pp, *msec;
-       size_t           ssz, tsz, ttsz, i;;
-
-       if (NULL == (buf = malloc(p->rmargin)))
-               err(1, "malloc");
-       if (NULL == (title = malloc(p->rmargin)))
-               err(1, "malloc");
-
-       if (NULL == (pp = mdoc_vol2a(meta->vol)))
-               switch (meta->msec) {
-               case (MSEC_1):
-                       /* FALLTHROUGH */
-               case (MSEC_6):
-                       /* FALLTHROUGH */
-               case (MSEC_7):
-                       pp = mdoc_vol2a(VOL_URM);
-                       break;
-               case (MSEC_8):
-                       pp = mdoc_vol2a(VOL_SMM);
-                       break;
-               case (MSEC_2):
-                       /* FALLTHROUGH */
-               case (MSEC_3):
-                       /* FALLTHROUGH */
-               case (MSEC_4):
-                       /* FALLTHROUGH */
-               case (MSEC_5):
-                       pp = mdoc_vol2a(VOL_PRM);
-                       break;
-               case (MSEC_9):
-                       pp = mdoc_vol2a(VOL_KM);
-                       break;
-               default:
-                       /* FIXME: capitalise. */
-                       if (NULL == (pp = mdoc_msec2a(meta->msec)))
-                               pp = mdoc_msec2a(MSEC_local);
-                       break;
-               }
-       assert(pp);
-
-       tsz = strlcpy(buf, pp, p->rmargin);
-       assert(tsz < p->rmargin);
-
-       if ((pp = mdoc_arch2a(meta->arch))) {
-               tsz = strlcat(buf, " (", p->rmargin);
-               assert(tsz < p->rmargin);
-               tsz = strlcat(buf, pp, p->rmargin);
-               assert(tsz < p->rmargin);
-               tsz = strlcat(buf, ")", p->rmargin);
-               assert(tsz < p->rmargin);
-       }
+       enum termfont     f;
+       int               i;

 
 

-       ttsz = strlcpy(title, meta->title, p->rmargin);
+       /*
+        * Encode and buffer a string of characters.  If the current
+        * font mode is unset, buffer directly, else encode then buffer
+        * character by character.
+        */

 
 

-       if (NULL == (msec = mdoc_msec2a(meta->msec)))
-               msec = "";
+       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;
+       }

 
 

-       ssz = (2 * (ttsz + 2 + strlen(msec))) + tsz + 2;
+       /* Pre-buffer, assuming worst-case. */

 
 

-       if (ssz > p->rmargin) {
-               if ((ssz -= p->rmargin) % 2)
-                       ssz++;
-               ssz /= 2;
-       
-               assert(ssz <= ttsz);
-               title[ttsz - ssz] = 0;
-               ssz = 1;
-       } else
-               ssz = ((p->rmargin - ssz) / 2) + 1;
+       if (p->col + 1 + (sz * 3) >= p->maxcols)
+               adjbuf(p, p->col + 1 + (sz * 3));

 
 

-       printf("%s(%s)", title, msec);
+       for (i = 0; i < (int)sz; i++) {
+               if ( ! isgraph((u_char)word[i])) {
+                       p->buf[(int)p->col++] = word[i];
+                       continue;
+               }

 
 

-       for (i = 0; i < ssz; i++)
-               printf(" ");
+               if (TERMFONT_UNDER == f)
+                       p->buf[(int)p->col++] = '_';
+               else
+                       p->buf[(int)p->col++] = word[i];

 
 

-       printf("%s", buf);
+               p->buf[(int)p->col++] = 8;
+               p->buf[(int)p->col++] = word[i];
+       }
+}

 
 

-       for (i = 0; i < ssz; i++)
-               printf(" ");

 
 

-       printf("%s(%s)\n", title, msec);
-       fflush(stdout);
+size_t
+term_len(const struct termp *p, size_t sz)
+{

 
 

-       free(title);
-       free(buf);
+       return((*p->width)(p, ' ') * sz);

 }
 
 
 }
 
 

-void
-termprint(const struct mdoc_node *node,
-               const struct mdoc_meta *meta)
+size_t
+term_strlen(const struct termp *p, const char *cp)

 {
 {

-       struct termp     p;
+       size_t           sz;
+
+       for (sz = 0; *cp; cp++)
+               sz += (*p->width)(p, *cp);

 
 

-       p.maxrmargin = 80; /* XXX */
-       p.rmargin = p.maxrmargin;
-       p.maxcols = 1024;
-       p.offset = p.col = 0;
-       p.flags = TERMP_NOSPACE;
+       return(sz);
+}

 
 

-       if (NULL == (p.buf = malloc(p.maxcols)))
-               err(1, "malloc");

 
 

-       termprint_header(&p, meta);
-       termprint_r(&p, meta, node);
-       termprint_footer(&p, meta);
+/* ARGSUSED */
+size_t
+term_vspan(const struct termp *p, const struct roffsu *su)
+{
+       double           r;

 
 

-       free(p.buf);
+       switch (su->unit) {
+       case (SCALE_CM):
+               r = su->scale * 2;
+               break;
+       case (SCALE_IN):
+               r = su->scale * 6;
+               break;
+       case (SCALE_PC):
+               r = su->scale;
+               break;
+       case (SCALE_PT):
+               r = su->scale / 8;
+               break;
+       case (SCALE_MM):
+               r = su->scale / 1000;
+               break;
+       case (SCALE_VS):
+               r = su->scale;
+               break;
+       default:
+               r = su->scale - 1;
+               break;
+       }
+
+       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);
+}