version 1.269, 2017/06/12 19:05:47 |
version 1.270, 2017/06/14 01:31:27 |
Line 116 term_flushln(struct termp *p) |
|
Line 116 term_flushln(struct termp *p) |
|
size_t jhy; /* last hyph before overflow w/r/t j */ |
size_t jhy; /* last hyph before overflow w/r/t j */ |
size_t maxvis; /* output position of visible boundary */ |
size_t maxvis; /* output position of visible boundary */ |
int ntab; /* number of tabs to prepend */ |
int ntab; /* number of tabs to prepend */ |
|
int breakline; /* after this word */ |
|
|
vbl = (p->flags & TERMP_NOPAD) || p->tcol->offset < p->viscol ? |
vbl = (p->flags & TERMP_NOPAD) || p->tcol->offset < p->viscol ? |
0 : p->tcol->offset - p->viscol; |
0 : p->tcol->offset - p->viscol; |
Line 155 term_flushln(struct termp *p) |
|
Line 156 term_flushln(struct termp *p) |
|
*/ |
*/ |
|
|
jhy = 0; |
jhy = 0; |
|
breakline = 0; |
for (j = p->tcol->col; j < p->tcol->lastcol; j++) { |
for (j = p->tcol->col; j < p->tcol->lastcol; j++) { |
|
if (p->tcol->buf[j] == '\n') { |
|
if ((p->flags & TERMP_BRIND) == 0) |
|
breakline = 1; |
|
continue; |
|
} |
if (p->tcol->buf[j] == ' ' || p->tcol->buf[j] == '\t') |
if (p->tcol->buf[j] == ' ' || p->tcol->buf[j] == '\t') |
break; |
break; |
|
|
Line 221 term_flushln(struct termp *p) |
|
Line 228 term_flushln(struct termp *p) |
|
for ( ; p->tcol->col < p->tcol->lastcol; p->tcol->col++) { |
for ( ; p->tcol->col < p->tcol->lastcol; p->tcol->col++) { |
if (vend > bp && jhy > 0 && p->tcol->col > jhy) |
if (vend > bp && jhy > 0 && p->tcol->col > jhy) |
break; |
break; |
|
if (p->tcol->buf[p->tcol->col] == '\n') |
|
continue; |
if (p->tcol->buf[p->tcol->col] == '\t') |
if (p->tcol->buf[p->tcol->col] == '\t') |
break; |
break; |
if (p->tcol->buf[p->tcol->col] == ' ') { |
if (p->tcol->buf[p->tcol->col] == ' ') { |
Line 260 term_flushln(struct termp *p) |
|
Line 269 term_flushln(struct termp *p) |
|
p->tcol->buf[p->tcol->col]); |
p->tcol->buf[p->tcol->col]); |
} |
} |
vis = vend; |
vis = vend; |
|
|
|
if (breakline == 0) |
|
continue; |
|
|
|
/* Explicitly requested output line break. */ |
|
|
|
if (p->flags & TERMP_MULTICOL) |
|
return; |
|
|
|
endline(p); |
|
breakline = 0; |
|
vis = vend = 0; |
|
|
|
/* Re-establish indentation. */ |
|
|
|
vbl = p->tcol->offset; |
|
maxvis = p->tcol->rmargin > vbl ? |
|
p->tcol->rmargin - vbl : 0; |
|
bp = !(p->flags & TERMP_NOBREAK) ? maxvis : |
|
p->maxrmargin > vbl ? p->maxrmargin - vbl : 0; |
} |
} |
|
|
/* |
/* |
Line 486 term_word(struct termp *p, const char *word) |
|
Line 515 term_word(struct termp *p, const char *word) |
|
continue; |
continue; |
case ESCAPE_FONTPREV: |
case ESCAPE_FONTPREV: |
term_fontlast(p); |
term_fontlast(p); |
|
continue; |
|
case ESCAPE_BREAK: |
|
bufferc(p, '\n'); |
continue; |
continue; |
case ESCAPE_NOSPACE: |
case ESCAPE_NOSPACE: |
if (p->flags & TERMP_BACKAFTER) |
if (p->flags & TERMP_BACKAFTER) |