version 1.266, 2017/06/07 17:38:26 |
version 1.269, 2017/06/12 19:05:47 |
Line 40 static void endline(struct termp *); |
|
Line 40 static void endline(struct termp *); |
|
|
|
|
|
void |
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) |
term_free(struct termp *p) |
{ |
{ |
for (p->tcol = p->tcols; p->tcol < p->tcols + p->maxtcol; p->tcol++) |
for (p->tcol = p->tcols; p->tcol < p->tcols + p->maxtcol; p->tcol++) |
Line 95 term_end(struct termp *p) |
|
Line 107 term_end(struct termp *p) |
|
void |
void |
term_flushln(struct termp *p) |
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 vis; /* current visual position on output */ |
size_t vbl; /* number of blanks to prepend to output */ |
size_t vbl; /* number of blanks to prepend to output */ |
size_t vend; /* end of word visual position on output */ |
size_t vend; /* end of word visual position on output */ |
Line 116 term_flushln(struct termp *p) |
|
Line 127 term_flushln(struct termp *p) |
|
p->maxrmargin > p->viscol + vbl ? |
p->maxrmargin > p->viscol + vbl ? |
p->maxrmargin - p->viscol - vbl : 0; |
p->maxrmargin - p->viscol - vbl : 0; |
vis = vend = 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 |
* Handle literal tab characters: collapse all |
* 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->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); |
vend = term_tab_next(vis); |
vbl += vend - vis; |
vbl += vend - vis; |
vis = vend; |
vis = vend; |
ntab++; |
ntab++; |
i++; |
p->tcol->col++; |
} |
} |
|
|
/* |
/* |
Line 139 term_flushln(struct termp *p) |
|
Line 154 term_flushln(struct termp *p) |
|
* space is printed according to regular spacing rules). |
* space is printed according to regular spacing rules). |
*/ |
*/ |
|
|
for (j = i, jhy = 0; j < p->lastcol; j++) { |
jhy = 0; |
|
for (j = p->tcol->col; j < p->tcol->lastcol; j++) { |
if (p->tcol->buf[j] == ' ' || p->tcol->buf[j] == '\t') |
if (p->tcol->buf[j] == ' ' || p->tcol->buf[j] == '\t') |
break; |
break; |
|
|
Line 171 term_flushln(struct termp *p) |
|
Line 187 term_flushln(struct termp *p) |
|
* Find out whether we would exceed the right margin. |
* Find out whether we would exceed the right margin. |
* If so, break to the next line. |
* 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) { |
(p->flags & TERMP_BRNEVER) == 0) { |
vend -= vis; |
if (p->flags & TERMP_MULTICOL) |
|
return; |
|
|
endline(p); |
endline(p); |
|
vend -= vis; |
|
|
/* Use pending tabs on the new line. */ |
/* Use pending tabs on the new line. */ |
|
|
Line 194 term_flushln(struct termp *p) |
|
Line 214 term_flushln(struct termp *p) |
|
p->maxrmargin > vbl ? p->maxrmargin - vbl : 0; |
p->maxrmargin > vbl ? p->maxrmargin - vbl : 0; |
} |
} |
|
|
/* Write out the [remaining] word. */ |
/* |
for ( ; i < p->lastcol; i++) { |
* Write out the rest of the word. |
if (vend > bp && jhy > 0 && i > jhy) |
*/ |
|
|
|
for ( ; p->tcol->col < p->tcol->lastcol; p->tcol->col++) { |
|
if (vend > bp && jhy > 0 && p->tcol->col > jhy) |
break; |
break; |
if (p->tcol->buf[i] == '\t') |
if (p->tcol->buf[p->tcol->col] == '\t') |
break; |
break; |
if (p->tcol->buf[i] == ' ') { |
if (p->tcol->buf[p->tcol->col] == ' ') { |
j = i; |
j = p->tcol->col; |
while (i < p->lastcol && |
while (p->tcol->col < p->tcol->lastcol && |
p->tcol->buf[i] == ' ') |
p->tcol->buf[p->tcol->col] == ' ') |
i++; |
p->tcol->col++; |
dv = (i - j) * (*p->width)(p, ' '); |
dv = (p->tcol->col - j) * (*p->width)(p, ' '); |
vbl += dv; |
vbl += dv; |
vend += dv; |
vend += dv; |
break; |
break; |
} |
} |
if (p->tcol->buf[i] == ASCII_NBRSP) { |
if (p->tcol->buf[p->tcol->col] == ASCII_NBRSP) { |
vbl += (*p->width)(p, ' '); |
vbl += (*p->width)(p, ' '); |
continue; |
continue; |
} |
} |
if (p->tcol->buf[i] == ASCII_BREAK) |
if (p->tcol->buf[p->tcol->col] == ASCII_BREAK) |
continue; |
continue; |
|
|
/* |
/* |
Line 228 term_flushln(struct termp *p) |
|
Line 251 term_flushln(struct termp *p) |
|
vbl = 0; |
vbl = 0; |
} |
} |
|
|
(*p->letter)(p, p->tcol->buf[i]); |
(*p->letter)(p, p->tcol->buf[p->tcol->col]); |
if (p->tcol->buf[i] == '\b') |
if (p->tcol->buf[p->tcol->col] == '\b') |
p->viscol -= (*p->width)(p, p->tcol->buf[i-1]); |
p->viscol -= (*p->width)(p, |
|
p->tcol->buf[p->tcol->col - 1]); |
else |
else |
p->viscol += (*p->width)(p, p->tcol->buf[i]); |
p->viscol += (*p->width)(p, |
|
p->tcol->buf[p->tcol->col]); |
} |
} |
vis = vend; |
vis = vend; |
} |
} |
Line 241 term_flushln(struct termp *p) |
|
Line 266 term_flushln(struct termp *p) |
|
* If there was trailing white space, it was not printed; |
* If there was trailing white space, it was not printed; |
* so reset the cursor position accordingly. |
* so reset the cursor position accordingly. |
*/ |
*/ |
|
|
if (vis > vbl) |
if (vis > vbl) |
vis -= vbl; |
vis -= vbl; |
else |
else |
vis = 0; |
vis = 0; |
|
|
p->col = p->lastcol = 0; |
p->col = p->tcol->col = p->tcol->lastcol = 0; |
p->minbl = p->trailspace; |
p->minbl = p->trailspace; |
p->flags &= ~(TERMP_BACKAFTER | TERMP_BACKBEFORE | TERMP_NOPAD); |
p->flags &= ~(TERMP_BACKAFTER | TERMP_BACKBEFORE | TERMP_NOPAD); |
|
|
|
if (p->flags & TERMP_MULTICOL) |
|
return; |
|
|
/* Trailing whitespace is significant in some columns. */ |
/* Trailing whitespace is significant in some columns. */ |
|
|
if (vis && vbl && (TERMP_BRTRSP & p->flags)) |
if (vis && vbl && (TERMP_BRTRSP & p->flags)) |
vis += vbl; |
vis += vbl; |
|
|
Line 290 term_newln(struct termp *p) |
|
Line 320 term_newln(struct termp *p) |
|
{ |
{ |
|
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
if (p->lastcol || p->viscol) |
if (p->tcol->lastcol || p->viscol) |
term_flushln(p); |
term_flushln(p); |
} |
} |
|
|
Line 464 term_word(struct termp *p, const char *word) |
|
Line 494 term_word(struct termp *p, const char *word) |
|
p->flags |= (TERMP_NOSPACE | TERMP_NONEWLINE); |
p->flags |= (TERMP_NOSPACE | TERMP_NONEWLINE); |
continue; |
continue; |
case ESCAPE_HORIZ: |
case ESCAPE_HORIZ: |
if (a2roffsu(seq, &su, SCALE_EM) == 0) |
if (a2roffsu(seq, &su, SCALE_EM) == NULL) |
continue; |
continue; |
uc = term_hspan(p, &su) / 24; |
uc = term_hspan(p, &su) / 24; |
if (uc > 0) |
if (uc > 0) |
Line 485 term_word(struct termp *p, const char *word) |
|
Line 515 term_word(struct termp *p, const char *word) |
|
} |
} |
continue; |
continue; |
case ESCAPE_HLINE: |
case ESCAPE_HLINE: |
if (a2roffsu(seq, &su, SCALE_EM) == 0) |
if ((seq = a2roffsu(seq, &su, SCALE_EM)) == NULL) |
continue; |
continue; |
uc = term_hspan(p, &su) / 24; |
uc = term_hspan(p, &su) / 24; |
if (uc <= 0) { |
if (uc <= 0) { |
Line 494 term_word(struct termp *p, const char *word) |
|
Line 524 term_word(struct termp *p, const char *word) |
|
lsz = p->tcol->rmargin - p->tcol->offset; |
lsz = p->tcol->rmargin - p->tcol->offset; |
} else |
} else |
lsz = uc; |
lsz = uc; |
while (sz && |
if (*seq == '\0') |
strchr(" %&()*+-./0123456789:<=>", *seq)) { |
|
seq++; |
|
sz--; |
|
} |
|
if (sz && strchr("cifMmnPpuv", *seq)) { |
|
seq++; |
|
sz--; |
|
} |
|
if (sz == 0) |
|
uc = -1; |
uc = -1; |
else if (*seq == '\\') { |
else if (*seq == '\\') { |
seq++; |
seq++; |
Line 559 term_word(struct termp *p, const char *word) |
|
Line 580 term_word(struct termp *p, const char *word) |
|
} |
} |
} |
} |
/* Trim trailing backspace/blank pair. */ |
/* Trim trailing backspace/blank pair. */ |
if (p->lastcol > 2 && |
if (p->tcol->lastcol > 2 && |
(p->tcol->buf[p->lastcol - 1] == ' ' || |
(p->tcol->buf[p->tcol->lastcol - 1] == ' ' || |
p->tcol->buf[p->lastcol - 1] == '\t')) |
p->tcol->buf[p->tcol->lastcol - 1] == '\t')) |
p->lastcol -= 2; |
p->tcol->lastcol -= 2; |
if (p->col > p->lastcol) |
if (p->col > p->tcol->lastcol) |
p->col = p->lastcol; |
p->col = p->tcol->lastcol; |
continue; |
continue; |
default: |
default: |
continue; |
continue; |
Line 607 bufferc(struct termp *p, char c) |
|
Line 628 bufferc(struct termp *p, char c) |
|
} |
} |
if (p->col + 1 >= p->tcol->maxcols) |
if (p->col + 1 >= p->tcol->maxcols) |
adjbuf(p->tcol, p->col + 1); |
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; |
p->tcol->buf[p->col] = c; |
if (p->lastcol < ++p->col) |
if (p->tcol->lastcol < ++p->col) |
p->lastcol = p->col; |
p->tcol->lastcol = p->col; |
} |
} |
|
|
/* |
/* |
Line 653 encode1(struct termp *p, int c) |
|
Line 674 encode1(struct termp *p, int c) |
|
p->tcol->buf[p->col++] = c; |
p->tcol->buf[p->col++] = c; |
p->tcol->buf[p->col++] = '\b'; |
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; |
p->tcol->buf[p->col] = c; |
if (p->lastcol < ++p->col) |
if (p->tcol->lastcol < ++p->col) |
p->lastcol = p->col; |
p->tcol->lastcol = p->col; |
if (p->flags & TERMP_BACKAFTER) { |
if (p->flags & TERMP_BACKAFTER) { |
p->flags |= TERMP_BACKBEFORE; |
p->flags |= TERMP_BACKBEFORE; |
p->flags &= ~TERMP_BACKAFTER; |
p->flags &= ~TERMP_BACKAFTER; |
Line 682 encode(struct termp *p, const char *word, size_t sz) |
|
Line 703 encode(struct termp *p, const char *word, size_t sz) |
|
isgraph((unsigned char)word[i])) |
isgraph((unsigned char)word[i])) |
encode1(p, word[i]); |
encode1(p, word[i]); |
else { |
else { |
if (p->lastcol <= p->col || |
if (p->tcol->lastcol <= p->col || |
(word[i] != ' ' && word[i] != ASCII_NBRSP)) |
(word[i] != ' ' && word[i] != ASCII_NBRSP)) |
p->tcol->buf[p->col] = word[i]; |
p->tcol->buf[p->col] = word[i]; |
p->col++; |
p->col++; |
Line 699 encode(struct termp *p, const char *word, size_t sz) |
|
Line 720 encode(struct termp *p, const char *word, size_t sz) |
|
} |
} |
} |
} |
} |
} |
if (p->lastcol < p->col) |
if (p->tcol->lastcol < p->col) |
p->lastcol = p->col; |
p->tcol->lastcol = p->col; |
} |
} |
|
|
void |
void |
Line 724 term_setwidth(struct termp *p, const char *wstr) |
|
Line 745 term_setwidth(struct termp *p, const char *wstr) |
|
default: |
default: |
break; |
break; |
} |
} |
if (a2roffsu(wstr, &su, SCALE_MAX)) |
if (a2roffsu(wstr, &su, SCALE_MAX) != NULL) |
width = term_hspan(p, &su); |
width = term_hspan(p, &su); |
else |
else |
iop = 0; |
iop = 0; |