=================================================================== RCS file: /cvs/mandoc/man_html.c,v retrieving revision 1.16 retrieving revision 1.26 diff -u -p -r1.16 -r1.26 --- mandoc/man_html.c 2009/10/28 08:00:18 1.16 +++ mandoc/man_html.c 2010/01/29 14:39:38 1.26 @@ -1,4 +1,4 @@ -/* $Id: man_html.c,v 1.16 2009/10/28 08:00:18 kristaps Exp $ */ +/* $Id: man_html.c,v 1.26 2010/01/29 14:39:38 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -14,11 +14,14 @@ * 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 @@ -67,11 +70,6 @@ static int man_SH_pre(MAN_ARGS); static int man_SM_pre(MAN_ARGS); static int man_SS_pre(MAN_ARGS); -#ifdef __linux__ -extern size_t strlcpy(char *, const char *, size_t); -extern size_t strlcat(char *, const char *, size_t); -#endif - static const struct htmlman mans[MAN_MAX] = { { man_br_pre, NULL }, /* br */ { NULL, NULL }, /* TH */ @@ -116,7 +114,7 @@ html_man(void *arg, const struct man *m) h = (struct html *)arg; - print_gen_doctype(h); + print_gen_decls(h); t = print_otag(h, TAG_HTML, 0, NULL); print_man(man_meta(m), man_node(m), h); @@ -189,8 +187,19 @@ print_man_node(MAN_ARGS) break; case (MAN_TEXT): print_text(h, n->string); - break; + return; default: + /* + * Close out scope of font prior to opening a macro + * scope. Assert that the metafont is on the top of the + * stack (it's never nested). + */ + if (h->metaf) { + assert(h->metaf == t); + print_tagq(h, h->metaf); + assert(NULL == h->metaf); + t = h->tags.head; + } if (mans[n->tok].pre) child = (*mans[n->tok].pre)(m, n, h); break; @@ -199,6 +208,7 @@ print_man_node(MAN_ARGS) if (child && n->child) print_man_nodelist(m, n->child, h); + /* This will automatically close out any font scope. */ print_stagq(h, t); bufinit(h); @@ -242,8 +252,7 @@ man_root_pre(MAN_ARGS) if (m->vol) (void)strlcat(b, m->vol, BUFSIZ); - (void)snprintf(title, BUFSIZ - 1, - "%s(%d)", m->title, m->msec); + snprintf(title, BUFSIZ - 1, "%s(%d)", m->title, m->msec); PAIR_CLASS_INIT(&tag[0], "header"); bufcat_style(h, "width", "100%"); @@ -334,6 +343,7 @@ man_br_pre(MAN_ARGS) bufcat_su(h, "height", &su); PAIR_STYLE_INIT(&tag, h); print_otag(h, TAG_DIV, 1, &tag); + /* So the div isn't empty: */ print_text(h, "\\~"); @@ -385,30 +395,27 @@ man_alt_pre(MAN_ARGS) const struct man_node *nn; struct tag *t; int i; - struct htmlpair tagi, tagb, *tagp; + enum htmlfont fp; - PAIR_CLASS_INIT(&tagi, "italic"); - PAIR_CLASS_INIT(&tagb, "bold"); - for (i = 0, nn = n->child; nn; nn = nn->next, i++) { switch (n->tok) { case (MAN_BI): - tagp = i % 2 ? &tagi : &tagb; + fp = i % 2 ? HTMLFONT_ITALIC : HTMLFONT_BOLD; break; case (MAN_IB): - tagp = i % 2 ? &tagb : &tagi; + fp = i % 2 ? HTMLFONT_BOLD : HTMLFONT_ITALIC; break; case (MAN_RI): - tagp = i % 2 ? &tagi : NULL; + fp = i % 2 ? HTMLFONT_ITALIC : HTMLFONT_NONE; break; case (MAN_IR): - tagp = i % 2 ? NULL : &tagi; + fp = i % 2 ? HTMLFONT_NONE : HTMLFONT_ITALIC; break; case (MAN_BR): - tagp = i % 2 ? NULL : &tagb; + fp = i % 2 ? HTMLFONT_NONE : HTMLFONT_BOLD; break; case (MAN_RB): - tagp = i % 2 ? &tagb : NULL; + fp = i % 2 ? HTMLFONT_BOLD : HTMLFONT_NONE; break; default: abort(); @@ -418,12 +425,14 @@ man_alt_pre(MAN_ARGS) if (i) h->flags |= HTML_NOSPACE; - if (tagp) { - t = print_otag(h, TAG_SPAN, 1, tagp); - print_man_node(m, nn, h); - print_tagq(h, t); - } else - print_man_node(m, nn, h); + /* + * Open and close the scope with each argument, so that + * internal \f escapes, which are common, are also + * closed out with the scope. + */ + t = print_ofont(h, fp); + print_man_node(m, nn, h); + print_tagq(h, t); } return(0); @@ -436,6 +445,7 @@ man_SB_pre(MAN_ARGS) { struct htmlpair tag; + /* FIXME: print_ofont(). */ PAIR_CLASS_INIT(&tag, "small bold"); print_otag(h, TAG_SPAN, 1, &tag); return(1); @@ -510,19 +520,19 @@ man_PP_pre(MAN_ARGS) i = 0; - if (MAN_ROOT == n->parent->tok) { + if (MAN_ROOT == n->parent->type) { SCALE_HS_INIT(&su, INDENT); bufcat_su(h, "margin-left", &su); - i++; + i = 1; } - if (n->next && n->next->child) { + if (n->prev) { SCALE_VS_INIT(&su, 1); - bufcat_su(h, "margin-bottom", &su); - i++; + bufcat_su(h, "margin-top", &su); + i = 1; } PAIR_STYLE_INIT(&tag, h); - print_otag(h, TAG_DIV, i ? 1 : 0, &tag); + print_otag(h, TAG_DIV, i, &tag); return(1); } @@ -649,10 +659,8 @@ man_HP_pre(MAN_ARGS) static int man_B_pre(MAN_ARGS) { - struct htmlpair tag; - PAIR_CLASS_INIT(&tag, "bold"); - print_otag(h, TAG_SPAN, 1, &tag); + print_ofont(h, HTMLFONT_BOLD); return(1); } @@ -661,10 +669,8 @@ man_B_pre(MAN_ARGS) static int man_I_pre(MAN_ARGS) { - struct htmlpair tag; - - PAIR_CLASS_INIT(&tag, "italic"); - print_otag(h, TAG_SPAN, 1, &tag); + + print_ofont(h, HTMLFONT_ITALIC); return(1); }