version 1.248, 2015/04/29 18:35:00 |
version 1.262, 2017/06/02 19:21:23 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010-2017 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
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 139 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 158 term_flushln(struct termp *p) |
|
Line 160 term_flushln(struct termp *p) |
|
if (' ' == p->buf[j] || '\t' == p->buf[j]) |
if (' ' == p->buf[j] || '\t' == p->buf[j]) |
break; |
break; |
|
|
/* Back over the the last printed character. */ |
/* Back over the last printed character. */ |
if (8 == p->buf[j]) { |
if (8 == p->buf[j]) { |
assert(j); |
assert(j); |
vend -= (*p->width)(p, p->buf[j - 1]); |
vend -= (*p->width)(p, p->buf[j - 1]); |
Line 190 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 291 term_flushln(struct termp *p) |
|
Line 296 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 359 term_fontpush(struct termp *p, enum termfont f) |
|
Line 368 term_fontpush(struct termp *p, enum termfont f) |
|
if (++p->fonti == p->fontsz) { |
if (++p->fonti == p->fontsz) { |
p->fontsz += 8; |
p->fontsz += 8; |
p->fontq = mandoc_reallocarray(p->fontq, |
p->fontq = mandoc_reallocarray(p->fontq, |
p->fontsz, sizeof(enum termfont *)); |
p->fontsz, sizeof(*p->fontq)); |
} |
} |
p->fontq[p->fonti] = f; |
p->fontq[p->fonti] = f; |
} |
} |
Line 391 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; |
size_t ssz; |
size_t csz, lsz, ssz; |
enum mandoc_esc esc; |
enum mandoc_esc esc; |
|
|
if ( ! (TERMP_NOSPACE & p->flags)) { |
if ( ! (TERMP_NOSPACE & p->flags)) { |
Line 448 term_word(struct termp *p, const char *word) |
|
Line 458 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 477 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 481 term_word(struct termp *p, const char *word) |
|
Line 489 term_word(struct termp *p, const char *word) |
|
else if (*word == '\0') |
else if (*word == '\0') |
p->flags |= (TERMP_NOSPACE | TERMP_NONEWLINE); |
p->flags |= (TERMP_NOSPACE | TERMP_NONEWLINE); |
continue; |
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; |
|
case ESCAPE_HLINE: |
|
if (a2roffsu(seq, &su, SCALE_EM) == 0) |
|
continue; |
|
uc = term_hspan(p, &su) / 24; |
|
if (uc <= 0) { |
|
if (p->rmargin <= p->offset) |
|
continue; |
|
lsz = p->rmargin - p->offset; |
|
} else |
|
lsz = uc; |
|
while (sz && |
|
strchr(" %&()*+-./0123456789:<=>", *seq)) { |
|
seq++; |
|
sz--; |
|
} |
|
if (sz && strchr("cifMmnPpuv", *seq)) { |
|
seq++; |
|
sz--; |
|
} |
|
if (sz == 0) |
|
uc = -1; |
|
else if (*seq == '\\') { |
|
seq++; |
|
esc = mandoc_escape(&seq, &cp, &sz); |
|
switch (esc) { |
|
case ESCAPE_UNICODE: |
|
uc = mchars_num2uc(cp + 1, sz - 1); |
|
break; |
|
case ESCAPE_NUMBERED: |
|
uc = mchars_num2char(cp, sz); |
|
break; |
|
case ESCAPE_SPECIAL: |
|
uc = mchars_spec2cp(cp, sz); |
|
break; |
|
default: |
|
uc = -1; |
|
break; |
|
} |
|
} else |
|
uc = *seq; |
|
if (uc < 0x20 || (uc > 0x7E && uc < 0xA0)) |
|
uc = '_'; |
|
if (p->enc == TERMENC_ASCII) { |
|
cp = ascii_uc2str(uc); |
|
csz = term_strlen(p, cp); |
|
ssz = strlen(cp); |
|
} else |
|
csz = (*p->width)(p, uc); |
|
while (lsz >= csz) { |
|
if (p->enc == TERMENC_ASCII) |
|
encode(p, cp, ssz); |
|
else |
|
encode1(p, uc); |
|
lsz -= csz; |
|
} |
|
continue; |
case ESCAPE_SKIPCHAR: |
case ESCAPE_SKIPCHAR: |
p->flags |= TERMP_BACKAFTER; |
p->flags |= TERMP_BACKAFTER; |
continue; |
continue; |
Line 499 term_word(struct termp *p, const char *word) |
|
Line 584 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->buf[p->col - 1] == '\t')) |
|
p->col -= 2; |
continue; |
continue; |
default: |
default: |
continue; |
continue; |
Line 557 encode1(struct termp *p, int c) |
|
Line 647 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->buf[p->col - 1] == '\t') |
|
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) { |
Line 594 encode(struct termp *p, const char *word, size_t sz) |
|
Line 687 encode(struct termp *p, const char *word, size_t sz) |
|
if (ASCII_HYPH == word[i] || |
if (ASCII_HYPH == word[i] || |
isgraph((unsigned char)word[i])) |
isgraph((unsigned char)word[i])) |
encode1(p, word[i]); |
encode1(p, word[i]); |
else |
else { |
p->buf[p->col++] = word[i]; |
p->buf[p->col++] = word[i]; |
|
|
|
/* |
|
* Postpone the effect of \z while handling |
|
* an overstrike sequence from ascii_uc2str(). |
|
*/ |
|
|
|
if (word[i] == '\b' && |
|
(p->flags & TERMP_BACKBEFORE)) { |
|
p->flags &= ~TERMP_BACKBEFORE; |
|
p->flags |= TERMP_BACKAFTER; |
|
} |
|
} |
} |
} |
} |
} |
|
|
|
|
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 746 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 794 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 862 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 900 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 908 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); |
} |
} |