version 1.165, 2010/07/26 21:58:41 |
version 1.172, 2010/09/23 20:26:00 |
Line 83 term_alloc(enum termenc enc) |
|
Line 83 term_alloc(enum termenc enc) |
|
p = calloc(1, sizeof(struct termp)); |
p = calloc(1, sizeof(struct termp)); |
if (NULL == p) { |
if (NULL == p) { |
perror(NULL); |
perror(NULL); |
exit(EXIT_FAILURE); |
exit((int)MANDOCLEVEL_SYSERR); |
} |
} |
|
|
p->enc = enc; |
p->enc = enc; |
Line 134 term_flushln(struct termp *p) |
|
Line 134 term_flushln(struct termp *p) |
|
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 */ |
int j; /* temporary loop index for p->buf */ |
int j; /* temporary loop index for p->buf */ |
int jhy; /* last hyph before overflow w/r/t j */ |
int 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 */ |
Line 169 term_flushln(struct termp *p) |
|
Line 170 term_flushln(struct termp *p) |
|
* 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. |
*/ |
*/ |
for (j = i; j < (int)p->col; j++) { |
while (i < (int)p->col && '\t' == p->buf[i]) { |
if ('\t' != p->buf[j]) |
|
break; |
|
vend = (vis / p->tabwidth + 1) * p->tabwidth; |
vend = (vis / p->tabwidth + 1) * p->tabwidth; |
vbl += vend - vis; |
vbl += vend - vis; |
vis = vend; |
vis = vend; |
|
i++; |
} |
} |
|
|
/* |
/* |
Line 185 term_flushln(struct termp *p) |
|
Line 185 term_flushln(struct termp *p) |
|
*/ |
*/ |
|
|
/* LINTED */ |
/* LINTED */ |
for (jhy = 0; j < (int)p->col; j++) { |
for (j = i, jhy = 0; j < (int)p->col; j++) { |
if ((j && ' ' == p->buf[j]) || '\t' == p->buf[j]) |
if ((j && ' ' == p->buf[j]) || '\t' == p->buf[j]) |
break; |
break; |
|
|
Line 228 term_flushln(struct termp *p) |
|
Line 228 term_flushln(struct termp *p) |
|
p->overstep = 0; |
p->overstep = 0; |
} |
} |
|
|
/* |
|
* Skip leading tabs, they were handled above. |
|
*/ |
|
while (i < (int)p->col && '\t' == p->buf[i]) |
|
i++; |
|
|
|
/* Write out the [remaining] word. */ |
/* Write out the [remaining] word. */ |
for ( ; i < (int)p->col; i++) { |
for ( ; i < (int)p->col; i++) { |
if (vend > bp && jhy > 0 && i > jhy) |
if (vend > bp && jhy > 0 && i > jhy) |
Line 244 term_flushln(struct termp *p) |
|
Line 238 term_flushln(struct termp *p) |
|
j = i; |
j = i; |
while (' ' == p->buf[i]) |
while (' ' == p->buf[i]) |
i++; |
i++; |
vbl += (i - j) * (*p->width)(p, ' '); |
dv = (i - j) * (*p->width)(p, ' '); |
|
vbl += dv; |
|
vend += dv; |
break; |
break; |
} |
} |
if (ASCII_NBRSP == p->buf[i]) { |
if (ASCII_NBRSP == p->buf[i]) { |
Line 271 term_flushln(struct termp *p) |
|
Line 267 term_flushln(struct termp *p) |
|
p->viscol += (*p->width)(p, p->buf[i]); |
p->viscol += (*p->width)(p, p->buf[i]); |
} |
} |
} |
} |
vend += vbl; |
|
vis = vend; |
vis = vend; |
} |
} |
|
|
|
/* |
|
* If there was trailing white space, it was not printed; |
|
* so reset the cursor position accordingly. |
|
*/ |
|
vis -= vbl; |
|
|
p->col = 0; |
p->col = 0; |
p->overstep = 0; |
p->overstep = 0; |
|
|
|
|
term_word(struct termp *p, const char *word) |
term_word(struct termp *p, const char *word) |
{ |
{ |
const char *sv, *seq; |
const char *sv, *seq; |
int sz; |
|
size_t ssz; |
size_t ssz; |
enum roffdeco deco; |
enum roffdeco deco; |
|
|
Line 502 term_word(struct termp *p, const char *word) |
|
Line 502 term_word(struct termp *p, const char *word) |
|
|
|
if ( ! (p->flags & TERMP_NONOSPACE)) |
if ( ! (p->flags & TERMP_NONOSPACE)) |
p->flags &= ~TERMP_NOSPACE; |
p->flags &= ~TERMP_NOSPACE; |
|
else |
|
p->flags |= TERMP_NOSPACE; |
|
|
p->flags &= ~TERMP_SENTENCE; |
p->flags &= ~TERMP_SENTENCE; |
|
|
Line 514 term_word(struct termp *p, const char *word) |
|
Line 516 term_word(struct termp *p, const char *word) |
|
continue; |
continue; |
|
|
seq = ++word; |
seq = ++word; |
sz = a2roffdeco(&deco, &seq, &ssz); |
word += a2roffdeco(&deco, &seq, &ssz); |
|
|
switch (deco) { |
switch (deco) { |
case (DECO_RESERVED): |
case (DECO_RESERVED): |
Line 541 term_word(struct termp *p, const char *word) |
|
Line 543 term_word(struct termp *p, const char *word) |
|
break; |
break; |
} |
} |
|
|
word += sz; |
|
if (DECO_NOSPACE == deco && '\0' == *word) |
if (DECO_NOSPACE == deco && '\0' == *word) |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
} |
} |
Line 575 adjbuf(struct termp *p, size_t sz) |
|
Line 576 adjbuf(struct termp *p, size_t sz) |
|
p->buf = realloc(p->buf, p->maxcols); |
p->buf = realloc(p->buf, p->maxcols); |
if (NULL == p->buf) { |
if (NULL == p->buf) { |
perror(NULL); |
perror(NULL); |
exit(EXIT_FAILURE); |
exit((int)MANDOCLEVEL_SYSERR); |
} |
} |
} |
} |
|
|
Line 644 term_len(const struct termp *p, size_t sz) |
|
Line 645 term_len(const struct termp *p, size_t sz) |
|
size_t |
size_t |
term_strlen(const struct termp *p, const char *cp) |
term_strlen(const struct termp *p, const char *cp) |
{ |
{ |
size_t sz; |
size_t sz, ssz, rsz, i; |
|
enum roffdeco d; |
|
const char *seq, *rhs; |
|
|
for (sz = 0; *cp; cp++) |
for (sz = 0; '\0' != *cp; ) |
sz += (*p->width)(p, *cp); |
/* |
|
* Account for escaped sequences within string length |
|
* calculations. This follows the logic in term_word() |
|
* as we must calculate the width of produced strings. |
|
*/ |
|
if ('\\' == *cp) { |
|
seq = ++cp; |
|
cp += a2roffdeco(&d, &seq, &ssz); |
|
|
|
switch (d) { |
|
case (DECO_RESERVED): |
|
rhs = chars_res2str |
|
(p->symtab, seq, ssz, &rsz); |
|
break; |
|
case (DECO_SPECIAL): |
|
/* FALLTHROUGH */ |
|
case (DECO_SSPECIAL): |
|
rhs = chars_spec2str |
|
(p->symtab, seq, ssz, &rsz); |
|
|
|
/* Allow for one-char escapes. */ |
|
if (DECO_SSPECIAL != d || rhs) |
|
break; |
|
|
|
rhs = seq; |
|
rsz = ssz; |
|
break; |
|
default: |
|
rhs = NULL; |
|
break; |
|
} |
|
|
|
if (rhs) |
|
for (i = 0; i < rsz; i++) |
|
sz += (*p->width)(p, *rhs++); |
|
} else |
|
sz += (*p->width)(p, *cp++); |
|
|
return(sz); |
return(sz); |
} |
} |