version 1.58, 2010/03/23 12:42:22 |
version 1.63, 2010/05/12 16:46:28 |
Line 142 static const struct termact termacts[MAN_MAX] = { |
|
Line 142 static const struct termact termacts[MAN_MAX] = { |
|
{ pre_sp, NULL, MAN_NOTEXT }, /* Sp */ |
{ pre_sp, NULL, MAN_NOTEXT }, /* Sp */ |
{ pre_nf, NULL, 0 }, /* Vb */ |
{ pre_nf, NULL, 0 }, /* Vb */ |
{ pre_fi, NULL, 0 }, /* Ve */ |
{ pre_fi, NULL, 0 }, /* Ve */ |
|
{ pre_ign, NULL, MAN_NOTEXT }, /* de */ |
|
{ pre_ign, NULL, MAN_NOTEXT }, /* dei */ |
|
{ pre_ign, NULL, MAN_NOTEXT }, /* am */ |
|
{ pre_ign, NULL, MAN_NOTEXT }, /* ami */ |
|
{ pre_ign, NULL, MAN_NOTEXT }, /* ig */ |
|
{ NULL, NULL, 0 }, /* . */ |
}; |
}; |
|
|
|
|
|
|
pre_fi(DECL_ARGS) |
pre_fi(DECL_ARGS) |
{ |
{ |
|
|
p->rmargin = p->maxrmargin = 65; |
|
mt->fl &= ~MANT_LITERAL; |
mt->fl &= ~MANT_LITERAL; |
return(1); |
return(1); |
} |
} |
|
|
pre_nf(DECL_ARGS) |
pre_nf(DECL_ARGS) |
{ |
{ |
|
|
p->rmargin = p->maxrmargin = 78; |
|
term_newln(p); |
|
mt->fl |= MANT_LITERAL; |
mt->fl |= MANT_LITERAL; |
|
|
return(MAN_Vb != n->tok); |
return(MAN_Vb != n->tok); |
} |
} |
|
|
Line 367 pre_sp(DECL_ARGS) |
|
Line 369 pre_sp(DECL_ARGS) |
|
|
|
if (0 == len) |
if (0 == len) |
term_newln(p); |
term_newln(p); |
for (i = 0; i < len; i++) |
for (i = 0; i <= len; i++) |
term_vspace(p); |
term_vspace(p); |
|
|
return(0); |
return(0); |
Line 708 pre_SH(DECL_ARGS) |
|
Line 710 pre_SH(DECL_ARGS) |
|
if (n->prev && MAN_SH == n->prev->tok) |
if (n->prev && MAN_SH == n->prev->tok) |
if (NULL == n->prev->body->child) |
if (NULL == n->prev->body->child) |
break; |
break; |
|
/* If the first macro, no vspae. */ |
|
if (NULL == n->prev) |
|
break; |
term_vspace(p); |
term_vspace(p); |
break; |
break; |
case (MAN_HEAD): |
case (MAN_HEAD): |
Line 785 post_RS(DECL_ARGS) |
|
Line 790 post_RS(DECL_ARGS) |
|
case (MAN_BLOCK): |
case (MAN_BLOCK): |
mt->offset = mt->lmargin = INDENT; |
mt->offset = mt->lmargin = INDENT; |
break; |
break; |
|
case (MAN_HEAD): |
|
break; |
default: |
default: |
term_newln(p); |
term_newln(p); |
p->offset = INDENT; |
p->offset = INDENT; |
Line 812 print_man_node(DECL_ARGS) |
|
Line 819 print_man_node(DECL_ARGS) |
|
/* FIXME: this means that macro lines are munged! */ |
/* FIXME: this means that macro lines are munged! */ |
|
|
if (MANT_LITERAL & mt->fl) { |
if (MANT_LITERAL & mt->fl) { |
|
p->rmargin = p->maxrmargin = TERM_MAXMARGIN; |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_flushln(p); |
term_flushln(p); |
|
p->rmargin = p->maxrmargin = 65; |
} |
} |
break; |
break; |
default: |
default: |
Line 833 print_man_node(DECL_ARGS) |
|
Line 842 print_man_node(DECL_ARGS) |
|
if ( ! (MAN_NOTEXT & termacts[n->tok].flags)) |
if ( ! (MAN_NOTEXT & termacts[n->tok].flags)) |
term_fontrepl(p, TERMFONT_NONE); |
term_fontrepl(p, TERMFONT_NONE); |
} |
} |
|
|
|
if (MAN_EOS & n->flags) |
|
p->flags |= TERMP_SENTENCE; |
} |
} |
|
|
|
|
Line 884 print_man_head(struct termp *p, const struct man_meta |
|
Line 896 print_man_head(struct termp *p, const struct man_meta |
|
char buf[BUFSIZ], title[BUFSIZ]; |
char buf[BUFSIZ], title[BUFSIZ]; |
size_t buflen, titlen; |
size_t buflen, titlen; |
|
|
|
/* |
|
* Note that old groff would spit out some spaces before the |
|
* header. We discontinue this strange behaviour, but at one |
|
* point we did so here. |
|
*/ |
|
|
p->rmargin = p->maxrmargin; |
p->rmargin = p->maxrmargin; |
|
|
p->offset = 0; |
p->offset = 0; |
Line 925 print_man_head(struct termp *p, const struct man_meta |
|
Line 943 print_man_head(struct termp *p, const struct man_meta |
|
p->rmargin = p->maxrmargin; |
p->rmargin = p->maxrmargin; |
p->offset = 0; |
p->offset = 0; |
p->flags &= ~TERMP_NOSPACE; |
p->flags &= ~TERMP_NOSPACE; |
|
|
|
/* |
|
* Groff likes to have some leading spaces before content. Well |
|
* that's fine by me. |
|
*/ |
|
|
|
term_vspace(p); |
|
term_vspace(p); |
|
term_vspace(p); |
} |
} |