Make the generated man(7) code more portable by using .PD

[mandoc.git] / term.c

diff --git a/term.c b/term.c
index 2810d620283d415b7dbce7d51b526225856f0c01..6229031285e3721b3daecb5c93c22abb29bbe83e 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,7 +1,7 @@
-/*     $Id: term.c,v 1.187 2011/05/14 17:54:42 kristaps Exp $ */
+/*     $Id: term.c,v 1.206 2012/11/16 17:16:55 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, 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>

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


@@ -33,12 +33,11 @@
 #include "term.h"
 #include "main.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, int);
+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)


@@ -72,18 +71,6 @@ 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
 /*
  * 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


@@ -93,22 +80,18 @@ term_alloc(enum termenc enc)
  *
  * 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
  *  - 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.
+ *    columns.  In short: don't print a newline and instead expect the
+ *    next call to do the padding up to the start of the next column.

  *
  *

- *  - TERMP_TWOSPACE: when padding, make sure there are at least two
- *    space characters of padding.  Otherwise, rather break the line.
+ *  - TERMP_TWOSPACE: make sure there is room for 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
  *
  *  - 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
+ *    overrunning, instead save the position and continue at that point

  *    when the next invocation.
  *
  *  In-line line breaking:
  *    when the next invocation.
  *
  *  In-line line breaking:


@@ -123,6 +106,7 @@ void
 term_flushln(struct termp *p)
 {
        int              i;     /* current input position in p->buf */
 term_flushln(struct termp *p)
 {
        int              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           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 */


@@ -148,22 +132,25 @@ term_flushln(struct termp *p)
        bp = TERMP_NOBREAK & p->flags ? mmax : maxvis;
 
        /*
        bp = TERMP_NOBREAK & p->flags ? mmax : 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,7 +161,7 @@ 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++) {
+               for (j = i, jhy = 0; j < p->col; j++) {

                        if ((j && ' ' == p->buf[j]) || '\t' == p->buf[j])
                                break;
 
                        if ((j && ' ' == p->buf[j]) || '\t' == p->buf[j])
                                break;
 


@@ -201,14 +188,17 @@ 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);

+                       p->viscol = 0;

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

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

                                vend += p->rmargin - p->offset;
                                vend += p->rmargin - p->offset;

-                       } else {
-                               p->viscol = 0;
+                       } else

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

-                       }
+
+                       /* use pending tabs on the new line */
+
+                       if (0 < ntab)
+                               vbl += ntab * p->tabwidth;

 
                        /* Remove the p->overstep width. */
 
 
                        /* Remove the p->overstep width. */
 


@@ -217,7 +207,7 @@ term_flushln(struct termp *p)
                }
 
                /* Write out the [remaining] word. */
                }
 
                /* 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])
                        if (vend > bp && jhy > 0 && i > jhy)
                                break;
                        if ('\t' == p->buf[i])


@@ -250,10 +240,14 @@ term_flushln(struct termp *p)
                        if (ASCII_HYPH == p->buf[i]) {
                                (*p->letter)(p, '-');
                                p->viscol += (*p->width)(p, '-');
                        if (ASCII_HYPH == p->buf[i]) {
                                (*p->letter)(p, '-');
                                p->viscol += (*p->width)(p, '-');

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

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


@@ -262,7 +256,8 @@ 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)
+               vis -= vbl;

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


@@ -278,34 +273,22 @@ term_flushln(struct termp *p)
                p->overstep = (int)(vis - maxvis + (*p->width)(p, ' '));
 
                /*
                p->overstep = (int)(vis - maxvis + (*p->width)(p, ' '));
 
                /*

-                * Behave exactly the same way as groff:

                 * If we have overstepped the margin, temporarily move
                 * it to the right and flag the rest of the line to be
                 * shorter.
                 * If we have overstepped the margin, temporarily move
                 * it to the right and flag the rest of the line to be
                 * shorter.

-                * If we landed right at the margin, be happy.
-                * If we are one step before the margin, temporarily
-                * move it one step LEFT and flag the rest of the line
-                * to be longer.

                 */
                 */

-               if (p->overstep >= -1) {
-                       assert((int)maxvis + p->overstep >= 0);
-                       maxvis += (size_t)p->overstep;
-               } else
+               if (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 +
+       /* If the column was overrun, break the line. */
+       if (maxvis <= vis +

            ((TERMP_TWOSPACE & p->flags) ? (*p->width)(p, ' ') : 0)) {
            ((TERMP_TWOSPACE & p->flags) ? (*p->width)(p, ' ') : 0)) {

-               p->viscol += maxvis - vis;
-               (*p->advance)(p, maxvis - vis);
-               vis += (maxvis - vis);
-       } else {        /* ...or newline break. */

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

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

        }
 }
 
        }
 }
 


@@ -320,12 +303,8 @@ 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);

 }
 
 
 }
 
 


@@ -341,46 +320,12 @@ 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);

 }
 
 }
 

-

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


@@ -431,7 +376,7 @@ void
 term_fontpopq(struct termp *p, const void *key)
 {
 
 term_fontpopq(struct termp *p, const void *key)
 {
 

-       while (p->fonti >= 0 && key != &p->fontq[p->fonti])
+       while (p->fonti >= 0 && key < (void *)(p->fontq + p->fonti))

                p->fonti--;
        assert(p->fonti >= 0);
 }
                p->fonti--;
        assert(p->fonti >= 0);
 }


@@ -445,7 +390,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,8 +398,9 @@ 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      *seq, *cp;
+       char             c;
+       int              sz, uc;

        size_t           ssz;
        enum mandoc_esc  esc;
 
        size_t           ssz;
        enum mandoc_esc  esc;
 


@@ -478,27 +423,56 @@ term_word(struct termp *p, const char *word)
        p->flags &= ~(TERMP_SENTENCE | TERMP_IGNDELIM);
 
        while ('\0' != *word) {
        p->flags &= ~(TERMP_SENTENCE | TERMP_IGNDELIM);
 
        while ('\0' != *word) {

-               if ((ssz = strcspn(word, "\\")) > 0)
+               if ('\\' != *word) {
+                       if (TERMP_SKIPCHAR & p->flags) {
+                               p->flags &= ~TERMP_SKIPCHAR;
+                               word++;
+                               continue;
+                       }
+                       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)
                        break;
 
 
                word++;
                esc = mandoc_escape(&word, &seq, &sz);
                if (ESCAPE_ERROR == esc)
                        break;
 

+               if (TERMENC_ASCII != p->enc)
+                       switch (esc) {
+                       case (ESCAPE_UNICODE):
+                               uc = mchars_num2uc(seq + 1, sz - 1);
+                               if ('\0' == uc)
+                                       break;
+                               encode1(p, uc);
+                               continue;
+                       case (ESCAPE_SPECIAL):
+                               uc = mchars_spec2cp(p->symtab, seq, sz);
+                               if (uc <= 0)
+                                       break;
+                               encode1(p, uc);
+                               continue;
+                       default:
+                               break;
+                       }
+

                switch (esc) {
                switch (esc) {

-               case (ESCAPE_NUMBERED):
-                       numbered(p, seq, sz);
+               case (ESCAPE_UNICODE):
+                       encode1(p, '?');

                        break;
                        break;

-               case (ESCAPE_PREDEF):
-                       res(p, seq, sz);
+               case (ESCAPE_NUMBERED):
+                       c = mchars_num2char(seq, sz);
+                       if ('\0' != c)
+                               encode(p, &c, 1);

                        break;
                case (ESCAPE_SPECIAL):
                        break;
                case (ESCAPE_SPECIAL):

-                       spec(p, seq, sz);
+                       cp = mchars_spec2str(p->symtab, seq, sz, &ssz);
+                       if (NULL != cp) 
+                               encode(p, cp, ssz);
+                       else if (1 == ssz)
+                               encode(p, seq, sz);

                        break;
                case (ESCAPE_FONTBOLD):
                        term_fontrepl(p, TERMFONT_BOLD);
                        break;
                case (ESCAPE_FONTBOLD):
                        term_fontrepl(p, TERMFONT_BOLD);


@@ -506,6 +480,8 @@ term_word(struct termp *p, const char *word)
                case (ESCAPE_FONTITALIC):
                        term_fontrepl(p, TERMFONT_UNDER);
                        break;
                case (ESCAPE_FONTITALIC):
                        term_fontrepl(p, TERMFONT_UNDER);
                        break;

+               case (ESCAPE_FONT):
+                       /* FALLTHROUGH */

                case (ESCAPE_FONTROMAN):
                        term_fontrepl(p, TERMFONT_NONE);
                        break;
                case (ESCAPE_FONTROMAN):
                        term_fontrepl(p, TERMFONT_NONE);
                        break;


@@ -513,18 +489,22 @@ term_word(struct termp *p, const char *word)
                        term_fontlast(p);
                        break;
                case (ESCAPE_NOSPACE):
                        term_fontlast(p);
                        break;
                case (ESCAPE_NOSPACE):

-                       if ('\0' == *word)
+                       if (TERMP_SKIPCHAR & p->flags)
+                               p->flags &= ~TERMP_SKIPCHAR;
+                       else if ('\0' == *word)

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

+               case (ESCAPE_SKIPCHAR):
+                       p->flags |= TERMP_SKIPCHAR;
+                       break;

                default:
                        break;
                }
        }
 }
 
                default:
                        break;
                }
        }
 }
 

-

 static void
 static void

-adjbuf(struct termp *p, size_t sz)
+adjbuf(struct termp *p, int sz)

 {
 
        if (0 == p->maxcols)
 {
 
        if (0 == p->maxcols)


@@ -532,10 +512,10 @@ 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_realloc
+               (p->buf, sizeof(int) * (size_t)p->maxcols);

 }
 
 }
 

-

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


@@ -543,15 +523,54 @@ 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
+encode1(struct termp *p, int c)
+{
+       enum termfont     f;
+
+       if (TERMP_SKIPCHAR & p->flags) {
+               p->flags &= ~TERMP_SKIPCHAR;
+               return;
+       }
+
+       if (p->col + 4 >= p->maxcols)
+               adjbuf(p, p->col + 4);
+
+       f = term_fonttop(p);
+
+       if (TERMFONT_NONE == f) {
+               p->buf[p->col++] = c;
+               return;
+       } else if (TERMFONT_UNDER == f) {
+               p->buf[p->col++] = '_';
+       } else
+               p->buf[p->col++] = c;
+
+       p->buf[p->col++] = 8;
+       p->buf[p->col++] = c;
+}

 
 static void
 encode(struct termp *p, const char *word, size_t sz)
 {
        enum termfont     f;
 
 static void
 encode(struct termp *p, const char *word, size_t sz)
 {
        enum termfont     f;

-       int               i;
+       int               i, len;
+
+       if (TERMP_SKIPCHAR & p->flags) {
+               p->flags &= ~TERMP_SKIPCHAR;
+               return;
+       }
+
+       /* LINTED */
+       len = sz;

 
        /*
         * Encode and buffer a string of characters.  If the current
 
        /*
         * Encode and buffer a string of characters.  If the current


@@ -560,35 +579,37 @@ encode(struct termp *p, const char *word, size_t sz)
         */
 
        if (TERMFONT_NONE == (f = term_fonttop(p))) {
         */
 
        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];
+               if (p->col + len >= p->maxcols) 
+                       adjbuf(p, p->col + len);
+               for (i = 0; i < len; i++)
+                       p->buf[p->col++] = word[i];

                return;
        }
 
        /* Pre-buffer, assuming worst-case. */
 
                return;
        }
 
        /* Pre-buffer, assuming worst-case. */
 

-       if (p->col + 1 + (sz * 3) >= p->maxcols)
-               adjbuf(p, p->col + 1 + (sz * 3));
+       if (p->col + 1 + (len * 3) >= p->maxcols)
+               adjbuf(p, p->col + 1 + (len * 3));

 
 

-       for (i = 0; i < (int)sz; i++) {
-               if ( ! isgraph((u_char)word[i])) {
-                       p->buf[(int)p->col++] = word[i];
+       for (i = 0; i < len; i++) {
+               if (ASCII_HYPH != word[i] &&
+                   ! isgraph((unsigned char)word[i])) {
+                       p->buf[p->col++] = word[i];

                        continue;
                }
 
                if (TERMFONT_UNDER == f)
                        continue;
                }
 
                if (TERMFONT_UNDER == f)

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

                else
                else

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

 
 

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

        }
 }
 
        }
 }
 

-

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


@@ -596,14 +617,25 @@ 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, c;

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

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

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


@@ -612,18 +644,50 @@ 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);
+
+               c = 0;

                switch (*cp) {
                case ('\\'):
                switch (*cp) {
                case ('\\'):

-                       ++cp;
+                       cp++;

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

+                       if (TERMENC_ASCII != p->enc)
+                               switch (esc) {
+                               case (ESCAPE_UNICODE):
+                                       c = mchars_num2uc
+                                               (seq + 1, ssz - 1);
+                                       if ('\0' == c)
+                                               break;
+                                       sz += cond_width(p, c, &skip);
+                                       continue;
+                               case (ESCAPE_SPECIAL):
+                                       c = mchars_spec2cp
+                                               (p->symtab, seq, ssz);
+                                       if (c <= 0)
+                                               break;
+                                       sz += cond_width(p, c, &skip);
+                                       continue;
+                               default:
+                                       break;
+                               }
+
+                       rhs = NULL;
+

                        switch (esc) {
                        switch (esc) {

-                       case (ESCAPE_PREDEF):
-                               rhs = mchars_res2str
-                                       (p->symtab, seq, ssz, &rsz);
+                       case (ESCAPE_UNICODE):
+                               sz += cond_width(p, '?', &skip);
+                               break;
+                       case (ESCAPE_NUMBERED):
+                               c = mchars_num2char(seq, ssz);
+                               if ('\0' != c)
+                                       sz += cond_width(p, c, &skip);

                                break;
                        case (ESCAPE_SPECIAL):
                                rhs = mchars_spec2str
                                break;
                        case (ESCAPE_SPECIAL):
                                rhs = mchars_spec2str


@@ -635,34 +699,40 @@ term_strlen(const struct termp *p, const char *cp)
                                rhs = seq;
                                rsz = ssz;
                                break;
                                rhs = seq;
                                rsz = ssz;
                                break;

+                       case (ESCAPE_SKIPCHAR):
+                               skip = 1;
+                               break;

                        default:
                        default:

-                               rhs = NULL;

                                break;
                        }
 
                        if (NULL == rhs)
                                break;
 
                                break;
                        }
 
                        if (NULL == rhs)
                                break;
 

+                       if (skip) {
+                               skip = 0;
+                               break;
+                       }
+

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

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

                        cp++;
                        break;
                case (ASCII_HYPH):
                        cp++;
                        break;
                case (ASCII_HYPH):

-                       sz += (*p->width)(p, '-');
+                       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
 term_vspan(const struct termp *p, const struct roffsu *su)
 /* ARGSUSED */
 size_t
 term_vspan(const struct termp *p, const struct roffsu *su)


@@ -699,7 +769,6 @@ term_vspan(const struct termp *p, const struct roffsu *su)
                        r);
 }
 
                        r);
 }
 

-

 size_t
 term_hspan(const struct termp *p, const struct roffsu *su)
 {
 size_t
 term_hspan(const struct termp *p, const struct roffsu *su)
 {