version 1.19, 2009/02/28 14:43:35 |
version 1.23, 2009/03/01 23:23:55 |
Line 173 flushln(struct termp *p) |
|
Line 173 flushln(struct termp *p) |
|
for (i = 0; i < p->col; i++) { |
for (i = 0; i < p->col; i++) { |
/* |
/* |
* Count up visible word characters. Control sequences |
* Count up visible word characters. Control sequences |
* (starting with the CSI) aren't counted. |
* (starting with the CSI) aren't counted. A space |
|
* generates a non-printing word, which is valid (the |
|
* space is printed according to regular spacing rules). |
*/ |
*/ |
assert( ! xisspace(p->buf[i])); |
|
|
|
/* LINTED */ |
/* LINTED */ |
for (j = i, vsz = 0; j < p->col; j++) { |
for (j = i, vsz = 0; j < p->col; j++) { |
Line 187 flushln(struct termp *p) |
|
Line 188 flushln(struct termp *p) |
|
} else |
} else |
vsz++; |
vsz++; |
} |
} |
assert(vsz > 0); |
|
|
|
/* |
/* |
|
* If we're breaking normally... |
|
* |
* If a word is too long and we're within a line, put it |
* If a word is too long and we're within a line, put it |
* on the next line. Puke if we're being asked to write |
* on the next line. Puke if we're being asked to write |
* something that will exceed the right margin (i.e., |
* something that will exceed the right margin (i.e., |
* from a fresh line or when we're not allowed to break |
* from a fresh line). |
* the line with TERMP_NOBREAK). |
* |
|
* If we're not breaking... |
|
* |
|
* Don't let the visible size exceed the full margin. |
*/ |
*/ |
|
|
/* FIXME: allow selective right-margin breaking. */ |
if ( ! (TERMP_NOBREAK & p->flags)) { |
|
if (vis && vis + vsz > maxvis) { |
if (vis && vis + vsz > maxvis) { |
putchar('\n'); |
if (p->flags & TERMP_NOBREAK) |
for (j = 0; j < p->offset; j++) |
|
putchar(' '); |
|
vis = 0; |
|
} else if (vis + vsz > maxvis) |
errx(1, "word breaks right margin"); |
errx(1, "word breaks right margin"); |
putchar('\n'); |
} else if (vis + vsz > p->maxrmargin) |
for (j = 0; j < p->offset; j++) |
|
putchar(' '); |
|
vis = 0; |
|
} else if (vis + vsz > maxvis) |
|
errx(1, "word breaks right margin"); |
errx(1, "word breaks right margin"); |
|
|
/* |
/* |
Line 226 flushln(struct termp *p) |
|
Line 230 flushln(struct termp *p) |
|
} |
} |
} |
} |
|
|
|
if ((TERMP_NOBREAK & p->flags) && vis >= maxvis) { |
|
putchar('\n'); |
|
for (i = 0; i < p->rmargin; i++) |
|
putchar(' '); |
|
p->col = 0; |
|
return; |
|
} |
|
|
/* |
/* |
* If we're not to right-marginalise it (newline), then instead |
* If we're not to right-marginalise it (newline), then instead |
* pad to the right margin and stay off. |
* pad to the right margin and stay off. |
*/ |
*/ |
|
|
if (p->flags & TERMP_NOBREAK) { |
if (p->flags & TERMP_NOBREAK) { |
if ( ! (p->flags & TERMP_NORPAD)) |
for ( ; vis < maxvis; vis++) |
for ( ; vis < maxvis; vis++) |
putchar(' '); |
putchar(' '); |
|
} else |
} else |
putchar('\n'); |
putchar('\n'); |
|
|
Line 465 pescape(struct termp *p, const char *word, size_t *i, |
|
Line 476 pescape(struct termp *p, const char *word, size_t *i, |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case ('.'): |
case ('.'): |
chara(p, word[*i]); |
chara(p, word[*i]); |
|
break; |
|
case ('e'): |
|
chara(p, '\\'); |
|
break; |
default: |
default: |
break; |
break; |
} |
} |
Line 484 pword(struct termp *p, const char *word, size_t len) |
|
Line 499 pword(struct termp *p, const char *word, size_t len) |
|
{ |
{ |
size_t i; |
size_t i; |
|
|
/*assert(len > 0);*/ /* Can be, if literal. */ |
|
|
|
/* |
/* |
* Handle pwords, partial words, which may be either a single |
* Handle pwords, partial words, which may be either a single |
* word or a phrase that cannot be broken down (such as a |
* word or a phrase that cannot be broken down (such as a |
Line 554 word(struct termp *p, const char *word) |
|
Line 567 word(struct termp *p, const char *word) |
|
if ( ! xisspace(word[i])) { |
if ( ! xisspace(word[i])) { |
j++; |
j++; |
continue; |
continue; |
|
} |
|
|
|
/* Escaped spaces don't delimit... */ |
|
if (i > 0 && xisspace(word[i]) && '\\' == word[i - 1]) { |
|
j++; |
|
continue; |
} |
} |
|
|
if (0 == j) |
if (0 == j) |
continue; |
continue; |
assert(i >= j); |
assert(i >= j); |