=================================================================== RCS file: /cvs/mandoc/term.c,v retrieving revision 1.221 retrieving revision 1.234 diff -u -p -r1.221 -r1.234 --- mandoc/term.c 2014/04/08 07:13:12 1.221 +++ mandoc/term.c 2014/11/01 04:03:49 1.234 @@ -1,4 +1,4 @@ -/* $Id: term.c,v 1.221 2014/04/08 07:13:12 schwarze Exp $ */ +/* $Id: term.c,v 1.234 2014/11/01 04:03:49 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010-2014 Ingo Schwarze @@ -15,9 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include @@ -39,21 +37,17 @@ static void bufferc(struct termp *, char); static void encode(struct termp *, const char *, size_t); static void encode1(struct termp *, int); + void term_free(struct termp *p) { - if (p->buf) - free(p->buf); - if (p->symtab) - mchars_free(p->symtab); - + free(p->buf); free(p); } - void -term_begin(struct termp *p, term_margin head, +term_begin(struct termp *p, term_margin head, term_margin foot, const void *arg) { @@ -63,7 +57,6 @@ term_begin(struct termp *p, term_margin head, (*p->begin)(p); } - void term_end(struct termp *p) { @@ -171,7 +164,7 @@ term_flushln(struct termp *p) /* Regular word. */ /* Break at the hyphen point if we overrun. */ - if (vend > vis && vend < bp && + if (vend > vis && vend < bp && (ASCII_HYPH == p->buf[j] || ASCII_BREAK == p->buf[j])) jhy = j; @@ -223,7 +216,7 @@ term_flushln(struct termp *p) break; if (' ' == p->buf[i]) { j = i; - while (' ' == p->buf[i]) + while (i < p->col && ' ' == p->buf[i]) i++; dv = (i - j) * (*p->width)(p, ' '); vbl += dv; @@ -251,7 +244,7 @@ term_flushln(struct termp *p) (*p->letter)(p, p->buf[i]); if (8 == p->buf[i]) p->viscol -= (*p->width)(p, p->buf[i-1]); - else + else p->viscol += (*p->width)(p, p->buf[i]); } vis = vend; @@ -275,7 +268,7 @@ term_flushln(struct termp *p) if (TERMP_HANG & p->flags) { p->overstep = (int)(vis - maxvis + - p->trailspace * (*p->width)(p, ' ')); + p->trailspace * (*p->width)(p, ' ')); /* * If we have overstepped the margin, temporarily move @@ -298,8 +291,7 @@ term_flushln(struct termp *p) } } - -/* +/* * A newline only breaks an existing line; it won't assert vertical * space. All data in the output buffer is flushed prior to the newline * assertion. @@ -313,7 +305,6 @@ term_newln(struct termp *p) term_flushln(p); } - /* * Asserts a vertical space (a full, empty line-break between lines). * Note that if used twice, this will cause two blank spaces and so on. @@ -342,7 +333,6 @@ term_fontlast(struct termp *p) p->fontq[p->fonti] = f; } - void term_fontrepl(struct termp *p, enum termfont f) { @@ -351,7 +341,6 @@ term_fontrepl(struct termp *p, enum termfont f) p->fontq[p->fonti] = f; } - void term_fontpush(struct termp *p, enum termfont f) { @@ -361,7 +350,6 @@ term_fontpush(struct termp *p, enum termfont f) p->fontq[++p->fonti] = f; } - const void * term_fontq(struct termp *p) { @@ -369,7 +357,6 @@ term_fontq(struct termp *p) return(&p->fontq[p->fonti]); } - enum termfont term_fonttop(struct termp *p) { @@ -377,7 +364,6 @@ term_fonttop(struct termp *p) return(p->fontq[p->fonti]); } - void term_fontpopq(struct termp *p, const void *key) { @@ -387,7 +373,6 @@ term_fontpopq(struct termp *p, const void *key) assert(p->fonti >= 0); } - void term_fontpop(struct termp *p) { @@ -406,7 +391,6 @@ term_word(struct termp *p, const char *word) { const char nbrsp[2] = { ASCII_NBRSP, 0 }; const char *seq, *cp; - char c; int sz, uc; size_t ssz; enum mandoc_esc esc; @@ -453,71 +437,73 @@ term_word(struct termp *p, const char *word) word++; esc = mandoc_escape(&word, &seq, &sz); if (ESCAPE_ERROR == esc) - break; + continue; - if (TERMENC_ASCII != p->enc) - switch (esc) { - case (ESCAPE_UNICODE): - uc = mchars_num2uc(seq + 1, sz - 1); - if ('\0' == uc) - break; - encode1(p, uc); - continue; - case (ESCAPE_SPECIAL): - uc = mchars_spec2cp(p->symtab, seq, sz); - if (uc <= 0) - break; - encode1(p, uc); - continue; - default: - break; - } - switch (esc) { - case (ESCAPE_UNICODE): - encode1(p, '?'); + case ESCAPE_UNICODE: + uc = mchars_num2uc(seq + 1, sz - 1); break; - case (ESCAPE_NUMBERED): - c = mchars_num2char(seq, sz); - if ('\0' != c) - encode(p, &c, 1); + case ESCAPE_NUMBERED: + uc = mchars_num2char(seq, sz); + if (uc < 0) + continue; break; - case (ESCAPE_SPECIAL): - cp = mchars_spec2str(p->symtab, seq, sz, &ssz); - if (NULL != cp) - encode(p, cp, ssz); - else if (1 == ssz) - encode(p, seq, sz); - break; - case (ESCAPE_FONTBOLD): + case ESCAPE_SPECIAL: + if (p->enc == TERMENC_ASCII) { + cp = mchars_spec2str(p->symtab, + seq, sz, &ssz); + if (cp != NULL) + encode(p, cp, ssz); + } else { + uc = mchars_spec2cp(p->symtab, seq, sz); + if (uc > 0) + encode1(p, uc); + } + continue; + case ESCAPE_FONTBOLD: term_fontrepl(p, TERMFONT_BOLD); - break; - case (ESCAPE_FONTITALIC): + continue; + case ESCAPE_FONTITALIC: term_fontrepl(p, TERMFONT_UNDER); - break; - case (ESCAPE_FONTBI): + continue; + case ESCAPE_FONTBI: term_fontrepl(p, TERMFONT_BI); - break; - case (ESCAPE_FONT): + continue; + case ESCAPE_FONT: /* FALLTHROUGH */ - case (ESCAPE_FONTROMAN): + case ESCAPE_FONTROMAN: term_fontrepl(p, TERMFONT_NONE); - break; - case (ESCAPE_FONTPREV): + continue; + case ESCAPE_FONTPREV: term_fontlast(p); - break; - case (ESCAPE_NOSPACE): + continue; + case ESCAPE_NOSPACE: if (TERMP_SKIPCHAR & p->flags) p->flags &= ~TERMP_SKIPCHAR; else if ('\0' == *word) p->flags |= TERMP_NOSPACE; - break; - case (ESCAPE_SKIPCHAR): + continue; + case ESCAPE_SKIPCHAR: p->flags |= TERMP_SKIPCHAR; - break; + continue; default: - break; + continue; } + + /* + * Common handling for Unicode and numbered + * character escape sequences. + */ + + if (p->enc == TERMENC_ASCII) { + cp = ascii_uc2str(uc); + encode(p, cp, strlen(cp)); + } else { + if ((uc < 0x20 && uc != 0x09) || + (uc > 0x7E && uc < 0xA0)) + uc = 0xFFFD; + encode1(p, uc); + } } p->flags &= ~TERMP_NBRWORD; } @@ -531,7 +517,7 @@ adjbuf(struct termp *p, size_t sz) while (sz >= p->maxcols) p->maxcols <<= 2; - p->buf = mandoc_realloc(p->buf, sizeof(int) * p->maxcols); + p->buf = mandoc_reallocarray(p->buf, p->maxcols, sizeof(int)); } static void @@ -595,7 +581,7 @@ encode(struct termp *p, const char *word, size_t sz) */ if (TERMFONT_NONE == term_fonttop(p)) { - if (p->col + sz >= p->maxcols) + if (p->col + sz >= p->maxcols) adjbuf(p, p->col + sz); for (i = 0; i < sz; i++) p->buf[p->col++] = word[i]; @@ -627,11 +613,11 @@ term_setwidth(struct termp *p, const char *wstr) width = 0; if (NULL != wstr) { switch (*wstr) { - case ('+'): + case '+': iop = 1; wstr++; break; - case ('-'): + case '-': iop = -1; wstr++; break; @@ -668,7 +654,7 @@ size_t term_strlen(const struct termp *p, const char *cp) { size_t sz, rsz, i; - int ssz, skip, c; + int ssz, skip, uc; const char *seq, *rhs; enum mandoc_esc esc; static const char rej[] = { '\\', ASCII_NBRSP, ASCII_HYPH, @@ -688,80 +674,83 @@ term_strlen(const struct termp *p, const char *cp) sz += cond_width(p, *cp++, &skip); switch (*cp) { - case ('\\'): + case '\\': cp++; esc = mandoc_escape(&cp, &seq, &ssz); if (ESCAPE_ERROR == esc) - return(sz); + continue; - if (TERMENC_ASCII != p->enc) - switch (esc) { - case (ESCAPE_UNICODE): - c = mchars_num2uc - (seq + 1, ssz - 1); - if ('\0' == c) - break; - sz += cond_width(p, c, &skip); - continue; - case (ESCAPE_SPECIAL): - c = mchars_spec2cp - (p->symtab, seq, ssz); - if (c <= 0) - break; - sz += cond_width(p, c, &skip); - continue; - default: - break; - } - rhs = NULL; switch (esc) { - case (ESCAPE_UNICODE): - sz += cond_width(p, '?', &skip); + case ESCAPE_UNICODE: + uc = mchars_num2uc(seq + 1, ssz - 1); break; - case (ESCAPE_NUMBERED): - c = mchars_num2char(seq, ssz); - if ('\0' != c) - sz += cond_width(p, c, &skip); + case ESCAPE_NUMBERED: + uc = mchars_num2char(seq, ssz); + if (uc < 0) + continue; break; - case (ESCAPE_SPECIAL): - rhs = mchars_spec2str - (p->symtab, seq, ssz, &rsz); - - if (ssz != 1 || rhs) - break; - - rhs = seq; - rsz = ssz; - break; - case (ESCAPE_SKIPCHAR): + case ESCAPE_SPECIAL: + if (p->enc == TERMENC_ASCII) { + rhs = mchars_spec2str(p->symtab, + seq, ssz, &rsz); + if (rhs != NULL) + break; + } else { + uc = mchars_spec2cp(p->symtab, + seq, ssz); + if (uc > 0) + sz += cond_width(p, uc, &skip); + } + continue; + case ESCAPE_SKIPCHAR: skip = 1; - break; + continue; default: - break; + continue; } - if (NULL == rhs) - break; + /* + * Common handling for Unicode and numbered + * character escape sequences. + */ + if (rhs == NULL) { + if (p->enc == TERMENC_ASCII) { + rhs = ascii_uc2str(uc); + rsz = strlen(rhs); + } else { + if ((uc < 0x20 && uc != 0x09) || + (uc > 0x7E && uc < 0xA0)) + uc = 0xFFFD; + sz += cond_width(p, uc, &skip); + continue; + } + } + if (skip) { skip = 0; break; } + /* + * Common handling for all escape sequences + * printing more than one character. + */ + for (i = 0; i < rsz; i++) sz += (*p->width)(p, *rhs++); break; - case (ASCII_NBRSP): + case ASCII_NBRSP: sz += cond_width(p, ' ', &skip); cp++; break; - case (ASCII_HYPH): + case ASCII_HYPH: sz += cond_width(p, '-', &skip); cp++; /* FALLTHROUGH */ - case (ASCII_BREAK): + case ASCII_BREAK: break; default: break; @@ -771,40 +760,38 @@ term_strlen(const struct termp *p, const char *cp) return(sz); } -/* ARGSUSED */ size_t term_vspan(const struct termp *p, const struct roffsu *su) { double r; switch (su->unit) { - case (SCALE_CM): - r = su->scale * 2; + case SCALE_CM: + r = su->scale * 2.0; break; - case (SCALE_IN): - r = su->scale * 6; + case SCALE_IN: + r = su->scale * 6.0; break; - case (SCALE_PC): + case SCALE_PC: r = su->scale; break; - case (SCALE_PT): - r = su->scale / 8; + case SCALE_PT: + r = su->scale / 8.0; break; - case (SCALE_MM): - r = su->scale / 1000; + case SCALE_MM: + r = su->scale / 1000.0; break; - case (SCALE_VS): + case SCALE_VS: r = su->scale; break; default: - r = su->scale - 1; + r = su->scale - 1.0; break; } if (r < 0.0) r = 0.0; - return(/* LINTED */(size_t) - r); + return((size_t)(r + 0.0005)); } size_t @@ -812,9 +799,8 @@ term_hspan(const struct termp *p, const struct roffsu { double v; - v = ((*p->hspan)(p, su)); + v = (*p->hspan)(p, su); if (v < 0.0) v = 0.0; - return((size_t) /* LINTED */ - v); + return((size_t)(v + 0.0005)); }