Fix missing support for \N'n' when calculating string widths in -Tascii

[mandoc.git] / term.c

diff --git a/term.c b/term.c
index 2810d620283d415b7dbce7d51b526225856f0c01..110bbc468749a52a4a87d08807187f46f61407ed 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,4 +1,4 @@
-/*     $Id: term.c,v 1.187 2011/05/14 17:54:42 kristaps Exp $ */
+/*     $Id: term.c,v 1.190 2011/05/15 15:47:46 kristaps 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 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>


@@ -36,7 +36,7 @@
 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              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              adjbuf(struct termp *p, int);

 static void              encode(struct termp *, const char *, size_t);
 
 
 static void              encode(struct termp *, const char *, size_t);
 
 


@@ -155,12 +155,12 @@ term_flushln(struct termp *p)
        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]) {
+               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;


@@ -174,7 +174,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;
 


@@ -217,7 +217,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])


@@ -524,7 +524,7 @@ term_word(struct termp *p, const char *word)
 
 
 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,7 +532,8 @@ 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);

 }
 
 
 }
 
 


@@ -543,7 +544,7 @@ 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;

 }
 
 
 }
 
 


@@ -551,7 +552,10 @@ static void
 encode(struct termp *p, const char *word, size_t sz)
 {
        enum termfont     f;
 encode(struct termp *p, const char *word, size_t sz)
 {
        enum termfont     f;

-       int               i;
+       int               i, len;
+
+       /* LINTED */
+       len = sz;

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


@@ -560,31 +564,31 @@ 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 ( ! 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
                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];

        }
 }
 
        }
 }
 


@@ -601,9 +605,9 @@ size_t
 term_strlen(const struct termp *p, const char *cp)
 {
        size_t           sz, rsz, i;
 term_strlen(const struct termp *p, const char *cp)
 {
        size_t           sz, rsz, i;

-       int              ssz;
-       enum mandoc_esc  esc;
+       int              ssz, c;

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

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

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


@@ -612,15 +616,23 @@ term_strlen(const struct termp *p, const char *cp)
         */
 
        sz = 0;
         */
 
        sz = 0;

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

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

-                       ++cp;
-                       esc = mandoc_escape(&cp, &seq, &ssz);
-                       if (ESCAPE_ERROR == esc)
+                       cp++;
+                       rhs = NULL;
+                       switch (mandoc_escape(&cp, &seq, &ssz)) {
+                       case (ESCAPE_ERROR):

                                return(sz);
                                return(sz);

-
-                       switch (esc) {
+                       case (ESCAPE_NUMBERED):
+                               c = mchars_num2char(seq, ssz);
+                               if ('\0' != c)
+                                       sz += (*p->width)(p, c);
+                               break;

                        case (ESCAPE_PREDEF):
                                rhs = mchars_res2str
                                        (p->symtab, seq, ssz, &rsz);
                        case (ESCAPE_PREDEF):
                                rhs = mchars_res2str
                                        (p->symtab, seq, ssz, &rsz);


@@ -636,7 +648,6 @@ term_strlen(const struct termp *p, const char *cp)
                                rsz = ssz;
                                break;
                        default:
                                rsz = ssz;
                                break;
                        default:

-                               rhs = NULL;

                                break;
                        }
 
                                break;
                        }
 


@@ -655,14 +666,13 @@ term_strlen(const struct termp *p, const char *cp)
                        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 +709,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)
 {