=================================================================== RCS file: /cvs/mandoc/term.c,v retrieving revision 1.217 retrieving revision 1.261 diff -u -p -r1.217 -r1.261 --- mandoc/term.c 2014/03/13 19:23:50 1.217 +++ mandoc/term.c 2017/06/01 19:05:37 1.261 @@ -1,34 +1,32 @@ -/* $Id: term.c,v 1.217 2014/03/13 19:23:50 schwarze Exp $ */ +/* $Id: term.c,v 1.261 2017/06/01 19:05:37 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons - * Copyright (c) 2010-2014 Ingo Schwarze + * Copyright (c) 2010-2017 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * 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 #include #include -#include #include #include #include #include "mandoc.h" +#include "mandoc_aux.h" #include "out.h" #include "term.h" #include "main.h" @@ -39,22 +37,19 @@ 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->fontq); free(p); } - void -term_begin(struct termp *p, term_margin head, - term_margin foot, const void *arg) +term_begin(struct termp *p, term_margin head, + term_margin foot, const struct roff_meta *arg) { p->headf = head; @@ -63,7 +58,6 @@ term_begin(struct termp *p, term_margin head, (*p->begin)(p); } - void term_end(struct termp *p) { @@ -72,34 +66,29 @@ term_end(struct termp *p) } /* - * Flush a line of text. A "line" is loosely defined as being something - * that should be followed by a newline, regardless of whether it's - * broken apart by newlines getting there. A line can also be a - * fragment of a columnar list (`Bl -tag' or `Bl -column'), which does - * not have a trailing newline. - * + * Flush a chunk of text. By default, break the output line each time + * the right margin is reached, and continue output on the next line + * at the same offset as the chunk itself. By default, also break the + * output line at the end of the chunk. * The following flags may be specified: * - * - TERMP_NOBREAK: this is the most important and is used when making - * columns. In short: don't print a newline and instead expect the - * next call to do the padding up to the start of the next column. - * p->trailspace may be set to 0, 1, or 2, depending on how many - * space characters are required at the end of the column. - * - * - TERMP_DANGLE: don't newline when TERMP_NOBREAK is specified and - * the line is overrun, and don't pad-right if it's underrun. - * - * - TERMP_HANG: like TERMP_DANGLE, but doesn't newline when - * overrunning, instead save the position and continue at that point - * when the next invocation. - * - * In-line line breaking: - * - * If TERMP_NOBREAK is specified and the line overruns the right - * margin, it will break and pad-right to the right margin after - * writing. If maxrmargin is violated, it will break and continue - * writing from the right-margin, which will lead to the above scenario - * upon exit. Otherwise, the line will break at the right margin. + * - TERMP_NOBREAK: Do not break the output line at the right margin, + * but only at the max right margin. Also, do not break the output + * line at the end of the chunk, such that the next call can pad to + * the next column. However, if less than p->trailspace blanks, + * which can be 0, 1, or 2, remain to the right margin, the line + * 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 + * to be broken, start the next line at the right margin instead + * of at the offset. Used together with TERMP_NOBREAK for the tags + * in various kinds of tagged lists. + * - TERMP_DANGLE: Do not break the output line at the right margin, + * append the next chunk after it even if this one is too long. + * To be used together with TERMP_NOBREAK. + * - TERMP_HANG: Like TERMP_DANGLE, and also suppress padding before + * the next chunk if this column is not full. */ void term_flushln(struct termp *p) @@ -114,7 +103,6 @@ term_flushln(struct termp *p) size_t j; /* temporary loop index for p->buf */ size_t jhy; /* last hyph before overflow w/r/t j */ size_t maxvis; /* output position of visible boundary */ - size_t mmax; /* used in calculating bp */ /* * First, establish the maximum columns of "visible" content. @@ -127,13 +115,16 @@ term_flushln(struct termp *p) * is negative, it gets sign extended. Subtracting that * very large size_t effectively adds a small number to dv. */ - assert (p->rmargin >= p->offset); - dv = p->rmargin - p->offset; + dv = p->rmargin > p->offset ? p->rmargin - p->offset : 0; maxvis = (int)dv > p->overstep ? dv - (size_t)p->overstep : 0; - dv = p->maxrmargin - p->offset; - mmax = (int)dv > p->overstep ? dv - (size_t)p->overstep : 0; - bp = TERMP_NOBREAK & p->flags ? mmax : maxvis; + if (p->flags & TERMP_NOBREAK) { + dv = p->maxrmargin > p->offset ? + p->maxrmargin - p->offset : 0; + bp = (int)dv > p->overstep ? + dv - (size_t)p->overstep : 0; + } else + bp = maxvis; /* * Calculate the required amount of padding. @@ -150,8 +141,8 @@ term_flushln(struct termp *p) * subsequent tabs into a single huge set of spaces. */ ntab = 0; - while (i < p->col && '\t' == p->buf[i]) { - vend = (vis / p->tabwidth + 1) * p->tabwidth; + while (i < p->col && p->buf[i] == '\t') { + vend = term_tab_next(vis); vbl += vend - vis; vis = vend; ntab++; @@ -169,7 +160,7 @@ term_flushln(struct termp *p) if (' ' == p->buf[j] || '\t' == p->buf[j]) break; - /* Back over the the last printed character. */ + /* Back over the last printed character. */ if (8 == p->buf[j]) { assert(j); vend -= (*p->width)(p, p->buf[j - 1]); @@ -178,7 +169,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; @@ -201,17 +192,21 @@ term_flushln(struct termp *p) vend -= vis; (*p->endline)(p); p->viscol = 0; - if (TERMP_NOBREAK & p->flags) { - vbl = p->rmargin; - vend += p->rmargin - p->offset; - } else - vbl = p->offset; - /* use pending tabs on the new line */ + /* Use pending tabs on the new line. */ - if (0 < ntab) - vbl += ntab * p->tabwidth; + vbl = 0; + 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. * Again, if p->overstep is negative, @@ -230,7 +225,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; @@ -258,7 +253,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; @@ -268,11 +263,14 @@ term_flushln(struct termp *p) * If there was trailing white space, it was not printed; * so reset the cursor position accordingly. */ - if (vis) + if (vis > vbl) vis -= vbl; + else + vis = 0; p->col = 0; p->overstep = 0; + p->flags &= ~(TERMP_BACKAFTER | TERMP_BACKBEFORE); if ( ! (TERMP_NOBREAK & p->flags)) { p->viscol = 0; @@ -281,8 +279,8 @@ term_flushln(struct termp *p) } if (TERMP_HANG & p->flags) { - p->overstep = (int)(vis - maxvis + - p->trailspace * (*p->width)(p, ' ')); + p->overstep += (int)(p->offset + vis - p->rmargin + + p->trailspace * (*p->width)(p, ' ')); /* * If we have overstepped the margin, temporarily move @@ -298,6 +296,10 @@ term_flushln(struct termp *p) } else if (TERMP_DANGLE & p->flags) 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 (maxvis < vis + p->trailspace * (*p->width)(p, ' ')) { (*p->endline)(p); @@ -305,8 +307,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. @@ -320,7 +321,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. @@ -339,6 +339,7 @@ term_vspace(struct termp *p) (*p->endline)(p); } +/* Swap current and previous font; for \fP and .ft P */ void term_fontlast(struct termp *p) { @@ -349,7 +350,7 @@ term_fontlast(struct termp *p) p->fontq[p->fonti] = f; } - +/* Set font, save current, discard previous; for \f, .ft, .B etc. */ void term_fontrepl(struct termp *p, enum termfont f) { @@ -358,43 +359,31 @@ term_fontrepl(struct termp *p, enum termfont f) p->fontq[p->fonti] = f; } - +/* Set font, save previous. */ void term_fontpush(struct termp *p, enum termfont f) { - assert(p->fonti + 1 < 10); p->fontl = p->fontq[p->fonti]; - p->fontq[++p->fonti] = f; + if (++p->fonti == p->fontsz) { + p->fontsz += 8; + p->fontq = mandoc_reallocarray(p->fontq, + p->fontsz, sizeof(*p->fontq)); + } + p->fontq[p->fonti] = f; } - -const void * -term_fontq(struct termp *p) -{ - - return(&p->fontq[p->fonti]); -} - - -enum termfont -term_fonttop(struct termp *p) -{ - - return(p->fontq[p->fonti]); -} - - +/* Flush to make the saved pointer current again. */ void -term_fontpopq(struct termp *p, const void *key) +term_fontpopq(struct termp *p, int i) { - while (p->fonti >= 0 && key < (void *)(p->fontq + p->fonti)) - p->fonti--; - assert(p->fonti >= 0); + assert(i >= 0); + if (p->fonti > i) + p->fonti = i; } - +/* Pop one font off the stack. */ void term_fontpop(struct termp *p) { @@ -411,9 +400,9 @@ term_fontpop(struct termp *p) void term_word(struct termp *p, const char *word) { + struct roffsu su; const char nbrsp[2] = { ASCII_NBRSP, 0 }; const char *seq, *cp; - char c; int sz, uc; size_t ssz; enum mandoc_esc esc; @@ -434,15 +423,11 @@ term_word(struct termp *p, const char *word) else p->flags |= TERMP_NOSPACE; - p->flags &= ~TERMP_SENTENCE; + p->flags &= ~(TERMP_SENTENCE | TERMP_NONEWLINE); + p->skipvsp = 0; while ('\0' != *word) { if ('\\' != *word) { - if (TERMP_SKIPCHAR & p->flags) { - p->flags &= ~TERMP_SKIPCHAR; - word++; - continue; - } if (TERMP_NBRWORD & p->flags) { if (' ' == *word) { encode(p, nbrsp, 1); @@ -460,71 +445,113 @@ 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(seq, sz, &ssz); + if (cp != NULL) + encode(p, cp, ssz); + } else { + uc = mchars_spec2cp(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): - /* FALLTHROUGH */ - case (ESCAPE_FONTROMAN): + continue; + case ESCAPE_FONT: + case ESCAPE_FONTROMAN: term_fontrepl(p, TERMFONT_NONE); - break; - case (ESCAPE_FONTPREV): + continue; + case ESCAPE_FONTPREV: term_fontlast(p); - break; - case (ESCAPE_NOSPACE): - if (TERMP_SKIPCHAR & p->flags) - p->flags &= ~TERMP_SKIPCHAR; - else if ('\0' == *word) - p->flags |= TERMP_NOSPACE; - break; - case (ESCAPE_SKIPCHAR): - p->flags |= TERMP_SKIPCHAR; - break; + continue; + case ESCAPE_NOSPACE: + if (p->flags & TERMP_BACKAFTER) + p->flags &= ~TERMP_BACKAFTER; + else if (*word == '\0') + p->flags |= (TERMP_NOSPACE | TERMP_NONEWLINE); + 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_SKIPCHAR: + p->flags |= TERMP_BACKAFTER; + continue; + case ESCAPE_OVERSTRIKE: + cp = seq + sz; + while (seq < cp) { + if (*seq == '\\') { + mandoc_escape(&seq, NULL, NULL); + continue; + } + encode1(p, *seq++); + if (seq < cp) { + 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->buf[p->col - 1] == '\t')) + p->col -= 2; + 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; } @@ -538,7 +565,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 @@ -561,16 +588,19 @@ encode1(struct termp *p, int c) { enum termfont f; - if (TERMP_SKIPCHAR & p->flags) { - p->flags &= ~TERMP_SKIPCHAR; - return; - } + if (p->col + 7 >= p->maxcols) + adjbuf(p, p->col + 7); - if (p->col + 6 >= p->maxcols) - adjbuf(p, p->col + 6); + f = (c == ASCII_HYPH || c > 127 || isgraph(c)) ? + p->fontq[p->fonti] : TERMFONT_NONE; - f = term_fonttop(p); - + if (p->flags & TERMP_BACKBEFORE) { + if (p->buf[p->col - 1] == ' ' || p->buf[p->col - 1] == '\t') + p->col--; + else + p->buf[p->col++] = 8; + p->flags &= ~TERMP_BACKBEFORE; + } if (TERMFONT_UNDER == f || TERMFONT_BI == f) { p->buf[p->col++] = '_'; p->buf[p->col++] = 8; @@ -583,6 +613,10 @@ encode1(struct termp *p, int c) p->buf[p->col++] = 8; } p->buf[p->col++] = c; + if (p->flags & TERMP_BACKAFTER) { + p->flags |= TERMP_BACKBEFORE; + p->flags &= ~TERMP_BACKAFTER; + } } static void @@ -590,44 +624,64 @@ encode(struct termp *p, const char *word, size_t sz) { size_t i; - if (TERMP_SKIPCHAR & p->flags) { - p->flags &= ~TERMP_SKIPCHAR; - return; - } + if (p->col + 2 + (sz * 5) >= p->maxcols) + adjbuf(p, p->col + 2 + (sz * 5)); - /* - * Encode and buffer a string of characters. If the current - * font mode is unset, buffer directly, else encode then buffer - * character by character. - */ - - if (TERMFONT_NONE == term_fonttop(p)) { - 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++) { if (ASCII_HYPH == word[i] || isgraph((unsigned char)word[i])) encode1(p, word[i]); - else + else { 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; + } + } } } +void +term_setwidth(struct termp *p, const char *wstr) +{ + struct roffsu su; + int iop, width; + + iop = 0; + width = 0; + if (NULL != wstr) { + switch (*wstr) { + case '+': + iop = 1; + wstr++; + break; + case '-': + iop = -1; + wstr++; + break; + default: + break; + } + if (a2roffsu(wstr, &su, SCALE_MAX)) + width = term_hspan(p, &su); + else + iop = 0; + } + (*p->setwidth)(p, iop, width); +} + size_t term_len(const struct termp *p, size_t sz) { - return((*p->width)(p, ' ') * sz); + return (*p->width)(p, ' ') * sz; } static size_t @@ -636,16 +690,16 @@ cond_width(const struct termp *p, int c, int *skip) if (*skip) { (*skip) = 0; - return(0); + return 0; } else - return((*p->width)(p, c)); + return (*p->width)(p, c); } 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, @@ -665,133 +719,150 @@ 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(seq, ssz, &rsz); + if (rhs != NULL) + break; + } else { + uc = mchars_spec2cp(seq, ssz); + if (uc > 0) + sz += cond_width(p, uc, &skip); + } + continue; + case ESCAPE_SKIPCHAR: skip = 1; - break; + continue; + case ESCAPE_OVERSTRIKE: + rsz = 0; + rhs = seq + ssz; + while (seq < rhs) { + if (*seq == '\\') { + mandoc_escape(&seq, NULL, NULL); + continue; + } + i = (*p->width)(p, *seq++); + if (rsz < i) + rsz = i; + } + sz += rsz; + 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): break; default: break; } } - return(sz); + return sz; } -/* ARGSUSED */ -size_t +int term_vspan(const struct termp *p, const struct roffsu *su) { double r; + int ri; switch (su->unit) { - case (SCALE_CM): - r = su->scale * 2; + case SCALE_BU: + r = su->scale / 40.0; break; - case (SCALE_IN): - r = su->scale * 6; + case SCALE_CM: + r = su->scale * 6.0 / 2.54; break; - case (SCALE_PC): + case SCALE_FS: + r = su->scale * 65536.0 / 40.0; + break; + case SCALE_IN: + r = su->scale * 6.0; + break; + case SCALE_MM: + r = su->scale * 0.006; + break; + case SCALE_PC: r = su->scale; break; - case (SCALE_PT): - r = su->scale / 8; + case SCALE_PT: + r = su->scale / 12.0; break; - case (SCALE_MM): - r = su->scale / 1000; + case SCALE_EN: + case SCALE_EM: + r = su->scale * 0.6; break; - case (SCALE_VS): + case SCALE_VS: r = su->scale; break; default: - r = su->scale - 1; - break; + abort(); } - - if (r < 0.0) - r = 0.0; - return(/* LINTED */(size_t) - r); + ri = r > 0.0 ? r + 0.4995 : r - 0.4995; + return ri < 66 ? ri : 1; } -size_t +/* + * Convert a scaling width to basic units, rounding down. + */ +int term_hspan(const struct termp *p, const struct roffsu *su) { - double v; - v = ((*p->hspan)(p, su)); - if (v < 0.0) - v = 0.0; - return((size_t) /* LINTED */ - v); + return (*p->hspan)(p, su); }