version 1.242, 2014/12/24 23:32:42 |
version 1.263, 2017/06/04 18:50:35 |
|
|
/* $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-2014 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 |
* copyright notice and this permission notice appear in all copies. |
* 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 |
* 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 |
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN |
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN |
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
Line 49 term_free(struct termp *p) |
|
Line 49 term_free(struct termp *p) |
|
|
|
void |
void |
term_begin(struct termp *p, term_margin head, |
term_begin(struct termp *p, term_margin head, |
term_margin foot, const void *arg) |
term_margin foot, const struct roff_meta *arg) |
{ |
{ |
|
|
p->headf = head; |
p->headf = head; |
Line 78 term_end(struct termp *p) |
|
Line 78 term_end(struct termp *p) |
|
* the next column. However, if less than p->trailspace blanks, |
* the next column. However, if less than p->trailspace blanks, |
* which can be 0, 1, or 2, remain to the right margin, the line |
* which can be 0, 1, or 2, remain to the right margin, the line |
* will be broken. |
* 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 |
* - 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 |
* 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) |
Line 102 term_flushln(struct termp *p) |
|
Line 104 term_flushln(struct termp *p) |
|
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 */ |
|
|
/* |
vbl = (p->flags & TERMP_NOPAD) || p->offset < p->viscol ? 0 : |
* First, establish the maximum columns of "visible" content. |
p->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->rmargin > p->viscol + vbl ? |
* |
p->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; |
|
|
Line 139 term_flushln(struct termp *p) |
|
Line 122 term_flushln(struct termp *p) |
|
* 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->col && p->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 158 term_flushln(struct termp *p) |
|
Line 141 term_flushln(struct termp *p) |
|
if (' ' == p->buf[j] || '\t' == p->buf[j]) |
if (' ' == p->buf[j] || '\t' == p->buf[j]) |
break; |
break; |
|
|
/* Back over the the last printed character. */ |
/* Back over the last printed character. */ |
if (8 == p->buf[j]) { |
if (8 == p->buf[j]) { |
assert(j); |
assert(j); |
vend -= (*p->width)(p, p->buf[j - 1]); |
vend -= (*p->width)(p, p->buf[j - 1]); |
Line 190 term_flushln(struct termp *p) |
|
Line 173 term_flushln(struct termp *p) |
|
vend -= vis; |
vend -= vis; |
(*p->endline)(p); |
(*p->endline)(p); |
p->viscol = 0; |
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->rmargin; |
|
else |
|
vbl += p->offset; |
|
maxvis = p->rmargin > vbl ? p->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. */ |
Line 264 term_flushln(struct termp *p) |
|
Line 243 term_flushln(struct termp *p) |
|
vis = 0; |
vis = 0; |
|
|
p->col = 0; |
p->col = 0; |
p->overstep = 0; |
p->flags &= ~(TERMP_BACKAFTER | TERMP_BACKBEFORE | TERMP_NOPAD); |
|
|
if ( ! (TERMP_NOBREAK & p->flags)) { |
if ( ! (TERMP_NOBREAK & p->flags)) { |
p->viscol = 0; |
p->viscol = 0; |
|
p->minbl = 0; |
(*p->endline)(p); |
(*p->endline)(p); |
return; |
return; |
} |
} |
|
|
if (TERMP_HANG & p->flags) { |
if (TERMP_HANG & p->flags) { |
p->overstep += (int)(p->offset + vis - p->rmargin + |
p->minbl = p->trailspace; |
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; |
return; |
|
} |
|
|
} else if (TERMP_DANGLE & p->flags) |
/* Trailing whitespace is significant in some columns. */ |
return; |
if (vis && vbl && (TERMP_BRTRSP & p->flags)) |
|
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 (maxvis < vis + p->trailspace * (*p->width)(p, ' ')) { |
(*p->endline)(p); |
(*p->endline)(p); |
p->viscol = 0; |
p->viscol = 0; |
} |
p->minbl = 0; |
|
} else |
|
p->minbl = p->trailspace; |
} |
} |
|
|
/* |
/* |
Line 358 term_fontpush(struct termp *p, enum termfont f) |
|
Line 331 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; |
} |
} |
|
|
/* Retrieve pointer to current font. */ |
|
const enum termfont * |
|
term_fontq(struct termp *p) |
|
{ |
|
|
|
return(&p->fontq[p->fonti]); |
|
} |
|
|
|
/* Flush to make the saved pointer current again. */ |
/* Flush to make the saved pointer current again. */ |
void |
void |
term_fontpopq(struct termp *p, const enum termfont *key) |
term_fontpopq(struct termp *p, int i) |
{ |
{ |
|
|
while (p->fonti >= 0 && key < p->fontq + p->fonti) |
assert(i >= 0); |
p->fonti--; |
if (p->fonti > i) |
assert(p->fonti >= 0); |
p->fonti = i; |
} |
} |
|
|
/* Pop one font off the stack. */ |
/* Pop one font off the stack. */ |
Line 398 term_fontpop(struct termp *p) |
|
Line 363 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 ( ! (TERMP_NOSPACE & p->flags)) { |
Line 421 term_word(struct termp *p, const char *word) |
|
Line 387 term_word(struct termp *p, const char *word) |
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
|
|
p->flags &= ~(TERMP_SENTENCE | TERMP_NONEWLINE); |
p->flags &= ~(TERMP_SENTENCE | TERMP_NONEWLINE); |
|
p->skipvsp = 0; |
|
|
while ('\0' != *word) { |
while ('\0' != *word) { |
if ('\\' != *word) { |
if ('\\' != *word) { |
if (TERMP_SKIPCHAR & p->flags) { |
|
p->flags &= ~TERMP_SKIPCHAR; |
|
word++; |
|
continue; |
|
} |
|
if (TERMP_NBRWORD & p->flags) { |
if (TERMP_NBRWORD & p->flags) { |
if (' ' == *word) { |
if (' ' == *word) { |
encode(p, nbrsp, 1); |
encode(p, nbrsp, 1); |
Line 459 term_word(struct termp *p, const char *word) |
|
Line 421 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 479 term_word(struct termp *p, const char *word) |
|
Line 440 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 447 term_word(struct termp *p, const char *word) |
|
term_fontlast(p); |
term_fontlast(p); |
continue; |
continue; |
case ESCAPE_NOSPACE: |
case ESCAPE_NOSPACE: |
if (TERMP_SKIPCHAR & p->flags) |
if (p->flags & TERMP_BACKAFTER) |
p->flags &= ~TERMP_SKIPCHAR; |
p->flags &= ~TERMP_BACKAFTER; |
else if ('\0' == *word) |
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->offset > (size_t)(-uc)) { |
|
p->ti += uc; |
|
p->offset += uc; |
|
} else { |
|
p->ti -= p->offset; |
|
p->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->rmargin <= p->offset) |
|
continue; |
|
lsz = p->rmargin - p->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_SKIPCHAR; |
p->flags |= TERMP_BACKAFTER; |
continue; |
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: |
default: |
continue; |
continue; |
} |
} |
Line 549 encode1(struct termp *p, int c) |
|
Line 607 encode1(struct termp *p, int c) |
|
{ |
{ |
enum termfont f; |
enum termfont f; |
|
|
if (TERMP_SKIPCHAR & p->flags) { |
if (p->col + 7 >= p->maxcols) |
p->flags &= ~TERMP_SKIPCHAR; |
adjbuf(p, p->col + 7); |
return; |
|
} |
|
|
|
if (p->col + 6 >= p->maxcols) |
f = (c == ASCII_HYPH || c > 127 || isgraph(c)) ? |
adjbuf(p, p->col + 6); |
p->fontq[p->fonti] : TERMFONT_NONE; |
|
|
f = *term_fontq(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) { |
if (TERMFONT_UNDER == f || TERMFONT_BI == f) { |
p->buf[p->col++] = '_'; |
p->buf[p->col++] = '_'; |
p->buf[p->col++] = 8; |
p->buf[p->col++] = 8; |
Line 571 encode1(struct termp *p, int c) |
|
Line 632 encode1(struct termp *p, int c) |
|
p->buf[p->col++] = 8; |
p->buf[p->col++] = 8; |
} |
} |
p->buf[p->col++] = c; |
p->buf[p->col++] = c; |
|
if (p->flags & TERMP_BACKAFTER) { |
|
p->flags |= TERMP_BACKBEFORE; |
|
p->flags &= ~TERMP_BACKAFTER; |
|
} |
} |
} |
|
|
static void |
static void |
Line 578 encode(struct termp *p, const char *word, size_t sz) |
|
Line 643 encode(struct termp *p, const char *word, size_t sz) |
|
{ |
{ |
size_t i; |
size_t i; |
|
|
if (TERMP_SKIPCHAR & p->flags) { |
if (p->col + 2 + (sz * 5) >= p->maxcols) |
p->flags &= ~TERMP_SKIPCHAR; |
adjbuf(p, p->col + 2 + (sz * 5)); |
return; |
|
} |
|
|
|
/* |
|
* Encode and buffer a string of characters. If the current |
|
* font mode is unset, buffer directly, else encode then buffer |
|
* character by character. |
|
*/ |
|
|
|
if (*term_fontq(p) == TERMFONT_NONE) { |
|
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++) { |
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]; |
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; |
|
} |
|
} |
} |
} |
} |
} |
|
|
|
|
term_setwidth(struct termp *p, const char *wstr) |
term_setwidth(struct termp *p, const char *wstr) |
{ |
{ |
struct roffsu su; |
struct roffsu su; |
size_t width; |
int iop, width; |
int iop; |
|
|
|
iop = 0; |
iop = 0; |
width = 0; |
width = 0; |
|
|
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 654 cond_width(const struct termp *p, int c, int *skip) |
|
Line 709 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 702 term_strlen(const struct termp *p, const char *cp) |
|
Line 757 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 716 term_strlen(const struct termp *p, const char *cp) |
|
Line 769 term_strlen(const struct termp *p, const char *cp) |
|
case ESCAPE_SKIPCHAR: |
case ESCAPE_SKIPCHAR: |
skip = 1; |
skip = 1; |
continue; |
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: |
default: |
continue; |
continue; |
} |
} |
Line 758 term_strlen(const struct termp *p, const char *cp) |
|
Line 825 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 798 term_vspan(const struct termp *p, const struct roffsu |
|
Line 863 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 807 term_vspan(const struct termp *p, const struct roffsu |
|
Line 871 term_vspan(const struct termp *p, const struct roffsu |
|
break; |
break; |
default: |
default: |
abort(); |
abort(); |
/* NOTREACHED */ |
|
} |
} |
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; |
} |
} |
|
|
|
/* |
|
* Convert a scaling width to basic units, rounding down. |
|
*/ |
int |
int |
term_hspan(const struct termp *p, const struct roffsu *su) |
term_hspan(const struct termp *p, const struct roffsu *su) |
{ |
{ |
double v; |
|
|
|
v = (*p->hspan)(p, su); |
return (*p->hspan)(p, su); |
return(v > 0.0 ? v + 0.0005 : v - 0.0005); |
|
} |
} |