version 1.117, 2011/09/19 22:36:16 |
version 1.121, 2011/09/21 09:57:13 |
Line 251 pre_literal(DECL_ARGS) |
|
Line 251 pre_literal(DECL_ARGS) |
|
* indentation has to be set up explicitly. |
* indentation has to be set up explicitly. |
*/ |
*/ |
if (MAN_HP == n->parent->tok && p->rmargin < p->maxrmargin) { |
if (MAN_HP == n->parent->tok && p->rmargin < p->maxrmargin) { |
p->offset = p->rmargin + 1; |
p->offset = p->rmargin; |
p->rmargin = p->maxrmargin; |
p->rmargin = p->maxrmargin; |
p->flags &= ~(TERMP_NOBREAK | TERMP_TWOSPACE); |
p->flags &= ~(TERMP_NOBREAK | TERMP_TWOSPACE); |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
Line 469 pre_HP(DECL_ARGS) |
|
Line 469 pre_HP(DECL_ARGS) |
|
len = (size_t)ival; |
len = (size_t)ival; |
|
|
one = term_len(p, 1); |
one = term_len(p, 1); |
if (len > one) |
if (len < one) |
len -= one; |
|
else |
|
len = one; |
len = one; |
|
|
p->offset = mt->offset; |
p->offset = mt->offset; |
Line 640 pre_TP(DECL_ARGS) |
|
Line 638 pre_TP(DECL_ARGS) |
|
/* Calculate offset. */ |
/* Calculate offset. */ |
|
|
if (NULL != (nn = n->parent->head->child)) |
if (NULL != (nn = n->parent->head->child)) |
if (nn->parent->line == nn->line) |
if (nn->string && nn->parent->line == nn->line) |
if ((ival = a2width(p, nn->string)) >= 0) |
if ((ival = a2width(p, nn->string)) >= 0) |
len = (size_t)ival; |
len = (size_t)ival; |
|
|
Line 826 pre_RS(DECL_ARGS) |
|
Line 824 pre_RS(DECL_ARGS) |
|
sz = (size_t)ival; |
sz = (size_t)ival; |
|
|
mt->offset += sz; |
mt->offset += sz; |
p->offset = mt->offset; |
p->rmargin = p->maxrmargin; |
|
p->offset = mt->offset < p->rmargin ? mt->offset : p->rmargin; |
|
|
if (++mt->lmarginsz < MAXMARGINS) |
if (++mt->lmarginsz < MAXMARGINS) |
mt->lmargincur = mt->lmarginsz; |
mt->lmargincur = mt->lmarginsz; |
Line 1007 print_man_head(struct termp *p, const void *arg) |
|
Line 1006 print_man_head(struct termp *p, const void *arg) |
|
* point we did so here. |
* point we did so here. |
*/ |
*/ |
|
|
|
p->offset = 0; |
p->rmargin = p->maxrmargin; |
p->rmargin = p->maxrmargin; |
|
|
p->offset = 0; |
|
buf[0] = title[0] = '\0'; |
buf[0] = title[0] = '\0'; |
|
|
if (m->vol) |
if (m->vol) |
Line 1019 print_man_head(struct termp *p, const void *arg) |
|
Line 1018 print_man_head(struct termp *p, const void *arg) |
|
snprintf(title, BUFSIZ, "%s(%s)", m->title, m->msec); |
snprintf(title, BUFSIZ, "%s(%s)", m->title, m->msec); |
titlen = term_strlen(p, title); |
titlen = term_strlen(p, title); |
|
|
|
p->flags |= TERMP_NOBREAK | TERMP_NOSPACE; |
p->offset = 0; |
p->offset = 0; |
p->rmargin = 2 * (titlen+1) + buflen < p->maxrmargin ? |
p->rmargin = 2 * (titlen+1) + buflen < p->maxrmargin ? |
(p->maxrmargin - |
(p->maxrmargin - |
term_strlen(p, buf) + term_len(p, 1)) / 2 : |
term_strlen(p, buf) + term_len(p, 1)) / 2 : |
p->maxrmargin - buflen; |
p->maxrmargin - buflen; |
p->flags |= TERMP_NOBREAK | TERMP_NOSPACE; |
|
|
|
term_word(p, title); |
term_word(p, title); |
term_flushln(p); |
term_flushln(p); |
Line 1046 print_man_head(struct termp *p, const void *arg) |
|
Line 1045 print_man_head(struct termp *p, const void *arg) |
|
term_flushln(p); |
term_flushln(p); |
} |
} |
|
|
p->rmargin = p->maxrmargin; |
|
p->offset = 0; |
|
p->flags &= ~TERMP_NOSPACE; |
p->flags &= ~TERMP_NOSPACE; |
|
p->offset = 0; |
|
p->rmargin = p->maxrmargin; |
|
|
/* |
/* |
* Groff likes to have some leading spaces before content. Well |
* Groff likes to have some leading spaces before content. Well |