version 1.195, 2011/05/18 23:59:08 |
version 1.201, 2011/09/21 09:57:13 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010, 2011 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 |
Line 79 term_end(struct termp *p) |
|
Line 79 term_end(struct termp *p) |
|
* |
* |
* The following flags may be specified: |
* The following flags may be specified: |
* |
* |
* - TERMP_NOLPAD: when beginning to write the line, don't left-pad the |
|
* offset value. This is useful when doing columnar lists where the |
|
* prior column has right-padded. |
|
* |
|
* - TERMP_NOBREAK: this is the most important and is used when making |
* - TERMP_NOBREAK: this is the most important and is used when making |
* columns. In short: don't print a newline and instead pad to the |
* columns. In short: don't print a newline and instead expect the |
* right margin. Used in conjunction with TERMP_NOLPAD. |
* next call to do the padding up to the start of the next column. |
* |
* |
* - TERMP_TWOSPACE: when padding, make sure there are at least two |
* - TERMP_TWOSPACE: make sure there is room for at least two space |
* space characters of padding. Otherwise, rather break the line. |
* characters of padding. Otherwise, rather break the line. |
* |
* |
* - TERMP_DANGLE: don't newline when TERMP_NOBREAK is specified and |
* - TERMP_DANGLE: don't newline when TERMP_NOBREAK is specified and |
* the line is overrun, and don't pad-right if it's underrun. |
* the line is overrun, and don't pad-right if it's underrun. |
* |
* |
* - TERMP_HANG: like TERMP_DANGLE, but doesn't newline when |
* - TERMP_HANG: like TERMP_DANGLE, but doesn't newline when |
* overruning, instead save the position and continue at that point |
* overrunning, instead save the position and continue at that point |
* when the next invocation. |
* when the next invocation. |
* |
* |
* In-line line breaking: |
* In-line line breaking: |
Line 134 term_flushln(struct termp *p) |
|
Line 130 term_flushln(struct termp *p) |
|
bp = TERMP_NOBREAK & p->flags ? mmax : maxvis; |
bp = TERMP_NOBREAK & p->flags ? mmax : maxvis; |
|
|
/* |
/* |
* Indent the first line of a paragraph. |
* Calculate the required amount of padding. |
*/ |
*/ |
vbl = p->flags & TERMP_NOLPAD ? (size_t)0 : p->offset; |
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 187 term_flushln(struct termp *p) |
|
Line 184 term_flushln(struct termp *p) |
|
if (vend > bp && 0 == jhy && vis > 0) { |
if (vend > bp && 0 == jhy && vis > 0) { |
vend -= vis; |
vend -= vis; |
(*p->endline)(p); |
(*p->endline)(p); |
|
p->viscol = 0; |
if (TERMP_NOBREAK & p->flags) { |
if (TERMP_NOBREAK & p->flags) { |
p->viscol = p->rmargin; |
vbl = p->rmargin; |
(*p->advance)(p, p->rmargin); |
|
vend += p->rmargin - p->offset; |
vend += p->rmargin - p->offset; |
} else { |
} else |
p->viscol = 0; |
|
vbl = p->offset; |
vbl = p->offset; |
} |
|
|
|
/* Remove the p->overstep width. */ |
/* Remove the p->overstep width. */ |
|
|
Line 236 term_flushln(struct termp *p) |
|
Line 231 term_flushln(struct termp *p) |
|
if (ASCII_HYPH == p->buf[i]) { |
if (ASCII_HYPH == p->buf[i]) { |
(*p->letter)(p, '-'); |
(*p->letter)(p, '-'); |
p->viscol += (*p->width)(p, '-'); |
p->viscol += (*p->width)(p, '-'); |
} else { |
continue; |
(*p->letter)(p, p->buf[i]); |
|
p->viscol += (*p->width)(p, p->buf[i]); |
|
} |
} |
|
|
|
(*p->letter)(p, p->buf[i]); |
|
if (8 == p->buf[i]) |
|
p->viscol -= (*p->width)(p, p->buf[i-1]); |
|
else |
|
p->viscol += (*p->width)(p, p->buf[i]); |
} |
} |
vis = vend; |
vis = vend; |
} |
} |
Line 248 term_flushln(struct termp *p) |
|
Line 247 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. |
*/ |
*/ |
vis -= vbl; |
if (vis) |
|
vis -= vbl; |
|
|
p->col = 0; |
p->col = 0; |
p->overstep = 0; |
p->overstep = 0; |
Line 273 term_flushln(struct termp *p) |
|
Line 273 term_flushln(struct termp *p) |
|
* move it one step LEFT and flag the rest of the line |
* move it one step LEFT and flag the rest of the line |
* to be longer. |
* to be longer. |
*/ |
*/ |
if (p->overstep >= -1) { |
if (p->overstep < -1) |
assert((int)maxvis + p->overstep >= 0); |
|
maxvis += (size_t)p->overstep; |
|
} else |
|
p->overstep = 0; |
p->overstep = 0; |
|
return; |
|
|
} else if (TERMP_DANGLE & p->flags) |
} else if (TERMP_DANGLE & p->flags) |
return; |
return; |
|
|
/* Right-pad. */ |
/* If the column was overrun, break the line. */ |
if (maxvis > vis + |
if (maxvis <= vis + |
((TERMP_TWOSPACE & p->flags) ? (*p->width)(p, ' ') : 0)) { |
((TERMP_TWOSPACE & p->flags) ? (*p->width)(p, ' ') : 0)) { |
p->viscol += maxvis - vis; |
|
(*p->advance)(p, maxvis - vis); |
|
vis += (maxvis - vis); |
|
} else { /* ...or newline break. */ |
|
(*p->endline)(p); |
(*p->endline)(p); |
p->viscol = p->rmargin; |
p->viscol = 0; |
(*p->advance)(p, p->rmargin); |
|
} |
} |
} |
} |
|
|
Line 306 term_newln(struct termp *p) |
|
Line 299 term_newln(struct termp *p) |
|
{ |
{ |
|
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
if (0 == p->col && 0 == p->viscol) { |
if (p->col || p->viscol) |
p->flags &= ~TERMP_NOLPAD; |
term_flushln(p); |
return; |
|
} |
|
term_flushln(p); |
|
p->flags &= ~TERMP_NOLPAD; |
|
} |
} |
|
|
|
|
Line 439 term_word(struct termp *p, const char *word) |
|
Line 428 term_word(struct termp *p, const char *word) |
|
if (ESCAPE_ERROR == esc) |
if (ESCAPE_ERROR == esc) |
break; |
break; |
|
|
switch (esc) { |
if (TERMENC_ASCII != p->enc) |
case (ESCAPE_UNICODE): |
switch (esc) { |
if (TERMENC_ASCII == p->enc) { |
case (ESCAPE_UNICODE): |
encode1(p, '?'); |
uc = mchars_num2uc(seq + 1, sz - 1); |
|
if ('\0' == uc) |
|
break; |
|
encode1(p, uc); |
|
continue; |
|
case (ESCAPE_SPECIAL): |
|
uc = mchars_spec2cp(p->symtab, seq, sz); |
|
if (uc <= 0) |
|
break; |
|
encode1(p, uc); |
|
continue; |
|
default: |
break; |
break; |
} |
} |
uc = mchars_num2uc(seq + 1, sz - 1); |
|
if ('\0' != uc) |
switch (esc) { |
encode1(p, uc); |
case (ESCAPE_UNICODE): |
|
encode1(p, '?'); |
break; |
break; |
case (ESCAPE_NUMBERED): |
case (ESCAPE_NUMBERED): |
if ('\0' != (c = mchars_num2char(seq, sz))) |
c = mchars_num2char(seq, sz); |
|
if ('\0' != c) |
encode(p, &c, 1); |
encode(p, &c, 1); |
break; |
break; |
case (ESCAPE_PREDEF): |
|
cp = mchars_res2str(p->symtab, seq, sz, &ssz); |
|
if (NULL != cp) |
|
encode(p, cp, ssz); |
|
break; |
|
case (ESCAPE_SPECIAL): |
case (ESCAPE_SPECIAL): |
cp = mchars_spec2str(p->symtab, seq, sz, &ssz); |
cp = mchars_spec2str(p->symtab, seq, sz, &ssz); |
if (NULL != cp) |
if (NULL != cp) |
Line 568 encode(struct termp *p, const char *word, size_t sz) |
|
Line 565 encode(struct termp *p, const char *word, size_t sz) |
|
adjbuf(p, p->col + 1 + (len * 3)); |
adjbuf(p, p->col + 1 + (len * 3)); |
|
|
for (i = 0; i < len; i++) { |
for (i = 0; i < len; i++) { |
if ( ! isgraph((unsigned char)word[i])) { |
if (ASCII_HYPH != word[i] && |
|
! isgraph((unsigned char)word[i])) { |
p->buf[p->col++] = word[i]; |
p->buf[p->col++] = word[i]; |
continue; |
continue; |
} |
} |
|
|
if (TERMFONT_UNDER == f) |
if (TERMFONT_UNDER == f) |
p->buf[p->col++] = '_'; |
p->buf[p->col++] = '_'; |
|
else if (ASCII_HYPH == word[i]) |
|
p->buf[p->col++] = '-'; |
else |
else |
p->buf[p->col++] = word[i]; |
p->buf[p->col++] = word[i]; |
|
|
Line 597 term_strlen(const struct termp *p, const char *cp) |
|
Line 597 term_strlen(const struct termp *p, const char *cp) |
|
size_t sz, rsz, i; |
size_t sz, rsz, i; |
int ssz, c; |
int ssz, c; |
const char *seq, *rhs; |
const char *seq, *rhs; |
|
enum mandoc_esc esc; |
static const char rej[] = { '\\', ASCII_HYPH, ASCII_NBRSP, '\0' }; |
static const char rej[] = { '\\', ASCII_HYPH, ASCII_NBRSP, '\0' }; |
|
|
/* |
/* |
Line 615 term_strlen(const struct termp *p, const char *cp) |
|
Line 616 term_strlen(const struct termp *p, const char *cp) |
|
switch (*cp) { |
switch (*cp) { |
case ('\\'): |
case ('\\'): |
cp++; |
cp++; |
rhs = NULL; |
esc = mandoc_escape(&cp, &seq, &ssz); |
switch (mandoc_escape(&cp, &seq, &ssz)) { |
if (ESCAPE_ERROR == esc) |
case (ESCAPE_ERROR): |
|
return(sz); |
return(sz); |
case (ESCAPE_UNICODE): |
|
if (TERMENC_ASCII != p->enc) { |
if (TERMENC_ASCII != p->enc) |
sz += (*p->width)(p, '?'); |
switch (esc) { |
|
case (ESCAPE_UNICODE): |
|
c = mchars_num2uc |
|
(seq + 1, ssz - 1); |
|
if ('\0' == c) |
|
break; |
|
sz += (*p->width)(p, c); |
|
continue; |
|
case (ESCAPE_SPECIAL): |
|
c = mchars_spec2cp |
|
(p->symtab, seq, ssz); |
|
if (c <= 0) |
|
break; |
|
sz += (*p->width)(p, c); |
|
continue; |
|
default: |
break; |
break; |
} |
} |
c = mchars_num2uc(seq + 1, ssz - 1); |
|
if ('\0' != c) |
rhs = NULL; |
sz += (*p->width)(p, c); |
|
|
switch (esc) { |
|
case (ESCAPE_UNICODE): |
|
sz += (*p->width)(p, '?'); |
break; |
break; |
case (ESCAPE_NUMBERED): |
case (ESCAPE_NUMBERED): |
c = mchars_num2char(seq, ssz); |
c = mchars_num2char(seq, ssz); |
if ('\0' != c) |
if ('\0' != c) |
sz += (*p->width)(p, c); |
sz += (*p->width)(p, c); |
break; |
|
case (ESCAPE_PREDEF): |
|
rhs = mchars_res2str |
|
(p->symtab, seq, ssz, &rsz); |
|
break; |
break; |
case (ESCAPE_SPECIAL): |
case (ESCAPE_SPECIAL): |
rhs = mchars_spec2str |
rhs = mchars_spec2str |