=================================================================== RCS file: /cvs/mandoc/man_term.c,v retrieving revision 1.26 retrieving revision 1.32 diff -u -p -r1.26 -r1.32 --- mandoc/man_term.c 2009/08/19 11:30:40 1.26 +++ mandoc/man_term.c 2009/10/03 19:57:53 1.32 @@ -1,4 +1,4 @@ -/* $Id: man_term.c,v 1.26 2009/08/19 11:30:40 kristaps Exp $ */ +/* $Id: man_term.c,v 1.32 2009/10/03 19:57:53 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -14,6 +14,8 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include + #include #include #include @@ -74,6 +76,7 @@ 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_ign(DECL_ARGS); static int pre_nf(DECL_ARGS); static int pre_r(DECL_ARGS); static int pre_sp(DECL_ARGS); @@ -88,7 +91,7 @@ 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] = { +static const struct termact termacts[MAN_MAX] = { { pre_br, NULL }, /* br */ { NULL, NULL }, /* TH */ { pre_SH, post_SH }, /* SH */ @@ -110,7 +113,7 @@ static const struct termact termacts[MAN_MAX] = { { pre_I, post_I }, /* I */ { pre_IR, NULL }, /* IR */ { pre_RI, NULL }, /* RI */ - { NULL, NULL }, /* na */ /* TODO: document that has no effect */ + { NULL, NULL }, /* na */ { pre_I, post_i }, /* i */ { pre_sp, NULL }, /* sp */ { pre_nf, NULL }, /* nf */ @@ -118,6 +121,8 @@ static const struct termact termacts[MAN_MAX] = { { pre_r, NULL }, /* r */ { NULL, NULL }, /* RE */ { pre_RS, post_RS }, /* RS */ + { pre_ign, NULL }, /* DT */ + { pre_ign, NULL }, /* UC */ }; #ifdef __linux__ @@ -136,15 +141,13 @@ static void fmt_block_vspace(struct termp *, static int arg_width(const struct man_node *); -int +void man_run(struct termp *p, const struct man *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); mt.fl = 0; mt.lmargin = INDENT; @@ -153,12 +156,11 @@ man_run(struct termp *p, const struct man *m) if (man_node(m)->child) print_body(p, &mt, man_node(m)->child, man_meta(m)); print_foot(p, man_meta(m)); - - return(1); } static void + fmt_block_vspace(struct termp *p, const struct man_node *n) { term_newln(p); @@ -205,10 +207,19 @@ arg_width(const struct man_node *n) /* ARGSUSED */ static int +pre_ign(DECL_ARGS) +{ + + return(0); +} + + +/* ARGSUSED */ +static int pre_I(DECL_ARGS) { - p->flags |= TERMP_UNDER; + p->under++; return(1); } @@ -218,8 +229,7 @@ static int pre_r(DECL_ARGS) { - p->flags &= ~TERMP_UNDER; - p->flags &= ~TERMP_BOLD; + p->bold = p->under = 0; return(1); } @@ -230,7 +240,7 @@ post_i(DECL_ARGS) { if (n->nchild) - p->flags &= ~TERMP_UNDER; + p->under--; } @@ -239,7 +249,7 @@ static void post_I(DECL_ARGS) { - p->flags &= ~TERMP_UNDER; + p->under--; } @@ -273,12 +283,12 @@ pre_IR(DECL_ARGS) for (i = 0, nn = n->child; nn; nn = nn->next, i++) { if ( ! (i % 2)) - p->flags |= TERMP_UNDER; + p->under++; if (i > 0) p->flags |= TERMP_NOSPACE; print_node(p, mt, nn, m); if ( ! (i % 2)) - p->flags &= ~TERMP_UNDER; + p->under--; } return(0); } @@ -292,11 +302,17 @@ pre_IB(DECL_ARGS) int i; for (i = 0, nn = n->child; nn; nn = nn->next, i++) { - p->flags |= i % 2 ? TERMP_BOLD : TERMP_UNDER; + if (i % 2) + p->bold++; + else + p->under++; if (i > 0) p->flags |= TERMP_NOSPACE; print_node(p, mt, nn, m); - p->flags &= i % 2 ? ~TERMP_BOLD : ~TERMP_UNDER; + if (i % 2) + p->bold--; + else + p->under--; } return(0); } @@ -311,12 +327,12 @@ pre_RB(DECL_ARGS) for (i = 0, nn = n->child; nn; nn = nn->next, i++) { if (i % 2) - p->flags |= TERMP_BOLD; + p->bold++; if (i > 0) p->flags |= TERMP_NOSPACE; print_node(p, mt, nn, m); if (i % 2) - p->flags &= ~TERMP_BOLD; + p->bold--; } return(0); } @@ -331,12 +347,12 @@ pre_RI(DECL_ARGS) for (i = 0, nn = n->child; nn; nn = nn->next, i++) { if ( ! (i % 2)) - p->flags |= TERMP_UNDER; + p->under++; if (i > 0) p->flags |= TERMP_NOSPACE; print_node(p, mt, nn, m); if ( ! (i % 2)) - p->flags &= ~TERMP_UNDER; + p->under--; } return(0); } @@ -351,12 +367,12 @@ pre_BR(DECL_ARGS) for (i = 0, nn = n->child; nn; nn = nn->next, i++) { if ( ! (i % 2)) - p->flags |= TERMP_BOLD; + p->bold++; if (i > 0) p->flags |= TERMP_NOSPACE; print_node(p, mt, nn, m); if ( ! (i % 2)) - p->flags &= ~TERMP_BOLD; + p->bold--; } return(0); } @@ -370,11 +386,17 @@ pre_BI(DECL_ARGS) int i; for (i = 0, nn = n->child; nn; nn = nn->next, i++) { - p->flags |= i % 2 ? TERMP_UNDER : TERMP_BOLD; + if (i % 2) + p->under++; + else + p->bold++; if (i > 0) p->flags |= TERMP_NOSPACE; print_node(p, mt, nn, m); - p->flags &= i % 2 ? ~TERMP_UNDER : ~TERMP_BOLD; + if (i % 2) + p->under--; + else + p->bold--; } return(0); } @@ -385,7 +407,7 @@ static int pre_B(DECL_ARGS) { - p->flags |= TERMP_BOLD; + p->bold++; return(1); } @@ -395,7 +417,7 @@ static void post_B(DECL_ARGS) { - p->flags &= ~TERMP_BOLD; + p->bold--; } @@ -706,7 +728,7 @@ pre_SS(DECL_ARGS) term_vspace(p); break; case (MAN_HEAD): - p->flags |= TERMP_BOLD; + p->bold++; p->offset = HALFINDENT; break; case (MAN_BODY): @@ -728,7 +750,7 @@ post_SS(DECL_ARGS) switch (n->type) { case (MAN_HEAD): term_newln(p); - p->flags &= ~TERMP_BOLD; + p->bold--; break; case (MAN_BODY): term_newln(p); @@ -755,7 +777,7 @@ pre_SH(DECL_ARGS) term_vspace(p); break; case (MAN_HEAD): - p->flags |= TERMP_BOLD; + p->bold++; p->offset = 0; break; case (MAN_BODY): @@ -777,7 +799,7 @@ post_SH(DECL_ARGS) switch (n->type) { case (MAN_HEAD): term_newln(p); - p->flags &= ~TERMP_BOLD; + p->bold--; break; case (MAN_BODY): term_newln(p); @@ -901,12 +923,12 @@ print_foot(struct termp *p, const struct man_meta *met char *buf; if (NULL == (buf = malloc(p->rmargin))) - err(1, "malloc"); + err(EXIT_FAILURE, "malloc"); tm = localtime(&meta->date); if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm)) - err(1, "strftime"); + err(EXIT_FAILURE, "strftime"); term_vspace(p); @@ -941,9 +963,9 @@ print_head(struct termp *p, const struct man_meta *met p->offset = 0; if (NULL == (buf = malloc(p->rmargin))) - err(1, "malloc"); + err(EXIT_FAILURE, "malloc"); if (NULL == (title = malloc(p->rmargin))) - err(1, "malloc"); + err(EXIT_FAILURE, "malloc"); if (meta->vol) (void)strlcpy(buf, meta->vol, p->rmargin);