version 1.209, 2013/08/08 20:07:47 |
version 1.210, 2013/08/21 21:20:40 |
|
|
#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, int); |
static void adjbuf(struct termp *p, 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); |
Line 105 term_end(struct termp *p) |
|
Line 105 term_end(struct termp *p) |
|
void |
void |
term_flushln(struct termp *p) |
term_flushln(struct termp *p) |
{ |
{ |
int i; /* current input position in p->buf */ |
size_t i; /* current input position in p->buf */ |
int ntab; /* number of tabs to prepend */ |
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 */ |
int j; /* temporary loop index for p->buf */ |
size_t j; /* temporary loop index for p->buf */ |
int 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 mmax; /* used in calculating bp */ |
|
|
Line 216 term_flushln(struct termp *p) |
|
Line 216 term_flushln(struct termp *p) |
|
j = i; |
j = i; |
while (' ' == p->buf[i]) |
while (' ' == p->buf[i]) |
i++; |
i++; |
dv = (size_t)(i - j) * (*p->width)(p, ' '); |
dv = (i - j) * (*p->width)(p, ' '); |
vbl += dv; |
vbl += dv; |
vend += dv; |
vend += dv; |
break; |
break; |
Line 507 term_word(struct termp *p, const char *word) |
|
Line 507 term_word(struct termp *p, const char *word) |
|
} |
} |
|
|
static void |
static void |
adjbuf(struct termp *p, int sz) |
adjbuf(struct termp *p, size_t sz) |
{ |
{ |
|
|
if (0 == p->maxcols) |
if (0 == p->maxcols) |
Line 515 adjbuf(struct termp *p, int sz) |
|
Line 515 adjbuf(struct termp *p, int sz) |
|
while (sz >= p->maxcols) |
while (sz >= p->maxcols) |
p->maxcols <<= 2; |
p->maxcols <<= 2; |
|
|
p->buf = mandoc_realloc |
p->buf = mandoc_realloc(p->buf, sizeof(int) * p->maxcols); |
(p->buf, sizeof(int) * (size_t)p->maxcols); |
|
} |
} |
|
|
static void |
static void |
Line 566 encode1(struct termp *p, int c) |
|
Line 565 encode1(struct termp *p, int c) |
|
static void |
static void |
encode(struct termp *p, const char *word, size_t sz) |
encode(struct termp *p, const char *word, size_t sz) |
{ |
{ |
int i, len; |
size_t i; |
|
|
if (TERMP_SKIPCHAR & p->flags) { |
if (TERMP_SKIPCHAR & p->flags) { |
p->flags &= ~TERMP_SKIPCHAR; |
p->flags &= ~TERMP_SKIPCHAR; |
return; |
return; |
} |
} |
|
|
/* LINTED */ |
|
len = sz; |
|
|
|
/* |
/* |
* Encode and buffer a string of characters. If the current |
* Encode and buffer a string of characters. If the current |
* font mode is unset, buffer directly, else encode then buffer |
* font mode is unset, buffer directly, else encode then buffer |
Line 583 encode(struct termp *p, const char *word, size_t sz) |
|
Line 579 encode(struct termp *p, const char *word, size_t sz) |
|
*/ |
*/ |
|
|
if (TERMFONT_NONE == term_fonttop(p)) { |
if (TERMFONT_NONE == term_fonttop(p)) { |
if (p->col + len >= p->maxcols) |
if (p->col + sz >= p->maxcols) |
adjbuf(p, p->col + len); |
adjbuf(p, p->col + sz); |
for (i = 0; i < len; i++) |
for (i = 0; i < sz; i++) |
p->buf[p->col++] = word[i]; |
p->buf[p->col++] = word[i]; |
return; |
return; |
} |
} |
|
|
/* Pre-buffer, assuming worst-case. */ |
/* Pre-buffer, assuming worst-case. */ |
|
|
if (p->col + 1 + (len * 5) >= p->maxcols) |
if (p->col + 1 + (sz * 5) >= p->maxcols) |
adjbuf(p, p->col + 1 + (len * 5)); |
adjbuf(p, p->col + 1 + (sz * 5)); |
|
|
for (i = 0; i < len; 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]); |