Removed TODO that was fixed by parsing escapes in offset strings.

[mandoc.git] / term.c

diff --git a/term.c b/term.c
index 71ab3a359abe4c9b671ef554bb8f8d960bad4f83..b609b0e8615d65391ec2d53ca41f2509eb298d13 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,4 +1,4 @@
-/*     $Id: term.c,v 1.171 2010/09/15 14:36:16 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>
 /*
  * 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           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 */
        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++;
                                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]) {
                                break;
                        }
                        if (ASCII_NBRSP == p->buf[i]) {


@@ -264,7 +267,6 @@ term_flushln(struct termp *p)
                                p->viscol += (*p->width)(p, p->buf[i]);
                        }
                }
                                p->viscol += (*p->width)(p, p->buf[i]);
                        }
                }

-               vend += vbl;

                vis = vend;
        }
 
                vis = vend;
        }