version 1.173, 2010/10/01 21:51:13 |
version 1.174, 2010/10/02 15:15:55 |
Line 146 term_flushln(struct termp *p) |
|
Line 146 term_flushln(struct termp *p) |
|
* an indentation, but can be, for tagged lists or columns, a |
* an indentation, but can be, for tagged lists or columns, a |
* small set of values. |
* small set of values. |
*/ |
*/ |
|
assert (p->rmargin > p->offset); |
|
dv = p->rmargin - p->offset; |
|
maxvis = (int)dv > p->overstep ? dv - (size_t)p->overstep : 0; |
|
dv = p->maxrmargin - p->offset; |
|
mmax = (int)dv > p->overstep ? dv - (size_t)p->overstep : 0; |
|
|
assert(p->offset < p->rmargin); |
|
|
|
maxvis = (int)(p->rmargin - p->offset) - p->overstep < 0 ? |
|
/* LINTED */ |
|
0 : p->rmargin - p->offset - p->overstep; |
|
mmax = (int)(p->maxrmargin - p->offset) - p->overstep < 0 ? |
|
/* LINTED */ |
|
0 : p->maxrmargin - p->offset - p->overstep; |
|
|
|
bp = TERMP_NOBREAK & p->flags ? mmax : maxvis; |
bp = TERMP_NOBREAK & p->flags ? mmax : maxvis; |
|
|
/* |
/* |
* Indent the first line of a paragraph. |
* Indent the first line of a paragraph. |
*/ |
*/ |
vbl = p->flags & TERMP_NOLPAD ? 0 : p->offset; |
vbl = p->flags & TERMP_NOLPAD ? (size_t)0 : p->offset; |
|
|
vis = vend = i = 0; |
vis = vend = 0; |
|
i = 0; |
|
|
while (i < (int)p->col) { |
while (i < (int)p->col) { |
/* |
/* |
Line 184 term_flushln(struct termp *p) |
|
Line 181 term_flushln(struct termp *p) |
|
* space is printed according to regular spacing rules). |
* space is printed according to regular spacing rules). |
*/ |
*/ |
|
|
/* LINTED */ |
|
for (j = i, jhy = 0; j < (int)p->col; j++) { |
for (j = i, jhy = 0; j < (int)p->col; j++) { |
if ((j && ' ' == p->buf[j]) || '\t' == p->buf[j]) |
if ((j && ' ' == p->buf[j]) || '\t' == p->buf[j]) |
break; |
break; |
Line 223 term_flushln(struct termp *p) |
|
Line 219 term_flushln(struct termp *p) |
|
|
|
/* Remove the p->overstep width. */ |
/* Remove the p->overstep width. */ |
|
|
bp += (int)/* LINTED */ |
bp += (size_t)p->overstep; |
p->overstep; |
|
p->overstep = 0; |
p->overstep = 0; |
} |
} |
|
|
Line 238 term_flushln(struct termp *p) |
|
Line 233 term_flushln(struct termp *p) |
|
j = i; |
j = i; |
while (' ' == p->buf[i]) |
while (' ' == p->buf[i]) |
i++; |
i++; |
dv = (i - j) * (*p->width)(p, ' '); |
dv = (size_t)(i - j) * (*p->width)(p, ' '); |
vbl += dv; |
vbl += dv; |
vend += dv; |
vend += dv; |
break; |
break; |
Line 287 term_flushln(struct termp *p) |
|
Line 282 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 = (int)(vis - maxvis + (*p->width)(p, ' ')); |
vis - maxvis + (*p->width)(p, ' '); |
|
|
|
/* |
/* |
* Behave exactly the same way as groff: |
* Behave exactly the same way as groff: |
Line 302 term_flushln(struct termp *p) |
|
Line 296 term_flushln(struct termp *p) |
|
*/ |
*/ |
if (p->overstep >= -1) { |
if (p->overstep >= -1) { |
assert((int)maxvis + p->overstep >= 0); |
assert((int)maxvis + p->overstep >= 0); |
/* LINTED */ |
maxvis += (size_t)p->overstep; |
maxvis += p->overstep; |
|
} else |
} else |
p->overstep = 0; |
p->overstep = 0; |
|
|
Line 311 term_flushln(struct termp *p) |
|
Line 304 term_flushln(struct termp *p) |
|
return; |
return; |
|
|
/* Right-pad. */ |
/* Right-pad. */ |
if (maxvis > vis + /* LINTED */ |
if (maxvis > vis + |
((TERMP_TWOSPACE & p->flags) ? |
((TERMP_TWOSPACE & p->flags) ? (*p->width)(p, ' ') : 0)) { |
(*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); |