=================================================================== RCS file: /cvs/mandoc/man_term.c,v retrieving revision 1.28 retrieving revision 1.33 diff -u -p -r1.28 -r1.33 --- mandoc/man_term.c 2009/08/21 08:41:05 1.28 +++ mandoc/man_term.c 2009/10/04 15:24:54 1.33 @@ -1,4 +1,4 @@ -/* $Id: man_term.c,v 1.28 2009/08/21 08:41:05 kristaps Exp $ */ +/* $Id: man_term.c,v 1.33 2009/10/04 15:24:54 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -76,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); @@ -90,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 */ @@ -120,7 +121,8 @@ static const struct termact termacts[MAN_MAX] = { { pre_r, NULL }, /* r */ { NULL, NULL }, /* RE */ { pre_RS, post_RS }, /* RS */ - { NULL, NULL }, /* DT */ + { pre_ign, NULL }, /* DT */ + { pre_ign, NULL }, /* UC */ }; #ifdef __linux__ @@ -139,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; @@ -156,8 +156,6 @@ 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); } @@ -208,10 +206,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); } @@ -221,8 +228,7 @@ static int pre_r(DECL_ARGS) { - p->flags &= ~TERMP_UNDER; - p->flags &= ~TERMP_BOLD; + p->bold = p->under = 0; return(1); } @@ -233,7 +239,7 @@ post_i(DECL_ARGS) { if (n->nchild) - p->flags &= ~TERMP_UNDER; + p->under--; } @@ -242,7 +248,7 @@ static void post_I(DECL_ARGS) { - p->flags &= ~TERMP_UNDER; + p->under--; } @@ -276,12 +282,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); } @@ -295,11 +301,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); } @@ -314,12 +326,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); } @@ -334,12 +346,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); } @@ -354,12 +366,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); } @@ -373,11 +385,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); } @@ -388,7 +406,7 @@ static int pre_B(DECL_ARGS) { - p->flags |= TERMP_BOLD; + p->bold++; return(1); } @@ -398,7 +416,7 @@ static void post_B(DECL_ARGS) { - p->flags &= ~TERMP_BOLD; + p->bold--; } @@ -709,7 +727,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): @@ -731,7 +749,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); @@ -758,7 +776,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): @@ -780,7 +798,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); @@ -904,12 +922,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); @@ -944,9 +962,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);