=================================================================== RCS file: /cvs/mandoc/man_term.c,v retrieving revision 1.23 retrieving revision 1.93 diff -u -p -r1.23 -r1.93 --- mandoc/man_term.c 2009/08/17 11:03:07 1.23 +++ mandoc/man_term.c 2011/01/03 15:30:25 1.93 @@ -1,6 +1,6 @@ -/* $Id: man_term.c,v 1.23 2009/08/17 11:03:07 kristaps Exp $ */ +/* $Id: man_term.c,v 1.93 2011/01/03 15:30:25 kristaps Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -14,363 +14,389 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include + #include #include -#include #include #include #include -#include "term.h" +#include "mandoc.h" +#include "out.h" #include "man.h" +#include "term.h" +#include "chars.h" +#include "main.h" #define INDENT 7 #define HALFINDENT 3 -#ifdef __linux__ -extern size_t strlcpy(char *, const char *, size_t); -extern size_t strlcat(char *, const char *, size_t); -#endif +/* FIXME: have PD set the default vspace width. */ +struct mtermp { + int fl; #define MANT_LITERAL (1 << 0) + /* + * Default amount to indent the left margin after leading text + * has been printed (e.g., `HP' left-indent, `TP' and `IP' body + * indent). This needs to be saved because `HP' and so on, if + * not having a specified value, must default. + * + * Note that this is the indentation AFTER the left offset, so + * the total offset is usually offset + lmargin. + */ + size_t lmargin; + /* + * The default offset, i.e., the amount between any text and the + * page boundary. + */ + size_t offset; +}; #define DECL_ARGS struct termp *p, \ - int *fl, \ + struct mtermp *mt, \ const struct man_node *n, \ const struct man_meta *m struct termact { int (*pre)(DECL_ARGS); void (*post)(DECL_ARGS); + int flags; +#define MAN_NOTEXT (1 << 0) /* Never has text children. */ }; +static int a2width(const struct termp *, const char *); +static size_t a2height(const struct termp *, const char *); + +static void print_man_nodelist(DECL_ARGS); +static void print_man_node(DECL_ARGS); +static void print_man_head(struct termp *, const void *); +static void print_man_foot(struct termp *, const void *); +static void print_bvspace(struct termp *, + const struct man_node *); + +static int pre_alternate(DECL_ARGS); static int pre_B(DECL_ARGS); -static int pre_BI(DECL_ARGS); -static int pre_BR(DECL_ARGS); static int pre_HP(DECL_ARGS); static int pre_I(DECL_ARGS); -static int pre_IB(DECL_ARGS); static int pre_IP(DECL_ARGS); -static int pre_IR(DECL_ARGS); static int pre_PP(DECL_ARGS); -static int pre_RB(DECL_ARGS); -static int pre_RI(DECL_ARGS); +static int pre_RS(DECL_ARGS); static int pre_SH(DECL_ARGS); static int pre_SS(DECL_ARGS); static int pre_TP(DECL_ARGS); -static int pre_br(DECL_ARGS); -static int pre_fi(DECL_ARGS); -static int pre_nf(DECL_ARGS); -static int pre_r(DECL_ARGS); +static int pre_ign(DECL_ARGS); +static int pre_in(DECL_ARGS); +static int pre_literal(DECL_ARGS); static int pre_sp(DECL_ARGS); +static int pre_ft(DECL_ARGS); -static void post_B(DECL_ARGS); -static void post_I(DECL_ARGS); static void post_IP(DECL_ARGS); static void post_HP(DECL_ARGS); +static void post_RS(DECL_ARGS); static void post_SH(DECL_ARGS); static void post_SS(DECL_ARGS); static void post_TP(DECL_ARGS); -static void post_i(DECL_ARGS); -static const struct termact termacts[MAN_MAX] = { - { pre_br, NULL }, /* br */ - { NULL, NULL }, /* TH */ - { pre_SH, post_SH }, /* SH */ - { pre_SS, post_SS }, /* SS */ - { pre_TP, post_TP }, /* TP */ - { pre_PP, NULL }, /* LP */ - { pre_PP, NULL }, /* PP */ - { pre_PP, NULL }, /* P */ - { pre_IP, post_IP }, /* IP */ - { pre_HP, post_HP }, /* HP */ - { NULL, NULL }, /* SM */ - { pre_B, post_B }, /* SB */ - { pre_BI, NULL }, /* BI */ - { pre_IB, NULL }, /* IB */ - { pre_BR, NULL }, /* BR */ - { pre_RB, NULL }, /* RB */ - { NULL, NULL }, /* R */ - { pre_B, post_B }, /* B */ - { pre_I, post_I }, /* I */ - { pre_IR, NULL }, /* IR */ - { pre_RI, NULL }, /* RI */ - { NULL, NULL }, /* na */ /* TODO: document that has no effect */ - { pre_I, post_i }, /* i */ - { pre_sp, NULL }, /* sp */ - { pre_nf, NULL }, /* nf */ - { pre_fi, NULL }, /* fi */ - { pre_r, NULL }, /* r */ +static const struct termact termacts[MAN_MAX] = { + { pre_sp, NULL, MAN_NOTEXT }, /* br */ + { NULL, NULL, 0 }, /* TH */ + { pre_SH, post_SH, 0 }, /* SH */ + { pre_SS, post_SS, 0 }, /* SS */ + { pre_TP, post_TP, 0 }, /* TP */ + { pre_PP, NULL, 0 }, /* LP */ + { pre_PP, NULL, 0 }, /* PP */ + { pre_PP, NULL, 0 }, /* P */ + { pre_IP, post_IP, 0 }, /* IP */ + { pre_HP, post_HP, 0 }, /* HP */ + { NULL, NULL, 0 }, /* SM */ + { pre_B, NULL, 0 }, /* SB */ + { pre_alternate, NULL, 0 }, /* BI */ + { pre_alternate, NULL, 0 }, /* IB */ + { pre_alternate, NULL, 0 }, /* BR */ + { pre_alternate, NULL, 0 }, /* RB */ + { NULL, NULL, 0 }, /* R */ + { pre_B, NULL, 0 }, /* B */ + { pre_I, NULL, 0 }, /* I */ + { pre_alternate, NULL, 0 }, /* IR */ + { pre_alternate, NULL, 0 }, /* RI */ + { NULL, NULL, MAN_NOTEXT }, /* na */ + { pre_sp, NULL, MAN_NOTEXT }, /* sp */ + { pre_literal, NULL, 0 }, /* nf */ + { pre_literal, NULL, 0 }, /* fi */ + { NULL, NULL, 0 }, /* RE */ + { pre_RS, post_RS, 0 }, /* RS */ + { pre_ign, NULL, 0 }, /* DT */ + { pre_ign, NULL, 0 }, /* UC */ + { pre_ign, NULL, 0 }, /* PD */ + { pre_ign, NULL, 0 }, /* AT */ + { pre_in, NULL, MAN_NOTEXT }, /* in */ + { pre_ft, NULL, MAN_NOTEXT }, /* ft */ }; -static void print_head(struct termp *, - const struct man_meta *); -static void print_body(DECL_ARGS); -static void print_node(DECL_ARGS); -static void print_foot(struct termp *, - const struct man_meta *); -static void fmt_block_vspace(struct termp *, - const struct man_node *); -static int arg_width(const struct man_node *); -int -man_run(struct termp *p, const struct man *m) +void +terminal_man(void *arg, const struct man *man) { - int fl; + struct termp *p; + const struct man_node *n; + const struct man_meta *m; + struct mtermp mt; - print_head(p, man_meta(m)); - p->flags |= TERMP_NOSPACE; - assert(man_node(m)); - assert(MAN_ROOT == man_node(m)->type); + p = (struct termp *)arg; - fl = 0; - if (man_node(m)->child) - print_body(p, &fl, man_node(m)->child, man_meta(m)); - print_foot(p, man_meta(m)); + p->overstep = 0; + p->maxrmargin = p->defrmargin; + p->tabwidth = term_len(p, 5); - return(1); -} + if (NULL == p->symtab) + switch (p->enc) { + case (TERMENC_ASCII): + p->symtab = chars_init(CHARS_ASCII); + break; + default: + abort(); + /* NOTREACHED */ + } + n = man_node(man); + m = man_meta(man); -static void -fmt_block_vspace(struct termp *p, const struct man_node *n) -{ - term_newln(p); + term_begin(p, print_man_head, print_man_foot, m); + p->flags |= TERMP_NOSPACE; - if (NULL == n->prev) - return; + mt.fl = 0; + mt.lmargin = term_len(p, INDENT); + mt.offset = term_len(p, INDENT); - if (MAN_SS == n->prev->tok) - return; - if (MAN_SH == n->prev->tok) - return; + if (n->child) + print_man_nodelist(p, &mt, n->child, m); - term_vspace(p); + term_end(p); } -static int -arg_width(const struct man_node *n) +static size_t +a2height(const struct termp *p, const char *cp) { - int i, len; - const char *p; + struct roffsu su; - assert(MAN_TEXT == n->type); - assert(n->string); + if ( ! a2roffsu(cp, &su, SCALE_VS)) + SCALE_VS_INIT(&su, term_strlen(p, cp)); - p = n->string; - - if (0 == (len = (int)strlen(p))) - return(-1); - - for (i = 0; i < len; i++) - if ( ! isdigit((u_char)p[i])) - break; - - if (i == len - 1) { - if ('n' == p[len - 1] || 'm' == p[len - 1]) - return(atoi(p)); - } else if (i == len) - return(atoi(p)); - - return(-1); + return(term_vspan(p, &su)); } -/* ARGSUSED */ static int -pre_I(DECL_ARGS) +a2width(const struct termp *p, const char *cp) { + struct roffsu su; - p->flags |= TERMP_UNDER; - return(1); -} + if ( ! a2roffsu(cp, &su, SCALE_BU)) + return(-1); - -/* ARGSUSED */ -static int -pre_r(DECL_ARGS) -{ - - p->flags &= ~TERMP_UNDER; - p->flags &= ~TERMP_BOLD; - return(1); + return((int)term_hspan(p, &su)); } -/* ARGSUSED */ static void -post_i(DECL_ARGS) +print_bvspace(struct termp *p, const struct man_node *n) { + term_newln(p); - if (n->nchild) - p->flags &= ~TERMP_UNDER; + if (NULL == n->prev) + return; + + if (MAN_SS == n->prev->tok) + return; + if (MAN_SH == n->prev->tok) + return; + + term_vspace(p); } /* ARGSUSED */ -static void -post_I(DECL_ARGS) +static int +pre_ign(DECL_ARGS) { - p->flags &= ~TERMP_UNDER; + return(0); } /* ARGSUSED */ static int -pre_fi(DECL_ARGS) +pre_I(DECL_ARGS) { - *fl &= ~MANT_LITERAL; + term_fontrepl(p, TERMFONT_UNDER); return(1); } /* ARGSUSED */ static int -pre_nf(DECL_ARGS) +pre_literal(DECL_ARGS) { term_newln(p); - *fl |= MANT_LITERAL; + + if (MAN_nf == n->tok) + mt->fl |= MANT_LITERAL; + else + mt->fl &= ~MANT_LITERAL; + return(1); } - /* ARGSUSED */ static int -pre_IR(DECL_ARGS) +pre_alternate(DECL_ARGS) { - const struct man_node *nn; - int i; + enum termfont font[2]; + const struct man_node *nn; + int savelit, i; - for (i = 0, nn = n->child; nn; nn = nn->next, i++) { - if ( ! (i % 2)) - p->flags |= TERMP_UNDER; - if (i > 0) - p->flags |= TERMP_NOSPACE; - print_node(p, fl, nn, m); - if ( ! (i % 2)) - p->flags &= ~TERMP_UNDER; + switch (n->tok) { + case (MAN_RB): + font[0] = TERMFONT_NONE; + font[1] = TERMFONT_BOLD; + break; + case (MAN_RI): + font[0] = TERMFONT_NONE; + font[1] = TERMFONT_UNDER; + break; + case (MAN_BR): + font[0] = TERMFONT_BOLD; + font[1] = TERMFONT_NONE; + break; + case (MAN_BI): + font[0] = TERMFONT_BOLD; + font[1] = TERMFONT_UNDER; + break; + case (MAN_IR): + font[0] = TERMFONT_UNDER; + font[1] = TERMFONT_NONE; + break; + case (MAN_IB): + font[0] = TERMFONT_UNDER; + font[1] = TERMFONT_BOLD; + break; + default: + abort(); } - return(0); -} + savelit = MANT_LITERAL & mt->fl; + mt->fl &= ~MANT_LITERAL; -/* ARGSUSED */ -static int -pre_IB(DECL_ARGS) -{ - const struct man_node *nn; - int i; - - for (i = 0, nn = n->child; nn; nn = nn->next, i++) { - p->flags |= i % 2 ? TERMP_BOLD : TERMP_UNDER; - if (i > 0) + for (i = 0, nn = n->child; nn; nn = nn->next, i = 1 - i) { + term_fontrepl(p, font[i]); + if (savelit && NULL == nn->next) + mt->fl |= MANT_LITERAL; + print_man_node(p, mt, nn, m); + if (nn->next) p->flags |= TERMP_NOSPACE; - print_node(p, fl, nn, m); - p->flags &= i % 2 ? ~TERMP_BOLD : ~TERMP_UNDER; } + return(0); } - /* ARGSUSED */ static int -pre_RB(DECL_ARGS) +pre_B(DECL_ARGS) { - const struct man_node *nn; - int i; - for (i = 0, nn = n->child; nn; nn = nn->next, i++) { - if (i % 2) - p->flags |= TERMP_BOLD; - if (i > 0) - p->flags |= TERMP_NOSPACE; - print_node(p, fl, nn, m); - if (i % 2) - p->flags &= ~TERMP_BOLD; - } - return(0); + term_fontrepl(p, TERMFONT_BOLD); + return(1); } - /* ARGSUSED */ static int -pre_RI(DECL_ARGS) +pre_ft(DECL_ARGS) { - const struct man_node *nn; - int i; + const char *cp; - for (i = 0, nn = n->child; nn; nn = nn->next, i++) { - if ( ! (i % 2)) - p->flags |= TERMP_UNDER; - if (i > 0) - p->flags |= TERMP_NOSPACE; - print_node(p, fl, nn, m); - if ( ! (i % 2)) - p->flags &= ~TERMP_UNDER; + if (NULL == n->child) { + term_fontlast(p); + return(0); } - return(0); -} - -/* ARGSUSED */ -static int -pre_BR(DECL_ARGS) -{ - const struct man_node *nn; - int i; - - for (i = 0, nn = n->child; nn; nn = nn->next, i++) { - if ( ! (i % 2)) - p->flags |= TERMP_BOLD; - if (i > 0) - p->flags |= TERMP_NOSPACE; - print_node(p, fl, nn, m); - if ( ! (i % 2)) - p->flags &= ~TERMP_BOLD; + cp = n->child->string; + switch (*cp) { + case ('4'): + /* FALLTHROUGH */ + case ('3'): + /* FALLTHROUGH */ + case ('B'): + term_fontrepl(p, TERMFONT_BOLD); + break; + case ('2'): + /* FALLTHROUGH */ + case ('I'): + term_fontrepl(p, TERMFONT_UNDER); + break; + case ('P'): + term_fontlast(p); + break; + case ('1'): + /* FALLTHROUGH */ + case ('C'): + /* FALLTHROUGH */ + case ('R'): + term_fontrepl(p, TERMFONT_NONE); + break; + default: + break; } return(0); } - /* ARGSUSED */ static int -pre_BI(DECL_ARGS) +pre_in(DECL_ARGS) { - const struct man_node *nn; - int i; + int len, less; + size_t v; + const char *cp; - for (i = 0, nn = n->child; nn; nn = nn->next, i++) { - p->flags |= i % 2 ? TERMP_UNDER : TERMP_BOLD; - if (i > 0) - p->flags |= TERMP_NOSPACE; - print_node(p, fl, nn, m); - p->flags &= i % 2 ? ~TERMP_UNDER : ~TERMP_BOLD; + term_newln(p); + + if (NULL == n->child) { + p->offset = mt->offset; + return(0); } - return(0); -} + cp = n->child->string; + less = 0; -/* ARGSUSED */ -static int -pre_B(DECL_ARGS) -{ + if ('-' == *cp) + less = -1; + else if ('+' == *cp) + less = 1; + else + cp--; - p->flags |= TERMP_BOLD; - return(1); -} + if ((len = a2width(p, ++cp)) < 0) + return(0); + v = (size_t)len; -/* ARGSUSED */ -static void -post_B(DECL_ARGS) -{ + if (less < 0) + p->offset -= p->offset > v ? v : p->offset; + else if (less > 0) + p->offset += v; + else + p->offset = v; - p->flags &= ~TERMP_BOLD; + return(0); } @@ -378,14 +404,17 @@ post_B(DECL_ARGS) static int pre_sp(DECL_ARGS) { - int i, len; + size_t i, len; - if (NULL == n->child) { - term_vspace(p); - return(0); + switch (n->tok) { + case (MAN_br): + len = 0; + break; + default: + len = n->child ? a2height(p, n->child->string) : 1; + break; } - len = atoi(n->child->string); if (0 == len) term_newln(p); for (i = 0; i < len; i++) @@ -397,33 +426,42 @@ pre_sp(DECL_ARGS) /* ARGSUSED */ static int -pre_br(DECL_ARGS) -{ - - term_newln(p); - return(0); -} - - -/* ARGSUSED */ -static int pre_HP(DECL_ARGS) { + size_t len; + int ival; + const struct man_node *nn; switch (n->type) { case (MAN_BLOCK): - fmt_block_vspace(p, n); - break; + print_bvspace(p, n); + return(1); case (MAN_BODY): p->flags |= TERMP_NOBREAK; p->flags |= TERMP_TWOSPACE; - p->offset = INDENT; - p->rmargin = INDENT * 2; break; default: return(0); } + len = mt->lmargin; + ival = -1; + + /* Calculate offset. */ + + if (NULL != (nn = n->parent->head->child)) + if ((ival = a2width(p, nn->string)) >= 0) + len = (size_t)ival; + + if (0 == len) + len = term_len(p, 1); + + p->offset = mt->offset; + p->rmargin = mt->offset + len; + + if (ival >= 0) + mt->lmargin = (size_t)ival; + return(1); } @@ -434,11 +472,14 @@ post_HP(DECL_ARGS) { switch (n->type) { + case (MAN_BLOCK): + term_flushln(p); + break; case (MAN_BODY): term_flushln(p); p->flags &= ~TERMP_NOBREAK; p->flags &= ~TERMP_TWOSPACE; - p->offset = INDENT; + p->offset = mt->offset; p->rmargin = p->maxrmargin; break; default: @@ -454,14 +495,15 @@ pre_PP(DECL_ARGS) switch (n->type) { case (MAN_BLOCK): - fmt_block_vspace(p, n); + mt->lmargin = term_len(p, INDENT); + print_bvspace(p, n); break; default: - p->offset = INDENT; + p->offset = mt->offset; break; } - return(1); + return(MAN_HEAD != n->type); } @@ -480,16 +522,15 @@ pre_IP(DECL_ARGS) break; case (MAN_HEAD): p->flags |= TERMP_NOBREAK; - p->flags |= TERMP_TWOSPACE; break; case (MAN_BLOCK): - fmt_block_vspace(p, n); + print_bvspace(p, n); /* FALLTHROUGH */ default: return(1); } - len = INDENT; + len = mt->lmargin; ival = -1; /* Calculate offset. */ @@ -498,7 +539,7 @@ pre_IP(DECL_ARGS) if (NULL != (nn = nn->next)) { for ( ; nn->next; nn = nn->next) /* Do nothing. */ ; - if ((ival = arg_width(nn)) >= 0) + if ((ival = a2width(p, nn->string)) >= 0) len = (size_t)ival; } @@ -506,19 +547,22 @@ pre_IP(DECL_ARGS) case (MAN_HEAD): /* Handle zero-width lengths. */ if (0 == len) - len = 1; + len = term_len(p, 1); - p->offset = INDENT; - p->rmargin = INDENT + len; + p->offset = mt->offset; + p->rmargin = mt->offset + len; if (ival < 0) break; + /* Set the saved left-margin. */ + mt->lmargin = (size_t)ival; + /* Don't print the length value. */ for (nn = n->child; nn->next; nn = nn->next) - print_node(p, fl, nn, m); + print_man_node(p, mt, nn, m); return(0); case (MAN_BODY): - p->offset = INDENT + len; + p->offset = mt->offset + len; p->rmargin = p->maxrmargin; break; default: @@ -538,7 +582,6 @@ post_IP(DECL_ARGS) case (MAN_HEAD): term_flushln(p); p->flags &= ~TERMP_NOBREAK; - p->flags &= ~TERMP_TWOSPACE; p->rmargin = p->maxrmargin; break; case (MAN_BODY): @@ -569,38 +612,45 @@ pre_TP(DECL_ARGS) p->flags |= TERMP_NOSPACE; break; case (MAN_BLOCK): - fmt_block_vspace(p, n); + print_bvspace(p, n); /* FALLTHROUGH */ default: return(1); } - len = INDENT; + len = (size_t)mt->lmargin; ival = -1; /* Calculate offset. */ - if (NULL != (nn = n->parent->head->child)) - if (NULL != nn->next) - if ((ival = arg_width(nn)) >= 0) + if (NULL != (nn = n->parent->head->child)) { + while (nn && MAN_TEXT != nn->type) + nn = nn->next; + if (nn && nn->next) + if ((ival = a2width(p, nn->string)) >= 0) len = (size_t)ival; + } switch (n->type) { case (MAN_HEAD): /* Handle zero-length properly. */ if (0 == len) - len = 1; + len = term_len(p, 1); - p->offset = INDENT; - p->rmargin = INDENT + len; + p->offset = mt->offset; + p->rmargin = mt->offset + len; /* Don't print same-line elements. */ for (nn = n->child; nn; nn = nn->next) if (nn->line > n->line) - print_node(p, fl, nn, m); + print_man_node(p, mt, nn, m); + + if (ival >= 0) + mt->lmargin = (size_t)ival; + return(0); case (MAN_BODY): - p->offset = INDENT + len; + p->offset = mt->offset + len; p->rmargin = p->maxrmargin; break; default: @@ -640,16 +690,24 @@ pre_SS(DECL_ARGS) switch (n->type) { case (MAN_BLOCK): - term_newln(p); - if (n->prev) - term_vspace(p); + mt->lmargin = term_len(p, INDENT); + mt->offset = term_len(p, INDENT); + /* If following a prior empty `SS', no vspace. */ + if (n->prev && MAN_SS == n->prev->tok) + if (NULL == n->prev->body->child) + break; + if (NULL == n->prev) + break; + term_vspace(p); break; case (MAN_HEAD): - p->flags |= TERMP_BOLD; - p->offset = HALFINDENT; + term_fontrepl(p, TERMFONT_BOLD); + p->offset = term_len(p, HALFINDENT); break; + case (MAN_BODY): + p->offset = mt->offset; + break; default: - p->offset = INDENT; break; } @@ -665,8 +723,10 @@ post_SS(DECL_ARGS) switch (n->type) { case (MAN_HEAD): term_newln(p); - p->flags &= ~TERMP_BOLD; break; + case (MAN_BODY): + term_newln(p); + break; default: break; } @@ -680,18 +740,23 @@ pre_SH(DECL_ARGS) switch (n->type) { case (MAN_BLOCK): + mt->lmargin = term_len(p, INDENT); + mt->offset = term_len(p, INDENT); /* If following a prior empty `SH', no vspace. */ if (n->prev && MAN_SH == n->prev->tok) if (NULL == n->prev->body->child) break; + /* If the first macro, no vspae. */ + if (NULL == n->prev) + break; term_vspace(p); break; case (MAN_HEAD): - p->flags |= TERMP_BOLD; + term_fontrepl(p, TERMFONT_BOLD); p->offset = 0; break; case (MAN_BODY): - p->offset = INDENT; + p->offset = mt->offset; break; default: break; @@ -709,7 +774,6 @@ post_SH(DECL_ARGS) switch (n->type) { case (MAN_HEAD): term_newln(p); - p->flags &= ~TERMP_BOLD; break; case (MAN_BODY): term_newln(p); @@ -720,11 +784,64 @@ post_SH(DECL_ARGS) } +/* ARGSUSED */ +static int +pre_RS(DECL_ARGS) +{ + const struct man_node *nn; + int ival; + + switch (n->type) { + case (MAN_BLOCK): + term_newln(p); + return(1); + case (MAN_HEAD): + return(0); + default: + break; + } + + if (NULL == (nn = n->parent->head->child)) { + mt->offset = mt->lmargin + term_len(p, INDENT); + p->offset = mt->offset; + return(1); + } + + if ((ival = a2width(p, nn->string)) < 0) + return(1); + + mt->offset = term_len(p, INDENT) + (size_t)ival; + p->offset = mt->offset; + + return(1); +} + + +/* ARGSUSED */ static void -print_node(DECL_ARGS) +post_RS(DECL_ARGS) { - int c, sz; + switch (n->type) { + case (MAN_BLOCK): + mt->offset = mt->lmargin = term_len(p, INDENT); + break; + case (MAN_HEAD): + break; + default: + term_newln(p); + p->offset = term_len(p, INDENT); + break; + } +} + + +static void +print_man_node(DECL_ARGS) +{ + size_t rm, rmax; + int c; + c = 1; switch (n->type) { @@ -733,69 +850,93 @@ print_node(DECL_ARGS) term_vspace(p); break; } - /* - * Note! This is hacky. Here, we recognise the `\c' - * escape embedded in so many -man pages. It's supposed - * to remove the subsequent space, so we mark NOSPACE if - * it's encountered in the string. - */ - sz = (int)strlen(n->string); + term_word(p, n->string); - if (sz >= 2 && n->string[sz - 1] == 'c' && - n->string[sz - 2] == '\\') - p->flags |= TERMP_NOSPACE; + /* FIXME: this means that macro lines are munged! */ - if (MANT_LITERAL & *fl) { + + if (MANT_LITERAL & mt->fl) { + rm = p->rmargin; + rmax = p->maxrmargin; + p->rmargin = p->maxrmargin = TERM_MAXMARGIN; p->flags |= TERMP_NOSPACE; term_flushln(p); + p->rmargin = rm; + p->maxrmargin = rmax; } break; + case (MAN_TBL): + if (TBL_SPAN_FIRST & n->span->flags) + term_newln(p); + term_tbl(p, n->span); + break; default: + if ( ! (MAN_NOTEXT & termacts[n->tok].flags)) + term_fontrepl(p, TERMFONT_NONE); if (termacts[n->tok].pre) - c = (*termacts[n->tok].pre)(p, fl, n, m); + c = (*termacts[n->tok].pre)(p, mt, n, m); break; } if (c && n->child) - print_body(p, fl, n->child, m); + print_man_nodelist(p, mt, n->child, m); - if (MAN_TEXT != n->type) + switch (n->type) { + case (MAN_TEXT): + /* FALLTHROUGH */ + case (MAN_TBL): + break; + default: if (termacts[n->tok].post) - (*termacts[n->tok].post)(p, fl, n, m); + (*termacts[n->tok].post)(p, mt, n, m); + if ( ! (MAN_NOTEXT & termacts[n->tok].flags)) + term_fontrepl(p, TERMFONT_NONE); + break; + } + + if (MAN_EOS & n->flags) + p->flags |= TERMP_SENTENCE; } static void -print_body(DECL_ARGS) +print_man_nodelist(DECL_ARGS) { - print_node(p, fl, n, m); + print_man_node(p, mt, n, m); if ( ! n->next) return; - print_body(p, fl, n->next, m); + print_man_nodelist(p, mt, n->next, m); } static void -print_foot(struct termp *p, const struct man_meta *meta) +print_man_foot(struct termp *p, const void *arg) { - struct tm *tm; - char *buf; + char buf[DATESIZ]; + const struct man_meta *meta; - if (NULL == (buf = malloc(p->rmargin))) - err(1, "malloc"); + meta = (const struct man_meta *)arg; - tm = localtime(&meta->date); + term_fontrepl(p, TERMFONT_NONE); - if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm)) - err(1, "strftime"); + if (meta->rawdate) + strlcpy(buf, meta->rawdate, DATESIZ); + else + time2a(meta->date, buf, DATESIZ); term_vspace(p); + term_vspace(p); + term_vspace(p); p->flags |= TERMP_NOSPACE | TERMP_NOBREAK; - p->rmargin = p->maxrmargin - strlen(buf); + p->rmargin = p->maxrmargin - term_strlen(p, buf); p->offset = 0; + /* term_strlen() can return zero. */ + if (p->rmargin == p->maxrmargin) + p->rmargin--; + if (meta->source) term_word(p, meta->source); if (meta->source) @@ -809,34 +950,41 @@ print_foot(struct termp *p, const struct man_meta *met term_word(p, buf); term_flushln(p); - - free(buf); } static void -print_head(struct termp *p, const struct man_meta *meta) +print_man_head(struct termp *p, const void *arg) { - char *buf, *title; + char buf[BUFSIZ], title[BUFSIZ]; + size_t buflen, titlen; + const struct man_meta *m; + m = (const struct man_meta *)arg; + + /* + * 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->offset = 0; + buf[0] = title[0] = '\0'; - if (NULL == (buf = malloc(p->rmargin))) - err(1, "malloc"); - if (NULL == (title = malloc(p->rmargin))) - err(1, "malloc"); + if (m->vol) + strlcpy(buf, m->vol, BUFSIZ); + buflen = term_strlen(p, buf); - if (meta->vol) - (void)strlcpy(buf, meta->vol, p->rmargin); - else - *buf = 0; + snprintf(title, BUFSIZ, "%s(%s)", m->title, m->msec); + titlen = term_strlen(p, title); - (void)snprintf(title, p->rmargin, "%s(%d)", - meta->title, meta->msec); - p->offset = 0; - p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2; + p->rmargin = 2 * (titlen+1) + buflen < p->maxrmargin ? + (p->maxrmargin - + term_strlen(p, buf) + term_len(p, 1)) / 2 : + p->maxrmargin - buflen; p->flags |= TERMP_NOBREAK | TERMP_NOSPACE; term_word(p, title); @@ -844,24 +992,31 @@ print_head(struct termp *p, const struct man_meta *met p->flags |= TERMP_NOLPAD | TERMP_NOSPACE; p->offset = p->rmargin; - p->rmargin = p->maxrmargin - strlen(title); + p->rmargin = p->offset + buflen + titlen < p->maxrmargin ? + p->maxrmargin - titlen : p->maxrmargin; term_word(p, buf); term_flushln(p); - p->offset = p->rmargin; - p->rmargin = p->maxrmargin; p->flags &= ~TERMP_NOBREAK; - p->flags |= TERMP_NOLPAD | TERMP_NOSPACE; + if (p->rmargin + titlen <= p->maxrmargin) { + p->flags |= TERMP_NOLPAD | TERMP_NOSPACE; + p->offset = p->rmargin; + p->rmargin = p->maxrmargin; + term_word(p, title); + term_flushln(p); + } - term_word(p, title); - term_flushln(p); - p->rmargin = p->maxrmargin; p->offset = 0; p->flags &= ~TERMP_NOSPACE; - free(title); - free(buf); -} + /* + * Groff likes to have some leading spaces before content. Well + * that's fine by me. + */ + term_vspace(p); + term_vspace(p); + term_vspace(p); +}