=================================================================== RCS file: /cvs/mandoc/man_html.c,v retrieving revision 1.56 retrieving revision 1.70 diff -u -p -r1.56 -r1.70 --- mandoc/man_html.c 2010/12/22 09:51:27 1.56 +++ mandoc/man_html.c 2011/03/07 01:35:51 1.70 @@ -1,6 +1,6 @@ -/* $Id: man_html.c,v 1.56 2010/12/22 09:51:27 kristaps Exp $ */ +/* $Id: man_html.c,v 1.70 2011/03/07 01:35:51 schwarze Exp $ */ /* - * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons + * Copyright (c) 2008, 2009, 2010, 2011 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 @@ -67,7 +67,7 @@ static int man_ign_pre(MAN_ARGS); static int man_in_pre(MAN_ARGS); static int man_literal_pre(MAN_ARGS); static void man_root_post(MAN_ARGS); -static int man_root_pre(MAN_ARGS); +static void man_root_pre(MAN_ARGS); static int man_B_pre(MAN_ARGS); static int man_HP_pre(MAN_ARGS); static int man_I_pre(MAN_ARGS); @@ -100,7 +100,7 @@ static const struct htmlman mans[MAN_MAX] = { { man_I_pre, NULL }, /* I */ { man_alt_pre, NULL }, /* IR */ { man_alt_pre, NULL }, /* RI */ - { NULL, NULL }, /* na */ + { man_ign_pre, NULL }, /* na */ { man_br_pre, NULL }, /* sp */ { man_literal_pre, NULL }, /* nf */ { man_literal_pre, NULL }, /* fi */ @@ -180,39 +180,72 @@ print_man_node(MAN_ARGS) { int child; struct tag *t; + struct htmlpair tag; child = 1; t = h->tags.head; - bufinit(h); - /* - * FIXME: embedded elements within next-line scopes (e.g., `br' - * within an empty `B') will cause formatting to be forgotten - * due to scope closing out. - */ - switch (n->type) { case (MAN_ROOT): - child = man_root_pre(m, n, mh, h); + man_root_pre(m, n, mh, h); break; case (MAN_TEXT): + /* + * If we have a blank line, output a vertical space. + * If we have a space as the first character, break + * before printing the line's data. + */ + if ('\0' == *n->string) { + print_otag(h, TAG_P, 0, NULL); + return; + } else if (' ' == *n->string && MAN_LINE & n->flags) + print_otag(h, TAG_BR, 0, NULL); + print_text(h, n->string); - if (MANH_LITERAL & mh->fl) + /* + * If we're in a literal context, make sure that words + * togehter on the same line stay together. This is a + * POST-printing call, so we check the NEXT word. Since + * -man doesn't have nested macros, we don't need to be + * more specific than this. + */ + if (MANH_LITERAL & mh->fl && + (NULL == n->next || + n->next->line > n->line)) print_otag(h, TAG_BR, 0, NULL); - return; + case (MAN_EQN): + PAIR_CLASS_INIT(&tag, "eqn"); + print_otag(h, TAG_SPAN, 1, &tag); + print_text(h, n->eqn->data); + break; + case (MAN_TBL): + /* + * This will take care of initialising all of the table + * state data for the first table, then tearing it down + * for the last one. + */ + print_tbl(h, n->span); + 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). + * scope. */ - if (h->metaf) { - assert(h->metaf == t); - print_tagq(h, h->metaf); - assert(NULL == h->metaf); + if (HTMLFONT_NONE != h->metac) { + h->metal = h->metac; + h->metac = HTMLFONT_NONE; + } + + /* + * Close out the current table, if it's open, and unset + * the "meta" table state. This will be reopened on the + * next table element. + */ + if (h->tblt) { + print_tblclose(h); t = h->tags.head; } if (mans[n->tok].pre) @@ -232,7 +265,7 @@ print_man_node(MAN_ARGS) case (MAN_ROOT): man_root_post(m, n, mh, h); break; - case (MAN_TEXT): + case (MAN_EQN): break; default: if (mans[n->tok].post) @@ -256,7 +289,7 @@ a2width(const struct man_node *n, struct roffsu *su) /* ARGSUSED */ -static int +static void man_root_pre(MAN_ARGS) { struct htmlpair tag[3]; @@ -310,7 +343,6 @@ man_root_pre(MAN_ARGS) print_text(h, title); print_tagq(h, t); - return(1); } @@ -320,13 +352,7 @@ man_root_post(MAN_ARGS) { struct htmlpair tag[3]; struct tag *t, *tt; - char b[DATESIZ]; - if (m->rawdate) - strlcpy(b, m->rawdate, DATESIZ); - else - time2a(m->date, b, DATESIZ); - PAIR_SUMMARY_INIT(&tag[0], "Document Footer"); PAIR_CLASS_INIT(&tag[1], "foot"); if (NULL == h->style) { @@ -343,7 +369,7 @@ man_root_post(MAN_ARGS) PAIR_CLASS_INIT(&tag[0], "foot-date"); print_otag(h, TAG_TD, 1, tag); - print_text(h, b); + print_text(h, m->date); print_stagq(h, tt); PAIR_CLASS_INIT(&tag[0], "foot-os"); @@ -409,29 +435,30 @@ static int man_alt_pre(MAN_ARGS) { const struct man_node *nn; - struct tag *t; - int i; - enum htmlfont fp; + int i; + enum htmltag fp; + struct tag *t; for (i = 0, nn = n->child; nn; nn = nn->next, i++) { + t = NULL; switch (n->tok) { case (MAN_BI): - fp = i % 2 ? HTMLFONT_ITALIC : HTMLFONT_BOLD; + fp = i % 2 ? TAG_I : TAG_B; break; case (MAN_IB): - fp = i % 2 ? HTMLFONT_BOLD : HTMLFONT_ITALIC; + fp = i % 2 ? TAG_B : TAG_I; break; case (MAN_RI): - fp = i % 2 ? HTMLFONT_ITALIC : HTMLFONT_NONE; + fp = i % 2 ? TAG_I : TAG_MAX; break; case (MAN_IR): - fp = i % 2 ? HTMLFONT_NONE : HTMLFONT_ITALIC; + fp = i % 2 ? TAG_MAX : TAG_I; break; case (MAN_BR): - fp = i % 2 ? HTMLFONT_NONE : HTMLFONT_BOLD; + fp = i % 2 ? TAG_MAX : TAG_B; break; case (MAN_RB): - fp = i % 2 ? HTMLFONT_BOLD : HTMLFONT_NONE; + fp = i % 2 ? TAG_B : TAG_MAX; break; default: abort(); @@ -441,14 +468,13 @@ man_alt_pre(MAN_ARGS) if (i) h->flags |= HTML_NOSPACE; - /* - * 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); + if (TAG_MAX != fp) + t = print_otag(h, fp, 0, NULL); + print_man_node(m, nn, mh, h); - print_tagq(h, t); + + if (t) + print_tagq(h, t); } return(0); @@ -459,13 +485,10 @@ man_alt_pre(MAN_ARGS) static int man_SM_pre(MAN_ARGS) { - struct htmlpair tag; - /* FIXME: print_ofont(). */ - PAIR_CLASS_INIT(&tag, "small"); - print_otag(h, TAG_SPAN, 1, &tag); + print_otag(h, TAG_SMALL, 0, NULL); if (MAN_SB == n->tok) - print_ofont(h, HTMLFONT_BOLD); + print_otag(h, TAG_B, 0, NULL); return(1); } @@ -509,7 +532,6 @@ man_IP_pre(MAN_ARGS) struct roffsu su; struct htmlpair tag; const struct man_node *nn; - int width; /* * This scattering of 1-BU margins and pads is to make sure that @@ -527,16 +549,12 @@ man_IP_pre(MAN_ARGS) n->head->child : n->parent->head->child; SCALE_HS_INIT(&su, INDENT); - width = 0; - /* Width is the last token. */ + /* Width is the second token. */ if (MAN_IP == n->tok && NULL != nn) - if (NULL != (nn = nn->next)) { - for ( ; nn->next; nn = nn->next) - /* Do nothing. */ ; - width = a2width(nn, &su); - } + if (NULL != (nn = nn->next)) + a2width(nn, &su); /* Width is the first token. */ @@ -545,7 +563,7 @@ man_IP_pre(MAN_ARGS) while (nn && MAN_TEXT != nn->type) nn = nn->next; if (nn) - width = a2width(nn, &su); + a2width(nn, &su); } if (MAN_BLOCK == n->type) { @@ -562,26 +580,17 @@ man_IP_pre(MAN_ARGS) print_otag(h, TAG_TD, 0, NULL); - /* - * Without a length string, we can print all of our children. - */ + /* For IP, only print the first header element. */ - if ( ! width) - return(1); + if (MAN_IP == n->tok && n->child) + print_man_node(m, n->child, mh, h); - /* - * When a length has been specified, we need to carefully print - * our child context: IP gets all children printed but the last - * (the width), while TP gets all children printed but the first - * (the width). - */ + /* For TP, only print next-line header elements. */ - if (MAN_IP == n->tok) - for (nn = n->child; nn->next; nn = nn->next) - print_man_node(m, nn, mh, h); if (MAN_TP == n->tok) - for (nn = n->child->next; nn; nn = nn->next) - print_man_node(m, nn, mh, h); + for (nn = n->child; nn; nn = nn->next) + if (nn->line > n->line) + print_man_node(m, nn, mh, h); return(0); } @@ -630,7 +639,7 @@ static int man_B_pre(MAN_ARGS) { - print_ofont(h, HTMLFONT_BOLD); + print_otag(h, TAG_B, 0, NULL); return(1); } @@ -640,7 +649,7 @@ static int man_I_pre(MAN_ARGS) { - print_ofont(h, HTMLFONT_ITALIC); + print_otag(h, TAG_I, 0, NULL); return(1); } @@ -656,7 +665,7 @@ man_literal_pre(MAN_ARGS) } else mh->fl &= ~MANH_LITERAL; - return(1); + return(0); }