version 1.138, 2013/11/11 00:37:55 |
version 1.139, 2013/12/22 23:34:13 |
Line 265 pre_literal(DECL_ARGS) |
|
Line 265 pre_literal(DECL_ARGS) |
|
if (MAN_HP == n->parent->tok && p->rmargin < p->maxrmargin) { |
if (MAN_HP == n->parent->tok && p->rmargin < p->maxrmargin) { |
p->offset = p->rmargin; |
p->offset = p->rmargin; |
p->rmargin = p->maxrmargin; |
p->rmargin = p->maxrmargin; |
p->flags &= ~(TERMP_NOBREAK | TERMP_TWOSPACE); |
p->trailspace = 0; |
|
p->flags &= ~TERMP_NOBREAK; |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
} |
} |
|
|
Line 535 pre_HP(DECL_ARGS) |
|
Line 536 pre_HP(DECL_ARGS) |
|
|
|
if ( ! (MANT_LITERAL & mt->fl)) { |
if ( ! (MANT_LITERAL & mt->fl)) { |
p->flags |= TERMP_NOBREAK; |
p->flags |= TERMP_NOBREAK; |
p->flags |= TERMP_TWOSPACE; |
p->trailspace = 2; |
} |
} |
|
|
len = mt->lmargin[mt->lmargincur]; |
len = mt->lmargin[mt->lmargincur]; |
Line 570 post_HP(DECL_ARGS) |
|
Line 571 post_HP(DECL_ARGS) |
|
case (MAN_BODY): |
case (MAN_BODY): |
term_newln(p); |
term_newln(p); |
p->flags &= ~TERMP_NOBREAK; |
p->flags &= ~TERMP_NOBREAK; |
p->flags &= ~TERMP_TWOSPACE; |
p->trailspace = 0; |
p->offset = mt->offset; |
p->offset = mt->offset; |
p->rmargin = p->maxrmargin; |
p->rmargin = p->maxrmargin; |
break; |
break; |
Line 613 pre_IP(DECL_ARGS) |
|
Line 614 pre_IP(DECL_ARGS) |
|
break; |
break; |
case (MAN_HEAD): |
case (MAN_HEAD): |
p->flags |= TERMP_NOBREAK; |
p->flags |= TERMP_NOBREAK; |
|
p->trailspace = 1; |
break; |
break; |
case (MAN_BLOCK): |
case (MAN_BLOCK): |
print_bvspace(p, n, mt->pardist); |
print_bvspace(p, n, mt->pardist); |
Line 675 post_IP(DECL_ARGS) |
|
Line 677 post_IP(DECL_ARGS) |
|
case (MAN_HEAD): |
case (MAN_HEAD): |
term_flushln(p); |
term_flushln(p); |
p->flags &= ~TERMP_NOBREAK; |
p->flags &= ~TERMP_NOBREAK; |
|
p->trailspace = 0; |
p->rmargin = p->maxrmargin; |
p->rmargin = p->maxrmargin; |
break; |
break; |
case (MAN_BODY): |
case (MAN_BODY): |
Line 698 pre_TP(DECL_ARGS) |
|
Line 701 pre_TP(DECL_ARGS) |
|
switch (n->type) { |
switch (n->type) { |
case (MAN_HEAD): |
case (MAN_HEAD): |
p->flags |= TERMP_NOBREAK; |
p->flags |= TERMP_NOBREAK; |
|
p->trailspace = 1; |
break; |
break; |
case (MAN_BODY): |
case (MAN_BODY): |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
Line 745 pre_TP(DECL_ARGS) |
|
Line 749 pre_TP(DECL_ARGS) |
|
case (MAN_BODY): |
case (MAN_BODY): |
p->offset = mt->offset + len; |
p->offset = mt->offset + len; |
p->rmargin = p->maxrmargin; |
p->rmargin = p->maxrmargin; |
|
p->trailspace = 0; |
p->flags &= ~TERMP_NOBREAK; |
p->flags &= ~TERMP_NOBREAK; |
p->flags &= ~TERMP_TWOSPACE; |
|
break; |
break; |
default: |
default: |
break; |
break; |
Line 1101 print_man_foot(struct termp *p, const void *arg) |
|
Line 1105 print_man_foot(struct termp *p, const void *arg) |
|
/* Bottom left corner: manual source. */ |
/* Bottom left corner: manual source. */ |
|
|
p->flags |= TERMP_NOSPACE | TERMP_NOBREAK; |
p->flags |= TERMP_NOSPACE | TERMP_NOBREAK; |
|
p->trailspace = 1; |
p->offset = 0; |
p->offset = 0; |
p->rmargin = (p->maxrmargin - datelen + term_len(p, 1)) / 2; |
p->rmargin = (p->maxrmargin - datelen + term_len(p, 1)) / 2; |
|
|
Line 1123 print_man_foot(struct termp *p, const void *arg) |
|
Line 1128 print_man_foot(struct termp *p, const void *arg) |
|
|
|
p->flags &= ~TERMP_NOBREAK; |
p->flags &= ~TERMP_NOBREAK; |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
|
p->trailspace = 0; |
p->offset = p->rmargin; |
p->offset = p->rmargin; |
p->rmargin = p->maxrmargin; |
p->rmargin = p->maxrmargin; |
|
|
Line 1154 print_man_head(struct termp *p, const void *arg) |
|
Line 1160 print_man_head(struct termp *p, const void *arg) |
|
titlen = term_strlen(p, title); |
titlen = term_strlen(p, title); |
|
|
p->flags |= TERMP_NOBREAK | TERMP_NOSPACE; |
p->flags |= TERMP_NOBREAK | TERMP_NOSPACE; |
|
p->trailspace = 1; |
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 - |
Line 1176 print_man_head(struct termp *p, const void *arg) |
|
Line 1183 print_man_head(struct termp *p, const void *arg) |
|
/* Top right corner: title and section, again. */ |
/* Top right corner: title and section, again. */ |
|
|
p->flags &= ~TERMP_NOBREAK; |
p->flags &= ~TERMP_NOBREAK; |
|
p->trailspace = 0; |
if (p->rmargin + titlen <= p->maxrmargin) { |
if (p->rmargin + titlen <= p->maxrmargin) { |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
p->offset = p->rmargin; |
p->offset = p->rmargin; |