version 1.251, 2015/09/26 00:54:04 |
version 1.266, 2017/06/07 17:38:26 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010-2017 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
|
|
#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_free(struct termp *p) |
{ |
{ |
|
for (p->tcol = p->tcols; p->tcol < p->tcols + p->maxtcol; p->tcol++) |
free(p->buf); |
free(p->tcol->buf); |
|
free(p->tcols); |
free(p->fontq); |
free(p->fontq); |
free(p); |
free(p); |
} |
} |
Line 84 term_end(struct termp *p) |
|
Line 86 term_end(struct termp *p) |
|
* to be broken, start the next line at the right margin instead |
* to be broken, start the next line at the right margin instead |
* of at the offset. Used together with TERMP_NOBREAK for the tags |
* of at the offset. Used together with TERMP_NOBREAK for the tags |
* in various kinds of tagged lists. |
* in various kinds of tagged lists. |
* - TERMP_DANGLE: Do not break the output line at the right margin, |
* - TERMP_HANG: Do not break the output line at the right margin, |
* append the next chunk after it even if this one is too long. |
* append the next chunk after it even if this one is too long. |
* To be used together with TERMP_NOBREAK. |
* To be used together with TERMP_NOBREAK. |
* - TERMP_HANG: Like TERMP_DANGLE, and also suppress padding before |
* - TERMP_NOPAD: Start writing at the current position, |
* the next chunk if this column is not full. |
* do not pad with blank characters up to the offset. |
*/ |
*/ |
void |
void |
term_flushln(struct termp *p) |
term_flushln(struct termp *p) |
{ |
{ |
size_t i; /* current input position in p->buf */ |
size_t i; /* current input position in p->tcol->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->tcol->offset < p->viscol ? |
* First, establish the maximum columns of "visible" content. |
0 : p->tcol->offset - p->viscol; |
* This is usually the difference between the right-margin and |
if (p->minbl && vbl < p->minbl) |
* an indentation, but can be, for tagged lists or columns, a |
vbl = p->minbl; |
* small set of values. |
maxvis = p->tcol->rmargin > p->viscol + vbl ? |
* |
p->tcol->rmargin - p->viscol - vbl : 0; |
* The following unsigned-signed subtractions look strange, |
bp = !(p->flags & TERMP_NOBREAK) ? maxvis : |
* but they are actually correct. If the int p->overstep |
p->maxrmargin > p->viscol + vbl ? |
* is negative, it gets sign extended. Subtracting that |
p->maxrmargin - p->viscol - vbl : 0; |
* very large size_t effectively adds a small number to dv. |
|
*/ |
|
dv = p->rmargin > p->offset ? p->rmargin - p->offset : 0; |
|
maxvis = (int)dv > p->overstep ? dv - (size_t)p->overstep : 0; |
|
|
|
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. |
|
*/ |
|
vbl = p->offset + p->overstep > p->viscol ? |
|
p->offset + p->overstep - p->viscol : 0; |
|
|
|
vis = vend = 0; |
vis = vend = 0; |
i = 0; |
i = 0; |
|
|
while (i < p->col) { |
while (i < p->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 && '\t' == p->buf[i]) { |
while (i < p->lastcol && p->tcol->buf[i] == '\t') { |
vend = (vis / p->tabwidth + 1) * p->tabwidth; |
vend = term_tab_next(vis); |
vbl += vend - vis; |
vbl += vend - vis; |
vis = vend; |
vis = vend; |
ntab++; |
ntab++; |
Line 156 term_flushln(struct termp *p) |
|
Line 139 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++) { |
for (j = i, jhy = 0; j < p->lastcol; j++) { |
if (' ' == p->buf[j] || '\t' == p->buf[j]) |
if (p->tcol->buf[j] == ' ' || p->tcol->buf[j] == '\t') |
break; |
break; |
|
|
/* Back over the 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 && 0 == jhy && vis > 0 && |
|
(p->flags & TERMP_BRNEVER) == 0) { |
vend -= vis; |
vend -= vis; |
(*p->endline)(p); |
endline(p); |
p->viscol = 0; |
|
if (TERMP_BRIND & p->flags) { |
|
vbl = p->rmargin; |
|
vend += p->rmargin; |
|
vend -= p->offset; |
|
} else |
|
vbl = p->offset; |
|
|
|
/* use pending tabs on the new line */ |
/* Use pending tabs on the new line. */ |
|
|
if (0 < ntab) |
vbl = 0; |
vbl += ntab * p->tabwidth; |
while (ntab--) |
|
vbl = term_tab_next(vbl); |
|
|
/* |
/* Re-establish indentation. */ |
* Remove the p->overstep width. |
|
* Again, if p->overstep is negative, |
|
* sign extension does the right thing. |
|
*/ |
|
|
|
bp += (size_t)p->overstep; |
if (p->flags & TERMP_BRIND) |
p->overstep = 0; |
vbl += p->tcol->rmargin; |
|
else |
|
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; |
} |
} |
|
|
/* Write out the [remaining] word. */ |
/* Write out the [remaining] word. */ |
for ( ; i < p->col; i++) { |
for ( ; i < p->lastcol; i++) { |
if (vend > bp && jhy > 0 && i > jhy) |
if (vend > bp && jhy > 0 && i > jhy) |
break; |
break; |
if ('\t' == p->buf[i]) |
if (p->tcol->buf[i] == '\t') |
break; |
break; |
if (' ' == p->buf[i]) { |
if (p->tcol->buf[i] == ' ') { |
j = i; |
j = i; |
while (i < p->col && ' ' == p->buf[i]) |
while (i < p->lastcol && |
|
p->tcol->buf[i] == ' ') |
i++; |
i++; |
dv = (i - j) * (*p->width)(p, ' '); |
dv = (i - j) * (*p->width)(p, ' '); |
vbl += dv; |
vbl += dv; |
vend += dv; |
vend += dv; |
break; |
break; |
} |
} |
if (ASCII_NBRSP == p->buf[i]) { |
if (p->tcol->buf[i] == ASCII_NBRSP) { |
vbl += (*p->width)(p, ' '); |
vbl += (*p->width)(p, ' '); |
continue; |
continue; |
} |
} |
if (ASCII_BREAK == p->buf[i]) |
if (p->tcol->buf[i] == ASCII_BREAK) |
continue; |
continue; |
|
|
/* |
/* |
Line 247 term_flushln(struct termp *p) |
|
Line 228 term_flushln(struct termp *p) |
|
vbl = 0; |
vbl = 0; |
} |
} |
|
|
(*p->letter)(p, p->buf[i]); |
(*p->letter)(p, p->tcol->buf[i]); |
if (8 == p->buf[i]) |
if (p->tcol->buf[i] == '\b') |
p->viscol -= (*p->width)(p, p->buf[i-1]); |
p->viscol -= (*p->width)(p, p->tcol->buf[i-1]); |
else |
else |
p->viscol += (*p->width)(p, p->buf[i]); |
p->viscol += (*p->width)(p, p->tcol->buf[i]); |
} |
} |
vis = vend; |
vis = vend; |
} |
} |
Line 265 term_flushln(struct termp *p) |
|
Line 246 term_flushln(struct termp *p) |
|
else |
else |
vis = 0; |
vis = 0; |
|
|
p->col = 0; |
p->col = p->lastcol = 0; |
p->overstep = 0; |
p->minbl = p->trailspace; |
p->flags &= ~(TERMP_BACKAFTER | TERMP_BACKBEFORE); |
p->flags &= ~(TERMP_BACKAFTER | TERMP_BACKBEFORE | TERMP_NOPAD); |
|
|
if ( ! (TERMP_NOBREAK & p->flags)) { |
|
p->viscol = 0; |
|
(*p->endline)(p); |
|
return; |
|
} |
|
|
|
if (TERMP_HANG & p->flags) { |
|
p->overstep += (int)(p->offset + vis - p->rmargin + |
|
p->trailspace * (*p->width)(p, ' ')); |
|
|
|
/* |
|
* If we have overstepped the margin, temporarily move |
|
* it to the right and flag the rest of the line to be |
|
* shorter. |
|
* If there is a request to keep the columns together, |
|
* allow negative overstep when the column is not full. |
|
*/ |
|
if (p->trailspace && p->overstep < 0) |
|
p->overstep = 0; |
|
return; |
|
|
|
} else if (TERMP_DANGLE & p->flags) |
|
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)) |
|
endline(p); |
|
} |
|
|
|
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); |
} |
} |
|
|
/* |
/* |
Line 314 term_newln(struct termp *p) |
|
Line 290 term_newln(struct termp *p) |
|
{ |
{ |
|
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
if (p->col || p->viscol) |
if (p->lastcol || p->viscol) |
term_flushln(p); |
term_flushln(p); |
} |
} |
|
|
Line 330 term_vspace(struct termp *p) |
|
Line 306 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 365 term_fontpush(struct termp *p, enum termfont f) |
|
Line 342 term_fontpush(struct termp *p, enum termfont f) |
|
if (++p->fonti == p->fontsz) { |
if (++p->fonti == p->fontsz) { |
p->fontsz += 8; |
p->fontsz += 8; |
p->fontq = mandoc_reallocarray(p->fontq, |
p->fontq = mandoc_reallocarray(p->fontq, |
p->fontsz, sizeof(enum termfont *)); |
p->fontsz, sizeof(*p->fontq)); |
} |
} |
p->fontq[p->fonti] = f; |
p->fontq[p->fonti] = f; |
} |
} |
Line 397 term_fontpop(struct termp *p) |
|
Line 374 term_fontpop(struct termp *p) |
|
void |
void |
term_word(struct termp *p, const char *word) |
term_word(struct termp *p, const char *word) |
{ |
{ |
|
struct roffsu su; |
const char nbrsp[2] = { ASCII_NBRSP, 0 }; |
const char nbrsp[2] = { ASCII_NBRSP, 0 }; |
const char *seq, *cp; |
const char *seq, *cp; |
int sz, uc; |
int sz, uc; |
size_t 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 454 term_word(struct termp *p, const char *word) |
|
Line 432 term_word(struct termp *p, const char *word) |
|
break; |
break; |
case ESCAPE_SPECIAL: |
case ESCAPE_SPECIAL: |
if (p->enc == TERMENC_ASCII) { |
if (p->enc == TERMENC_ASCII) { |
cp = mchars_spec2str(p->symtab, |
cp = mchars_spec2str(seq, sz, &ssz); |
seq, sz, &ssz); |
|
if (cp != NULL) |
if (cp != NULL) |
encode(p, cp, ssz); |
encode(p, cp, ssz); |
} else { |
} else { |
uc = mchars_spec2cp(p->symtab, seq, sz); |
uc = mchars_spec2cp(seq, sz); |
if (uc > 0) |
if (uc > 0) |
encode1(p, uc); |
encode1(p, uc); |
} |
} |
Line 474 term_word(struct termp *p, const char *word) |
|
Line 451 term_word(struct termp *p, const char *word) |
|
term_fontrepl(p, TERMFONT_BI); |
term_fontrepl(p, TERMFONT_BI); |
continue; |
continue; |
case ESCAPE_FONT: |
case ESCAPE_FONT: |
/* FALLTHROUGH */ |
|
case ESCAPE_FONTROMAN: |
case ESCAPE_FONTROMAN: |
term_fontrepl(p, TERMFONT_NONE); |
term_fontrepl(p, TERMFONT_NONE); |
continue; |
continue; |
Line 487 term_word(struct termp *p, const char *word) |
|
Line 463 term_word(struct termp *p, const char *word) |
|
else if (*word == '\0') |
else if (*word == '\0') |
p->flags |= (TERMP_NOSPACE | TERMP_NONEWLINE); |
p->flags |= (TERMP_NOSPACE | TERMP_NONEWLINE); |
continue; |
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->tcol->offset > (size_t)(-uc)) { |
|
p->ti += uc; |
|
p->tcol->offset += uc; |
|
} else { |
|
p->ti -= p->tcol->offset; |
|
p->tcol->offset = 0; |
|
} |
|
} |
|
continue; |
|
case ESCAPE_HLINE: |
|
if (a2roffsu(seq, &su, SCALE_EM) == 0) |
|
continue; |
|
uc = term_hspan(p, &su) / 24; |
|
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) |
|
uc = -1; |
|
else if (*seq == '\\') { |
|
seq++; |
|
esc = mandoc_escape(&seq, &cp, &sz); |
|
switch (esc) { |
|
case ESCAPE_UNICODE: |
|
uc = mchars_num2uc(cp + 1, sz - 1); |
|
break; |
|
case ESCAPE_NUMBERED: |
|
uc = mchars_num2char(cp, sz); |
|
break; |
|
case ESCAPE_SPECIAL: |
|
uc = mchars_spec2cp(cp, sz); |
|
break; |
|
default: |
|
uc = -1; |
|
break; |
|
} |
|
} else |
|
uc = *seq; |
|
if (uc < 0x20 || (uc > 0x7E && uc < 0xA0)) |
|
uc = '_'; |
|
if (p->enc == TERMENC_ASCII) { |
|
cp = ascii_uc2str(uc); |
|
csz = term_strlen(p, cp); |
|
ssz = strlen(cp); |
|
} else |
|
csz = (*p->width)(p, uc); |
|
while (lsz >= csz) { |
|
if (p->enc == TERMENC_ASCII) |
|
encode(p, cp, ssz); |
|
else |
|
encode1(p, uc); |
|
lsz -= csz; |
|
} |
|
continue; |
case ESCAPE_SKIPCHAR: |
case ESCAPE_SKIPCHAR: |
p->flags |= TERMP_BACKAFTER; |
p->flags |= TERMP_BACKAFTER; |
continue; |
continue; |
Line 506 term_word(struct termp *p, const char *word) |
|
Line 559 term_word(struct termp *p, const char *word) |
|
} |
} |
} |
} |
/* Trim trailing backspace/blank pair. */ |
/* Trim trailing backspace/blank pair. */ |
if (p->col > 2 && p->buf[p->col - 1] == ' ') |
if (p->lastcol > 2 && |
p->col -= 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; |
continue; |
continue; |
default: |
default: |
continue; |
continue; |
Line 532 term_word(struct termp *p, const char *word) |
|
Line 589 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->lastcol <= p->col || (c != ' ' && c != ASCII_NBRSP)) |
|
p->tcol->buf[p->col] = c; |
|
if (p->lastcol < ++p->col) |
|
p->lastcol = p->col; |
} |
} |
|
|
/* |
/* |
Line 563 encode1(struct termp *p, int c) |
|
Line 623 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; |
|
} |
|
|
f = (c == ASCII_HYPH || isgraph(c)) ? |
if (p->col + 7 >= p->tcol->maxcols) |
|
adjbuf(p->tcol, p->col + 7); |
|
|
|
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] == ' ') |
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->lastcol <= p->col || (c != ' ' && c != ASCII_NBRSP)) |
|
p->tcol->buf[p->col] = c; |
|
if (p->lastcol < ++p->col) |
|
p->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 599 encode(struct termp *p, const char *word, size_t sz) |
|
Line 668 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->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 |
|
* an overstrike sequence from ascii_uc2str(). |
|
*/ |
|
|
|
if (word[i] == '\b' && |
|
(p->flags & TERMP_BACKBEFORE)) { |
|
p->flags &= ~TERMP_BACKBEFORE; |
|
p->flags |= TERMP_BACKAFTER; |
|
} |
|
} |
} |
} |
|
if (p->lastcol < p->col) |
|
p->lastcol = p->col; |
} |
} |
|
|
void |
void |
|
|
term_len(const struct termp *p, size_t sz) |
term_len(const struct termp *p, size_t sz) |
{ |
{ |
|
|
return((*p->width)(p, ' ') * sz); |
return (*p->width)(p, ' ') * sz; |
} |
} |
|
|
static size_t |
static size_t |
Line 653 cond_width(const struct termp *p, int c, int *skip) |
|
Line 745 cond_width(const struct termp *p, int c, int *skip) |
|
|
|
if (*skip) { |
if (*skip) { |
(*skip) = 0; |
(*skip) = 0; |
return(0); |
return 0; |
} else |
} else |
return((*p->width)(p, c)); |
return (*p->width)(p, c); |
} |
} |
|
|
size_t |
size_t |
Line 701 term_strlen(const struct termp *p, const char *cp) |
|
Line 793 term_strlen(const struct termp *p, const char *cp) |
|
break; |
break; |
case ESCAPE_SPECIAL: |
case ESCAPE_SPECIAL: |
if (p->enc == TERMENC_ASCII) { |
if (p->enc == TERMENC_ASCII) { |
rhs = mchars_spec2str(p->symtab, |
rhs = mchars_spec2str(seq, ssz, &rsz); |
seq, ssz, &rsz); |
|
if (rhs != NULL) |
if (rhs != NULL) |
break; |
break; |
} else { |
} else { |
uc = mchars_spec2cp(p->symtab, |
uc = mchars_spec2cp(seq, ssz); |
seq, ssz); |
|
if (uc > 0) |
if (uc > 0) |
sz += cond_width(p, uc, &skip); |
sz += cond_width(p, uc, &skip); |
} |
} |
Line 771 term_strlen(const struct termp *p, const char *cp) |
|
Line 861 term_strlen(const struct termp *p, const char *cp) |
|
case ASCII_HYPH: |
case ASCII_HYPH: |
sz += cond_width(p, '-', &skip); |
sz += cond_width(p, '-', &skip); |
cp++; |
cp++; |
/* FALLTHROUGH */ |
|
case ASCII_BREAK: |
|
break; |
break; |
default: |
default: |
break; |
break; |
} |
} |
} |
} |
|
|
return(sz); |
return sz; |
} |
} |
|
|
int |
int |
Line 811 term_vspan(const struct termp *p, const struct roffsu |
|
Line 899 term_vspan(const struct termp *p, const struct roffsu |
|
r = su->scale / 12.0; |
r = su->scale / 12.0; |
break; |
break; |
case SCALE_EN: |
case SCALE_EN: |
/* FALLTHROUGH */ |
|
case SCALE_EM: |
case SCALE_EM: |
r = su->scale * 0.6; |
r = su->scale * 0.6; |
break; |
break; |
Line 822 term_vspan(const struct termp *p, const struct roffsu |
|
Line 909 term_vspan(const struct termp *p, const struct roffsu |
|
abort(); |
abort(); |
} |
} |
ri = r > 0.0 ? r + 0.4995 : r - 0.4995; |
ri = r > 0.0 ? r + 0.4995 : r - 0.4995; |
return(ri < 66 ? ri : 1); |
return ri < 66 ? ri : 1; |
} |
} |
|
|
/* |
/* |
|
|
term_hspan(const struct termp *p, const struct roffsu *su) |
term_hspan(const struct termp *p, const struct roffsu *su) |
{ |
{ |
|
|
return((*p->hspan)(p, su)); |
return (*p->hspan)(p, su); |
} |
} |