version 1.116, 2011/09/18 21:08:34 |
version 1.121, 2011/09/21 09:57:13 |
Line 245 pre_literal(DECL_ARGS) |
|
Line 245 pre_literal(DECL_ARGS) |
|
else |
else |
mt->fl &= ~MANT_LITERAL; |
mt->fl &= ~MANT_LITERAL; |
|
|
|
/* |
|
* Unlike .IP and .TP, .HP does not have a HEAD. |
|
* So in case a second call to term_flushln() is needed, |
|
* indentation has to be set up explicitly. |
|
*/ |
|
if (MAN_HP == n->parent->tok && p->rmargin < p->maxrmargin) { |
|
p->offset = p->rmargin; |
|
p->rmargin = p->maxrmargin; |
|
p->flags &= ~(TERMP_NOBREAK | TERMP_TWOSPACE); |
|
p->flags |= TERMP_NOSPACE; |
|
} |
|
|
return(0); |
return(0); |
} |
} |
|
|
Line 431 pre_sp(DECL_ARGS) |
|
Line 443 pre_sp(DECL_ARGS) |
|
static int |
static int |
pre_HP(DECL_ARGS) |
pre_HP(DECL_ARGS) |
{ |
{ |
size_t len; |
size_t len, one; |
int ival; |
int ival; |
const struct man_node *nn; |
const struct man_node *nn; |
|
|
Line 456 pre_HP(DECL_ARGS) |
|
Line 468 pre_HP(DECL_ARGS) |
|
if ((ival = a2width(p, nn->string)) >= 0) |
if ((ival = a2width(p, nn->string)) >= 0) |
len = (size_t)ival; |
len = (size_t)ival; |
|
|
if (0 == len) |
one = term_len(p, 1); |
len = term_len(p, 1); |
if (len < one) |
|
len = one; |
|
|
p->offset = mt->offset; |
p->offset = mt->offset; |
p->rmargin = mt->offset + len; |
p->rmargin = mt->offset + len; |
Line 520 pre_IP(DECL_ARGS) |
|
Line 533 pre_IP(DECL_ARGS) |
|
|
|
switch (n->type) { |
switch (n->type) { |
case (MAN_BODY): |
case (MAN_BODY): |
p->flags |= TERMP_NOLPAD; |
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
break; |
break; |
case (MAN_HEAD): |
case (MAN_HEAD): |
Line 591 post_IP(DECL_ARGS) |
|
Line 603 post_IP(DECL_ARGS) |
|
break; |
break; |
case (MAN_BODY): |
case (MAN_BODY): |
term_newln(p); |
term_newln(p); |
p->flags &= ~TERMP_NOLPAD; |
|
break; |
break; |
default: |
default: |
break; |
break; |
Line 612 pre_TP(DECL_ARGS) |
|
Line 623 pre_TP(DECL_ARGS) |
|
p->flags |= TERMP_NOBREAK; |
p->flags |= TERMP_NOBREAK; |
break; |
break; |
case (MAN_BODY): |
case (MAN_BODY): |
p->flags |= TERMP_NOLPAD; |
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
break; |
break; |
case (MAN_BLOCK): |
case (MAN_BLOCK): |
Line 628 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 681 post_TP(DECL_ARGS) |
|
Line 691 post_TP(DECL_ARGS) |
|
break; |
break; |
case (MAN_BODY): |
case (MAN_BODY): |
term_newln(p); |
term_newln(p); |
p->flags &= ~TERMP_NOLPAD; |
|
break; |
break; |
default: |
default: |
break; |
break; |
Line 815 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 882 print_man_node(DECL_ARGS) |
|
Line 892 print_man_node(DECL_ARGS) |
|
* -man doesn't have nested macros, we don't need to be |
* -man doesn't have nested macros, we don't need to be |
* more specific than this. |
* more specific than this. |
*/ |
*/ |
if (MANT_LITERAL & mt->fl && |
if (MANT_LITERAL & mt->fl && ! (TERMP_NOBREAK & p->flags) && |
(NULL == n->next || |
(NULL == n->next || |
n->next->line > n->line)) { |
n->next->line > n->line)) { |
rm = p->rmargin; |
rm = p->rmargin; |
Line 890 print_man_node(DECL_ARGS) |
|
Line 900 print_man_node(DECL_ARGS) |
|
p->rmargin = p->maxrmargin = TERM_MAXMARGIN; |
p->rmargin = p->maxrmargin = TERM_MAXMARGIN; |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_flushln(p); |
term_flushln(p); |
p->flags &= ~TERMP_NOLPAD; |
|
p->rmargin = rm; |
p->rmargin = rm; |
p->maxrmargin = rmax; |
p->maxrmargin = rmax; |
} |
} |
Line 972 print_man_foot(struct termp *p, const void *arg) |
|
Line 981 print_man_foot(struct termp *p, const void *arg) |
|
term_word(p, ""); |
term_word(p, ""); |
term_flushln(p); |
term_flushln(p); |
|
|
p->flags |= TERMP_NOLPAD | TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
p->offset = p->rmargin; |
p->offset = p->rmargin; |
p->rmargin = p->maxrmargin; |
p->rmargin = p->maxrmargin; |
p->flags &= ~TERMP_NOBREAK; |
p->flags &= ~TERMP_NOBREAK; |
Line 997 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 1009 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); |
|
|
p->flags |= TERMP_NOLPAD | TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
p->offset = p->rmargin; |
p->offset = p->rmargin; |
p->rmargin = p->offset + buflen + titlen < p->maxrmargin ? |
p->rmargin = p->offset + buflen + titlen < p->maxrmargin ? |
p->maxrmargin - titlen : p->maxrmargin; |
p->maxrmargin - titlen : p->maxrmargin; |
Line 1029 print_man_head(struct termp *p, const void *arg) |
|
Line 1038 print_man_head(struct termp *p, const void *arg) |
|
|
|
p->flags &= ~TERMP_NOBREAK; |
p->flags &= ~TERMP_NOBREAK; |
if (p->rmargin + titlen <= p->maxrmargin) { |
if (p->rmargin + titlen <= p->maxrmargin) { |
p->flags |= TERMP_NOLPAD | TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
p->offset = p->rmargin; |
p->offset = p->rmargin; |
p->rmargin = p->maxrmargin; |
p->rmargin = p->maxrmargin; |
term_word(p, title); |
term_word(p, title); |
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 |