version 1.150, 2010/06/26 15:36:37 |
version 1.153, 2010/06/28 22:46:21 |
Line 133 term_flushln(struct termp *p) |
|
Line 133 term_flushln(struct termp *p) |
|
size_t vbl; /* number of blanks to prepend to output */ |
size_t vbl; /* number of blanks to prepend to output */ |
size_t vend; /* end of word visual position on output */ |
size_t vend; /* end of word visual position on output */ |
size_t bp; /* visual right border position */ |
size_t bp; /* visual right border position */ |
int j; /* temporary loop index */ |
int j; /* temporary loop index for p->buf */ |
int jhy; /* last hyphen before line overflow */ |
int jhy; /* last hyph before overflow w/r/t j */ |
size_t maxvis, mmax; |
size_t maxvis; /* output position of visible boundary */ |
|
size_t mmax; /* used in calculating bp */ |
|
|
/* |
/* |
* First, establish the maximum columns of "visible" content. |
* First, establish the maximum columns of "visible" content. |
Line 194 term_flushln(struct termp *p) |
|
Line 195 term_flushln(struct termp *p) |
|
if (vend > vis && vend < bp && |
if (vend > vis && vend < bp && |
ASCII_HYPH == p->buf[j]) |
ASCII_HYPH == p->buf[j]) |
jhy = j; |
jhy = j; |
vend++; |
vend += (*p->width)(p, p->buf[j]); |
} else |
} else { |
vend--; |
assert(j); |
|
vend -= (*p->width)(p, p->buf[j - 1]); |
|
} |
} |
} |
|
|
/* |
/* |
Line 236 term_flushln(struct termp *p) |
|
Line 239 term_flushln(struct termp *p) |
|
break; |
break; |
if (' ' == p->buf[i]) { |
if (' ' == p->buf[i]) { |
while (' ' == p->buf[i]) { |
while (' ' == p->buf[i]) { |
vbl++; |
vbl += (*p->width)(p, p->buf[i]); |
i++; |
i++; |
} |
} |
break; |
break; |
} |
} |
if (ASCII_NBRSP == p->buf[i]) { |
if (ASCII_NBRSP == p->buf[i]) { |
vbl++; |
vbl += (*p->width)(p, ' '); |
continue; |
continue; |
} |
} |
|
|
Line 257 term_flushln(struct termp *p) |
|
Line 260 term_flushln(struct termp *p) |
|
vbl = 0; |
vbl = 0; |
} |
} |
|
|
if (ASCII_HYPH == p->buf[i]) |
if (ASCII_HYPH == p->buf[i]) { |
(*p->letter)(p, '-'); |
(*p->letter)(p, '-'); |
else |
p->viscol += (*p->width)(p, '-'); |
|
} else { |
(*p->letter)(p, p->buf[i]); |
(*p->letter)(p, p->buf[i]); |
|
p->viscol += (*p->width)(p, p->buf[i]); |
p->viscol += 1; |
} |
} |
} |
vend += vbl; |
vend += vbl; |
vis = vend; |
vis = vend; |
Line 280 term_flushln(struct termp *p) |
|
Line 284 term_flushln(struct termp *p) |
|
if (TERMP_HANG & p->flags) { |
if (TERMP_HANG & p->flags) { |
/* We need one blank after the tag. */ |
/* We need one blank after the tag. */ |
p->overstep = /* LINTED */ |
p->overstep = /* LINTED */ |
vis - maxvis + 1; |
vis - maxvis + (*p->width)(p, ' '); |
|
|
/* |
/* |
* Behave exactly the same way as groff: |
* Behave exactly the same way as groff: |
Line 304 term_flushln(struct termp *p) |
|
Line 308 term_flushln(struct termp *p) |
|
|
|
/* Right-pad. */ |
/* Right-pad. */ |
if (maxvis > vis + /* LINTED */ |
if (maxvis > vis + /* LINTED */ |
((TERMP_TWOSPACE & p->flags) ? 1 : 0)) { |
((TERMP_TWOSPACE & p->flags) ? (*p->width)(p, ' ') : 0)) { |
p->viscol += maxvis - vis; |
p->viscol += maxvis - vis; |
(*p->advance)(p, maxvis - vis); |
(*p->advance)(p, maxvis - vis); |
vis += (maxvis - vis); |
vis += (maxvis - vis); |
Line 480 term_word(struct termp *p, const char *word) |
|
Line 484 term_word(struct termp *p, const char *word) |
|
} |
} |
|
|
if ( ! (TERMP_NOSPACE & p->flags)) { |
if ( ! (TERMP_NOSPACE & p->flags)) { |
bufferc(p, ' '); |
if ( ! (TERMP_KEEP & p->flags)) { |
if (TERMP_SENTENCE & p->flags) |
if (TERMP_PREKEEP & p->flags) |
|
p->flags |= TERMP_KEEP; |
bufferc(p, ' '); |
bufferc(p, ' '); |
|
if (TERMP_SENTENCE & p->flags) |
|
bufferc(p, ' '); |
|
} else |
|
bufferc(p, ASCII_NBRSP); |
} |
} |
|
|
if ( ! (p->flags & TERMP_NONOSPACE)) |
if ( ! (p->flags & TERMP_NONOSPACE)) |