=================================================================== RCS file: /cvs/mandoc/term.c,v retrieving revision 1.266 retrieving revision 1.272 diff -u -p -r1.266 -r1.272 --- mandoc/term.c 2017/06/07 17:38:26 1.266 +++ mandoc/term.c 2017/06/14 18:23:37 1.272 @@ -1,4 +1,4 @@ -/* $Id: term.c,v 1.266 2017/06/07 17:38:26 schwarze Exp $ */ +/* $Id: term.c,v 1.272 2017/06/14 18:23:37 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010-2017 Ingo Schwarze @@ -40,6 +40,18 @@ static void endline(struct termp *); void +term_setcol(struct termp *p, size_t maxtcol) +{ + if (maxtcol > p->maxtcol) { + p->tcols = mandoc_recallocarray(p->tcols, + p->maxtcol, maxtcol, sizeof(*p->tcols)); + p->maxtcol = maxtcol; + } + p->lasttcol = maxtcol - 1; + p->tcol = p->tcols; +} + +void term_free(struct termp *p) { for (p->tcol = p->tcols; p->tcol < p->tcols + p->maxtcol; p->tcol++) @@ -95,7 +107,6 @@ term_end(struct termp *p) void term_flushln(struct termp *p) { - size_t i; /* current input position in p->tcol->buf */ size_t vis; /* current visual position on output */ size_t vbl; /* number of blanks to prepend to output */ size_t vend; /* end of word visual position on output */ @@ -105,6 +116,7 @@ term_flushln(struct termp *p) size_t jhy; /* last hyph before overflow w/r/t j */ size_t maxvis; /* output position of visible boundary */ int ntab; /* number of tabs to prepend */ + int breakline; /* after this word */ vbl = (p->flags & TERMP_NOPAD) || p->tcol->offset < p->viscol ? 0 : p->tcol->offset - p->viscol; @@ -116,20 +128,24 @@ term_flushln(struct termp *p) p->maxrmargin > p->viscol + vbl ? p->maxrmargin - p->viscol - vbl : 0; vis = vend = 0; - i = 0; - while (i < p->lastcol) { + if ((p->flags && TERMP_MULTICOL) == 0) + p->tcol->col = 0; + while (p->tcol->col < p->tcol->lastcol) { + /* * Handle literal tab characters: collapse all * subsequent tabs into a single huge set of spaces. */ + ntab = 0; - while (i < p->lastcol && p->tcol->buf[i] == '\t') { + while (p->tcol->col < p->tcol->lastcol && + p->tcol->buf[p->tcol->col] == '\t') { vend = term_tab_next(vis); vbl += vend - vis; vis = vend; ntab++; - i++; + p->tcol->col++; } /* @@ -139,7 +155,14 @@ term_flushln(struct termp *p) * space is printed according to regular spacing rules). */ - for (j = i, jhy = 0; j < p->lastcol; j++) { + jhy = 0; + breakline = 0; + for (j = p->tcol->col; j < p->tcol->lastcol; j++) { + if (p->tcol->buf[j] == '\n') { + if ((p->flags & TERMP_BRIND) == 0) + breakline = 1; + continue; + } if (p->tcol->buf[j] == ' ' || p->tcol->buf[j] == '\t') break; @@ -171,10 +194,14 @@ term_flushln(struct termp *p) * Find out whether we would exceed the right margin. * If so, break to the next line. */ - if (vend > bp && 0 == jhy && vis > 0 && + + if (vend > bp && jhy == 0 && vis > 0 && (p->flags & TERMP_BRNEVER) == 0) { - vend -= vis; + if (p->flags & TERMP_MULTICOL) + return; + endline(p); + vend -= vis; /* Use pending tabs on the new line. */ @@ -194,27 +221,32 @@ term_flushln(struct termp *p) p->maxrmargin > vbl ? p->maxrmargin - vbl : 0; } - /* Write out the [remaining] word. */ - for ( ; i < p->lastcol; i++) { - if (vend > bp && jhy > 0 && i > jhy) + /* + * Write out the rest of the word. + */ + + for ( ; p->tcol->col < p->tcol->lastcol; p->tcol->col++) { + if (vend > bp && jhy > 0 && p->tcol->col > jhy) break; - if (p->tcol->buf[i] == '\t') + if (p->tcol->buf[p->tcol->col] == '\n') + continue; + if (p->tcol->buf[p->tcol->col] == '\t') break; - if (p->tcol->buf[i] == ' ') { - j = i; - while (i < p->lastcol && - p->tcol->buf[i] == ' ') - i++; - dv = (i - j) * (*p->width)(p, ' '); + if (p->tcol->buf[p->tcol->col] == ' ') { + j = p->tcol->col; + while (p->tcol->col < p->tcol->lastcol && + p->tcol->buf[p->tcol->col] == ' ') + p->tcol->col++; + dv = (p->tcol->col - j) * (*p->width)(p, ' '); vbl += dv; vend += dv; break; } - if (p->tcol->buf[i] == ASCII_NBRSP) { + if (p->tcol->buf[p->tcol->col] == ASCII_NBRSP) { vbl += (*p->width)(p, ' '); continue; } - if (p->tcol->buf[i] == ASCII_BREAK) + if (p->tcol->buf[p->tcol->col] == ASCII_BREAK) continue; /* @@ -228,29 +260,56 @@ term_flushln(struct termp *p) vbl = 0; } - (*p->letter)(p, p->tcol->buf[i]); - if (p->tcol->buf[i] == '\b') - p->viscol -= (*p->width)(p, p->tcol->buf[i-1]); + (*p->letter)(p, p->tcol->buf[p->tcol->col]); + if (p->tcol->buf[p->tcol->col] == '\b') + p->viscol -= (*p->width)(p, + p->tcol->buf[p->tcol->col - 1]); else - p->viscol += (*p->width)(p, p->tcol->buf[i]); + p->viscol += (*p->width)(p, + p->tcol->buf[p->tcol->col]); } vis = vend; + + if (breakline == 0) + continue; + + /* Explicitly requested output line break. */ + + if (p->flags & TERMP_MULTICOL) + return; + + endline(p); + breakline = 0; + vis = vend = 0; + + /* Re-establish indentation. */ + + vbl = p->tcol->offset; + maxvis = p->tcol->rmargin > vbl ? + p->tcol->rmargin - vbl : 0; + bp = !(p->flags & TERMP_NOBREAK) ? maxvis : + p->maxrmargin > vbl ? p->maxrmargin - vbl : 0; } /* * If there was trailing white space, it was not printed; * so reset the cursor position accordingly. */ + if (vis > vbl) vis -= vbl; else vis = 0; - p->col = p->lastcol = 0; + p->col = p->tcol->col = p->tcol->lastcol = 0; p->minbl = p->trailspace; p->flags &= ~(TERMP_BACKAFTER | TERMP_BACKBEFORE | TERMP_NOPAD); + if (p->flags & TERMP_MULTICOL) + return; + /* Trailing whitespace is significant in some columns. */ + if (vis && vbl && (TERMP_BRTRSP & p->flags)) vis += vbl; @@ -290,7 +349,7 @@ term_newln(struct termp *p) { p->flags |= TERMP_NOSPACE; - if (p->lastcol || p->viscol) + if (p->tcol->lastcol || p->viscol) term_flushln(p); } @@ -457,6 +516,9 @@ term_word(struct termp *p, const char *word) case ESCAPE_FONTPREV: term_fontlast(p); continue; + case ESCAPE_BREAK: + bufferc(p, '\n'); + continue; case ESCAPE_NOSPACE: if (p->flags & TERMP_BACKAFTER) p->flags &= ~TERMP_BACKAFTER; @@ -464,9 +526,9 @@ term_word(struct termp *p, const char *word) p->flags |= (TERMP_NOSPACE | TERMP_NONEWLINE); continue; case ESCAPE_HORIZ: - if (a2roffsu(seq, &su, SCALE_EM) == 0) + if (a2roffsu(seq, &su, SCALE_EM) == NULL) continue; - uc = term_hspan(p, &su) / 24; + uc = term_hen(p, &su); if (uc > 0) while (uc-- > 0) bufferc(p, ASCII_NBRSP); @@ -485,28 +547,19 @@ term_word(struct termp *p, const char *word) } continue; case ESCAPE_HLINE: - if (a2roffsu(seq, &su, SCALE_EM) == 0) + if ((cp = a2roffsu(seq, &su, SCALE_EM)) == NULL) continue; - uc = term_hspan(p, &su) / 24; + uc = term_hen(p, &su); if (uc <= 0) { if (p->tcol->rmargin <= p->tcol->offset) continue; lsz = p->tcol->rmargin - p->tcol->offset; } else lsz = uc; - while (sz && - strchr(" %&()*+-./0123456789:<=>", *seq)) { - seq++; - sz--; - } - if (sz && strchr("cifMmnPpuv", *seq)) { - seq++; - sz--; - } - if (sz == 0) + if (*cp == seq[-1]) uc = -1; - else if (*seq == '\\') { - seq++; + else if (*cp == '\\') { + seq = cp + 1; esc = mandoc_escape(&seq, &cp, &sz); switch (esc) { case ESCAPE_UNICODE: @@ -523,7 +576,7 @@ term_word(struct termp *p, const char *word) break; } } else - uc = *seq; + uc = *cp; if (uc < 0x20 || (uc > 0x7E && uc < 0xA0)) uc = '_'; if (p->enc == TERMENC_ASCII) { @@ -559,12 +612,12 @@ term_word(struct termp *p, const char *word) } } /* Trim trailing backspace/blank pair. */ - if (p->lastcol > 2 && - (p->tcol->buf[p->lastcol - 1] == ' ' || - p->tcol->buf[p->lastcol - 1] == '\t')) - p->lastcol -= 2; - if (p->col > p->lastcol) - p->col = p->lastcol; + if (p->tcol->lastcol > 2 && + (p->tcol->buf[p->tcol->lastcol - 1] == ' ' || + p->tcol->buf[p->tcol->lastcol - 1] == '\t')) + p->tcol->lastcol -= 2; + if (p->col > p->tcol->lastcol) + p->col = p->tcol->lastcol; continue; default: continue; @@ -607,10 +660,10 @@ bufferc(struct termp *p, char c) } if (p->col + 1 >= p->tcol->maxcols) adjbuf(p->tcol, p->col + 1); - if (p->lastcol <= p->col || (c != ' ' && c != ASCII_NBRSP)) + if (p->tcol->lastcol <= p->col || (c != ' ' && c != ASCII_NBRSP)) p->tcol->buf[p->col] = c; - if (p->lastcol < ++p->col) - p->lastcol = p->col; + if (p->tcol->lastcol < ++p->col) + p->tcol->lastcol = p->col; } /* @@ -653,10 +706,10 @@ encode1(struct termp *p, int c) p->tcol->buf[p->col++] = c; p->tcol->buf[p->col++] = '\b'; } - if (p->lastcol <= p->col || (c != ' ' && c != ASCII_NBRSP)) + if (p->tcol->lastcol <= p->col || (c != ' ' && c != ASCII_NBRSP)) p->tcol->buf[p->col] = c; - if (p->lastcol < ++p->col) - p->lastcol = p->col; + if (p->tcol->lastcol < ++p->col) + p->tcol->lastcol = p->col; if (p->flags & TERMP_BACKAFTER) { p->flags |= TERMP_BACKBEFORE; p->flags &= ~TERMP_BACKAFTER; @@ -682,7 +735,7 @@ encode(struct termp *p, const char *word, size_t sz) isgraph((unsigned char)word[i])) encode1(p, word[i]); else { - if (p->lastcol <= p->col || + if (p->tcol->lastcol <= p->col || (word[i] != ' ' && word[i] != ASCII_NBRSP)) p->tcol->buf[p->col] = word[i]; p->col++; @@ -699,8 +752,8 @@ encode(struct termp *p, const char *word, size_t sz) } } } - if (p->lastcol < p->col) - p->lastcol = p->col; + if (p->tcol->lastcol < p->col) + p->tcol->lastcol = p->col; } void @@ -724,7 +777,7 @@ term_setwidth(struct termp *p, const char *wstr) default: break; } - if (a2roffsu(wstr, &su, SCALE_MAX)) + if (a2roffsu(wstr, &su, SCALE_MAX) != NULL) width = term_hspan(p, &su); else iop = 0; @@ -913,11 +966,25 @@ term_vspan(const struct termp *p, const struct roffsu } /* - * Convert a scaling width to basic units, rounding down. + * Convert a scaling width to basic units, rounding towards 0. */ int term_hspan(const struct termp *p, const struct roffsu *su) { return (*p->hspan)(p, su); +} + +/* + * Convert a scaling width to basic units, rounding to closest. + */ +int +term_hen(const struct termp *p, const struct roffsu *su) +{ + int bu; + + if ((bu = (*p->hspan)(p, su)) >= 0) + return (bu + 11) / 24; + else + return -((-bu + 11) / 24); }