version 1.234, 2014/11/01 04:03:49 |
version 1.238, 2014/12/19 17:12:04 |
Line 43 term_free(struct termp *p) |
|
Line 43 term_free(struct termp *p) |
|
{ |
{ |
|
|
free(p->buf); |
free(p->buf); |
|
free(p->fontq); |
free(p); |
free(p); |
} |
} |
|
|
Line 100 term_flushln(struct termp *p) |
|
Line 101 term_flushln(struct termp *p) |
|
size_t j; /* temporary loop index for p->buf */ |
size_t j; /* temporary loop index for p->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 */ |
size_t mmax; /* used in calculating bp */ |
size_t rmargin; /* the rightmost of the two margins */ |
|
|
/* |
/* |
* First, establish the maximum columns of "visible" content. |
* First, establish the maximum columns of "visible" content. |
Line 113 term_flushln(struct termp *p) |
|
Line 114 term_flushln(struct termp *p) |
|
* is negative, it gets sign extended. Subtracting that |
* is negative, it gets sign extended. Subtracting that |
* very large size_t effectively adds a small number to dv. |
* very large size_t effectively adds a small number to dv. |
*/ |
*/ |
assert (p->rmargin >= p->offset); |
rmargin = p->rmargin > p->offset ? p->rmargin : p->offset; |
dv = p->rmargin - p->offset; |
dv = p->rmargin - p->offset; |
maxvis = (int)dv > p->overstep ? dv - (size_t)p->overstep : 0; |
maxvis = (int)dv > p->overstep ? dv - (size_t)p->overstep : 0; |
dv = p->maxrmargin - p->offset; |
|
mmax = (int)dv > p->overstep ? dv - (size_t)p->overstep : 0; |
|
|
|
bp = TERMP_NOBREAK & p->flags ? mmax : maxvis; |
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. |
* Calculate the required amount of padding. |
Line 188 term_flushln(struct termp *p) |
|
Line 193 term_flushln(struct termp *p) |
|
(*p->endline)(p); |
(*p->endline)(p); |
p->viscol = 0; |
p->viscol = 0; |
if (TERMP_BRIND & p->flags) { |
if (TERMP_BRIND & p->flags) { |
vbl = p->rmargin; |
vbl = rmargin; |
vend += p->rmargin - p->offset; |
vend += rmargin - p->offset; |
} else |
} else |
vbl = p->offset; |
vbl = p->offset; |
|
|
Line 254 term_flushln(struct termp *p) |
|
Line 259 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) |
if (vis > vbl) |
vis -= vbl; |
vis -= vbl; |
|
else |
|
vis = 0; |
|
|
p->col = 0; |
p->col = 0; |
p->overstep = 0; |
p->overstep = 0; |
Line 323 term_vspace(struct termp *p) |
|
Line 330 term_vspace(struct termp *p) |
|
(*p->endline)(p); |
(*p->endline)(p); |
} |
} |
|
|
|
/* Swap current and previous font; for \fP and .ft P */ |
void |
void |
term_fontlast(struct termp *p) |
term_fontlast(struct termp *p) |
{ |
{ |
Line 333 term_fontlast(struct termp *p) |
|
Line 341 term_fontlast(struct termp *p) |
|
p->fontq[p->fonti] = f; |
p->fontq[p->fonti] = f; |
} |
} |
|
|
|
/* Set font, save current, discard previous; for \f, .ft, .B etc. */ |
void |
void |
term_fontrepl(struct termp *p, enum termfont f) |
term_fontrepl(struct termp *p, enum termfont f) |
{ |
{ |
Line 341 term_fontrepl(struct termp *p, enum termfont f) |
|
Line 350 term_fontrepl(struct termp *p, enum termfont f) |
|
p->fontq[p->fonti] = f; |
p->fontq[p->fonti] = f; |
} |
} |
|
|
|
/* Set font, save previous. */ |
void |
void |
term_fontpush(struct termp *p, enum termfont f) |
term_fontpush(struct termp *p, enum termfont f) |
{ |
{ |
|
|
assert(p->fonti + 1 < 10); |
|
p->fontl = p->fontq[p->fonti]; |
p->fontl = p->fontq[p->fonti]; |
p->fontq[++p->fonti] = f; |
if (++p->fonti == p->fontsz) { |
|
p->fontsz += 8; |
|
p->fontq = mandoc_reallocarray(p->fontq, |
|
p->fontsz, sizeof(enum termfont *)); |
|
} |
|
p->fontq[p->fonti] = f; |
} |
} |
|
|
const void * |
/* Retrieve pointer to current font. */ |
|
const enum termfont * |
term_fontq(struct termp *p) |
term_fontq(struct termp *p) |
{ |
{ |
|
|
return(&p->fontq[p->fonti]); |
return(&p->fontq[p->fonti]); |
} |
} |
|
|
enum termfont |
/* Flush to make the saved pointer current again. */ |
term_fonttop(struct termp *p) |
|
{ |
|
|
|
return(p->fontq[p->fonti]); |
|
} |
|
|
|
void |
void |
term_fontpopq(struct termp *p, const void *key) |
term_fontpopq(struct termp *p, const enum termfont *key) |
{ |
{ |
|
|
while (p->fonti >= 0 && key < (void *)(p->fontq + p->fonti)) |
while (p->fonti >= 0 && key < p->fontq + p->fonti) |
p->fonti--; |
p->fonti--; |
assert(p->fonti >= 0); |
assert(p->fonti >= 0); |
} |
} |
|
|
|
/* Pop one font off the stack. */ |
void |
void |
term_fontpop(struct termp *p) |
term_fontpop(struct termp *p) |
{ |
{ |
Line 411 term_word(struct termp *p, const char *word) |
|
Line 421 term_word(struct termp *p, const char *word) |
|
else |
else |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
|
|
p->flags &= ~TERMP_SENTENCE; |
p->flags &= ~(TERMP_SENTENCE | TERMP_NONEWLINE); |
|
|
while ('\0' != *word) { |
while ('\0' != *word) { |
if ('\\' != *word) { |
if ('\\' != *word) { |
Line 481 term_word(struct termp *p, const char *word) |
|
Line 491 term_word(struct termp *p, const char *word) |
|
if (TERMP_SKIPCHAR & p->flags) |
if (TERMP_SKIPCHAR & p->flags) |
p->flags &= ~TERMP_SKIPCHAR; |
p->flags &= ~TERMP_SKIPCHAR; |
else if ('\0' == *word) |
else if ('\0' == *word) |
p->flags |= TERMP_NOSPACE; |
p->flags |= (TERMP_NOSPACE | TERMP_NONEWLINE); |
continue; |
continue; |
case ESCAPE_SKIPCHAR: |
case ESCAPE_SKIPCHAR: |
p->flags |= TERMP_SKIPCHAR; |
p->flags |= TERMP_SKIPCHAR; |
Line 548 encode1(struct termp *p, int c) |
|
Line 558 encode1(struct termp *p, int c) |
|
if (p->col + 6 >= p->maxcols) |
if (p->col + 6 >= p->maxcols) |
adjbuf(p, p->col + 6); |
adjbuf(p, p->col + 6); |
|
|
f = term_fonttop(p); |
f = *term_fontq(p); |
|
|
if (TERMFONT_UNDER == f || TERMFONT_BI == f) { |
if (TERMFONT_UNDER == f || TERMFONT_BI == f) { |
p->buf[p->col++] = '_'; |
p->buf[p->col++] = '_'; |
Line 580 encode(struct termp *p, const char *word, size_t sz) |
|
Line 590 encode(struct termp *p, const char *word, size_t sz) |
|
* character by character. |
* character by character. |
*/ |
*/ |
|
|
if (TERMFONT_NONE == term_fonttop(p)) { |
if (*term_fontq(p) == TERMFONT_NONE) { |
if (p->col + sz >= p->maxcols) |
if (p->col + sz >= p->maxcols) |
adjbuf(p, p->col + sz); |
adjbuf(p, p->col + sz); |
for (i = 0; i < sz; i++) |
for (i = 0; i < sz; i++) |