Reduce the amount of code by moving the three copies of the ohash

[mandoc.git] / term.c

diff --git a/term.c b/term.c
index 2810d620283d415b7dbce7d51b526225856f0c01..973b404edaa06d4e52048faf9e86c33a9c1ee136 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,61 +1,55 @@
-/*     $Id: term.c,v 1.187 2011/05/14 17:54:42 kristaps Exp $ */
+/*     $Id: term.c,v 1.253 2015/10/12 00:08:16 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010-2015 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
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
  * 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"
 #include "config.h"

-#endif

 
 #include <sys/types.h>
 
 #include <assert.h>
 #include <ctype.h>
 
 #include <sys/types.h>
 
 #include <assert.h>
 #include <ctype.h>

-#include <stdint.h>

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

+#include "mandoc_aux.h"

 #include "out.h"
 #include "term.h"
 #include "main.h"
 
 #include "out.h"
 #include "term.h"
 #include "main.h"
 

-static void              spec(struct termp *, 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);
+static size_t           cond_width(const struct termp *, int, int *);
+static void             adjbuf(struct termp *p, size_t);
+static void             bufferc(struct termp *, char);
+static void             encode(struct termp *, const char *, size_t);
+static void             encode1(struct termp *, int);

 
 
 void
 term_free(struct termp *p)
 {
 
 
 
 void
 term_free(struct termp *p)
 {
 

-       if (p->buf)
-               free(p->buf);
-       if (p->symtab)
-               mchars_free(p->symtab);
-
+       free(p->buf);
+       free(p->fontq);

        free(p);
 }
 
        free(p);
 }
 

-

 void
 void

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

 {
 
        p->headf = head;
 {
 
        p->headf = head;


@@ -64,7 +58,6 @@ term_begin(struct termp *p, term_margin head,
        (*p->begin)(p);
 }
 
        (*p->begin)(p);
 }
 

-

 void
 term_end(struct termp *p)
 {
 void
 term_end(struct termp *p)
 {


@@ -72,98 +65,87 @@ term_end(struct termp *p)
        (*p->end)(p);
 }
 
        (*p->end)(p);
 }
 

-
-struct termp *
-term_alloc(enum termenc enc)
-{
-       struct termp    *p;
-
-       p = mandoc_calloc(1, sizeof(struct termp));
-       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.
- *
+ * 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:
  *
  * 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.
+ *  - TERMP_NOBREAK: Do not break the output line at the right margin,
+ *    but only at the max right margin.  Also, do not break the output
+ *    line at the end of the chunk, such that the next call can pad to
+ *    the next column.  However, if less than p->trailspace blanks,
+ *    which can be 0, 1, or 2, remain to the right margin, the line
+ *    will be broken.
+ *  - TERMP_BRTRSP: Consider trailing whitespace significant
+ *    when deciding whether the chunk fits or not.
+ *  - TERMP_BRIND: If the chunk does not fit and the output line has
+ *    to be broken, start the next line at the right margin instead
+ *    of at the offset.  Used together with TERMP_NOBREAK for the tags
+ *    in various kinds of tagged lists.
+ *  - TERMP_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.

  */
 void
 term_flushln(struct termp *p)
 {
  */
 void
 term_flushln(struct termp *p)
 {

-       int              i;     /* current input position in p->buf */
+       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           vis;   /* current visual position on output */
        size_t           vbl;   /* number of blanks to prepend to output */
        size_t           vend;  /* end of word visual position on output */
        size_t           bp;    /* visual right border position */
        size_t           dv;    /* temporary for visual pos calculations */

-       int              j;     /* temporary loop index for p->buf */
-       int              jhy;   /* last hyph before overflow w/r/t j */
+       size_t           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           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.
+        *
+        * 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.

         */
         */

-       assert  (p->rmargin >= p->offset);
-       dv     = p->rmargin - p->offset;
+       dv = p->rmargin > p->offset ? p->rmargin - p->offset : 0;

        maxvis = (int)dv > p->overstep ? dv - (size_t)p->overstep : 0;
        maxvis = (int)dv > p->overstep ? dv - (size_t)p->overstep : 0;

-       dv     = p->maxrmargin - p->offset;
-       mmax   = (int)dv > p->overstep ? dv - (size_t)p->overstep : 0;

 
 

-       bp = TERMP_NOBREAK & p->flags ? mmax : maxvis;
+       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;

 
        /*
 
        /*

-        * Indent the first line of a paragraph.
+        * Calculate the required amount of padding.

         */
         */

-       vbl = p->flags & TERMP_NOLPAD ? (size_t)0 : p->offset;
+       vbl = p->offset + p->overstep > p->viscol ?
+             p->offset + p->overstep - p->viscol : 0;

 
        vis = vend = 0;
        i = 0;
 
 
        vis = vend = 0;
        i = 0;
 

-       while (i < (int)p->col) {
+       while (i < p->col) {

                /*
                 * Handle literal tab characters: collapse all
                 * subsequent tabs into a single huge set of spaces.
                 */
                /*
                 * Handle literal tab characters: collapse all
                 * subsequent tabs into a single huge set of spaces.
                 */

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

                        vend = (vis / p->tabwidth + 1) * p->tabwidth;
                        vbl += vend - vis;
                        vis = vend;
                        vend = (vis / p->tabwidth + 1) * p->tabwidth;
                        vbl += vend - vis;
                        vis = vend;

+                       ntab++;

                        i++;
                }
 
                        i++;
                }
 


@@ -174,8 +156,8 @@ term_flushln(struct termp *p)
                 * space is printed according to regular spacing rules).
                 */
 
                 * space is printed according to regular spacing rules).
                 */
 

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

                                break;
 
                        /* Back over the the last printed character. */
                                break;
 
                        /* Back over the the last printed character. */


@@ -187,10 +169,18 @@ term_flushln(struct termp *p)
 
                        /* Regular word. */
                        /* Break at the hyphen point if we overrun. */
 
                        /* Regular word. */
                        /* Break at the hyphen point if we overrun. */

-                       if (vend > vis && vend < bp && 
-                                       ASCII_HYPH == p->buf[j])
+                       if (vend > vis && vend < bp &&
+                           (ASCII_HYPH == p->buf[j] ||
+                            ASCII_BREAK == p->buf[j]))

                                jhy = j;
 
                                jhy = j;
 

+                       /*
+                        * Hyphenation now decided, put back a real
+                        * hyphen such that we get the correct width.
+                        */
+                       if (ASCII_HYPH == p->buf[j])
+                               p->buf[j] = '-';
+

                        vend += (*p->width)(p, p->buf[j]);
                }
 
                        vend += (*p->width)(p, p->buf[j]);
                }
 


@@ -201,32 +191,40 @@ term_flushln(struct termp *p)
                if (vend > bp && 0 == jhy && vis > 0) {
                        vend -= vis;
                        (*p->endline)(p);
                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;
+                       p->viscol = 0;
+                       if (TERMP_BRIND & p->flags) {
+                               vbl = p->rmargin;
+                               vend += p->rmargin;
+                               vend -= p->offset;
+                       } else

                                vbl = p->offset;
                                vbl = p->offset;

-                       }

 
 

-                       /* Remove the p->overstep width. */
+                       /* use pending tabs on the new line */
+
+                       if (0 < ntab)
+                               vbl += ntab * p->tabwidth;
+
+                       /*
+                        * Remove the p->overstep width.
+                        * Again, if p->overstep is negative,
+                        * sign extension does the right thing.
+                        */

 
                        bp += (size_t)p->overstep;
                        p->overstep = 0;
                }
 
                /* Write out the [remaining] word. */
 
                        bp += (size_t)p->overstep;
                        p->overstep = 0;
                }
 
                /* Write out the [remaining] word. */

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

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

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

                                        i++;
                                        i++;

-                               dv = (size_t)(i - j) * (*p->width)(p, ' ');
+                               dv = (i - j) * (*p->width)(p, ' ');

                                vbl += dv;
                                vend += dv;
                                break;
                                vbl += dv;
                                vend += dv;
                                break;


@@ -235,6 +233,8 @@ term_flushln(struct termp *p)
                                vbl += (*p->width)(p, ' ');
                                continue;
                        }
                                vbl += (*p->width)(p, ' ');
                                continue;
                        }

+                       if (ASCII_BREAK == p->buf[i])
+                               continue;

 
                        /*
                         * Now we definitely know there will be
 
                        /*
                         * Now we definitely know there will be


@@ -247,13 +247,11 @@ term_flushln(struct termp *p)
                                vbl = 0;
                        }
 
                                vbl = 0;
                        }
 

-                       if (ASCII_HYPH == p->buf[i]) {
-                               (*p->letter)(p, '-');
-                               p->viscol += (*p->width)(p, '-');
-                       } else {
-                               (*p->letter)(p, p->buf[i]);
+                       (*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]);
                                p->viscol += (*p->width)(p, p->buf[i]);

-                       }

                }
                vis = vend;
        }
                }
                vis = vend;
        }


@@ -262,10 +260,14 @@ term_flushln(struct termp *p)
         * If there was trailing white space, it was not printed;
         * so reset the cursor position accordingly.
         */
         * If there was trailing white space, it was not printed;
         * so reset the cursor position accordingly.
         */

-       vis -= vbl;
+       if (vis > vbl)
+               vis -= vbl;
+       else
+               vis = 0;

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

+       p->flags &= ~(TERMP_BACKAFTER | TERMP_BACKBEFORE);

 
        if ( ! (TERMP_NOBREAK & p->flags)) {
                p->viscol = 0;
 
        if ( ! (TERMP_NOBREAK & p->flags)) {
                p->viscol = 0;


@@ -274,43 +276,35 @@ term_flushln(struct termp *p)
        }
 
        if (TERMP_HANG & p->flags) {
        }
 
        if (TERMP_HANG & p->flags) {

-               /* We need one blank after the tag. */
-               p->overstep = (int)(vis - maxvis + (*p->width)(p, ' '));
+               p->overstep += (int)(p->offset + vis - p->rmargin +
+                   p->trailspace * (*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 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 there is a request to keep the columns together,
+                * allow negative overstep when the column is not full.

                 */
                 */

-               if (p->overstep >= -1) {
-                       assert((int)maxvis + p->overstep >= 0);
-                       maxvis += (size_t)p->overstep;
-               } else
+               if (p->trailspace && p->overstep < 0)

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

+               return;

 
        } else if (TERMP_DANGLE & p->flags)
                return;
 
 
        } else if (TERMP_DANGLE & p->flags)
                return;
 

-       /* Right-pad. */
-       if (maxvis > vis +
-           ((TERMP_TWOSPACE & p->flags) ? (*p->width)(p, ' ') : 0)) {
-               p->viscol += maxvis - vis;
-               (*p->advance)(p, maxvis - vis);
-               vis += (maxvis - vis);
-       } else {        /* ...or newline break. */
+       /* Trailing whitespace is significant in some columns. */
+       if (vis && vbl && (TERMP_BRTRSP & p->flags))
+               vis += vbl;
+
+       /* If the column was overrun, break the line. */
+       if (maxvis < vis + p->trailspace * (*p->width)(p, ' ')) {

                (*p->endline)(p);
                (*p->endline)(p);

-               p->viscol = p->rmargin;
-               (*p->advance)(p, p->rmargin);
+               p->viscol = 0;

        }
 }
 
        }
 }
 

-
-/* 
+/*

  * 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.
  * 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.


@@ -320,15 +314,10 @@ term_newln(struct termp *p)
 {
 
        p->flags |= TERMP_NOSPACE;
 {
 
        p->flags |= TERMP_NOSPACE;

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

 }
 
 }
 

-

 /*
  * 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.
 /*
  * 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.


@@ -341,46 +330,13 @@ term_vspace(struct termp *p)
 
        term_newln(p);
        p->viscol = 0;
 
        term_newln(p);
        p->viscol = 0;

-       (*p->endline)(p);
-}
-
-
-static void
-numbered(struct termp *p, const char *word, size_t len)
-{
-       char             c;
-
-       if ('\0' != (c = mchars_num2char(word, len)))
-               encode(p, &c, 1);
-}
-
-
-static void
-spec(struct termp *p, const char *word, size_t len)
-{
-       const char      *rhs;
-       size_t           sz;
-
-       rhs = mchars_spec2str(p->symtab, word, len, &sz);
-       if (rhs) 
-               encode(p, rhs, sz);
-       else if (1 == len)
-               encode(p, word, len);
-}
-
-
-static void
-res(struct termp *p, const char *word, size_t len)
-{
-       const char      *rhs;
-       size_t           sz;
-
-       rhs = mchars_res2str(p->symtab, word, len, &sz);
-       if (rhs)
-               encode(p, rhs, sz);
+       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)
 {


@@ -391,7 +347,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)
 {


@@ -400,43 +356,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(enum termfont *));
+       }
+       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 != &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)
 {


@@ -445,7 +389,6 @@ term_fontpop(struct termp *p)
        p->fonti--;
 }
 
        p->fonti--;
 }
 

-

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


@@ -454,75 +397,139 @@ term_fontpop(struct termp *p)
 void
 term_word(struct termp *p, const char *word)
 {
 void
 term_word(struct termp *p, const char *word)
 {

-       const char      *seq;
-       int              sz;
+       const char       nbrsp[2] = { ASCII_NBRSP, 0 };
+       const char      *seq, *cp;
+       int              sz, uc;

        size_t           ssz;
        enum mandoc_esc  esc;
 
        if ( ! (TERMP_NOSPACE & p->flags)) {
                if ( ! (TERMP_KEEP & p->flags)) {
        size_t           ssz;
        enum mandoc_esc  esc;
 
        if ( ! (TERMP_NOSPACE & p->flags)) {
                if ( ! (TERMP_KEEP & p->flags)) {

-                       if (TERMP_PREKEEP & p->flags)
-                               p->flags |= TERMP_KEEP;

                        bufferc(p, ' ');
                        if (TERMP_SENTENCE & p->flags)
                                bufferc(p, ' ');
                } else
                        bufferc(p, ASCII_NBRSP);
        }
                        bufferc(p, ' ');
                        if (TERMP_SENTENCE & p->flags)
                                bufferc(p, ' ');
                } else
                        bufferc(p, ASCII_NBRSP);
        }

+       if (TERMP_PREKEEP & p->flags)
+               p->flags |= TERMP_KEEP;

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

-       p->flags &= ~(TERMP_SENTENCE | TERMP_IGNDELIM);
+       p->flags &= ~(TERMP_SENTENCE | TERMP_NONEWLINE);
+       p->skipvsp = 0;

 
        while ('\0' != *word) {
 
        while ('\0' != *word) {

-               if ((ssz = strcspn(word, "\\")) > 0)
+               if ('\\' != *word) {
+                       if (TERMP_NBRWORD & p->flags) {
+                               if (' ' == *word) {
+                                       encode(p, nbrsp, 1);
+                                       word++;
+                                       continue;
+                               }
+                               ssz = strcspn(word, "\\ ");
+                       } else
+                               ssz = strcspn(word, "\\");

                        encode(p, word, ssz);
                        encode(p, word, ssz);

-
-               word += (int)ssz;
-               if ('\\' != *word)
+                       word += (int)ssz;

                        continue;
                        continue;

+               }

 
                word++;
                esc = mandoc_escape(&word, &seq, &sz);
                if (ESCAPE_ERROR == esc)
 
                word++;
                esc = mandoc_escape(&word, &seq, &sz);
                if (ESCAPE_ERROR == esc)

-                       break;
+                       continue;

 
                switch (esc) {
 
                switch (esc) {

-               case (ESCAPE_NUMBERED):
-                       numbered(p, seq, sz);
-                       break;
-               case (ESCAPE_PREDEF):
-                       res(p, seq, sz);
+               case ESCAPE_UNICODE:
+                       uc = mchars_num2uc(seq + 1, sz - 1);

                        break;
                        break;

-               case (ESCAPE_SPECIAL):
-                       spec(p, seq, sz);
+               case ESCAPE_NUMBERED:
+                       uc = mchars_num2char(seq, sz);
+                       if (uc < 0)
+                               continue;

                        break;
                        break;

-               case (ESCAPE_FONTBOLD):
+               case ESCAPE_SPECIAL:
+                       if (p->enc == TERMENC_ASCII) {
+                               cp = mchars_spec2str(p->symtab,
+                                   seq, sz, &ssz);
+                               if (cp != NULL)
+                                       encode(p, cp, ssz);
+                       } else {
+                               uc = mchars_spec2cp(p->symtab, seq, sz);
+                               if (uc > 0)
+                                       encode1(p, uc);
+                       }
+                       continue;
+               case ESCAPE_FONTBOLD:

                        term_fontrepl(p, TERMFONT_BOLD);
                        term_fontrepl(p, TERMFONT_BOLD);

-                       break;
-               case (ESCAPE_FONTITALIC):
+                       continue;
+               case ESCAPE_FONTITALIC:

                        term_fontrepl(p, TERMFONT_UNDER);
                        term_fontrepl(p, TERMFONT_UNDER);

-                       break;
-               case (ESCAPE_FONTROMAN):
+                       continue;
+               case ESCAPE_FONTBI:
+                       term_fontrepl(p, TERMFONT_BI);
+                       continue;
+               case ESCAPE_FONT:
+               case ESCAPE_FONTROMAN:

                        term_fontrepl(p, TERMFONT_NONE);
                        term_fontrepl(p, TERMFONT_NONE);

-                       break;
-               case (ESCAPE_FONTPREV):
+                       continue;
+               case ESCAPE_FONTPREV:

                        term_fontlast(p);
                        term_fontlast(p);

-                       break;
-               case (ESCAPE_NOSPACE):
-                       if ('\0' == *word)
-                               p->flags |= TERMP_NOSPACE;
-                       break;
+                       continue;
+               case ESCAPE_NOSPACE:
+                       if (p->flags & TERMP_BACKAFTER)
+                               p->flags &= ~TERMP_BACKAFTER;
+                       else if (*word == '\0')
+                               p->flags |= (TERMP_NOSPACE | TERMP_NONEWLINE);
+                       continue;
+               case ESCAPE_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->col > 2 && p->buf[p->col - 1] == ' ')
+                               p->col -= 2;
+                       continue;

                default:
                default:

-                       break;
+                       continue;
+               }
+
+               /*
+                * Common handling for Unicode and numbered
+                * character escape sequences.
+                */
+
+               if (p->enc == TERMENC_ASCII) {
+                       cp = ascii_uc2str(uc);
+                       encode(p, cp, strlen(cp));
+               } else {
+                       if ((uc < 0x20 && uc != 0x09) ||
+                           (uc > 0x7E && uc < 0xA0))
+                               uc = 0xFFFD;
+                       encode1(p, uc);

                }
        }
                }
        }

+       p->flags &= ~TERMP_NBRWORD;

 }
 
 }
 

-

 static void
 adjbuf(struct termp *p, size_t sz)
 {
 static void
 adjbuf(struct termp *p, size_t sz)
 {


@@ -532,10 +539,9 @@ adjbuf(struct termp *p, size_t sz)
        while (sz >= p->maxcols)
                p->maxcols <<= 2;
 
        while (sz >= p->maxcols)
                p->maxcols <<= 2;
 

-       p->buf = mandoc_realloc(p->buf, sizeof(int) * p->maxcols);
+       p->buf = mandoc_reallocarray(p->buf, p->maxcols, sizeof(int));

 }
 
 }
 

-

 static void
 bufferc(struct termp *p, char c)
 {
 static void
 bufferc(struct termp *p, char c)
 {


@@ -543,67 +549,123 @@ bufferc(struct termp *p, char c)
        if (p->col + 1 >= p->maxcols)
                adjbuf(p, p->col + 1);
 
        if (p->col + 1 >= p->maxcols)
                adjbuf(p, p->col + 1);
 

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

 }
 
 }
 

-
+/*
+ * See encode().
+ * Do this for a single (probably unicode) value.
+ * Does not check for non-decorated glyphs.
+ */

 static void
 static void

-encode(struct termp *p, const char *word, size_t sz)
+encode1(struct termp *p, int c)

 {
        enum termfont     f;
 {
        enum termfont     f;

-       int               i;

 
 

-       /*
-        * Encode and buffer a string of characters.  If the current
-        * font mode is unset, buffer directly, else encode then buffer
-        * character by character.
-        */
+       if (p->col + 7 >= p->maxcols)
+               adjbuf(p, p->col + 7);

 
 

-       if (TERMFONT_NONE == (f = term_fonttop(p))) {
-               if (p->col + sz >= p->maxcols) 
-                       adjbuf(p, p->col + sz);
-               for (i = 0; i < (int)sz; i++)
-                       p->buf[(int)p->col++] = word[i];
-               return;
-       }
+       f = (c == ASCII_HYPH || isgraph(c)) ?
+           p->fontq[p->fonti] : TERMFONT_NONE;

 
 

-       /* Pre-buffer, assuming worst-case. */
+       if (p->flags & TERMP_BACKBEFORE) {
+               if (p->buf[p->col - 1] == ' ')
+                       p->col--;
+               else
+                       p->buf[p->col++] = 8;
+               p->flags &= ~TERMP_BACKBEFORE;
+       }
+       if (TERMFONT_UNDER == f || TERMFONT_BI == f) {
+               p->buf[p->col++] = '_';
+               p->buf[p->col++] = 8;
+       }
+       if (TERMFONT_BOLD == f || TERMFONT_BI == f) {
+               if (ASCII_HYPH == c)
+                       p->buf[p->col++] = '-';
+               else
+                       p->buf[p->col++] = c;
+               p->buf[p->col++] = 8;
+       }
+       p->buf[p->col++] = c;
+       if (p->flags & TERMP_BACKAFTER) {
+               p->flags |= TERMP_BACKBEFORE;
+               p->flags &= ~TERMP_BACKAFTER;
+       }
+}

 
 

-       if (p->col + 1 + (sz * 3) >= p->maxcols)
-               adjbuf(p, p->col + 1 + (sz * 3));
+static void
+encode(struct termp *p, const char *word, size_t sz)
+{
+       size_t            i;

 
 

-       for (i = 0; i < (int)sz; i++) {
-               if ( ! isgraph((u_char)word[i])) {
-                       p->buf[(int)p->col++] = word[i];
-                       continue;
-               }
+       if (p->col + 2 + (sz * 5) >= p->maxcols)
+               adjbuf(p, p->col + 2 + (sz * 5));

 
 

-               if (TERMFONT_UNDER == f)
-                       p->buf[(int)p->col++] = '_';
+       for (i = 0; i < sz; i++) {
+               if (ASCII_HYPH == word[i] ||
+                   isgraph((unsigned char)word[i]))
+                       encode1(p, word[i]);

                else
                else

-                       p->buf[(int)p->col++] = word[i];
-
-               p->buf[(int)p->col++] = 8;
-               p->buf[(int)p->col++] = word[i];
+                       p->buf[p->col++] = word[i];

        }
 }
 
        }
 }
 

+void
+term_setwidth(struct termp *p, const char *wstr)
+{
+       struct roffsu    su;
+       int              iop, width;
+
+       iop = 0;
+       width = 0;
+       if (NULL != wstr) {
+               switch (*wstr) {
+               case '+':
+                       iop = 1;
+                       wstr++;
+                       break;
+               case '-':
+                       iop = -1;
+                       wstr++;
+                       break;
+               default:
+                       break;
+               }
+               if (a2roffsu(wstr, &su, SCALE_MAX))
+                       width = term_hspan(p, &su);
+               else
+                       iop = 0;
+       }
+       (*p->setwidth)(p, iop, width);
+}

 
 size_t
 term_len(const struct termp *p, size_t sz)
 {
 
 
 size_t
 term_len(const struct termp *p, size_t sz)
 {
 

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

 }
 
 }
 

+static size_t
+cond_width(const struct termp *p, int c, int *skip)
+{
+
+       if (*skip) {
+               (*skip) = 0;
+               return 0;
+       } else
+               return (*p->width)(p, c);
+}

 
 size_t
 term_strlen(const struct termp *p, const char *cp)
 {
        size_t           sz, rsz, i;
 
 size_t
 term_strlen(const struct termp *p, const char *cp)
 {
        size_t           sz, rsz, i;

-       int              ssz;
-       enum mandoc_esc  esc;
+       int              ssz, skip, uc;

        const char      *seq, *rhs;
        const char      *seq, *rhs;

+       enum mandoc_esc  esc;
+       static const char rej[] = { '\\', ASCII_NBRSP, ASCII_HYPH,
+                       ASCII_BREAK, '\0' };

 
        /*
         * Account for escaped sequences within string length
 
        /*
         * Account for escaped sequences within string length


@@ -612,102 +674,159 @@ term_strlen(const struct termp *p, const char *cp)
         */
 
        sz = 0;
         */
 
        sz = 0;

-       while ('\0' != *cp)
+       skip = 0;
+       while ('\0' != *cp) {
+               rsz = strcspn(cp, rej);
+               for (i = 0; i < rsz; i++)
+                       sz += cond_width(p, *cp++, &skip);
+

                switch (*cp) {
                switch (*cp) {

-               case ('\\'):
-                       ++cp;
+               case '\\':
+                       cp++;

                        esc = mandoc_escape(&cp, &seq, &ssz);
                        if (ESCAPE_ERROR == esc)
                        esc = mandoc_escape(&cp, &seq, &ssz);
                        if (ESCAPE_ERROR == esc)

-                               return(sz);
+                               continue;
+
+                       rhs = NULL;

 
                        switch (esc) {
 
                        switch (esc) {

-                       case (ESCAPE_PREDEF):
-                               rhs = mchars_res2str
-                                       (p->symtab, seq, ssz, &rsz);
+                       case ESCAPE_UNICODE:
+                               uc = mchars_num2uc(seq + 1, ssz - 1);

                                break;
                                break;

-                       case (ESCAPE_SPECIAL):
-                               rhs = mchars_spec2str
-                                       (p->symtab, seq, ssz, &rsz);
-
-                               if (ssz != 1 || rhs)
-                                       break;
-
-                               rhs = seq;
-                               rsz = ssz;
+                       case ESCAPE_NUMBERED:
+                               uc = mchars_num2char(seq, ssz);
+                               if (uc < 0)
+                                       continue;

                                break;
                                break;

+                       case ESCAPE_SPECIAL:
+                               if (p->enc == TERMENC_ASCII) {
+                                       rhs = mchars_spec2str(p->symtab,
+                                           seq, ssz, &rsz);
+                                       if (rhs != NULL)
+                                               break;
+                               } else {
+                                       uc = mchars_spec2cp(p->symtab,
+                                           seq, ssz);
+                                       if (uc > 0)
+                                               sz += cond_width(p, uc, &skip);
+                               }
+                               continue;
+                       case ESCAPE_SKIPCHAR:
+                               skip = 1;
+                               continue;
+                       case ESCAPE_OVERSTRIKE:
+                               rsz = 0;
+                               rhs = seq + ssz;
+                               while (seq < rhs) {
+                                       if (*seq == '\\') {
+                                               mandoc_escape(&seq, NULL, NULL);
+                                               continue;
+                                       }
+                                       i = (*p->width)(p, *seq++);
+                                       if (rsz < i)
+                                               rsz = i;
+                               }
+                               sz += rsz;
+                               continue;

                        default:
                        default:

-                               rhs = NULL;
-                               break;
+                               continue;

                        }
 
                        }
 

-                       if (NULL == rhs)
+                       /*
+                        * Common handling for Unicode and numbered
+                        * character escape sequences.
+                        */
+
+                       if (rhs == NULL) {
+                               if (p->enc == TERMENC_ASCII) {
+                                       rhs = ascii_uc2str(uc);
+                                       rsz = strlen(rhs);
+                               } else {
+                                       if ((uc < 0x20 && uc != 0x09) ||
+                                           (uc > 0x7E && uc < 0xA0))
+                                               uc = 0xFFFD;
+                                       sz += cond_width(p, uc, &skip);
+                                       continue;
+                               }
+                       }
+
+                       if (skip) {
+                               skip = 0;

                                break;
                                break;

+                       }
+
+                       /*
+                        * Common handling for all escape sequences
+                        * printing more than one character.
+                        */

 
                        for (i = 0; i < rsz; i++)
                                sz += (*p->width)(p, *rhs++);
                        break;
 
                        for (i = 0; i < rsz; i++)
                                sz += (*p->width)(p, *rhs++);
                        break;

-               case (ASCII_NBRSP):
-                       sz += (*p->width)(p, ' ');
+               case ASCII_NBRSP:
+                       sz += cond_width(p, ' ', &skip);

                        cp++;
                        break;
                        cp++;
                        break;

-               case (ASCII_HYPH):
-                       sz += (*p->width)(p, '-');
+               case ASCII_HYPH:
+                       sz += cond_width(p, '-', &skip);

                        cp++;
                        break;
                default:
                        cp++;
                        break;
                default:

-                       sz += (*p->width)(p, *cp++);

                        break;
                }
                        break;
                }

+       }

 
 

-       return(sz);
+       return sz;

 }
 
 }
 

-
-/* ARGSUSED */
-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_CM):
-               r = su->scale * 2;
+       case SCALE_BU:
+               r = su->scale / 40.0;
+               break;
+       case SCALE_CM:
+               r = su->scale * 6.0 / 2.54;
+               break;
+       case SCALE_FS:
+               r = su->scale * 65536.0 / 40.0;

                break;
                break;

-       case (SCALE_IN):
-               r = su->scale * 6;
+       case SCALE_IN:
+               r = su->scale * 6.0;

                break;
                break;

-       case (SCALE_PC):
+       case SCALE_MM:
+               r = su->scale * 0.006;
+               break;
+       case SCALE_PC:

                r = su->scale;
                break;
                r = su->scale;
                break;

-       case (SCALE_PT):
-               r = su->scale / 8;
+       case SCALE_PT:
+               r = su->scale / 12.0;

                break;
                break;

-       case (SCALE_MM):
-               r = su->scale / 1000;
+       case SCALE_EN:
+       case SCALE_EM:
+               r = su->scale * 0.6;

                break;
                break;

-       case (SCALE_VS):
+       case SCALE_VS:

                r = su->scale;
                break;
        default:
                r = su->scale;
                break;
        default:

-               r = su->scale - 1;
-               break;
+               abort();

        }
        }

-
-       if (r < 0.0)
-               r = 0.0;
-       return(/* LINTED */(size_t)
-                       r);
+       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 down.
+ */
+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) /* LINTED */
-                       v);
+       return (*p->hspan)(p, su);

 }
 }