version 1.170, 2010/09/04 20:18:53 |
version 1.177, 2011/01/30 16:05:37 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010, 2011 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 |
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 145 term_flushln(struct termp *p) |
|
Line 146 term_flushln(struct termp *p) |
|
* an indentation, but can be, for tagged lists or columns, a |
* an indentation, but can be, for tagged lists or columns, a |
* small set of values. |
* small set of values. |
*/ |
*/ |
|
assert (p->rmargin >= p->offset); |
|
dv = p->rmargin - p->offset; |
|
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; |
|
|
assert(p->offset < p->rmargin); |
|
|
|
maxvis = (int)(p->rmargin - p->offset) - p->overstep < 0 ? |
|
/* LINTED */ |
|
0 : p->rmargin - p->offset - p->overstep; |
|
mmax = (int)(p->maxrmargin - p->offset) - p->overstep < 0 ? |
|
/* LINTED */ |
|
0 : p->maxrmargin - p->offset - p->overstep; |
|
|
|
bp = TERMP_NOBREAK & p->flags ? mmax : maxvis; |
bp = TERMP_NOBREAK & p->flags ? mmax : maxvis; |
|
|
/* |
/* |
* Indent the first line of a paragraph. |
* Indent the first line of a paragraph. |
*/ |
*/ |
vbl = p->flags & TERMP_NOLPAD ? 0 : p->offset; |
vbl = p->flags & TERMP_NOLPAD ? (size_t)0 : p->offset; |
|
|
vis = vend = i = 0; |
vis = vend = 0; |
|
i = 0; |
|
|
while (i < (int)p->col) { |
while (i < (int)p->col) { |
/* |
/* |
Line 183 term_flushln(struct termp *p) |
|
Line 181 term_flushln(struct termp *p) |
|
* space is printed according to regular spacing rules). |
* space is printed according to regular spacing rules). |
*/ |
*/ |
|
|
/* LINTED */ |
|
for (j = i, 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 222 term_flushln(struct termp *p) |
|
Line 219 term_flushln(struct termp *p) |
|
|
|
/* Remove the p->overstep width. */ |
/* Remove the p->overstep width. */ |
|
|
bp += (int)/* LINTED */ |
bp += (size_t)p->overstep; |
p->overstep; |
|
p->overstep = 0; |
p->overstep = 0; |
} |
} |
|
|
Line 237 term_flushln(struct termp *p) |
|
Line 233 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 = (size_t)(i - j) * (*p->width)(p, ' '); |
|
vbl += dv; |
|
vend += dv; |
break; |
break; |
} |
} |
if (ASCII_NBRSP == p->buf[i]) { |
if (ASCII_NBRSP == p->buf[i]) { |
Line 264 term_flushln(struct termp *p) |
|
Line 262 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; |
} |
} |
|
|
Line 285 term_flushln(struct termp *p) |
|
Line 282 term_flushln(struct termp *p) |
|
|
|
if (TERMP_HANG & p->flags) { |
if (TERMP_HANG & p->flags) { |
/* We need one blank after the tag. */ |
/* We need one blank after the tag. */ |
p->overstep = /* LINTED */ |
p->overstep = (int)(vis - maxvis + (*p->width)(p, ' ')); |
vis - maxvis + (*p->width)(p, ' '); |
|
|
|
/* |
/* |
* Behave exactly the same way as groff: |
* Behave exactly the same way as groff: |
Line 300 term_flushln(struct termp *p) |
|
Line 296 term_flushln(struct termp *p) |
|
*/ |
*/ |
if (p->overstep >= -1) { |
if (p->overstep >= -1) { |
assert((int)maxvis + p->overstep >= 0); |
assert((int)maxvis + p->overstep >= 0); |
/* LINTED */ |
maxvis += (size_t)p->overstep; |
maxvis += p->overstep; |
|
} else |
} else |
p->overstep = 0; |
p->overstep = 0; |
|
|
Line 309 term_flushln(struct termp *p) |
|
Line 304 term_flushln(struct termp *p) |
|
return; |
return; |
|
|
/* Right-pad. */ |
/* Right-pad. */ |
if (maxvis > vis + /* LINTED */ |
if (maxvis > vis + |
((TERMP_TWOSPACE & p->flags) ? |
((TERMP_TWOSPACE & p->flags) ? (*p->width)(p, ' ') : 0)) { |
(*p->width)(p, ' ') : 0)) { |
|
p->viscol += maxvis - vis; |
p->viscol += maxvis - vis; |
(*p->advance)(p, maxvis - vis); |
(*p->advance)(p, maxvis - vis); |
vis += (maxvis - vis); |
vis += (maxvis - vis); |
Line 359 term_vspace(struct termp *p) |
|
Line 353 term_vspace(struct termp *p) |
|
|
|
|
|
static void |
static void |
|
numbered(struct termp *p, const char *word, size_t len) |
|
{ |
|
const char *rhs; |
|
|
|
rhs = chars_num2char(word, len); |
|
if (rhs) |
|
encode(p, rhs, 1); |
|
} |
|
|
|
|
|
static void |
spec(struct termp *p, enum roffdeco d, const char *word, size_t len) |
spec(struct termp *p, enum roffdeco d, const char *word, size_t len) |
{ |
{ |
const char *rhs; |
const char *rhs; |
|
|
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 504 term_word(struct termp *p, const char *word) |
|
Line 508 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_IGNDELIM); |
|
|
while (*word) { |
while (*word) { |
if ((ssz = strcspn(word, "\\")) > 0) |
if ((ssz = strcspn(word, "\\")) > 0) |
Line 515 term_word(struct termp *p, const char *word) |
|
Line 519 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_NUMBERED): |
|
numbered(p, seq, ssz); |
|
break; |
case (DECO_RESERVED): |
case (DECO_RESERVED): |
res(p, seq, ssz); |
res(p, seq, ssz); |
break; |
break; |
Line 542 term_word(struct termp *p, const char *word) |
|
Line 549 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 645 term_len(const struct termp *p, size_t sz) |
|
Line 651 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 if (ASCII_NBRSP == *cp) { |
|
sz += (*p->width)(p, ' '); |
|
cp++; |
|
} else if (ASCII_HYPH == *cp) { |
|
sz += (*p->width)(p, '-'); |
|
cp++; |
|
} else |
|
sz += (*p->width)(p, *cp++); |
|
|
return(sz); |
return(sz); |
} |
} |