version 1.248, 2015/04/29 18:35:00 |
version 1.255, 2015/10/23 14:50:58 |
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 291 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 448 term_word(struct termp *p, const char *word) |
|
Line 454 term_word(struct termp *p, const char *word) |
|
break; |
break; |
case ESCAPE_SPECIAL: |
case ESCAPE_SPECIAL: |
if (p->enc == TERMENC_ASCII) { |
if (p->enc == TERMENC_ASCII) { |
cp = mchars_spec2str(p->symtab, |
cp = mchars_spec2str(seq, sz, &ssz); |
seq, sz, &ssz); |
|
if (cp != NULL) |
if (cp != NULL) |
encode(p, cp, ssz); |
encode(p, cp, ssz); |
} else { |
} else { |
uc = mchars_spec2cp(p->symtab, seq, sz); |
uc = mchars_spec2cp(seq, sz); |
if (uc > 0) |
if (uc > 0) |
encode1(p, uc); |
encode1(p, uc); |
} |
} |
Line 468 term_word(struct termp *p, const char *word) |
|
Line 473 term_word(struct termp *p, const char *word) |
|
term_fontrepl(p, TERMFONT_BI); |
term_fontrepl(p, TERMFONT_BI); |
continue; |
continue; |
case ESCAPE_FONT: |
case ESCAPE_FONT: |
/* FALLTHROUGH */ |
|
case ESCAPE_FONTROMAN: |
case ESCAPE_FONTROMAN: |
term_fontrepl(p, TERMFONT_NONE); |
term_fontrepl(p, TERMFONT_NONE); |
continue; |
continue; |
Line 499 term_word(struct termp *p, const char *word) |
|
Line 503 term_word(struct termp *p, const char *word) |
|
p->flags |= TERMP_BACKBEFORE; |
p->flags |= TERMP_BACKBEFORE; |
} |
} |
} |
} |
|
/* Trim trailing backspace/blank pair. */ |
|
if (p->col > 2 && p->buf[p->col - 1] == ' ') |
|
p->col -= 2; |
continue; |
continue; |
default: |
default: |
continue; |
continue; |
Line 557 encode1(struct termp *p, int c) |
|
Line 564 encode1(struct termp *p, int c) |
|
if (p->col + 7 >= p->maxcols) |
if (p->col + 7 >= p->maxcols) |
adjbuf(p, p->col + 7); |
adjbuf(p, p->col + 7); |
|
|
f = (c == ASCII_HYPH || isgraph(c)) ? |
f = (c == ASCII_HYPH || c > 127 || isgraph(c)) ? |
p->fontq[p->fonti] : TERMFONT_NONE; |
p->fontq[p->fonti] : TERMFONT_NONE; |
|
|
if (p->flags & TERMP_BACKBEFORE) { |
if (p->flags & TERMP_BACKBEFORE) { |
p->buf[p->col++] = 8; |
if (p->buf[p->col - 1] == ' ') |
|
p->col--; |
|
else |
|
p->buf[p->col++] = 8; |
p->flags &= ~TERMP_BACKBEFORE; |
p->flags &= ~TERMP_BACKBEFORE; |
} |
} |
if (TERMFONT_UNDER == f || TERMFONT_BI == f) { |
if (TERMFONT_UNDER == f || TERMFONT_BI == f) { |
|
|
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 641 cond_width(const struct termp *p, int c, int *skip) |
|
Line 651 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 689 term_strlen(const struct termp *p, const char *cp) |
|
Line 699 term_strlen(const struct termp *p, const char *cp) |
|
break; |
break; |
case ESCAPE_SPECIAL: |
case ESCAPE_SPECIAL: |
if (p->enc == TERMENC_ASCII) { |
if (p->enc == TERMENC_ASCII) { |
rhs = mchars_spec2str(p->symtab, |
rhs = mchars_spec2str(seq, ssz, &rsz); |
seq, ssz, &rsz); |
|
if (rhs != NULL) |
if (rhs != NULL) |
break; |
break; |
} else { |
} else { |
uc = mchars_spec2cp(p->symtab, |
uc = mchars_spec2cp(seq, ssz); |
seq, ssz); |
|
if (uc > 0) |
if (uc > 0) |
sz += cond_width(p, uc, &skip); |
sz += cond_width(p, uc, &skip); |
} |
} |
Line 759 term_strlen(const struct termp *p, const char *cp) |
|
Line 767 term_strlen(const struct termp *p, const char *cp) |
|
case ASCII_HYPH: |
case ASCII_HYPH: |
sz += cond_width(p, '-', &skip); |
sz += cond_width(p, '-', &skip); |
cp++; |
cp++; |
/* FALLTHROUGH */ |
|
case ASCII_BREAK: |
|
break; |
break; |
default: |
default: |
break; |
break; |
} |
} |
} |
} |
|
|
return(sz); |
return sz; |
} |
} |
|
|
int |
int |
Line 799 term_vspan(const struct termp *p, const struct roffsu |
|
Line 805 term_vspan(const struct termp *p, const struct roffsu |
|
r = su->scale / 12.0; |
r = su->scale / 12.0; |
break; |
break; |
case SCALE_EN: |
case SCALE_EN: |
/* FALLTHROUGH */ |
|
case SCALE_EM: |
case SCALE_EM: |
r = su->scale * 0.6; |
r = su->scale * 0.6; |
break; |
break; |
Line 808 term_vspan(const struct termp *p, const struct roffsu |
|
Line 813 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; |
} |
} |
|
|
/* |
/* |
|
|
term_hspan(const struct termp *p, const struct roffsu *su) |
term_hspan(const struct termp *p, const struct roffsu *su) |
{ |
{ |
|
|
return((*p->hspan)(p, su)); |
return (*p->hspan)(p, su); |
} |
} |