=================================================================== RCS file: /cvs/mandoc/man_term.c,v retrieving revision 1.3 retrieving revision 1.15 diff -u -p -r1.3 -r1.15 --- mandoc/man_term.c 2009/03/26 15:19:44 1.3 +++ mandoc/man_term.c 2009/06/18 19:54:04 1.15 @@ -1,20 +1,18 @@ -/* $Id: man_term.c,v 1.3 2009/03/26 15:19:44 kristaps Exp $ */ +/* $Id: man_term.c,v 1.15 2009/06/18 19:54:04 kristaps Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009 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 copyright notice and this permission notice appear in all - * copies. + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #include #include @@ -42,8 +40,10 @@ struct termact { static int pre_B(DECL_ARGS); static int pre_BI(DECL_ARGS); static int pre_BR(DECL_ARGS); +static int pre_br(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); @@ -58,7 +58,7 @@ static void post_SH(DECL_ARGS); static void post_SS(DECL_ARGS); static const struct termact termacts[MAN_MAX] = { - { NULL, NULL }, /* __ */ + { pre_br, NULL }, /* br */ { NULL, NULL }, /* TH */ { pre_SH, post_SH }, /* SH */ { pre_SS, post_SS }, /* SS */ @@ -66,8 +66,8 @@ static const struct termact termacts[MAN_MAX] = { { pre_PP, NULL }, /* LP */ { pre_PP, NULL }, /* PP */ { pre_PP, NULL }, /* P */ - { NULL, NULL }, /* IP */ - { pre_PP, NULL }, /* HP */ /* XXX */ + { pre_IP, NULL }, /* IP */ + { pre_PP, NULL }, /* HP */ /* FIXME */ { NULL, NULL }, /* SM */ { pre_B, post_B }, /* SB */ { pre_BI, NULL }, /* BI */ @@ -79,6 +79,8 @@ static const struct termact termacts[MAN_MAX] = { { pre_I, post_I }, /* I */ { pre_IR, NULL }, /* IR */ { pre_RI, NULL }, /* RI */ + { NULL, NULL }, /* na */ + { pre_I, post_I }, /* i */ }; static void print_head(struct termp *, @@ -95,7 +97,10 @@ man_run(struct termp *p, const struct man *m) print_head(p, man_meta(m)); p->flags |= TERMP_NOSPACE; - print_body(p, man_node(m), man_meta(m)); + assert(man_node(m)); + assert(MAN_ROOT == man_node(m)->type); + if (man_node(m)->child) + print_body(p, man_node(m)->child, man_meta(m)); print_foot(p, man_meta(m)); return(1); @@ -131,6 +136,8 @@ pre_IR(DECL_ARGS) 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, nn, m); if ( ! (i % 2)) p->flags &= ~TERMP_UNDER; @@ -148,6 +155,8 @@ pre_IB(DECL_ARGS) for (i = 0, nn = n->child; nn; nn = nn->next, i++) { p->flags |= i % 2 ? TERMP_BOLD : TERMP_UNDER; + if (i > 0) + p->flags |= TERMP_NOSPACE; print_node(p, nn, m); p->flags &= i % 2 ? ~TERMP_BOLD : ~TERMP_UNDER; } @@ -165,6 +174,8 @@ pre_RB(DECL_ARGS) 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, nn, m); if (i % 2) p->flags &= ~TERMP_BOLD; @@ -183,6 +194,8 @@ pre_RI(DECL_ARGS) 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, nn, m); if ( ! (i % 2)) p->flags &= ~TERMP_UNDER; @@ -201,6 +214,8 @@ pre_BR(DECL_ARGS) 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, nn, m); if ( ! (i % 2)) p->flags &= ~TERMP_BOLD; @@ -218,6 +233,8 @@ pre_BI(DECL_ARGS) 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, nn, m); p->flags &= i % 2 ? ~TERMP_UNDER : ~TERMP_BOLD; } @@ -246,6 +263,16 @@ post_B(DECL_ARGS) /* ARGSUSED */ static int +pre_br(DECL_ARGS) +{ + + term_newln(p); + return(0); +} + + +/* ARGSUSED */ +static int pre_PP(DECL_ARGS) { @@ -257,6 +284,41 @@ pre_PP(DECL_ARGS) /* ARGSUSED */ static int +pre_IP(DECL_ARGS) +{ +#if 0 + const struct man_node *nn; + size_t offs; +#endif + + term_vspace(p); + p->offset = INDENT; + +#if 0 + if (NULL == (nn = n->child)) + return(1); + if (MAN_TEXT != nn->type) + errx(1, "expected text line argument"); + + if (nn->next) { + if (MAN_TEXT != nn->next->type) + errx(1, "expected text line argument"); + offs = (size_t)atoi(nn->next->string); + } else + offs = strlen(nn->string); + + p->flags |= TERMP_NOSPACE; + /* FIXME */ + if ((p->offset += offs) > p->rmargin) + errx(1, "line too long"); +#endif + + return(0); +} + + +/* ARGSUSED */ +static int pre_TP(DECL_ARGS) { const struct man_node *nn; @@ -335,7 +397,7 @@ post_SH(DECL_ARGS) static void print_node(DECL_ARGS) { - int c; + int c, sz; c = 1; @@ -345,11 +407,21 @@ print_node(DECL_ARGS) c = (*termacts[n->tok].pre)(p, n, m); break; case(MAN_TEXT): - if (*n->string) { - term_word(p, n->string); + if (0 == *n->string) { + term_vspace(p); break; } - term_vspace(p); + /* + * 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; break; default: break; @@ -390,20 +462,9 @@ print_foot(struct termp *p, const struct man_meta *met tm = localtime(&meta->date); -#ifdef __OpenBSD__ - if (NULL == strftime(buf, p->rmargin, "%B %d, %Y", tm)) -#else if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm)) -#endif err(1, "strftime"); - /* - * This is /slightly/ different from regular groff output - * because we don't have page numbers. Print the following: - * - * OS MDOCDATE - */ - term_vspace(p); p->flags |= TERMP_NOSPACE | TERMP_NOBREAK; @@ -441,19 +502,6 @@ print_head(struct termp *p, const struct man_meta *met if (NULL == (title = malloc(p->rmargin))) err(1, "malloc"); - /* - * The header is strange. It has three components, which are - * really two with the first duplicated. It goes like this: - * - * IDENTIFIER TITLE IDENTIFIER - * - * The IDENTIFIER is NAME(SECTION), which is the command-name - * (if given, or "unknown" if not) followed by the manual page - * section. These are given in `Dt'. The TITLE is a free-form - * string depending on the manual volume. If not specified, it - * switches on the manual section. - */ - if (meta->vol) (void)strlcpy(buf, meta->vol, p->rmargin); else @@ -463,7 +511,7 @@ print_head(struct termp *p, const struct man_meta *met meta->title, meta->msec); p->offset = 0; - p->rmargin = (p->maxrmargin - strlen(buf)) / 2; + p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2; p->flags |= TERMP_NOBREAK | TERMP_NOSPACE; term_word(p, title);