version 1.138, 2013/11/11 00:37:55 |
version 1.142, 2014/03/08 16:22:04 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010, 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010-2014 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 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 656 pre_IP(DECL_ARGS) |
|
Line 658 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->rmargin = p->maxrmargin > p->offset ? |
|
p->maxrmargin : p->offset; |
break; |
break; |
default: |
default: |
break; |
break; |
Line 675 post_IP(DECL_ARGS) |
|
Line 678 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 702 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 715 pre_TP(DECL_ARGS) |
|
Line 720 pre_TP(DECL_ARGS) |
|
/* Calculate offset. */ |
/* Calculate offset. */ |
|
|
if (NULL != (nn = n->parent->head->child)) |
if (NULL != (nn = n->parent->head->child)) |
if (nn->string && nn->parent->line == nn->line) |
if (nn->string && 0 == (MAN_LINE & nn->flags)) |
if ((ival = a2width(p, nn->string)) >= 0) |
if ((ival = a2width(p, nn->string)) >= 0) |
len = (size_t)ival; |
len = (size_t)ival; |
|
|
Line 732 pre_TP(DECL_ARGS) |
|
Line 737 pre_TP(DECL_ARGS) |
|
mt->fl &= ~MANT_LITERAL; |
mt->fl &= ~MANT_LITERAL; |
|
|
/* Don't print same-line elements. */ |
/* Don't print same-line elements. */ |
for (nn = n->child; nn; nn = nn->next) |
nn = n->child; |
if (nn->line > n->line) |
while (NULL != nn && 0 == (MAN_LINE & nn->flags)) |
print_man_node(p, mt, nn, meta); |
nn = nn->next; |
|
|
|
while (NULL != nn) { |
|
print_man_node(p, mt, nn, meta); |
|
nn = nn->next; |
|
} |
|
|
if (savelit) |
if (savelit) |
mt->fl |= MANT_LITERAL; |
mt->fl |= MANT_LITERAL; |
if (ival >= 0) |
if (ival >= 0) |
Line 744 pre_TP(DECL_ARGS) |
|
Line 754 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->rmargin = p->maxrmargin > p->offset ? |
|
p->maxrmargin : p->offset; |
|
p->trailspace = 0; |
p->flags &= ~TERMP_NOBREAK; |
p->flags &= ~TERMP_NOBREAK; |
p->flags &= ~TERMP_TWOSPACE; |
|
break; |
break; |
default: |
default: |
break; |
break; |
Line 905 pre_RS(DECL_ARGS) |
|
Line 916 pre_RS(DECL_ARGS) |
|
sz = (size_t)ival; |
sz = (size_t)ival; |
|
|
mt->offset += sz; |
mt->offset += sz; |
p->rmargin = p->maxrmargin; |
p->offset = mt->offset; |
p->offset = mt->offset < p->rmargin ? mt->offset : p->rmargin; |
p->rmargin = p->maxrmargin > p->offset ? |
|
p->maxrmargin : p->offset; |
|
|
if (++mt->lmarginsz < MAXMARGINS) |
if (++mt->lmarginsz < MAXMARGINS) |
mt->lmargincur = mt->lmarginsz; |
mt->lmargincur = mt->lmarginsz; |
|
|
* more specific than this. |
* more specific than this. |
*/ |
*/ |
if (MANT_LITERAL & mt->fl && ! (TERMP_NOBREAK & p->flags) && |
if (MANT_LITERAL & mt->fl && ! (TERMP_NOBREAK & p->flags) && |
(NULL == n->next || n->next->line > n->line)) { |
(NULL == n->next || MAN_LINE & n->next->flags)) { |
rm = p->rmargin; |
rm = p->rmargin; |
rmax = p->maxrmargin; |
rmax = p->maxrmargin; |
p->rmargin = p->maxrmargin = TERM_MAXMARGIN; |
p->rmargin = p->maxrmargin = TERM_MAXMARGIN; |
Line 1101 print_man_foot(struct termp *p, const void *arg) |
|
Line 1113 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 1136 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 1168 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 1191 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; |