version 1.246, 2015/04/02 23:48:20 |
version 1.252, 2015/10/06 18:32:20 |
Line 78 term_end(struct termp *p) |
|
Line 78 term_end(struct termp *p) |
|
* the next column. However, if less than p->trailspace blanks, |
* the next column. However, if less than p->trailspace blanks, |
* which can be 0, 1, or 2, remain to the right margin, the line |
* which can be 0, 1, or 2, remain to the right margin, the line |
* will be broken. |
* will be broken. |
|
* - TERMP_BRTRSP: Consider trailing whitespace significant |
|
* when deciding whether the chunk fits or not. |
* - TERMP_BRIND: If the chunk does not fit and the output line has |
* - TERMP_BRIND: If the chunk does not fit and the output line has |
* to be broken, start the next line at the right margin instead |
* to be broken, start the next line at the right margin instead |
* of at the offset. Used together with TERMP_NOBREAK for the tags |
* of at the offset. Used together with TERMP_NOBREAK for the tags |
Line 265 term_flushln(struct termp *p) |
|
Line 267 term_flushln(struct termp *p) |
|
|
|
p->col = 0; |
p->col = 0; |
p->overstep = 0; |
p->overstep = 0; |
|
p->flags &= ~(TERMP_BACKAFTER | TERMP_BACKBEFORE); |
|
|
if ( ! (TERMP_NOBREAK & p->flags)) { |
if ( ! (TERMP_NOBREAK & p->flags)) { |
p->viscol = 0; |
p->viscol = 0; |
Line 290 term_flushln(struct termp *p) |
|
Line 293 term_flushln(struct termp *p) |
|
} else if (TERMP_DANGLE & p->flags) |
} else if (TERMP_DANGLE & p->flags) |
return; |
return; |
|
|
|
/* Trailing whitespace is significant in some columns. */ |
|
if (vis && vbl && (TERMP_BRTRSP & p->flags)) |
|
vis += vbl; |
|
|
/* If the column was overrun, break the line. */ |
/* If the column was overrun, break the line. */ |
if (maxvis < vis + p->trailspace * (*p->width)(p, ' ')) { |
if (maxvis < vis + p->trailspace * (*p->width)(p, ' ')) { |
(*p->endline)(p); |
(*p->endline)(p); |
Line 417 term_word(struct termp *p, const char *word) |
|
Line 424 term_word(struct termp *p, const char *word) |
|
|
|
while ('\0' != *word) { |
while ('\0' != *word) { |
if ('\\' != *word) { |
if ('\\' != *word) { |
if (TERMP_SKIPCHAR & p->flags) { |
|
p->flags &= ~TERMP_SKIPCHAR; |
|
word++; |
|
continue; |
|
} |
|
if (TERMP_NBRWORD & p->flags) { |
if (TERMP_NBRWORD & p->flags) { |
if (' ' == *word) { |
if (' ' == *word) { |
encode(p, nbrsp, 1); |
encode(p, nbrsp, 1); |
Line 480 term_word(struct termp *p, const char *word) |
|
Line 482 term_word(struct termp *p, const char *word) |
|
term_fontlast(p); |
term_fontlast(p); |
continue; |
continue; |
case ESCAPE_NOSPACE: |
case ESCAPE_NOSPACE: |
if (TERMP_SKIPCHAR & p->flags) |
if (p->flags & TERMP_BACKAFTER) |
p->flags &= ~TERMP_SKIPCHAR; |
p->flags &= ~TERMP_BACKAFTER; |
else if ('\0' == *word) |
else if (*word == '\0') |
p->flags |= (TERMP_NOSPACE | TERMP_NONEWLINE); |
p->flags |= (TERMP_NOSPACE | TERMP_NONEWLINE); |
continue; |
continue; |
case ESCAPE_SKIPCHAR: |
case ESCAPE_SKIPCHAR: |
p->flags |= TERMP_SKIPCHAR; |
p->flags |= TERMP_BACKAFTER; |
continue; |
continue; |
case ESCAPE_OVERSTRIKE: |
case ESCAPE_OVERSTRIKE: |
cp = seq + sz; |
cp = seq + sz; |
Line 496 term_word(struct termp *p, const char *word) |
|
Line 498 term_word(struct termp *p, const char *word) |
|
continue; |
continue; |
} |
} |
encode1(p, *seq++); |
encode1(p, *seq++); |
if (seq < cp) |
if (seq < cp) { |
encode(p, "\b", 1); |
if (p->flags & TERMP_BACKBEFORE) |
|
p->flags |= TERMP_BACKAFTER; |
|
else |
|
p->flags |= TERMP_BACKBEFORE; |
|
} |
} |
} |
|
/* Trim trailing backspace/blank pair. */ |
|
if (p->col > 2 && p->buf[p->col - 1] == ' ') |
|
p->col -= 2; |
|
continue; |
default: |
default: |
continue; |
continue; |
} |
} |
Line 553 encode1(struct termp *p, int c) |
|
Line 563 encode1(struct termp *p, int c) |
|
{ |
{ |
enum termfont f; |
enum termfont f; |
|
|
if (TERMP_SKIPCHAR & p->flags) { |
if (p->col + 7 >= p->maxcols) |
p->flags &= ~TERMP_SKIPCHAR; |
adjbuf(p, p->col + 7); |
return; |
|
} |
|
|
|
if (p->col + 6 >= p->maxcols) |
f = (c == ASCII_HYPH || isgraph(c)) ? |
adjbuf(p, p->col + 6); |
p->fontq[p->fonti] : TERMFONT_NONE; |
|
|
f = p->fontq[p->fonti]; |
if (p->flags & TERMP_BACKBEFORE) { |
|
if (p->buf[p->col - 1] == ' ') |
|
p->col--; |
|
else |
|
p->buf[p->col++] = 8; |
|
p->flags &= ~TERMP_BACKBEFORE; |
|
} |
if (TERMFONT_UNDER == f || TERMFONT_BI == f) { |
if (TERMFONT_UNDER == f || TERMFONT_BI == f) { |
p->buf[p->col++] = '_'; |
p->buf[p->col++] = '_'; |
p->buf[p->col++] = 8; |
p->buf[p->col++] = 8; |
Line 575 encode1(struct termp *p, int c) |
|
Line 588 encode1(struct termp *p, int c) |
|
p->buf[p->col++] = 8; |
p->buf[p->col++] = 8; |
} |
} |
p->buf[p->col++] = c; |
p->buf[p->col++] = c; |
|
if (p->flags & TERMP_BACKAFTER) { |
|
p->flags |= TERMP_BACKBEFORE; |
|
p->flags &= ~TERMP_BACKAFTER; |
|
} |
} |
} |
|
|
static void |
static void |
Line 582 encode(struct termp *p, const char *word, size_t sz) |
|
Line 599 encode(struct termp *p, const char *word, size_t sz) |
|
{ |
{ |
size_t i; |
size_t i; |
|
|
if (TERMP_SKIPCHAR & p->flags) { |
if (p->col + 2 + (sz * 5) >= p->maxcols) |
p->flags &= ~TERMP_SKIPCHAR; |
adjbuf(p, p->col + 2 + (sz * 5)); |
return; |
|
} |
|
|
|
/* |
|
* Encode and buffer a string of characters. If the current |
|
* font mode is unset, buffer directly, else encode then buffer |
|
* character by character. |
|
*/ |
|
|
|
if (p->fontq[p->fonti] == TERMFONT_NONE) { |
|
if (p->col + sz >= p->maxcols) |
|
adjbuf(p, p->col + sz); |
|
for (i = 0; i < sz; i++) |
|
p->buf[p->col++] = word[i]; |
|
return; |
|
} |
|
|
|
/* Pre-buffer, assuming worst-case. */ |
|
|
|
if (p->col + 1 + (sz * 5) >= p->maxcols) |
|
adjbuf(p, p->col + 1 + (sz * 5)); |
|
|
|
for (i = 0; i < sz; i++) { |
for (i = 0; i < sz; i++) { |
if (ASCII_HYPH == word[i] || |
if (ASCII_HYPH == word[i] || |
isgraph((unsigned char)word[i])) |
isgraph((unsigned char)word[i])) |
|
|
term_setwidth(struct termp *p, const char *wstr) |
term_setwidth(struct termp *p, const char *wstr) |
{ |
{ |
struct roffsu su; |
struct roffsu su; |
size_t width; |
int iop, width; |
int iop; |
|
|
|
iop = 0; |
iop = 0; |
width = 0; |
width = 0; |
|
|
term_len(const struct termp *p, size_t sz) |
term_len(const struct termp *p, size_t sz) |
{ |
{ |
|
|
return((*p->width)(p, ' ') * sz); |
return (*p->width)(p, ' ') * sz; |
} |
} |
|
|
static size_t |
static size_t |
Line 658 cond_width(const struct termp *p, int c, int *skip) |
|
Line 653 cond_width(const struct termp *p, int c, int *skip) |
|
|
|
if (*skip) { |
if (*skip) { |
(*skip) = 0; |
(*skip) = 0; |
return(0); |
return 0; |
} else |
} else |
return((*p->width)(p, c)); |
return (*p->width)(p, c); |
} |
} |
|
|
size_t |
size_t |
Line 784 term_strlen(const struct termp *p, const char *cp) |
|
Line 779 term_strlen(const struct termp *p, const char *cp) |
|
} |
} |
} |
} |
|
|
return(sz); |
return sz; |
} |
} |
|
|
int |
int |
Line 825 term_vspan(const struct termp *p, const struct roffsu |
|
Line 820 term_vspan(const struct termp *p, const struct roffsu |
|
break; |
break; |
default: |
default: |
abort(); |
abort(); |
/* NOTREACHED */ |
|
} |
} |
ri = r > 0.0 ? r + 0.4995 : r - 0.4995; |
ri = r > 0.0 ? r + 0.4995 : r - 0.4995; |
return(ri < 66 ? ri : 1); |
return ri < 66 ? ri : 1; |
} |
} |
|
|
|
/* |
|
* Convert a scaling width to basic units, rounding down. |
|
*/ |
int |
int |
term_hspan(const struct termp *p, const struct roffsu *su) |
term_hspan(const struct termp *p, const struct roffsu *su) |
{ |
{ |
double v; |
|
|
|
v = (*p->hspan)(p, su); |
return (*p->hspan)(p, su); |
return(v > 0.0 ? v + 0.0005 : v - 0.0005); |
|
} |
} |