sync to OpenBSD:

[mandoc.git] / term.c

diff --git a/term.c b/term.c
index 475ee3430734b258523bc11ad0662f8702b2914f..b609b0e8615d65391ec2d53ca41f2509eb298d13 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,4 +1,4 @@
-/*     $Id: term.c,v 1.170 2010/09/04 20:18:53 kristaps Exp $ */
+/*     $Id: term.c,v 1.172 2010/09/23 20:26:00 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -134,6 +134,7 @@ term_flushln(struct termp *p)
        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           maxvis; /* output position of visible boundary */
@@ -237,7 +238,9 @@ term_flushln(struct termp *p)
                                j = i;
                                while (' ' == p->buf[i])
                                        i++;
-                               vbl += (i - j) * (*p->width)(p, ' ');
+                               dv = (i - j) * (*p->width)(p, ' ');
+                               vbl += dv;
+                               vend += dv;
                                break;
                        }
                        if (ASCII_NBRSP == p->buf[i]) {
@@ -264,7 +267,6 @@ term_flushln(struct termp *p)
                                p->viscol += (*p->width)(p, p->buf[i]);
                        }
                }
-               vend += vbl;
                vis = vend;
        }
 
@@ -458,7 +460,6 @@ void
 term_word(struct termp *p, const char *word)
 {
        const char      *sv, *seq;
-       int              sz;
        size_t           ssz;
        enum roffdeco    deco;
 
@@ -515,7 +516,7 @@ term_word(struct termp *p, const char *word)
                        continue;
 
                seq = ++word;
-               sz = a2roffdeco(&deco, &seq, &ssz);
+               word += a2roffdeco(&deco, &seq, &ssz);
 
                switch (deco) {
                case (DECO_RESERVED):
@@ -542,7 +543,6 @@ term_word(struct termp *p, const char *word)
                        break;
                }
 
-               word += sz;
                if (DECO_NOSPACE == deco && '\0' == *word)
                        p->flags |= TERMP_NOSPACE;
        }
@@ -645,10 +645,48 @@ term_len(const struct termp *p, size_t sz)
 size_t
 term_strlen(const struct termp *p, const char *cp)
 {
-       size_t           sz;
+       size_t           sz, ssz, rsz, i;
+       enum roffdeco    d;
+       const char      *seq, *rhs;
 
-       for (sz = 0; *cp; cp++)
-               sz += (*p->width)(p, *cp);
+       for (sz = 0; '\0' != *cp; )
+               /*
+                * Account for escaped sequences within string length
+                * calculations.  This follows the logic in term_word()
+                * as we must calculate the width of produced strings.
+                */
+               if ('\\' == *cp) {
+                       seq = ++cp;
+                       cp += a2roffdeco(&d, &seq, &ssz);
+
+                       switch (d) {
+                       case (DECO_RESERVED):
+                               rhs = chars_res2str
+                                       (p->symtab, seq, ssz, &rsz);
+                               break;
+                       case (DECO_SPECIAL):
+                               /* FALLTHROUGH */
+                       case (DECO_SSPECIAL):
+                               rhs = chars_spec2str
+                                       (p->symtab, seq, ssz, &rsz);
+
+                               /* Allow for one-char escapes. */
+                               if (DECO_SSPECIAL != d || rhs)
+                                       break;
+
+                               rhs = seq;
+                               rsz = ssz;
+                               break;
+                       default:
+                               rhs = NULL;
+                               break;
+                       }
+
+                       if (rhs)
+                               for (i = 0; i < rsz; i++)
+                                       sz += (*p->width)(p, *rhs++);
+               } else
+                       sz += (*p->width)(p, *cp++);
 
        return(sz);
 }