version 1.155, 2014/10/28 17:36:19 |
version 1.156, 2014/11/21 01:52:53 |
Line 456 pre_in(DECL_ARGS) |
|
Line 456 pre_in(DECL_ARGS) |
|
else |
else |
p->offset = v; |
p->offset = v; |
|
|
/* Don't let this creep beyond the right margin. */ |
|
|
|
if (p->offset > p->rmargin) |
|
p->offset = p->rmargin; |
|
|
|
return(0); |
return(0); |
} |
} |
|
|
Line 654 pre_IP(DECL_ARGS) |
|
Line 649 pre_IP(DECL_ARGS) |
|
return(0); |
return(0); |
case MAN_BODY: |
case MAN_BODY: |
p->offset = mt->offset + len; |
p->offset = mt->offset + len; |
p->rmargin = p->maxrmargin > p->offset ? |
p->rmargin = p->maxrmargin; |
p->maxrmargin : p->offset; |
|
break; |
break; |
default: |
default: |
break; |
break; |
Line 746 pre_TP(DECL_ARGS) |
|
Line 740 pre_TP(DECL_ARGS) |
|
return(0); |
return(0); |
case MAN_BODY: |
case MAN_BODY: |
p->offset = mt->offset + len; |
p->offset = mt->offset + len; |
p->rmargin = p->maxrmargin > p->offset ? |
p->rmargin = p->maxrmargin; |
p->maxrmargin : p->offset; |
|
p->trailspace = 0; |
p->trailspace = 0; |
p->flags &= ~TERMP_NOBREAK; |
p->flags &= ~TERMP_NOBREAK; |
break; |
break; |
Line 898 pre_RS(DECL_ARGS) |
|
Line 891 pre_RS(DECL_ARGS) |
|
|
|
mt->offset += sz; |
mt->offset += sz; |
p->offset = mt->offset; |
p->offset = mt->offset; |
p->rmargin = p->maxrmargin > p->offset ? |
p->rmargin = p->maxrmargin; |
p->maxrmargin : p->offset; |
|
|
|
if (++mt->lmarginsz < MAXMARGINS) |
if (++mt->lmarginsz < MAXMARGINS) |
mt->lmargincur = mt->lmarginsz; |
mt->lmargincur = mt->lmarginsz; |
Line 1063 print_man_foot(struct termp *p, const void *arg) |
|
Line 1055 print_man_foot(struct termp *p, const void *arg) |
|
{ |
{ |
const struct man_meta *meta; |
const struct man_meta *meta; |
char *title; |
char *title; |
size_t datelen; |
size_t datelen, titlen; |
|
|
meta = (const struct man_meta *)arg; |
meta = (const struct man_meta *)arg; |
assert(meta->title); |
assert(meta->title); |
Line 1100 print_man_foot(struct termp *p, const void *arg) |
|
Line 1092 print_man_foot(struct termp *p, const void *arg) |
|
p->flags |= TERMP_NOSPACE | TERMP_NOBREAK; |
p->flags |= TERMP_NOSPACE | TERMP_NOBREAK; |
p->trailspace = 1; |
p->trailspace = 1; |
p->offset = 0; |
p->offset = 0; |
p->rmargin = (p->maxrmargin - datelen + term_len(p, 1)) / 2; |
p->rmargin = p->maxrmargin > datelen ? |
|
(p->maxrmargin + term_len(p, 1) - datelen) / 2 : 0; |
|
|
if (meta->source) |
if (meta->source) |
term_word(p, meta->source); |
term_word(p, meta->source); |
Line 1108 print_man_foot(struct termp *p, const void *arg) |
|
Line 1101 print_man_foot(struct termp *p, const void *arg) |
|
|
|
/* At the bottom in the middle: manual date. */ |
/* At the bottom in the middle: manual date. */ |
|
|
p->flags |= TERMP_NOSPACE; |
|
p->offset = p->rmargin; |
p->offset = p->rmargin; |
p->rmargin = p->maxrmargin - term_strlen(p, title); |
titlen = term_strlen(p, title); |
if (p->offset + datelen >= p->rmargin) |
p->rmargin = p->maxrmargin > titlen ? p->maxrmargin - titlen : 0; |
p->rmargin = p->offset + datelen; |
p->flags |= TERMP_NOSPACE; |
|
|
term_word(p, meta->date); |
term_word(p, meta->date); |
term_flushln(p); |
term_flushln(p); |
Line 1155 print_man_head(struct termp *p, const void *arg) |
|
Line 1147 print_man_head(struct termp *p, const void *arg) |
|
p->offset = 0; |
p->offset = 0; |
p->rmargin = 2 * (titlen+1) + vollen < p->maxrmargin ? |
p->rmargin = 2 * (titlen+1) + vollen < p->maxrmargin ? |
(p->maxrmargin - vollen + term_len(p, 1)) / 2 : |
(p->maxrmargin - vollen + term_len(p, 1)) / 2 : |
p->maxrmargin - vollen; |
vollen < p->maxrmargin ? p->maxrmargin - vollen : 0; |
|
|
term_word(p, title); |
term_word(p, title); |
term_flushln(p); |
term_flushln(p); |