diff options
Diffstat (limited to 'usr.bin/mandoc/man_html.c')
| -rw-r--r-- | usr.bin/mandoc/man_html.c | 71 |
1 files changed, 23 insertions, 48 deletions
diff --git a/usr.bin/mandoc/man_html.c b/usr.bin/mandoc/man_html.c index e367e883b1b..979b0d54a0d 100644 --- a/usr.bin/mandoc/man_html.c +++ b/usr.bin/mandoc/man_html.c @@ -1,4 +1,4 @@ -/* $Id: man_html.c,v 1.51 2014/03/30 19:47:32 schwarze Exp $ */ +/* $Id: man_html.c,v 1.52 2014/04/20 16:44:44 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -49,7 +49,7 @@ struct htmlman { int (*post)(MAN_ARGS); }; -static void print_bvspace(struct html *, +static void print_bvspace(struct html *, const struct man_node *); static void print_man(MAN_ARGS); static void print_man_head(MAN_ARGS); @@ -86,7 +86,7 @@ static const struct htmlman mans[MAN_MAX] = { { man_PP_pre, NULL }, /* PP */ { man_PP_pre, NULL }, /* P */ { man_IP_pre, NULL }, /* IP */ - { man_HP_pre, NULL }, /* HP */ + { man_HP_pre, NULL }, /* HP */ { man_SM_pre, NULL }, /* SM */ { man_SM_pre, NULL }, /* SB */ { man_alt_pre, NULL }, /* BI */ @@ -118,6 +118,7 @@ static const struct htmlman mans[MAN_MAX] = { { man_ign_pre, NULL }, /* ll */ }; + /* * Printing leading vertical space before a block. * This is used for the paragraph macros. @@ -152,7 +153,7 @@ html_man(void *arg, const struct man *man) } static void -print_man(MAN_ARGS) +print_man(MAN_ARGS) { struct tag *t, *tt; struct htmlpair tag; @@ -167,15 +168,13 @@ print_man(MAN_ARGS) print_tagq(h, tt); print_otag(h, TAG_BODY, 0, NULL); print_otag(h, TAG_DIV, 1, &tag); - } else + } else t = print_otag(h, TAG_DIV, 1, &tag); print_man_nodelist(man, n, mh, h); print_tagq(h, t); } - -/* ARGSUSED */ static void print_man_head(MAN_ARGS) { @@ -188,7 +187,6 @@ print_man_head(MAN_ARGS) print_text(h, h->buf); } - static void print_man_nodelist(MAN_ARGS) { @@ -198,7 +196,6 @@ print_man_nodelist(MAN_ARGS) print_man_nodelist(man, n->next, mh, h); } - static void print_man_node(MAN_ARGS) { @@ -209,10 +206,10 @@ print_man_node(MAN_ARGS) t = h->tags.head; switch (n->type) { - case (MAN_ROOT): + case MAN_ROOT: man_root_pre(man, n, mh, h); break; - case (MAN_TEXT): + case MAN_TEXT: /* * If we have a blank line, output a vertical space. * If we have a space as the first character, break @@ -230,10 +227,10 @@ print_man_node(MAN_ARGS) print_text(h, n->string); return; - case (MAN_EQN): + case MAN_EQN: print_eqn(h, n->eqn); break; - case (MAN_TBL): + case MAN_TBL: /* * This will take care of initialising all of the table * state data for the first table, then tearing it down @@ -242,7 +239,7 @@ print_man_node(MAN_ARGS) print_tbl(h, n->span); return; default: - /* + /* * Close out scope of font prior to opening a macro * scope. */ @@ -272,10 +269,10 @@ print_man_node(MAN_ARGS) print_stagq(h, t); switch (n->type) { - case (MAN_ROOT): + case MAN_ROOT: man_root_post(man, n, mh, h); break; - case (MAN_EQN): + case MAN_EQN: break; default: if (mans[n->tok].post) @@ -284,7 +281,6 @@ print_man_node(MAN_ARGS) } } - static int a2width(const struct man_node *n, struct roffsu *su) { @@ -297,8 +293,6 @@ a2width(const struct man_node *n, struct roffsu *su) return(0); } - -/* ARGSUSED */ static void man_root_pre(MAN_ARGS) { @@ -345,8 +339,6 @@ man_root_pre(MAN_ARGS) print_tagq(h, t); } - -/* ARGSUSED */ static void man_root_post(MAN_ARGS) { @@ -380,7 +372,6 @@ man_root_post(MAN_ARGS) } -/* ARGSUSED */ static int man_br_pre(MAN_ARGS) { @@ -407,7 +398,6 @@ man_br_pre(MAN_ARGS) return(0); } -/* ARGSUSED */ static int man_SH_pre(MAN_ARGS) { @@ -425,7 +415,6 @@ man_SH_pre(MAN_ARGS) return(1); } -/* ARGSUSED */ static int man_alt_pre(MAN_ARGS) { @@ -434,7 +423,7 @@ man_alt_pre(MAN_ARGS) enum htmltag fp; struct tag *t; - if ((savelit = mh->fl & MANH_LITERAL)) + if ((savelit = mh->fl & MANH_LITERAL)) print_otag(h, TAG_BR, 0, NULL); mh->fl &= ~MANH_LITERAL; @@ -442,22 +431,22 @@ man_alt_pre(MAN_ARGS) for (i = 0, nn = n->child; nn; nn = nn->next, i++) { t = NULL; switch (n->tok) { - case (MAN_BI): + case MAN_BI: fp = i % 2 ? TAG_I : TAG_B; break; - case (MAN_IB): + case MAN_IB: fp = i % 2 ? TAG_B : TAG_I; break; - case (MAN_RI): + case MAN_RI: fp = i % 2 ? TAG_I : TAG_MAX; break; - case (MAN_IR): + case MAN_IR: fp = i % 2 ? TAG_MAX : TAG_I; break; - case (MAN_BR): + case MAN_BR: fp = i % 2 ? TAG_MAX : TAG_B; break; - case (MAN_RB): + case MAN_RB: fp = i % 2 ? TAG_B : TAG_MAX; break; default: @@ -483,18 +472,16 @@ man_alt_pre(MAN_ARGS) return(0); } -/* ARGSUSED */ static int man_SM_pre(MAN_ARGS) { - + print_otag(h, TAG_SMALL, 0, NULL); if (MAN_SB == n->tok) print_otag(h, TAG_B, 0, NULL); return(1); } -/* ARGSUSED */ static int man_SS_pre(MAN_ARGS) { @@ -512,7 +499,6 @@ man_SS_pre(MAN_ARGS) return(1); } -/* ARGSUSED */ static int man_PP_pre(MAN_ARGS) { @@ -525,13 +511,12 @@ man_PP_pre(MAN_ARGS) return(1); } -/* ARGSUSED */ static int man_IP_pre(MAN_ARGS) { const struct man_node *nn; - if (MAN_BODY == n->type) { + if (MAN_BODY == n->type) { print_otag(h, TAG_DD, 0, NULL); return(1); } else if (MAN_HEAD != n->type) { @@ -563,7 +548,6 @@ man_IP_pre(MAN_ARGS) return(0); } -/* ARGSUSED */ static int man_HP_pre(MAN_ARGS) { @@ -592,7 +576,6 @@ man_HP_pre(MAN_ARGS) return(1); } -/* ARGSUSED */ static int man_OP_pre(MAN_ARGS) { @@ -622,8 +605,6 @@ man_OP_pre(MAN_ARGS) return(0); } - -/* ARGSUSED */ static int man_B_pre(MAN_ARGS) { @@ -632,16 +613,14 @@ man_B_pre(MAN_ARGS) return(1); } -/* ARGSUSED */ static int man_I_pre(MAN_ARGS) { - + print_otag(h, TAG_I, 0, NULL); return(1); } -/* ARGSUSED */ static int man_literal_pre(MAN_ARGS) { @@ -655,7 +634,6 @@ man_literal_pre(MAN_ARGS) return(0); } -/* ARGSUSED */ static int man_in_pre(MAN_ARGS) { @@ -664,7 +642,6 @@ man_in_pre(MAN_ARGS) return(0); } -/* ARGSUSED */ static int man_ign_pre(MAN_ARGS) { @@ -672,7 +649,6 @@ man_ign_pre(MAN_ARGS) return(0); } -/* ARGSUSED */ static int man_RS_pre(MAN_ARGS) { @@ -695,7 +671,6 @@ man_RS_pre(MAN_ARGS) return(1); } -/* ARGSUSED */ static int man_UR_pre(MAN_ARGS) { |