version 1.61, 2010/05/10 08:27:09 |
version 1.68, 2010/05/15 22:44:04 |
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 }, /* . */ |
|
}; |
}; |
|
|
|
|
Line 163 terminal_man(void *arg, const struct man *man) |
|
Line 157 terminal_man(void *arg, const struct man *man) |
|
p = (struct termp *)arg; |
p = (struct termp *)arg; |
|
|
p->overstep = 0; |
p->overstep = 0; |
p->maxrmargin = 65; |
p->maxrmargin = p->defrmargin; |
|
|
if (NULL == p->symtab) |
if (NULL == p->symtab) |
switch (p->enc) { |
switch (p->enc) { |
Line 484 pre_IP(DECL_ARGS) |
|
Line 478 pre_IP(DECL_ARGS) |
|
break; |
break; |
case (MAN_HEAD): |
case (MAN_HEAD): |
p->flags |= TERMP_NOBREAK; |
p->flags |= TERMP_NOBREAK; |
p->flags |= TERMP_TWOSPACE; |
|
break; |
break; |
case (MAN_BLOCK): |
case (MAN_BLOCK): |
print_bvspace(p, n); |
print_bvspace(p, n); |
Line 545 post_IP(DECL_ARGS) |
|
Line 538 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->flags &= ~TERMP_TWOSPACE; |
|
p->rmargin = p->maxrmargin; |
p->rmargin = p->maxrmargin; |
break; |
break; |
case (MAN_BODY): |
case (MAN_BODY): |
Line 803 post_RS(DECL_ARGS) |
|
Line 795 post_RS(DECL_ARGS) |
|
static void |
static void |
print_man_node(DECL_ARGS) |
print_man_node(DECL_ARGS) |
{ |
{ |
|
size_t rm, rmax; |
int c; |
int c; |
|
|
c = 1; |
c = 1; |
Line 819 print_man_node(DECL_ARGS) |
|
Line 812 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) { |
|
rm = p->rmargin; |
|
rmax = p->maxrmargin; |
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->rmargin = p->maxrmargin = 65; |
p->rmargin = rm; |
|
p->maxrmargin = rmax; |
} |
} |
break; |
break; |
default: |
default: |
Line 842 print_man_node(DECL_ARGS) |
|
Line 838 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 893 print_man_head(struct termp *p, const struct man_meta |
|
Line 892 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; |
|
|
#ifdef __OpenBSD__ |
|
term_vspace(p); |
|
term_vspace(p); |
|
term_vspace(p); |
|
#endif |
|
|
|
p->offset = 0; |
p->offset = 0; |
buf[0] = title[0] = '\0'; |
buf[0] = title[0] = '\0'; |
|
|
Line 908 print_man_head(struct termp *p, const struct man_meta |
|
Line 907 print_man_head(struct termp *p, const struct man_meta |
|
strlcpy(buf, m->vol, BUFSIZ); |
strlcpy(buf, m->vol, BUFSIZ); |
buflen = strlen(buf); |
buflen = strlen(buf); |
|
|
snprintf(title, BUFSIZ, "%s(%d)", m->title, m->msec); |
snprintf(title, BUFSIZ, "%s(%s)", m->title, m->msec); |
titlen = strlen(title); |
titlen = strlen(title); |
|
|
p->offset = 0; |
p->offset = 0; |
Line 941 print_man_head(struct termp *p, const struct man_meta |
|
Line 940 print_man_head(struct termp *p, const struct man_meta |
|
p->offset = 0; |
p->offset = 0; |
p->flags &= ~TERMP_NOSPACE; |
p->flags &= ~TERMP_NOSPACE; |
|
|
#ifdef __OpenBSD__ |
/* |
|
* Groff likes to have some leading spaces before content. Well |
|
* that's fine by me. |
|
*/ |
|
|
term_vspace(p); |
term_vspace(p); |
term_vspace(p); |
term_vspace(p); |
#else |
|
term_vspace(p); |
term_vspace(p); |
term_vspace(p); |
|
term_vspace(p); |
|
#endif |
|
} |
} |