version 1.263, 2017/06/04 18:50:35 |
version 1.269, 2017/06/12 19:05:47 |
|
|
#include "main.h" |
#include "main.h" |
|
|
static size_t cond_width(const struct termp *, int, int *); |
static size_t cond_width(const struct termp *, int, int *); |
static void adjbuf(struct termp *p, size_t); |
static void adjbuf(struct termp_col *, size_t); |
static void bufferc(struct termp *, char); |
static void bufferc(struct termp *, char); |
static void encode(struct termp *, const char *, size_t); |
static void encode(struct termp *, const char *, size_t); |
static void encode1(struct termp *, int); |
static void encode1(struct termp *, int); |
|
static void endline(struct termp *); |
|
|
|
|
void |
void |
term_free(struct termp *p) |
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; |
|
} |
|
|
free(p->buf); |
void |
|
term_free(struct termp *p) |
|
{ |
|
for (p->tcol = p->tcols; p->tcol < p->tcols + p->maxtcol; p->tcol++) |
|
free(p->tcol->buf); |
|
free(p->tcols); |
free(p->fontq); |
free(p->fontq); |
free(p); |
free(p); |
} |
} |
Line 93 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->buf */ |
|
int ntab; /* number of tabs to prepend */ |
|
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 */ |
size_t bp; /* visual right border position */ |
size_t bp; /* visual right border position */ |
size_t dv; /* temporary for visual pos calculations */ |
size_t dv; /* temporary for visual pos calculations */ |
size_t j; /* temporary loop index for p->buf */ |
size_t j; /* temporary loop index for p->tcol->buf */ |
size_t jhy; /* last hyph before overflow w/r/t j */ |
size_t jhy; /* last hyph before overflow w/r/t j */ |
size_t maxvis; /* output position of visible boundary */ |
size_t maxvis; /* output position of visible boundary */ |
|
int ntab; /* number of tabs to prepend */ |
|
|
vbl = (p->flags & TERMP_NOPAD) || p->offset < p->viscol ? 0 : |
vbl = (p->flags & TERMP_NOPAD) || p->tcol->offset < p->viscol ? |
p->offset - p->viscol; |
0 : p->tcol->offset - p->viscol; |
if (p->minbl && vbl < p->minbl) |
if (p->minbl && vbl < p->minbl) |
vbl = p->minbl; |
vbl = p->minbl; |
maxvis = p->rmargin > p->viscol + vbl ? |
maxvis = p->tcol->rmargin > p->viscol + vbl ? |
p->rmargin - p->viscol - vbl : 0; |
p->tcol->rmargin - p->viscol - vbl : 0; |
bp = !(p->flags & TERMP_NOBREAK) ? maxvis : |
bp = !(p->flags & TERMP_NOBREAK) ? maxvis : |
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->col) { |
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->col && p->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 137 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->col; j++) { |
jhy = 0; |
if (' ' == p->buf[j] || '\t' == p->buf[j]) |
for (j = p->tcol->col; j < p->tcol->lastcol; j++) { |
|
if (p->tcol->buf[j] == ' ' || p->tcol->buf[j] == '\t') |
break; |
break; |
|
|
/* Back over the last printed character. */ |
/* Back over the last printed character. */ |
if (8 == p->buf[j]) { |
if (p->tcol->buf[j] == '\b') { |
assert(j); |
assert(j); |
vend -= (*p->width)(p, p->buf[j - 1]); |
vend -= (*p->width)(p, p->tcol->buf[j - 1]); |
continue; |
continue; |
} |
} |
|
|
/* Regular word. */ |
/* Regular word. */ |
/* Break at the hyphen point if we overrun. */ |
/* Break at the hyphen point if we overrun. */ |
if (vend > vis && vend < bp && |
if (vend > vis && vend < bp && |
(ASCII_HYPH == p->buf[j] || |
(p->tcol->buf[j] == ASCII_HYPH|| |
ASCII_BREAK == p->buf[j])) |
p->tcol->buf[j] == ASCII_BREAK)) |
jhy = j; |
jhy = j; |
|
|
/* |
/* |
* Hyphenation now decided, put back a real |
* Hyphenation now decided, put back a real |
* hyphen such that we get the correct width. |
* hyphen such that we get the correct width. |
*/ |
*/ |
if (ASCII_HYPH == p->buf[j]) |
if (p->tcol->buf[j] == ASCII_HYPH) |
p->buf[j] = '-'; |
p->tcol->buf[j] = '-'; |
|
|
vend += (*p->width)(p, p->buf[j]); |
vend += (*p->width)(p, p->tcol->buf[j]); |
} |
} |
|
|
/* |
/* |
* 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) { |
|
if (p->flags & TERMP_MULTICOL) |
|
return; |
|
|
|
endline(p); |
vend -= vis; |
vend -= vis; |
(*p->endline)(p); |
|
p->viscol = 0; |
|
|
|
/* Use pending tabs on the new line. */ |
/* Use pending tabs on the new line. */ |
|
|
Line 183 term_flushln(struct termp *p) |
|
Line 205 term_flushln(struct termp *p) |
|
/* Re-establish indentation. */ |
/* Re-establish indentation. */ |
|
|
if (p->flags & TERMP_BRIND) |
if (p->flags & TERMP_BRIND) |
vbl += p->rmargin; |
vbl += p->tcol->rmargin; |
else |
else |
vbl += p->offset; |
vbl += p->tcol->offset; |
maxvis = p->rmargin > vbl ? p->rmargin - vbl : 0; |
maxvis = p->tcol->rmargin > vbl ? |
|
p->tcol->rmargin - vbl : 0; |
bp = !(p->flags & TERMP_NOBREAK) ? maxvis : |
bp = !(p->flags & TERMP_NOBREAK) ? maxvis : |
p->maxrmargin > vbl ? p->maxrmargin - vbl : 0; |
p->maxrmargin > vbl ? p->maxrmargin - vbl : 0; |
} |
} |
|
|
/* Write out the [remaining] word. */ |
/* |
for ( ; i < p->col; 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 ('\t' == p->buf[i]) |
if (p->tcol->buf[p->tcol->col] == '\t') |
break; |
break; |
if (' ' == p->buf[i]) { |
if (p->tcol->buf[p->tcol->col] == ' ') { |
j = i; |
j = p->tcol->col; |
while (i < p->col && ' ' == p->buf[i]) |
while (p->tcol->col < p->tcol->lastcol && |
i++; |
p->tcol->buf[p->tcol->col] == ' ') |
dv = (i - j) * (*p->width)(p, ' '); |
p->tcol->col++; |
|
dv = (p->tcol->col - j) * (*p->width)(p, ' '); |
vbl += dv; |
vbl += dv; |
vend += dv; |
vend += dv; |
break; |
break; |
} |
} |
if (ASCII_NBRSP == p->buf[i]) { |
if (p->tcol->buf[p->tcol->col] == ASCII_NBRSP) { |
vbl += (*p->width)(p, ' '); |
vbl += (*p->width)(p, ' '); |
continue; |
continue; |
} |
} |
if (ASCII_BREAK == p->buf[i]) |
if (p->tcol->buf[p->tcol->col] == ASCII_BREAK) |
continue; |
continue; |
|
|
/* |
/* |
Line 224 term_flushln(struct termp *p) |
|
Line 251 term_flushln(struct termp *p) |
|
vbl = 0; |
vbl = 0; |
} |
} |
|
|
(*p->letter)(p, p->buf[i]); |
(*p->letter)(p, p->tcol->buf[p->tcol->col]); |
if (8 == p->buf[i]) |
if (p->tcol->buf[p->tcol->col] == '\b') |
p->viscol -= (*p->width)(p, p->buf[i-1]); |
p->viscol -= (*p->width)(p, |
|
p->tcol->buf[p->tcol->col - 1]); |
else |
else |
p->viscol += (*p->width)(p, p->buf[i]); |
p->viscol += (*p->width)(p, |
|
p->tcol->buf[p->tcol->col]); |
} |
} |
vis = vend; |
vis = vend; |
} |
} |
Line 237 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 = 0; |
p->col = p->tcol->col = p->tcol->lastcol = 0; |
|
p->minbl = p->trailspace; |
p->flags &= ~(TERMP_BACKAFTER | TERMP_BACKBEFORE | TERMP_NOPAD); |
p->flags &= ~(TERMP_BACKAFTER | TERMP_BACKBEFORE | TERMP_NOPAD); |
|
|
if ( ! (TERMP_NOBREAK & p->flags)) { |
if (p->flags & TERMP_MULTICOL) |
p->viscol = 0; |
|
p->minbl = 0; |
|
(*p->endline)(p); |
|
return; |
return; |
} |
|
|
|
if (TERMP_HANG & p->flags) { |
|
p->minbl = p->trailspace; |
|
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; |
|
|
/* 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 ((p->flags & TERMP_NOBREAK) == 0 || |
(*p->endline)(p); |
((p->flags & TERMP_HANG) == 0 && |
p->viscol = 0; |
vis + p->trailspace * (*p->width)(p, ' ') > maxvis)) |
p->minbl = 0; |
endline(p); |
} else |
|
p->minbl = p->trailspace; |
|
} |
} |
|
|
|
static void |
|
endline(struct termp *p) |
|
{ |
|
if ((p->flags & (TERMP_NEWMC | TERMP_ENDMC)) == TERMP_ENDMC) { |
|
p->mc = NULL; |
|
p->flags &= ~TERMP_ENDMC; |
|
} |
|
if (p->mc != NULL) { |
|
if (p->viscol && p->maxrmargin >= p->viscol) |
|
(*p->advance)(p, p->maxrmargin - p->viscol + 1); |
|
p->flags |= TERMP_NOBUF | TERMP_NOSPACE; |
|
term_word(p, p->mc); |
|
p->flags &= ~(TERMP_NOBUF | TERMP_NEWMC); |
|
} |
|
p->viscol = 0; |
|
p->minbl = 0; |
|
(*p->endline)(p); |
|
} |
|
|
/* |
/* |
* A newline only breaks an existing line; it won't assert vertical |
* 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 |
* space. All data in the output buffer is flushed prior to the newline |
Line 280 term_newln(struct termp *p) |
|
Line 320 term_newln(struct termp *p) |
|
{ |
{ |
|
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
if (p->col || p->viscol) |
if (p->tcol->lastcol || p->viscol) |
term_flushln(p); |
term_flushln(p); |
} |
} |
|
|
Line 296 term_vspace(struct termp *p) |
|
Line 336 term_vspace(struct termp *p) |
|
|
|
term_newln(p); |
term_newln(p); |
p->viscol = 0; |
p->viscol = 0; |
|
p->minbl = 0; |
if (0 < p->skipvsp) |
if (0 < p->skipvsp) |
p->skipvsp--; |
p->skipvsp--; |
else |
else |
Line 370 term_word(struct termp *p, const char *word) |
|
Line 411 term_word(struct termp *p, const char *word) |
|
size_t csz, lsz, ssz; |
size_t csz, lsz, ssz; |
enum mandoc_esc esc; |
enum mandoc_esc esc; |
|
|
if ( ! (TERMP_NOSPACE & p->flags)) { |
if ((p->flags & TERMP_NOBUF) == 0) { |
if ( ! (TERMP_KEEP & p->flags)) { |
if ((p->flags & TERMP_NOSPACE) == 0) { |
bufferc(p, ' '); |
if ((p->flags & TERMP_KEEP) == 0) { |
if (TERMP_SENTENCE & p->flags) |
|
bufferc(p, ' '); |
bufferc(p, ' '); |
} else |
if (p->flags & TERMP_SENTENCE) |
bufferc(p, ASCII_NBRSP); |
bufferc(p, ' '); |
|
} else |
|
bufferc(p, ASCII_NBRSP); |
|
} |
|
if (p->flags & TERMP_PREKEEP) |
|
p->flags |= TERMP_KEEP; |
|
if (p->flags & TERMP_NONOSPACE) |
|
p->flags |= TERMP_NOSPACE; |
|
else |
|
p->flags &= ~TERMP_NOSPACE; |
|
p->flags &= ~(TERMP_SENTENCE | TERMP_NONEWLINE); |
|
p->skipvsp = 0; |
} |
} |
if (TERMP_PREKEEP & p->flags) |
|
p->flags |= TERMP_KEEP; |
|
|
|
if ( ! (p->flags & TERMP_NONOSPACE)) |
|
p->flags &= ~TERMP_NOSPACE; |
|
else |
|
p->flags |= TERMP_NOSPACE; |
|
|
|
p->flags &= ~(TERMP_SENTENCE | TERMP_NONEWLINE); |
|
p->skipvsp = 0; |
|
|
|
while ('\0' != *word) { |
while ('\0' != *word) { |
if ('\\' != *word) { |
if ('\\' != *word) { |
if (TERMP_NBRWORD & p->flags) { |
if (TERMP_NBRWORD & p->flags) { |
Line 453 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 464 term_word(struct termp *p, const char *word) |
|
Line 505 term_word(struct termp *p, const char *word) |
|
else { |
else { |
uc += p->col; |
uc += p->col; |
p->col = 0; |
p->col = 0; |
if (p->offset > (size_t)(-uc)) { |
if (p->tcol->offset > (size_t)(-uc)) { |
p->ti += uc; |
p->ti += uc; |
p->offset += uc; |
p->tcol->offset += uc; |
} else { |
} else { |
p->ti -= p->offset; |
p->ti -= p->tcol->offset; |
p->offset = 0; |
p->tcol->offset = 0; |
} |
} |
} |
} |
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) { |
if (p->rmargin <= p->offset) |
if (p->tcol->rmargin <= p->tcol->offset) |
continue; |
continue; |
lsz = p->rmargin - p->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 548 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->col > 2 && |
if (p->tcol->lastcol > 2 && |
(p->buf[p->col - 1] == ' ' || |
(p->tcol->buf[p->tcol->lastcol - 1] == ' ' || |
p->buf[p->col - 1] == '\t')) |
p->tcol->buf[p->tcol->lastcol - 1] == '\t')) |
p->col -= 2; |
p->tcol->lastcol -= 2; |
|
if (p->col > p->tcol->lastcol) |
|
p->col = p->tcol->lastcol; |
continue; |
continue; |
default: |
default: |
continue; |
continue; |
Line 576 term_word(struct termp *p, const char *word) |
|
Line 610 term_word(struct termp *p, const char *word) |
|
} |
} |
|
|
static void |
static void |
adjbuf(struct termp *p, size_t sz) |
adjbuf(struct termp_col *c, size_t sz) |
{ |
{ |
|
if (c->maxcols == 0) |
if (0 == p->maxcols) |
c->maxcols = 1024; |
p->maxcols = 1024; |
while (c->maxcols <= sz) |
while (sz >= p->maxcols) |
c->maxcols <<= 2; |
p->maxcols <<= 2; |
c->buf = mandoc_reallocarray(c->buf, c->maxcols, sizeof(*c->buf)); |
|
|
p->buf = mandoc_reallocarray(p->buf, p->maxcols, sizeof(int)); |
|
} |
} |
|
|
static void |
static void |
bufferc(struct termp *p, char c) |
bufferc(struct termp *p, char c) |
{ |
{ |
|
if (p->flags & TERMP_NOBUF) { |
if (p->col + 1 >= p->maxcols) |
(*p->letter)(p, c); |
adjbuf(p, p->col + 1); |
return; |
|
} |
p->buf[p->col++] = c; |
if (p->col + 1 >= p->tcol->maxcols) |
|
adjbuf(p->tcol, p->col + 1); |
|
if (p->tcol->lastcol <= p->col || (c != ' ' && c != ASCII_NBRSP)) |
|
p->tcol->buf[p->col] = c; |
|
if (p->tcol->lastcol < ++p->col) |
|
p->tcol->lastcol = p->col; |
} |
} |
|
|
/* |
/* |
Line 607 encode1(struct termp *p, int c) |
|
Line 644 encode1(struct termp *p, int c) |
|
{ |
{ |
enum termfont f; |
enum termfont f; |
|
|
if (p->col + 7 >= p->maxcols) |
if (p->flags & TERMP_NOBUF) { |
adjbuf(p, p->col + 7); |
(*p->letter)(p, c); |
|
return; |
|
} |
|
|
|
if (p->col + 7 >= p->tcol->maxcols) |
|
adjbuf(p->tcol, p->col + 7); |
|
|
f = (c == ASCII_HYPH || c > 127 || 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) { |
if (p->buf[p->col - 1] == ' ' || p->buf[p->col - 1] == '\t') |
if (p->tcol->buf[p->col - 1] == ' ' || |
|
p->tcol->buf[p->col - 1] == '\t') |
p->col--; |
p->col--; |
else |
else |
p->buf[p->col++] = 8; |
p->tcol->buf[p->col++] = '\b'; |
p->flags &= ~TERMP_BACKBEFORE; |
p->flags &= ~TERMP_BACKBEFORE; |
} |
} |
if (TERMFONT_UNDER == f || TERMFONT_BI == f) { |
if (f == TERMFONT_UNDER || f == TERMFONT_BI) { |
p->buf[p->col++] = '_'; |
p->tcol->buf[p->col++] = '_'; |
p->buf[p->col++] = 8; |
p->tcol->buf[p->col++] = '\b'; |
} |
} |
if (TERMFONT_BOLD == f || TERMFONT_BI == f) { |
if (f == TERMFONT_BOLD || f == TERMFONT_BI) { |
if (ASCII_HYPH == c) |
if (c == ASCII_HYPH) |
p->buf[p->col++] = '-'; |
p->tcol->buf[p->col++] = '-'; |
else |
else |
p->buf[p->col++] = c; |
p->tcol->buf[p->col++] = c; |
p->buf[p->col++] = 8; |
p->tcol->buf[p->col++] = '\b'; |
} |
} |
p->buf[p->col++] = c; |
if (p->tcol->lastcol <= p->col || (c != ' ' && c != ASCII_NBRSP)) |
|
p->tcol->buf[p->col] = c; |
|
if (p->tcol->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 643 encode(struct termp *p, const char *word, size_t sz) |
|
Line 689 encode(struct termp *p, const char *word, size_t sz) |
|
{ |
{ |
size_t i; |
size_t i; |
|
|
if (p->col + 2 + (sz * 5) >= p->maxcols) |
if (p->flags & TERMP_NOBUF) { |
adjbuf(p, p->col + 2 + (sz * 5)); |
for (i = 0; i < sz; i++) |
|
(*p->letter)(p, word[i]); |
|
return; |
|
} |
|
|
|
if (p->col + 2 + (sz * 5) >= p->tcol->maxcols) |
|
adjbuf(p->tcol, p->col + 2 + (sz * 5)); |
|
|
for (i = 0; i < sz; i++) { |
for (i = 0; i < sz; i++) { |
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]; |
if (p->tcol->lastcol <= p->col || |
|
(word[i] != ' ' && word[i] != ASCII_NBRSP)) |
|
p->tcol->buf[p->col] = word[i]; |
|
p->col++; |
|
|
/* |
/* |
* Postpone the effect of \z while handling |
* Postpone the effect of \z while handling |
Line 665 encode(struct termp *p, const char *word, size_t sz) |
|
Line 720 encode(struct termp *p, const char *word, size_t sz) |
|
} |
} |
} |
} |
} |
} |
|
if (p->tcol->lastcol < p->col) |
|
p->tcol->lastcol = p->col; |
} |
} |
|
|
void |
void |
Line 688 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; |