]> 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
Create the link from ./man to ./mandoc in the "all" target rather than
[mandoc.git] / term.c
diff --git a/term.c b/term.c
index 5b01aa68813813c574ce455a6c0e48dde0de3f49..fb0351d91f1d693c28ee0bcebaa2712a4f2d1a18 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,15 +1,15 @@
-/*     $Id: term.c,v 1.236 2014/11/21 01:52:53 schwarze Exp $ */
+/* $Id: term.c,v 1.283 2021/08/10 12:55:04 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010-2020 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  *
  * 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.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * 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
@@ -21,6 +21,7 @@
 
 #include <assert.h>
 #include <ctype.h>
 
 #include <assert.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>
@@ -32,23 +33,41 @@
 #include "main.h"
 
 static size_t           cond_width(const struct termp *, int, int *);
 #include "main.h"
 
 static size_t           cond_width(const struct termp *, int, int *);
-static void             adjbuf(struct termp *p, size_t);
+static void             adjbuf(struct termp_col *, size_t);
 static void             bufferc(struct termp *, char);
 static void             encode(struct termp *, const char *, size_t);
 static void             encode1(struct termp *, int);
 static void             bufferc(struct termp *, char);
 static void             encode(struct termp *, const char *, size_t);
 static void             encode1(struct termp *, int);
+static void             endline(struct termp *);
+static void             term_field(struct termp *, size_t, size_t);
+static void             term_fill(struct termp *, size_t *, size_t *,
+                               size_t);
 
 
 void
 
 
 void
-term_free(struct termp *p)
+term_setcol(struct termp *p, size_t maxtcol)
 {
 {
+       if (maxtcol > p->maxtcol) {
+               p->tcols = mandoc_recallocarray(p->tcols,
+                   p->maxtcol, maxtcol, sizeof(*p->tcols));
+               p->maxtcol = maxtcol;
+       }
+       p->lasttcol = maxtcol - 1;
+       p->tcol = p->tcols;
+}
 
 
-       free(p->buf);
+void
+term_free(struct termp *p)
+{
+       for (p->tcol = p->tcols; p->tcol < p->tcols + p->maxtcol; p->tcol++)
+               free(p->tcol->buf);
+       free(p->tcols);
+       free(p->fontq);
        free(p);
 }
 
 void
 term_begin(struct termp *p, term_margin head,
        free(p);
 }
 
 void
 term_begin(struct termp *p, term_margin head,
-               term_margin foot, const void *arg)
+               term_margin foot, const struct roff_meta *arg)
 {
 
        p->headf = head;
 {
 
        p->headf = head;
@@ -68,233 +87,344 @@ term_end(struct termp *p)
  * Flush a chunk of text.  By default, break the output line each time
  * the right margin is reached, and continue output on the next line
  * at the same offset as the chunk itself.  By default, also break the
  * Flush a chunk of text.  By default, break the output line each time
  * the right margin is reached, and continue output on the next line
  * at the same offset as the chunk itself.  By default, also break the
- * output line at the end of the chunk.
- * The following flags may be specified:
- *
- *  - TERMP_NOBREAK: Do not break the output line at the right margin,
- *    but only at the max right margin.  Also, do not break the output
- *    line at the end of the chunk, such that the next call can pad to
- *    the next column.  However, if less than p->trailspace blanks,
- *    which can be 0, 1, or 2, remain to the right margin, the line
- *    will be broken.
- *  - TERMP_BRIND: If the chunk does not fit and the output line has
- *    to be broken, start the next line at the right margin instead
- *    of at the offset.  Used together with TERMP_NOBREAK for the tags
- *    in various kinds of tagged lists.
- *  - TERMP_DANGLE: Do not break the output line at the right margin,
- *    append the next chunk after it even if this one is too long.
- *    To be used together with TERMP_NOBREAK.
- *  - TERMP_HANG: Like TERMP_DANGLE, and also suppress padding before
- *    the next chunk if this column is not full.
+ * output line at the end of the chunk.  There are many flags modifying
+ * this behaviour, see the comments in the body of the function.
  */
 void
 term_flushln(struct termp *p)
 {
  */
 void
 term_flushln(struct termp *p)
 {
-       size_t           i;     /* current input position in p->buf */
-       int              ntab;  /* number of tabs to prepend */
-       size_t           vis;   /* current visual position on output */
-       size_t           vbl;   /* number of blanks to prepend to output */
-       size_t           vend;  /* end of word visual position on output */
-       size_t           bp;    /* visual right border position */
-       size_t           dv;    /* temporary for visual pos calculations */
-       size_t           j;     /* temporary loop index for p->buf */
-       size_t           jhy;   /* last hyph before overflow w/r/t j */
-       size_t           maxvis; /* output position of visible boundary */
-       size_t           rmargin; /* the rightmost of the two margins */
+       size_t   vbl;      /* Number of blanks to prepend to the output. */
+       size_t   vbr;      /* Actual visual position of the end of field. */
+       size_t   vfield;   /* Desired visual field width. */
+       size_t   vtarget;  /* Desired visual position of the right margin. */
+       size_t   ic;       /* Character position in the input buffer. */
+       size_t   nbr;      /* Number of characters to print in this field. */
 
        /*
 
        /*
-        * 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.
-        *
-        * The following unsigned-signed subtractions look strange,
-        * but they are actually correct.  If the int p->overstep
-        * is negative, it gets sign extended.  Subtracting that
-        * very large size_t effectively adds a small number to dv.
+        * Normally, start writing at the left margin, but with the
+        * NOPAD flag, start writing at the current position instead.
         */
         */
-       rmargin = p->rmargin > p->offset ? p->rmargin : p->offset;
-       dv = p->rmargin - p->offset;
-       maxvis = (int)dv > p->overstep ? dv - (size_t)p->overstep : 0;
-
-       if (p->flags & TERMP_NOBREAK) {
-               dv = p->maxrmargin > p->offset ?
-                    p->maxrmargin - p->offset : 0;
-               bp = (int)dv > p->overstep ?
-                    dv - (size_t)p->overstep : 0;
-       } else
-               bp = maxvis;
 
 
-       /*
-        * Calculate the required amount of padding.
-        */
-       vbl = p->offset + p->overstep > p->viscol ?
-             p->offset + p->overstep - p->viscol : 0;
+       vbl = (p->flags & TERMP_NOPAD) || p->tcol->offset < p->viscol ?
+           0 : p->tcol->offset - p->viscol;
+       if (p->minbl && vbl < p->minbl)
+               vbl = p->minbl;
+
+       if ((p->flags & TERMP_MULTICOL) == 0)
+               p->tcol->col = 0;
 
 
-       vis = vend = 0;
-       i = 0;
+       /* Loop over output lines. */
+
+       for (;;) {
+               vfield = p->tcol->rmargin > p->viscol + vbl ?
+                   p->tcol->rmargin - p->viscol - vbl : 0;
 
 
-       while (i < p->col) {
                /*
                /*
-                * Handle literal tab characters: collapse all
-                * subsequent tabs into a single huge set of spaces.
+                * Normally, break the line at the the right margin
+                * of the field, but with the NOBREAK flag, only
+                * break it at the max right margin of the screen,
+                * and with the BRNEVER flag, never break it at all.
                 */
                 */
-               ntab = 0;
-               while (i < p->col && '\t' == p->buf[i]) {
-                       vend = (vis / p->tabwidth + 1) * p->tabwidth;
-                       vbl += vend - vis;
-                       vis = vend;
-                       ntab++;
-                       i++;
-               }
+
+               vtarget = (p->flags & TERMP_NOBREAK) == 0 ? vfield :
+                   p->maxrmargin > p->viscol + vbl ?
+                   p->maxrmargin - p->viscol - vbl : 0;
 
                /*
 
                /*
-                * 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).
+                * Figure out how much text will fit in the field.
+                * If there is whitespace only, print nothing.
                 */
 
                 */
 
-               for (j = i, jhy = 0; j < p->col; j++) {
-                       if (' ' == p->buf[j] || '\t' == p->buf[j])
-                               break;
+               term_fill(p, &nbr, &vbr,
+                   p->flags & TERMP_BRNEVER ? SIZE_MAX : vtarget);
+               if (nbr == 0)
+                       break;
+
+               /*
+                * With the CENTER or RIGHT flag, increase the indentation
+                * to center the text between the left and right margins
+                * or to adjust it to the right margin, respectively.
+                */
+
+               if (vbr < vtarget) {
+                       if (p->flags & TERMP_CENTER)
+                               vbl += (vtarget - vbr) / 2;
+                       else if (p->flags & TERMP_RIGHT)
+                               vbl += vtarget - vbr;
+               }
 
 
-                       /* Back over the the last printed character. */
-                       if (8 == p->buf[j]) {
-                               assert(j);
-                               vend -= (*p->width)(p, p->buf[j - 1]);
+               /* Finally, print the field content. */
+
+               term_field(p, vbl, nbr);
+
+               /*
+                * If there is no text left in the field, exit the loop.
+                * If the BRTRSP flag is set, consider trailing
+                * whitespace significant when deciding whether
+                * the field fits or not.
+                */
+
+               for (ic = p->tcol->col; ic < p->tcol->lastcol; ic++) {
+                       switch (p->tcol->buf[ic]) {
+                       case '\t':
+                               if (p->flags & TERMP_BRTRSP)
+                                       vbr = term_tab_next(vbr);
+                               continue;
+                       case ' ':
+                               if (p->flags & TERMP_BRTRSP)
+                                       vbr += (*p->width)(p, ' ');
                                continue;
                                continue;
+                       case '\n':
+                       case ASCII_BREAK:
+                               continue;
+                       default:
+                               break;
                        }
                        }
+                       break;
+               }
+               if (ic == p->tcol->lastcol)
+                       break;
 
 
-                       /* Regular word. */
-                       /* Break at the hyphen point if we overrun. */
-                       if (vend > vis && vend < bp &&
-                           (ASCII_HYPH == p->buf[j] ||
-                            ASCII_BREAK == p->buf[j]))
-                               jhy = j;
+               /*
+                * At the location of an automtic line break, input
+                * space characters are consumed by the line break.
+                */
 
 
-                       /*
-                        * Hyphenation now decided, put back a real
-                        * hyphen such that we get the correct width.
-                        */
-                       if (ASCII_HYPH == p->buf[j])
-                               p->buf[j] = '-';
+               while (p->tcol->col < p->tcol->lastcol &&
+                   p->tcol->buf[p->tcol->col] == ' ')
+                       p->tcol->col++;
 
 
-                       vend += (*p->width)(p, p->buf[j]);
-               }
+               /*
+                * In multi-column mode, leave the rest of the text
+                * in the buffer to be handled by a subsequent
+                * invocation, such that the other columns of the
+                * table can be handled first.
+                * In single-column mode, simply break the line.
+                */
+
+               if (p->flags & TERMP_MULTICOL)
+                       return;
+
+               endline(p);
+               p->viscol = 0;
 
                /*
 
                /*
-                * Find out whether we would exceed the right margin.
-                * If so, break to the next line.
+                * Normally, start the next line at the same indentation
+                * as this one, but with the BRIND flag, start it at the
+                * right margin instead.  This is used together with
+                * NOBREAK for the tags in various kinds of tagged lists.
                 */
                 */
-               if (vend > bp && 0 == jhy && vis > 0) {
-                       vend -= vis;
-                       (*p->endline)(p);
-                       p->viscol = 0;
-                       if (TERMP_BRIND & p->flags) {
-                               vbl = rmargin;
-                               vend += rmargin - p->offset;
-                       } else
-                               vbl = p->offset;
 
 
-                       /* use pending tabs on the new line */
+               vbl = p->flags & TERMP_BRIND ?
+                   p->tcol->rmargin : p->tcol->offset;
+       }
 
 
-                       if (0 < ntab)
-                               vbl += ntab * p->tabwidth;
+       /* Reset output state in preparation for the next field. */
 
 
-                       /*
-                        * Remove the p->overstep width.
-                        * Again, if p->overstep is negative,
-                        * sign extension does the right thing.
-                        */
+       p->col = p->tcol->col = p->tcol->lastcol = 0;
+       p->minbl = p->trailspace;
+       p->flags &= ~(TERMP_BACKAFTER | TERMP_BACKBEFORE | TERMP_NOPAD);
 
 
-                       bp += (size_t)p->overstep;
-                       p->overstep = 0;
-               }
+       if (p->flags & TERMP_MULTICOL)
+               return;
+
+       /*
+        * The HANG flag means that the next field
+        * always follows on the same line.
+        * The NOBREAK flag means that the next field
+        * follows on the same line unless the field was overrun.
+        * Normally, break the line at the end of each field.
+        */
+
+       if ((p->flags & TERMP_HANG) == 0 &&
+           ((p->flags & TERMP_NOBREAK) == 0 ||
+            vbr + term_len(p, p->trailspace) > vfield))
+               endline(p);
+}
+
+/*
+ * Store the number of input characters to print in this field in *nbr
+ * and their total visual width to print in *vbr.
+ * If there is only whitespace in the field, both remain zero.
+ * The desired visual width of the field is provided by vtarget.
+ * If the first word is longer, the field will be overrun.
+ */
+static void
+term_fill(struct termp *p, size_t *nbr, size_t *vbr, size_t vtarget)
+{
+       size_t   ic;        /* Character position in the input buffer. */
+       size_t   vis;       /* Visual position of the current character. */
+       size_t   vn;        /* Visual position of the next character. */
+       int      breakline; /* Break at the end of this word. */
+       int      graph;     /* Last character was non-blank. */
+
+       *nbr = *vbr = vis = 0;
+       breakline = graph = 0;
+       for (ic = p->tcol->col; ic < p->tcol->lastcol; ic++) {
+               switch (p->tcol->buf[ic]) {
+               case '\b':  /* Escape \o (overstrike) or backspace markup. */
+                       assert(ic > 0);
+                       vis -= (*p->width)(p, p->tcol->buf[ic - 1]);
+                       continue;
 
 
-               /* Write out the [remaining] word. */
-               for ( ; i < p->col; i++) {
-                       if (vend > bp && jhy > 0 && i > jhy)
+               case '\t':  /* Normal ASCII whitespace. */
+               case ' ':
+               case ASCII_BREAK:  /* Escape \: (breakpoint). */
+                       switch (p->tcol->buf[ic]) {
+                       case '\t':
+                               vn = term_tab_next(vis);
                                break;
                                break;
-                       if ('\t' == p->buf[i])
+                       case ' ':
+                               vn = vis + (*p->width)(p, ' ');
                                break;
                                break;
-                       if (' ' == p->buf[i]) {
-                               j = i;
-                               while (i < p->col && ' ' == p->buf[i])
-                                       i++;
-                               dv = (i - j) * (*p->width)(p, ' ');
-                               vbl += dv;
-                               vend += dv;
+                       case ASCII_BREAK:
+                               vn = vis;
                                break;
                                break;
+                       default:
+                               abort();
                        }
                        }
-                       if (ASCII_NBRSP == p->buf[i]) {
-                               vbl += (*p->width)(p, ' ');
-                               continue;
+                       /* Can break at the end of a word. */
+                       if (breakline || vn > vtarget)
+                               break;
+                       if (graph) {
+                               *nbr = ic;
+                               *vbr = vis;
+                               graph = 0;
                        }
                        }
-                       if (ASCII_BREAK == p->buf[i])
-                               continue;
+                       vis = vn;
+                       continue;
+
+               case '\n':  /* Escape \p (break at the end of the word). */
+                       breakline = 1;
+                       continue;
 
 
+               case ASCII_HYPH:  /* Breakable hyphen. */
+                       graph = 1;
                        /*
                        /*
-                        * Now we definitely know there will be
-                        * printable characters to output,
-                        * so write preceding white space now.
+                        * We are about to decide whether to break the
+                        * line or not, so we no longer need this hyphen
+                        * to be marked as breakable.  Put back a real
+                        * hyphen such that we get the correct width.
                         */
                         */
-                       if (vbl) {
-                               (*p->advance)(p, vbl);
-                               p->viscol += vbl;
-                               vbl = 0;
+                       p->tcol->buf[ic] = '-';
+                       vis += (*p->width)(p, '-');
+                       if (vis > vtarget) {
+                               ic++;
+                               break;
                        }
                        }
+                       *nbr = ic + 1;
+                       *vbr = vis;
+                       continue;
 
 
-                       (*p->letter)(p, p->buf[i]);
-                       if (8 == p->buf[i])
-                               p->viscol -= (*p->width)(p, p->buf[i-1]);
-                       else
-                               p->viscol += (*p->width)(p, p->buf[i]);
+               case ASCII_NBRSP:  /* Non-breakable space. */
+                       p->tcol->buf[ic] = ' ';
+                       /* FALLTHROUGH */
+               default:  /* Printable character. */
+                       graph = 1;
+                       vis += (*p->width)(p, p->tcol->buf[ic]);
+                       if (vis > vtarget && *nbr > 0)
+                               return;
+                       continue;
                }
                }
-               vis = vend;
+               break;
        }
 
        /*
        }
 
        /*
-        * If there was trailing white space, it was not printed;
-        * so reset the cursor position accordingly.
+        * If the last word extends to the end of the field without any
+        * trailing whitespace, the loop could not check yet whether it
+        * can remain on this line.  So do the check now.
         */
         */
-       if (vis > vbl)
-               vis -= vbl;
-       else
-               vis = 0;
-
-       p->col = 0;
-       p->overstep = 0;
 
 
-       if ( ! (TERMP_NOBREAK & p->flags)) {
-               p->viscol = 0;
-               (*p->endline)(p);
-               return;
+       if (graph && (vis <= vtarget || *nbr == 0)) {
+               *nbr = ic;
+               *vbr = vis;
        }
        }
+}
 
 
-       if (TERMP_HANG & p->flags) {
-               p->overstep = (int)(vis - maxvis +
-                   p->trailspace * (*p->width)(p, ' '));
+/*
+ * Print the contents of one field
+ * with an indentation of       vbl      visual columns,
+ * and an input string length of nbr     characters.
+ */
+static void
+term_field(struct termp *p, size_t vbl, size_t nbr)
+{
+       size_t   ic;    /* Character position in the input buffer. */
+       size_t   vis;   /* Visual position of the current character. */
+       size_t   dv;    /* Visual width of the current character. */
+       size_t   vn;    /* Visual position of the next character. */
+
+       vis = 0;
+       for (ic = p->tcol->col; ic < nbr; ic++) {
 
                /*
 
                /*
-                * If we have overstepped the margin, temporarily move
-                * it to the right and flag the rest of the line to be
-                * shorter.
-                * If there is a request to keep the columns together,
-                * allow negative overstep when the column is not full.
+                * To avoid the printing of trailing whitespace,
+                * do not print whitespace right away, only count it.
                 */
                 */
-               if (p->trailspace && p->overstep < 0)
-                       p->overstep = 0;
-               return;
 
 
-       } else if (TERMP_DANGLE & p->flags)
-               return;
+               switch (p->tcol->buf[ic]) {
+               case '\n':
+               case ASCII_BREAK:
+                       continue;
+               case '\t':
+                       vn = term_tab_next(vis);
+                       vbl += vn - vis;
+                       vis = vn;
+                       continue;
+               case ' ':
+               case ASCII_NBRSP:
+                       dv = (*p->width)(p, ' ');
+                       vbl += dv;
+                       vis += dv;
+                       continue;
+               default:
+                       break;
+               }
 
 
-       /* If the column was overrun, break the line. */
-       if (maxvis < vis + p->trailspace * (*p->width)(p, ' ')) {
-               (*p->endline)(p);
-               p->viscol = 0;
+               /*
+                * We found a non-blank character to print,
+                * so write preceding white space now.
+                */
+
+               if (vbl > 0) {
+                       (*p->advance)(p, vbl);
+                       p->viscol += vbl;
+                       vbl = 0;
+               }
+
+               /* Print the character and adjust the visual position. */
+
+               (*p->letter)(p, p->tcol->buf[ic]);
+               if (p->tcol->buf[ic] == '\b') {
+                       dv = (*p->width)(p, p->tcol->buf[ic - 1]);
+                       p->viscol -= dv;
+                       vis -= dv;
+               } else {
+                       dv = (*p->width)(p, p->tcol->buf[ic]);
+                       p->viscol += dv;
+                       vis += dv;
+               }
        }
        }
+       p->tcol->col = nbr;
+}
+
+static void
+endline(struct termp *p)
+{
+       if ((p->flags & (TERMP_NEWMC | TERMP_ENDMC)) == TERMP_ENDMC) {
+               p->mc = NULL;
+               p->flags &= ~TERMP_ENDMC;
+       }
+       if (p->mc != NULL) {
+               if (p->viscol && p->maxrmargin >= p->viscol)
+                       (*p->advance)(p, p->maxrmargin - p->viscol + 1);
+               p->flags |= TERMP_NOBUF | TERMP_NOSPACE;
+               term_word(p, p->mc);
+               p->flags &= ~(TERMP_NOBUF | TERMP_NEWMC);
+       }
+       p->viscol = 0;
+       p->minbl = 0;
+       (*p->endline)(p);
 }
 
 /*
 }
 
 /*
@@ -307,7 +437,7 @@ term_newln(struct termp *p)
 {
 
        p->flags |= TERMP_NOSPACE;
 {
 
        p->flags |= TERMP_NOSPACE;
-       if (p->col || p->viscol)
+       if (p->tcol->lastcol || p->viscol)
                term_flushln(p);
 }
 
                term_flushln(p);
 }
 
@@ -323,12 +453,14 @@ term_vspace(struct termp *p)
 
        term_newln(p);
        p->viscol = 0;
 
        term_newln(p);
        p->viscol = 0;
+       p->minbl = 0;
        if (0 < p->skipvsp)
                p->skipvsp--;
        else
                (*p->endline)(p);
 }
 
        if (0 < p->skipvsp)
                p->skipvsp--;
        else
                (*p->endline)(p);
 }
 
+/* Swap current and previous font; for \fP and .ft P */
 void
 term_fontlast(struct termp *p)
 {
 void
 term_fontlast(struct termp *p)
 {
@@ -339,6 +471,7 @@ term_fontlast(struct termp *p)
        p->fontq[p->fonti] = f;
 }
 
        p->fontq[p->fonti] = f;
 }
 
+/* Set font, save current, discard previous; for \f, .ft, .B etc. */
 void
 term_fontrepl(struct termp *p, enum termfont f)
 {
 void
 term_fontrepl(struct termp *p, enum termfont f)
 {
@@ -347,38 +480,31 @@ term_fontrepl(struct termp *p, enum termfont f)
        p->fontq[p->fonti] = f;
 }
 
        p->fontq[p->fonti] = f;
 }
 
+/* Set font, save previous. */
 void
 term_fontpush(struct termp *p, enum termfont f)
 {
 
 void
 term_fontpush(struct termp *p, enum termfont f)
 {
 
-       assert(p->fonti + 1 < 10);
        p->fontl = p->fontq[p->fonti];
        p->fontl = p->fontq[p->fonti];
-       p->fontq[++p->fonti] = f;
-}
-
-const void *
-term_fontq(struct termp *p)
-{
-
-       return(&p->fontq[p->fonti]);
-}
-
-enum termfont
-term_fonttop(struct termp *p)
-{
-
-       return(p->fontq[p->fonti]);
+       if (++p->fonti == p->fontsz) {
+               p->fontsz += 8;
+               p->fontq = mandoc_reallocarray(p->fontq,
+                   p->fontsz, sizeof(*p->fontq));
+       }
+       p->fontq[p->fonti] = f;
 }
 
 }
 
+/* Flush to make the saved pointer current again. */
 void
 void
-term_fontpopq(struct termp *p, const void *key)
+term_fontpopq(struct termp *p, int i)
 {
 
 {
 
-       while (p->fonti >= 0 && key < (void *)(p->fontq + p->fonti))
-               p->fonti--;
-       assert(p->fonti >= 0);
+       assert(i >= 0);
+       if (p->fonti > i)
+               p->fonti = i;
 }
 
 }
 
+/* Pop one font off the stack. */
 void
 term_fontpop(struct termp *p)
 {
 void
 term_fontpop(struct termp *p)
 {
@@ -395,37 +521,34 @@ term_fontpop(struct termp *p)
 void
 term_word(struct termp *p, const char *word)
 {
 void
 term_word(struct termp *p, const char *word)
 {
+       struct roffsu    su;
        const char       nbrsp[2] = { ASCII_NBRSP, 0 };
        const char      *seq, *cp;
        int              sz, uc;
        const char       nbrsp[2] = { ASCII_NBRSP, 0 };
        const char      *seq, *cp;
        int              sz, uc;
-       size_t           ssz;
+       size_t           csz, lsz, ssz;
        enum mandoc_esc  esc;
 
        enum mandoc_esc  esc;
 
-       if ( ! (TERMP_NOSPACE & p->flags)) {
-               if ( ! (TERMP_KEEP & p->flags)) {
-                       bufferc(p, ' ');
-                       if (TERMP_SENTENCE & p->flags)
+       if ((p->flags & TERMP_NOBUF) == 0) {
+               if ((p->flags & TERMP_NOSPACE) == 0) {
+                       if ((p->flags & TERMP_KEEP) == 0) {
                                bufferc(p, ' ');
                                bufferc(p, ' ');
-               } else
-                       bufferc(p, ASCII_NBRSP);
+                               if (p->flags & TERMP_SENTENCE)
+                                       bufferc(p, ' ');
+                       } else
+                               bufferc(p, ASCII_NBRSP);
+               }
+               if (p->flags & TERMP_PREKEEP)
+                       p->flags |= TERMP_KEEP;
+               if (p->flags & TERMP_NONOSPACE)
+                       p->flags |= TERMP_NOSPACE;
+               else
+                       p->flags &= ~TERMP_NOSPACE;
+               p->flags &= ~(TERMP_SENTENCE | TERMP_NONEWLINE);
+               p->skipvsp = 0;
        }
        }
-       if (TERMP_PREKEEP & p->flags)
-               p->flags |= TERMP_KEEP;
-
-       if ( ! (p->flags & TERMP_NONOSPACE))
-               p->flags &= ~TERMP_NOSPACE;
-       else
-               p->flags |= TERMP_NOSPACE;
-
-       p->flags &= ~TERMP_SENTENCE;
 
        while ('\0' != *word) {
                if ('\\' != *word) {
 
        while ('\0' != *word) {
                if ('\\' != *word) {
-                       if (TERMP_SKIPCHAR & p->flags) {
-                               p->flags &= ~TERMP_SKIPCHAR;
-                               word++;
-                               continue;
-                       }
                        if (TERMP_NBRWORD & p->flags) {
                                if (' ' == *word) {
                                        encode(p, nbrsp, 1);
                        if (TERMP_NBRWORD & p->flags) {
                                if (' ' == *word) {
                                        encode(p, nbrsp, 1);
@@ -442,9 +565,6 @@ term_word(struct termp *p, const char *word)
 
                word++;
                esc = mandoc_escape(&word, &seq, &sz);
 
                word++;
                esc = mandoc_escape(&word, &seq, &sz);
-               if (ESCAPE_ERROR == esc)
-                       continue;
-
                switch (esc) {
                case ESCAPE_UNICODE:
                        uc = mchars_num2uc(seq + 1, sz - 1);
                switch (esc) {
                case ESCAPE_UNICODE:
                        uc = mchars_num2uc(seq + 1, sz - 1);
@@ -456,41 +576,157 @@ term_word(struct termp *p, const char *word)
                        break;
                case ESCAPE_SPECIAL:
                        if (p->enc == TERMENC_ASCII) {
                        break;
                case ESCAPE_SPECIAL:
                        if (p->enc == TERMENC_ASCII) {
-                               cp = mchars_spec2str(p->symtab,
-                                   seq, sz, &ssz);
+                               cp = mchars_spec2str(seq, sz, &ssz);
                                if (cp != NULL)
                                        encode(p, cp, ssz);
                        } else {
                                if (cp != NULL)
                                        encode(p, cp, ssz);
                        } else {
-                               uc = mchars_spec2cp(p->symtab, seq, sz);
+                               uc = mchars_spec2cp(seq, sz);
                                if (uc > 0)
                                        encode1(p, uc);
                        }
                        continue;
                                if (uc > 0)
                                        encode1(p, uc);
                        }
                        continue;
+               case ESCAPE_UNDEF:
+                       uc = *seq;
+                       break;
                case ESCAPE_FONTBOLD:
                case ESCAPE_FONTBOLD:
+               case ESCAPE_FONTCB:
                        term_fontrepl(p, TERMFONT_BOLD);
                        continue;
                case ESCAPE_FONTITALIC:
                        term_fontrepl(p, TERMFONT_BOLD);
                        continue;
                case ESCAPE_FONTITALIC:
+               case ESCAPE_FONTCI:
                        term_fontrepl(p, TERMFONT_UNDER);
                        continue;
                case ESCAPE_FONTBI:
                        term_fontrepl(p, TERMFONT_BI);
                        continue;
                case ESCAPE_FONT:
                        term_fontrepl(p, TERMFONT_UNDER);
                        continue;
                case ESCAPE_FONTBI:
                        term_fontrepl(p, TERMFONT_BI);
                        continue;
                case ESCAPE_FONT:
-                       /* FALLTHROUGH */
+               case ESCAPE_FONTCR:
                case ESCAPE_FONTROMAN:
                        term_fontrepl(p, TERMFONT_NONE);
                        continue;
                case ESCAPE_FONTPREV:
                        term_fontlast(p);
                        continue;
                case ESCAPE_FONTROMAN:
                        term_fontrepl(p, TERMFONT_NONE);
                        continue;
                case ESCAPE_FONTPREV:
                        term_fontlast(p);
                        continue;
+               case ESCAPE_BREAK:
+                       bufferc(p, '\n');
+                       continue;
                case ESCAPE_NOSPACE:
                case ESCAPE_NOSPACE:
-                       if (TERMP_SKIPCHAR & p->flags)
-                               p->flags &= ~TERMP_SKIPCHAR;
-                       else if ('\0' == *word)
-                               p->flags |= TERMP_NOSPACE;
+                       if (p->flags & TERMP_BACKAFTER)
+                               p->flags &= ~TERMP_BACKAFTER;
+                       else if (*word == '\0')
+                               p->flags |= (TERMP_NOSPACE | TERMP_NONEWLINE);
+                       continue;
+               case ESCAPE_DEVICE:
+                       if (p->type == TERMTYPE_PDF)
+                               encode(p, "pdf", 3);
+                       else if (p->type == TERMTYPE_PS)
+                               encode(p, "ps", 2);
+                       else if (p->enc == TERMENC_ASCII)
+                               encode(p, "ascii", 5);
+                       else
+                               encode(p, "utf8", 4);
+                       continue;
+               case ESCAPE_HORIZ:
+                       if (*seq == '|') {
+                               seq++;
+                               uc = -p->col;
+                       } else
+                               uc = 0;
+                       if (a2roffsu(seq, &su, SCALE_EM) == NULL)
+                               continue;
+                       uc += term_hen(p, &su);
+                       if (uc > 0)
+                               while (uc-- > 0)
+                                       bufferc(p, ASCII_NBRSP);
+                       else if (p->col > (size_t)(-uc))
+                               p->col += uc;
+                       else {
+                               uc += p->col;
+                               p->col = 0;
+                               if (p->tcol->offset > (size_t)(-uc)) {
+                                       p->ti += uc;
+                                       p->tcol->offset += uc;
+                               } else {
+                                       p->ti -= p->tcol->offset;
+                                       p->tcol->offset = 0;
+                               }
+                       }
+                       continue;
+               case ESCAPE_HLINE:
+                       if ((cp = a2roffsu(seq, &su, SCALE_EM)) == NULL)
+                               continue;
+                       uc = term_hen(p, &su);
+                       if (uc <= 0) {
+                               if (p->tcol->rmargin <= p->tcol->offset)
+                                       continue;
+                               lsz = p->tcol->rmargin - p->tcol->offset;
+                       } else
+                               lsz = uc;
+                       if (*cp == seq[-1])
+                               uc = -1;
+                       else if (*cp == '\\') {
+                               seq = cp + 1;
+                               esc = mandoc_escape(&seq, &cp, &sz);
+                               switch (esc) {
+                               case ESCAPE_UNICODE:
+                                       uc = mchars_num2uc(cp + 1, sz - 1);
+                                       break;
+                               case ESCAPE_NUMBERED:
+                                       uc = mchars_num2char(cp, sz);
+                                       break;
+                               case ESCAPE_SPECIAL:
+                                       uc = mchars_spec2cp(cp, sz);
+                                       break;
+                               case ESCAPE_UNDEF:
+                                       uc = *seq;
+                                       break;
+                               default:
+                                       uc = -1;
+                                       break;
+                               }
+                       } else
+                               uc = *cp;
+                       if (uc < 0x20 || (uc > 0x7E && uc < 0xA0))
+                               uc = '_';
+                       if (p->enc == TERMENC_ASCII) {
+                               cp = ascii_uc2str(uc);
+                               csz = term_strlen(p, cp);
+                               ssz = strlen(cp);
+                       } else
+                               csz = (*p->width)(p, uc);
+                       while (lsz >= csz) {
+                               if (p->enc == TERMENC_ASCII)
+                                       encode(p, cp, ssz);
+                               else
+                                       encode1(p, uc);
+                               lsz -= csz;
+                       }
                        continue;
                case ESCAPE_SKIPCHAR:
                        continue;
                case ESCAPE_SKIPCHAR:
-                       p->flags |= TERMP_SKIPCHAR;
+                       p->flags |= TERMP_BACKAFTER;
+                       continue;
+               case ESCAPE_OVERSTRIKE:
+                       cp = seq + sz;
+                       while (seq < cp) {
+                               if (*seq == '\\') {
+                                       mandoc_escape(&seq, NULL, NULL);
+                                       continue;
+                               }
+                               encode1(p, *seq++);
+                               if (seq < cp) {
+                                       if (p->flags & TERMP_BACKBEFORE)
+                                               p->flags |= TERMP_BACKAFTER;
+                                       else
+                                               p->flags |= TERMP_BACKBEFORE;
+                               }
+                       }
+                       /* Trim trailing backspace/blank pair. */
+                       if (p->tcol->lastcol > 2 &&
+                           (p->tcol->buf[p->tcol->lastcol - 1] == ' ' ||
+                            p->tcol->buf[p->tcol->lastcol - 1] == '\t'))
+                               p->tcol->lastcol -= 2;
+                       if (p->col > p->tcol->lastcol)
+                               p->col = p->tcol->lastcol;
                        continue;
                default:
                        continue;
                        continue;
                default:
                        continue;
@@ -515,25 +751,28 @@ term_word(struct termp *p, const char *word)
 }
 
 static void
 }
 
 static void
-adjbuf(struct termp *p, size_t sz)
+adjbuf(struct termp_col *c, size_t sz)
 {
 {
-
-       if (0 == p->maxcols)
-               p->maxcols = 1024;
-       while (sz >= p->maxcols)
-               p->maxcols <<= 2;
-
-       p->buf = mandoc_reallocarray(p->buf, p->maxcols, sizeof(int));
+       if (c->maxcols == 0)
+               c->maxcols = 1024;
+       while (c->maxcols <= sz)
+               c->maxcols <<= 2;
+       c->buf = mandoc_reallocarray(c->buf, c->maxcols, sizeof(*c->buf));
 }
 
 static void
 bufferc(struct termp *p, char c)
 {
 }
 
 static void
 bufferc(struct termp *p, char c)
 {
-
-       if (p->col + 1 >= p->maxcols)
-               adjbuf(p, p->col + 1);
-
-       p->buf[p->col++] = c;
+       if (p->flags & TERMP_NOBUF) {
+               (*p->letter)(p, c);
+               return;
+       }
+       if (p->col + 1 >= p->tcol->maxcols)
+               adjbuf(p->tcol, p->col + 1);
+       if (p->tcol->lastcol <= p->col || (c != ' ' && c != ASCII_NBRSP))
+               p->tcol->buf[p->col] = c;
+       if (p->tcol->lastcol < ++p->col)
+               p->tcol->lastcol = p->col;
 }
 
 /*
 }
 
 /*
@@ -546,28 +785,44 @@ encode1(struct termp *p, int c)
 {
        enum termfont     f;
 
 {
        enum termfont     f;
 
-       if (TERMP_SKIPCHAR & p->flags) {
-               p->flags &= ~TERMP_SKIPCHAR;
+       if (p->flags & TERMP_NOBUF) {
+               (*p->letter)(p, c);
                return;
        }
 
                return;
        }
 
-       if (p->col + 6 >= p->maxcols)
-               adjbuf(p, p->col + 6);
+       if (p->col + 7 >= p->tcol->maxcols)
+               adjbuf(p->tcol, p->col + 7);
 
 
-       f = term_fonttop(p);
+       f = (c == ASCII_HYPH || c > 127 || isgraph(c)) ?
+           p->fontq[p->fonti] : TERMFONT_NONE;
 
 
-       if (TERMFONT_UNDER == f || TERMFONT_BI == f) {
-               p->buf[p->col++] = '_';
-               p->buf[p->col++] = 8;
+       if (p->flags & TERMP_BACKBEFORE) {
+               if (p->tcol->buf[p->col - 1] == ' ' ||
+                   p->tcol->buf[p->col - 1] == '\t')
+                       p->col--;
+               else
+                       p->tcol->buf[p->col++] = '\b';
+               p->flags &= ~TERMP_BACKBEFORE;
+       }
+       if (f == TERMFONT_UNDER || f == TERMFONT_BI) {
+               p->tcol->buf[p->col++] = '_';
+               p->tcol->buf[p->col++] = '\b';
        }
        }
-       if (TERMFONT_BOLD == f || TERMFONT_BI == f) {
-               if (ASCII_HYPH == c)
-                       p->buf[p->col++] = '-';
+       if (f == TERMFONT_BOLD || f == TERMFONT_BI) {
+               if (c == ASCII_HYPH)
+                       p->tcol->buf[p->col++] = '-';
                else
                else
-                       p->buf[p->col++] = c;
-               p->buf[p->col++] = 8;
+                       p->tcol->buf[p->col++] = c;
+               p->tcol->buf[p->col++] = '\b';
+       }
+       if (p->tcol->lastcol <= p->col || (c != ' ' && c != ASCII_NBRSP))
+               p->tcol->buf[p->col] = c;
+       if (p->tcol->lastcol < ++p->col)
+               p->tcol->lastcol = p->col;
+       if (p->flags & TERMP_BACKAFTER) {
+               p->flags |= TERMP_BACKBEFORE;
+               p->flags &= ~TERMP_BACKAFTER;
        }
        }
-       p->buf[p->col++] = c;
 }
 
 static void
 }
 
 static void
@@ -575,45 +830,46 @@ encode(struct termp *p, const char *word, size_t sz)
 {
        size_t            i;
 
 {
        size_t            i;
 
-       if (TERMP_SKIPCHAR & p->flags) {
-               p->flags &= ~TERMP_SKIPCHAR;
-               return;
-       }
-
-       /*
-        * 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 == term_fonttop(p)) {
-               if (p->col + sz >= p->maxcols)
-                       adjbuf(p, p->col + sz);
+       if (p->flags & TERMP_NOBUF) {
                for (i = 0; i < sz; i++)
                for (i = 0; i < sz; i++)
-                       p->buf[p->col++] = word[i];
+                       (*p->letter)(p, word[i]);
                return;
        }
 
                return;
        }
 
-       /* Pre-buffer, assuming worst-case. */
-
-       if (p->col + 1 + (sz * 5) >= p->maxcols)
-               adjbuf(p, p->col + 1 + (sz * 5));
+       if (p->col + 2 + (sz * 5) >= p->tcol->maxcols)
+               adjbuf(p->tcol, p->col + 2 + (sz * 5));
 
        for (i = 0; i < sz; i++) {
                if (ASCII_HYPH == word[i] ||
                    isgraph((unsigned char)word[i]))
                        encode1(p, word[i]);
 
        for (i = 0; i < sz; i++) {
                if (ASCII_HYPH == word[i] ||
                    isgraph((unsigned char)word[i]))
                        encode1(p, word[i]);
-               else
-                       p->buf[p->col++] = word[i];
+               else {
+                       if (p->tcol->lastcol <= p->col ||
+                           (word[i] != ' ' && word[i] != ASCII_NBRSP))
+                               p->tcol->buf[p->col] = word[i];
+                       p->col++;
+
+                       /*
+                        * Postpone the effect of \z while handling
+                        * an overstrike sequence from ascii_uc2str().
+                        */
+
+                       if (word[i] == '\b' &&
+                           (p->flags & TERMP_BACKBEFORE)) {
+                               p->flags &= ~TERMP_BACKBEFORE;
+                               p->flags |= TERMP_BACKAFTER;
+                       }
+               }
        }
        }
+       if (p->tcol->lastcol < p->col)
+               p->tcol->lastcol = p->col;
 }
 
 void
 term_setwidth(struct termp *p, const char *wstr)
 {
        struct roffsu    su;
 }
 
 void
 term_setwidth(struct termp *p, const char *wstr)
 {
        struct roffsu    su;
-       size_t           width;
-       int              iop;
+       int              iop, width;
 
        iop = 0;
        width = 0;
 
        iop = 0;
        width = 0;
@@ -630,7 +886,7 @@ term_setwidth(struct termp *p, const char *wstr)
                default:
                        break;
                }
                default:
                        break;
                }
-               if (a2roffsu(wstr, &su, SCALE_MAX))
+               if (a2roffsu(wstr, &su, SCALE_MAX) != NULL)
                        width = term_hspan(p, &su);
                else
                        iop = 0;
                        width = term_hspan(p, &su);
                else
                        iop = 0;
@@ -642,7 +898,7 @@ size_t
 term_len(const struct termp *p, size_t sz)
 {
 
 term_len(const struct termp *p, size_t sz)
 {
 
-       return((*p->width)(p, ' ') * sz);
+       return (*p->width)(p, ' ') * sz;
 }
 
 static size_t
 }
 
 static size_t
@@ -651,9 +907,9 @@ cond_width(const struct termp *p, int c, int *skip)
 
        if (*skip) {
                (*skip) = 0;
 
        if (*skip) {
                (*skip) = 0;
-               return(0);
+               return 0;
        } else
        } else
-               return((*p->width)(p, c));
+               return (*p->width)(p, c);
 }
 
 size_t
 }
 
 size_t
@@ -682,12 +938,8 @@ term_strlen(const struct termp *p, const char *cp)
                switch (*cp) {
                case '\\':
                        cp++;
                switch (*cp) {
                case '\\':
                        cp++;
-                       esc = mandoc_escape(&cp, &seq, &ssz);
-                       if (ESCAPE_ERROR == esc)
-                               continue;
-
                        rhs = NULL;
                        rhs = NULL;
-
+                       esc = mandoc_escape(&cp, &seq, &ssz);
                        switch (esc) {
                        case ESCAPE_UNICODE:
                                uc = mchars_num2uc(seq + 1, ssz - 1);
                        switch (esc) {
                        case ESCAPE_UNICODE:
                                uc = mchars_num2uc(seq + 1, ssz - 1);
@@ -699,20 +951,50 @@ term_strlen(const struct termp *p, const char *cp)
                                break;
                        case ESCAPE_SPECIAL:
                                if (p->enc == TERMENC_ASCII) {
                                break;
                        case ESCAPE_SPECIAL:
                                if (p->enc == TERMENC_ASCII) {
-                                       rhs = mchars_spec2str(p->symtab,
-                                           seq, ssz, &rsz);
+                                       rhs = mchars_spec2str(seq, ssz, &rsz);
                                        if (rhs != NULL)
                                                break;
                                } else {
                                        if (rhs != NULL)
                                                break;
                                } else {
-                                       uc = mchars_spec2cp(p->symtab,
-                                           seq, ssz);
+                                       uc = mchars_spec2cp(seq, ssz);
                                        if (uc > 0)
                                                sz += cond_width(p, uc, &skip);
                                }
                                continue;
                                        if (uc > 0)
                                                sz += cond_width(p, uc, &skip);
                                }
                                continue;
+                       case ESCAPE_UNDEF:
+                               uc = *seq;
+                               break;
+                       case ESCAPE_DEVICE:
+                               if (p->type == TERMTYPE_PDF) {
+                                       rhs = "pdf";
+                                       rsz = 3;
+                               } else if (p->type == TERMTYPE_PS) {
+                                       rhs = "ps";
+                                       rsz = 2;
+                               } else if (p->enc == TERMENC_ASCII) {
+                                       rhs = "ascii";
+                                       rsz = 5;
+                               } else {
+                                       rhs = "utf8";
+                                       rsz = 4;
+                               }
+                               break;
                        case ESCAPE_SKIPCHAR:
                                skip = 1;
                                continue;
                        case ESCAPE_SKIPCHAR:
                                skip = 1;
                                continue;
+                       case ESCAPE_OVERSTRIKE:
+                               rsz = 0;
+                               rhs = seq + ssz;
+                               while (seq < rhs) {
+                                       if (*seq == '\\') {
+                                               mandoc_escape(&seq, NULL, NULL);
+                                               continue;
+                                       }
+                                       i = (*p->width)(p, *seq++);
+                                       if (rsz < i)
+                                               rsz = i;
+                               }
+                               sz += rsz;
+                               continue;
                        default:
                                continue;
                        }
                        default:
                                continue;
                        }
@@ -755,58 +1037,77 @@ term_strlen(const struct termp *p, const char *cp)
                case ASCII_HYPH:
                        sz += cond_width(p, '-', &skip);
                        cp++;
                case ASCII_HYPH:
                        sz += cond_width(p, '-', &skip);
                        cp++;
-                       /* FALLTHROUGH */
-               case ASCII_BREAK:
                        break;
                default:
                        break;
                }
        }
 
                        break;
                default:
                        break;
                }
        }
 
-       return(sz);
+       return sz;
 }
 
 }
 
-size_t
+int
 term_vspan(const struct termp *p, const struct roffsu *su)
 {
        double           r;
 term_vspan(const struct termp *p, const struct roffsu *su)
 {
        double           r;
+       int              ri;
 
        switch (su->unit) {
 
        switch (su->unit) {
+       case SCALE_BU:
+               r = su->scale / 40.0;
+               break;
        case SCALE_CM:
        case SCALE_CM:
-               r = su->scale * 2.0;
+               r = su->scale * 6.0 / 2.54;
+               break;
+       case SCALE_FS:
+               r = su->scale * 65536.0 / 40.0;
                break;
        case SCALE_IN:
                r = su->scale * 6.0;
                break;
                break;
        case SCALE_IN:
                r = su->scale * 6.0;
                break;
+       case SCALE_MM:
+               r = su->scale * 0.006;
+               break;
        case SCALE_PC:
                r = su->scale;
                break;
        case SCALE_PT:
        case SCALE_PC:
                r = su->scale;
                break;
        case SCALE_PT:
-               r = su->scale / 8.0;
+               r = su->scale / 12.0;
                break;
                break;
-       case SCALE_MM:
-               r = su->scale / 1000.0;
+       case SCALE_EN:
+       case SCALE_EM:
+               r = su->scale * 0.6;
                break;
        case SCALE_VS:
                r = su->scale;
                break;
        default:
                break;
        case SCALE_VS:
                r = su->scale;
                break;
        default:
-               r = su->scale - 1.0;
-               break;
+               abort();
        }
        }
-
-       if (r < 0.0)
-               r = 0.0;
-       return((size_t)(r + 0.0005));
+       ri = r > 0.0 ? r + 0.4995 : r - 0.4995;
+       return ri < 66 ? ri : 1;
 }
 
 }
 
-size_t
+/*
+ * Convert a scaling width to basic units, rounding towards 0.
+ */
+int
 term_hspan(const struct termp *p, const struct roffsu *su)
 {
 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)(v + 0.0005));
+       return (*p->hspan)(p, su);
+}
+
+/*
+ * Convert a scaling width to basic units, rounding to closest.
+ */
+int
+term_hen(const struct termp *p, const struct roffsu *su)
+{
+       int bu;
+
+       if ((bu = (*p->hspan)(p, su)) >= 0)
+               return (bu + 11) / 24;
+       else
+               return -((-bu + 11) / 24);
 }
 }
A git conversion mirror of mandoc.bsd.lv