version 1.259, 2017/01/08 18:16:58 |
version 1.261, 2017/06/01 19:05:37 |
Line 141 term_flushln(struct termp *p) |
|
Line 141 term_flushln(struct termp *p) |
|
* subsequent tabs into a single huge set of spaces. |
* subsequent tabs into a single huge set of spaces. |
*/ |
*/ |
ntab = 0; |
ntab = 0; |
while (i < p->col && '\t' == p->buf[i]) { |
while (i < p->col && p->buf[i] == '\t') { |
vend = (vis / p->tabwidth + 1) * p->tabwidth; |
vend = term_tab_next(vis); |
vbl += vend - vis; |
vbl += vend - vis; |
vis = vend; |
vis = vend; |
ntab++; |
ntab++; |
Line 192 term_flushln(struct termp *p) |
|
Line 192 term_flushln(struct termp *p) |
|
vend -= vis; |
vend -= vis; |
(*p->endline)(p); |
(*p->endline)(p); |
p->viscol = 0; |
p->viscol = 0; |
if (TERMP_BRIND & p->flags) { |
|
vbl = p->rmargin; |
|
vend += p->rmargin; |
|
vend -= p->offset; |
|
} else |
|
vbl = p->offset; |
|
|
|
/* use pending tabs on the new line */ |
/* Use pending tabs on the new line. */ |
|
|
if (0 < ntab) |
vbl = 0; |
vbl += ntab * p->tabwidth; |
while (ntab--) |
|
vbl = term_tab_next(vbl); |
|
|
|
/* Re-establish indentation. */ |
|
|
|
if (p->flags & TERMP_BRIND) { |
|
vbl += p->rmargin; |
|
vend += p->rmargin - p->offset; |
|
} else |
|
vbl += p->offset; |
|
|
/* |
/* |
* Remove the p->overstep width. |
* Remove the p->overstep width. |
* Again, if p->overstep is negative, |
* Again, if p->overstep is negative, |
Line 397 term_fontpop(struct termp *p) |
|
Line 400 term_fontpop(struct termp *p) |
|
void |
void |
term_word(struct termp *p, const char *word) |
term_word(struct termp *p, const char *word) |
{ |
{ |
|
struct roffsu su; |
const char nbrsp[2] = { ASCII_NBRSP, 0 }; |
const char nbrsp[2] = { ASCII_NBRSP, 0 }; |
const char *seq, *cp; |
const char *seq, *cp; |
int sz, uc; |
int sz, uc; |
Line 484 term_word(struct termp *p, const char *word) |
|
Line 488 term_word(struct termp *p, const char *word) |
|
p->flags &= ~TERMP_BACKAFTER; |
p->flags &= ~TERMP_BACKAFTER; |
else if (*word == '\0') |
else if (*word == '\0') |
p->flags |= (TERMP_NOSPACE | TERMP_NONEWLINE); |
p->flags |= (TERMP_NOSPACE | TERMP_NONEWLINE); |
|
continue; |
|
case ESCAPE_HORIZ: |
|
if (a2roffsu(seq, &su, SCALE_EM) == 0) |
|
continue; |
|
uc = term_hspan(p, &su) / 24; |
|
if (uc > 0) |
|
while (uc-- > 0) |
|
bufferc(p, ASCII_NBRSP); |
|
else if (p->col > (size_t)(-uc)) |
|
p->col += uc; |
|
else { |
|
uc += p->col; |
|
p->col = 0; |
|
if (p->offset > (size_t)(-uc)) { |
|
p->ti += uc; |
|
p->offset += uc; |
|
} else { |
|
p->ti -= p->offset; |
|
p->offset = 0; |
|
} |
|
} |
continue; |
continue; |
case ESCAPE_SKIPCHAR: |
case ESCAPE_SKIPCHAR: |
p->flags |= TERMP_BACKAFTER; |
p->flags |= TERMP_BACKAFTER; |