version 1.266, 2017/06/07 17:38:26 |
version 1.268, 2017/06/08 12:54:58 |
Line 95 term_end(struct termp *p) |
|
Line 95 term_end(struct termp *p) |
|
void |
void |
term_flushln(struct termp *p) |
term_flushln(struct termp *p) |
{ |
{ |
size_t i; /* current input position in p->tcol->buf */ |
|
size_t vis; /* current visual position on output */ |
size_t vis; /* current visual position on output */ |
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 */ |
Line 116 term_flushln(struct termp *p) |
|
Line 115 term_flushln(struct termp *p) |
|
p->maxrmargin > p->viscol + vbl ? |
p->maxrmargin > p->viscol + vbl ? |
p->maxrmargin - p->viscol - vbl : 0; |
p->maxrmargin - p->viscol - vbl : 0; |
vis = vend = 0; |
vis = vend = 0; |
i = 0; |
|
|
|
while (i < p->lastcol) { |
if (p->lasttcol == 0) |
|
p->tcol->col = 0; |
|
while (p->tcol->col < p->lastcol) { |
|
|
/* |
/* |
* Handle literal tab characters: collapse all |
* Handle literal tab characters: collapse all |
* 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->lastcol && p->tcol->buf[i] == '\t') { |
while (p->tcol->col < p->lastcol && |
|
p->tcol->buf[p->tcol->col] == '\t') { |
vend = term_tab_next(vis); |
vend = term_tab_next(vis); |
vbl += vend - vis; |
vbl += vend - vis; |
vis = vend; |
vis = vend; |
ntab++; |
ntab++; |
i++; |
p->tcol->col++; |
} |
} |
|
|
/* |
/* |
Line 139 term_flushln(struct termp *p) |
|
Line 142 term_flushln(struct termp *p) |
|
* space is printed according to regular spacing rules). |
* space is printed according to regular spacing rules). |
*/ |
*/ |
|
|
for (j = i, jhy = 0; j < p->lastcol; j++) { |
jhy = 0; |
|
for (j = p->tcol->col; j < p->lastcol; j++) { |
if (p->tcol->buf[j] == ' ' || p->tcol->buf[j] == '\t') |
if (p->tcol->buf[j] == ' ' || p->tcol->buf[j] == '\t') |
break; |
break; |
|
|
Line 171 term_flushln(struct termp *p) |
|
Line 175 term_flushln(struct termp *p) |
|
* Find out whether we would exceed the right margin. |
* Find out whether we would exceed the right margin. |
* If so, break to the next line. |
* If so, break to the next line. |
*/ |
*/ |
if (vend > bp && 0 == jhy && vis > 0 && |
|
|
if (vend > bp && jhy == 0 && vis > 0 && |
(p->flags & TERMP_BRNEVER) == 0) { |
(p->flags & TERMP_BRNEVER) == 0) { |
vend -= vis; |
if (p->lasttcol) |
|
return; |
|
|
endline(p); |
endline(p); |
|
vend -= vis; |
|
|
/* Use pending tabs on the new line. */ |
/* Use pending tabs on the new line. */ |
|
|
Line 194 term_flushln(struct termp *p) |
|
Line 202 term_flushln(struct termp *p) |
|
p->maxrmargin > vbl ? p->maxrmargin - vbl : 0; |
p->maxrmargin > vbl ? p->maxrmargin - vbl : 0; |
} |
} |
|
|
/* Write out the [remaining] word. */ |
/* |
for ( ; i < p->lastcol; i++) { |
* Write out the rest of the word. |
if (vend > bp && jhy > 0 && i > jhy) |
*/ |
|
|
|
for ( ; p->tcol->col < p->lastcol; p->tcol->col++) { |
|
if (vend > bp && jhy > 0 && p->tcol->col > jhy) |
break; |
break; |
if (p->tcol->buf[i] == '\t') |
if (p->tcol->buf[p->tcol->col] == '\t') |
break; |
break; |
if (p->tcol->buf[i] == ' ') { |
if (p->tcol->buf[p->tcol->col] == ' ') { |
j = i; |
j = p->tcol->col; |
while (i < p->lastcol && |
while (p->tcol->col < p->lastcol && |
p->tcol->buf[i] == ' ') |
p->tcol->buf[p->tcol->col] == ' ') |
i++; |
p->tcol->col++; |
dv = (i - j) * (*p->width)(p, ' '); |
dv = (p->tcol->col - j) * (*p->width)(p, ' '); |
vbl += dv; |
vbl += dv; |
vend += dv; |
vend += dv; |
break; |
break; |
} |
} |
if (p->tcol->buf[i] == ASCII_NBRSP) { |
if (p->tcol->buf[p->tcol->col] == ASCII_NBRSP) { |
vbl += (*p->width)(p, ' '); |
vbl += (*p->width)(p, ' '); |
continue; |
continue; |
} |
} |
if (p->tcol->buf[i] == ASCII_BREAK) |
if (p->tcol->buf[p->tcol->col] == ASCII_BREAK) |
continue; |
continue; |
|
|
/* |
/* |
Line 228 term_flushln(struct termp *p) |
|
Line 239 term_flushln(struct termp *p) |
|
vbl = 0; |
vbl = 0; |
} |
} |
|
|
(*p->letter)(p, p->tcol->buf[i]); |
(*p->letter)(p, p->tcol->buf[p->tcol->col]); |
if (p->tcol->buf[i] == '\b') |
if (p->tcol->buf[p->tcol->col] == '\b') |
p->viscol -= (*p->width)(p, p->tcol->buf[i-1]); |
p->viscol -= (*p->width)(p, |
|
p->tcol->buf[p->tcol->col - 1]); |
else |
else |
p->viscol += (*p->width)(p, p->tcol->buf[i]); |
p->viscol += (*p->width)(p, |
|
p->tcol->buf[p->tcol->col]); |
} |
} |
vis = vend; |
vis = vend; |
} |
} |
Line 241 term_flushln(struct termp *p) |
|
Line 254 term_flushln(struct termp *p) |
|
* If there was trailing white space, it was not printed; |
* If there was trailing white space, it was not printed; |
* so reset the cursor position accordingly. |
* so reset the cursor position accordingly. |
*/ |
*/ |
|
|
if (vis > vbl) |
if (vis > vbl) |
vis -= vbl; |
vis -= vbl; |
else |
else |
Line 251 term_flushln(struct termp *p) |
|
Line 265 term_flushln(struct termp *p) |
|
p->flags &= ~(TERMP_BACKAFTER | TERMP_BACKBEFORE | TERMP_NOPAD); |
p->flags &= ~(TERMP_BACKAFTER | TERMP_BACKBEFORE | TERMP_NOPAD); |
|
|
/* Trailing whitespace is significant in some columns. */ |
/* Trailing whitespace is significant in some columns. */ |
|
|
if (vis && vbl && (TERMP_BRTRSP & p->flags)) |
if (vis && vbl && (TERMP_BRTRSP & p->flags)) |
vis += vbl; |
vis += vbl; |
|
|
Line 464 term_word(struct termp *p, const char *word) |
|
Line 479 term_word(struct termp *p, const char *word) |
|
p->flags |= (TERMP_NOSPACE | TERMP_NONEWLINE); |
p->flags |= (TERMP_NOSPACE | TERMP_NONEWLINE); |
continue; |
continue; |
case ESCAPE_HORIZ: |
case ESCAPE_HORIZ: |
if (a2roffsu(seq, &su, SCALE_EM) == 0) |
if (a2roffsu(seq, &su, SCALE_EM) == NULL) |
continue; |
continue; |
uc = term_hspan(p, &su) / 24; |
uc = term_hspan(p, &su) / 24; |
if (uc > 0) |
if (uc > 0) |
Line 485 term_word(struct termp *p, const char *word) |
|
Line 500 term_word(struct termp *p, const char *word) |
|
} |
} |
continue; |
continue; |
case ESCAPE_HLINE: |
case ESCAPE_HLINE: |
if (a2roffsu(seq, &su, SCALE_EM) == 0) |
if ((seq = a2roffsu(seq, &su, SCALE_EM)) == NULL) |
continue; |
continue; |
uc = term_hspan(p, &su) / 24; |
uc = term_hspan(p, &su) / 24; |
if (uc <= 0) { |
if (uc <= 0) { |
Line 494 term_word(struct termp *p, const char *word) |
|
Line 509 term_word(struct termp *p, const char *word) |
|
lsz = p->tcol->rmargin - p->tcol->offset; |
lsz = p->tcol->rmargin - p->tcol->offset; |
} else |
} else |
lsz = uc; |
lsz = uc; |
while (sz && |
if (*seq == '\0') |
strchr(" %&()*+-./0123456789:<=>", *seq)) { |
|
seq++; |
|
sz--; |
|
} |
|
if (sz && strchr("cifMmnPpuv", *seq)) { |
|
seq++; |
|
sz--; |
|
} |
|
if (sz == 0) |
|
uc = -1; |
uc = -1; |
else if (*seq == '\\') { |
else if (*seq == '\\') { |
seq++; |
seq++; |
Line 724 term_setwidth(struct termp *p, const char *wstr) |
|
Line 730 term_setwidth(struct termp *p, const char *wstr) |
|
default: |
default: |
break; |
break; |
} |
} |
if (a2roffsu(wstr, &su, SCALE_MAX)) |
if (a2roffsu(wstr, &su, SCALE_MAX) != NULL) |
width = term_hspan(p, &su); |
width = term_hspan(p, &su); |
else |
else |
iop = 0; |
iop = 0; |