=================================================================== RCS file: /cvs/mandoc/man_html.c,v retrieving revision 1.70 retrieving revision 1.78 diff -u -p -r1.70 -r1.78 --- mandoc/man_html.c 2011/03/07 01:35:51 1.70 +++ mandoc/man_html.c 2011/07/07 13:54:36 1.78 @@ -1,4 +1,4 @@ -/* $Id: man_html.c,v 1.70 2011/03/07 01:35:51 schwarze Exp $ */ +/* $Id: man_html.c,v 1.78 2011/07/07 13:54:36 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * @@ -53,6 +53,8 @@ struct htmlman { int (*post)(MAN_ARGS); }; +static void print_bvspace(struct html *, + const struct man_node *); static void print_man(MAN_ARGS); static void print_man_head(MAN_ARGS); static void print_man_nodelist(MAN_ARGS); @@ -114,7 +116,29 @@ static const struct htmlman mans[MAN_MAX] = { { man_ign_pre, NULL }, /* ft */ }; +/* + * Printing leading vertical space before a block. + * This is used for the paragraph macros. + * The rules are pretty simple, since there's very little nesting going + * on here. Basically, if we're the first within another block (SS/SH), + * then don't emit vertical space. If we are (RS), then do. If not the + * first, print it. + */ +static void +print_bvspace(struct html *h, const struct man_node *n) +{ + if (n->body && n->body->child) + if (MAN_TBL == n->body->child->type) + return; + + if (MAN_ROOT == n->parent->type || MAN_RS != n->parent->tok) + if (NULL == n->prev) + return; + + print_otag(h, TAG_P, 0, NULL); +} + void html_man(void *arg, const struct man *m) { @@ -135,7 +159,6 @@ html_man(void *arg, const struct man *m) printf("\n"); } - static void print_man(MAN_ARGS) { @@ -157,9 +180,7 @@ print_man_head(MAN_ARGS) { print_gen_head(h); - bufinit(h); - buffmt(h, "%s(%s)", m->title, m->msec); - + bufcat_fmt(h, "%s(%s)", m->title, m->msec); print_otag(h, TAG_TITLE, 0, NULL); print_text(h, h->buf); } @@ -184,7 +205,6 @@ print_man_node(MAN_ARGS) child = 1; t = h->tags.head; - bufinit(h); switch (n->type) { case (MAN_ROOT): @@ -199,22 +219,14 @@ print_man_node(MAN_ARGS) if ('\0' == *n->string) { print_otag(h, TAG_P, 0, NULL); return; - } else if (' ' == *n->string && MAN_LINE & n->flags) + } + + if (' ' == *n->string && MAN_LINE & n->flags) print_otag(h, TAG_BR, 0, NULL); + else if (MANH_LITERAL & mh->fl && n->prev) + print_otag(h, TAG_BR, 0, NULL); print_text(h, n->string); - - /* - * 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"); @@ -259,8 +271,6 @@ print_man_node(MAN_ARGS) /* This will automatically close out any font scope. */ print_stagq(h, t); - bufinit(h); - switch (n->type) { case (MAN_ROOT): man_root_post(m, n, mh, h); @@ -385,7 +395,6 @@ man_root_post(MAN_ARGS) } - /* ARGSUSED */ static int man_br_pre(MAN_ARGS) @@ -396,11 +405,13 @@ man_br_pre(MAN_ARGS) SCALE_VS_INIT(&su, 1); if (MAN_sp == n->tok) { - if (n->child) - a2roffsu(n->child->string, &su, SCALE_VS); + if (NULL != (n = n->child)) + if ( ! a2roffsu(n->string, &su, SCALE_VS)) + SCALE_VS_INIT(&su, atoi(n->string)); } else su.scale = 0; + bufinit(h); bufcat_su(h, "height", &su); PAIR_STYLE_INIT(&tag, h); print_otag(h, TAG_DIV, 1, &tag); @@ -411,7 +422,6 @@ man_br_pre(MAN_ARGS) return(0); } - /* ARGSUSED */ static int man_SH_pre(MAN_ARGS) @@ -419,6 +429,7 @@ man_SH_pre(MAN_ARGS) struct htmlpair tag; if (MAN_BLOCK == n->type) { + mh->fl &= ~MANH_LITERAL; PAIR_CLASS_INIT(&tag, "section"); print_otag(h, TAG_DIV, 1, &tag); return(1); @@ -429,16 +440,20 @@ man_SH_pre(MAN_ARGS) return(1); } - /* ARGSUSED */ static int man_alt_pre(MAN_ARGS) { const struct man_node *nn; - int i; + int i, savelit; enum htmltag fp; struct tag *t; + if ((savelit = mh->fl & MANH_LITERAL)) + print_otag(h, TAG_BR, 0, NULL); + + mh->fl &= ~MANH_LITERAL; + for (i = 0, nn = n->child; nn; nn = nn->next, i++) { t = NULL; switch (n->tok) { @@ -477,10 +492,12 @@ man_alt_pre(MAN_ARGS) print_tagq(h, t); } + if (savelit) + mh->fl |= MANH_LITERAL; + return(0); } - /* ARGSUSED */ static int man_SM_pre(MAN_ARGS) @@ -492,7 +509,6 @@ man_SM_pre(MAN_ARGS) return(1); } - /* ARGSUSED */ static int man_SS_pre(MAN_ARGS) @@ -500,6 +516,7 @@ man_SS_pre(MAN_ARGS) struct htmlpair tag; if (MAN_BLOCK == n->type) { + mh->fl &= ~MANH_LITERAL; PAIR_CLASS_INIT(&tag, "subsection"); print_otag(h, TAG_DIV, 1, &tag); return(1); @@ -510,7 +527,6 @@ man_SS_pre(MAN_ARGS) return(1); } - /* ARGSUSED */ static int man_PP_pre(MAN_ARGS) @@ -518,68 +534,30 @@ man_PP_pre(MAN_ARGS) if (MAN_HEAD == n->type) return(0); - else if (MAN_BODY == n->type && n->prev) - print_otag(h, TAG_P, 0, NULL); + else if (MAN_BLOCK == n->type) + print_bvspace(h, n); return(1); } - /* ARGSUSED */ static int man_IP_pre(MAN_ARGS) { - struct roffsu su; - struct htmlpair tag; const struct man_node *nn; - /* - * This scattering of 1-BU margins and pads is to make sure that - * when text overruns its box, the subsequent text isn't flush - * up against it. However, the rest of the right-hand box must - * also be adjusted in consideration of this 1-BU space. - */ - if (MAN_BODY == n->type) { - print_otag(h, TAG_TD, 0, NULL); + print_otag(h, TAG_DD, 0, NULL); return(1); + } else if (MAN_HEAD != n->type) { + print_otag(h, TAG_DL, 0, NULL); + return(1); } - nn = MAN_BLOCK == n->type ? - n->head->child : n->parent->head->child; + /* FIXME: width specification. */ - SCALE_HS_INIT(&su, INDENT); + print_otag(h, TAG_DT, 0, NULL); - /* Width is the second token. */ - - if (MAN_IP == n->tok && NULL != nn) - if (NULL != (nn = nn->next)) - a2width(nn, &su); - - /* Width is the first token. */ - - if (MAN_TP == n->tok && NULL != nn) { - /* Skip past non-text children. */ - while (nn && MAN_TEXT != nn->type) - nn = nn->next; - if (nn) - a2width(nn, &su); - } - - if (MAN_BLOCK == n->type) { - print_otag(h, TAG_P, 0, NULL); - print_otag(h, TAG_TABLE, 0, NULL); - bufcat_su(h, "width", &su); - PAIR_STYLE_INIT(&tag, h); - print_otag(h, TAG_COL, 1, &tag); - print_otag(h, TAG_COL, 0, NULL); - print_otag(h, TAG_TBODY, 0, NULL); - print_otag(h, TAG_TR, 0, NULL); - return(1); - } - - print_otag(h, TAG_TD, 0, NULL); - /* For IP, only print the first header element. */ if (MAN_IP == n->tok && n->child) @@ -595,7 +573,6 @@ man_IP_pre(MAN_ARGS) return(0); } - /* ARGSUSED */ static int man_HP_pre(MAN_ARGS) @@ -604,36 +581,27 @@ man_HP_pre(MAN_ARGS) struct roffsu su; const struct man_node *np; - np = MAN_BLOCK == n->type ? - n->head->child : - n->parent->head->child; + if (MAN_HEAD == n->type) + return(0); + else if (MAN_BLOCK != n->type) + return(1); + np = n->head->child; + if (NULL == np || ! a2width(np, &su)) SCALE_HS_INIT(&su, INDENT); - if (MAN_HEAD == n->type) { - print_otag(h, TAG_TD, 0, NULL); - return(0); - } else if (MAN_BLOCK == n->type) { - print_otag(h, TAG_P, 0, NULL); - print_otag(h, TAG_TABLE, 0, NULL); - bufcat_su(h, "width", &su); - PAIR_STYLE_INIT(&tag, h); - print_otag(h, TAG_COL, 1, &tag); - print_otag(h, TAG_COL, 0, NULL); - print_otag(h, TAG_TBODY, 0, NULL); - print_otag(h, TAG_TR, 0, NULL); - return(1); - } + bufinit(h); + print_bvspace(h, n); + bufcat_su(h, "margin-left", &su); su.scale = -su.scale; bufcat_su(h, "text-indent", &su); PAIR_STYLE_INIT(&tag, h); - print_otag(h, TAG_TD, 1, &tag); + print_otag(h, TAG_P, 1, &tag); return(1); } - /* ARGSUSED */ static int man_B_pre(MAN_ARGS) @@ -643,7 +611,6 @@ man_B_pre(MAN_ARGS) return(1); } - /* ARGSUSED */ static int man_I_pre(MAN_ARGS) @@ -653,22 +620,20 @@ man_I_pre(MAN_ARGS) return(1); } - /* ARGSUSED */ static int man_literal_pre(MAN_ARGS) { - if (MAN_nf == n->tok) { + if (MAN_nf != n->tok) { print_otag(h, TAG_BR, 0, NULL); - mh->fl |= MANH_LITERAL; - } else mh->fl &= ~MANH_LITERAL; + } else + mh->fl |= MANH_LITERAL; return(0); } - /* ARGSUSED */ static int man_in_pre(MAN_ARGS) @@ -678,7 +643,6 @@ man_in_pre(MAN_ARGS) return(0); } - /* ARGSUSED */ static int man_ign_pre(MAN_ARGS) @@ -687,7 +651,6 @@ man_ign_pre(MAN_ARGS) return(0); } - /* ARGSUSED */ static int man_RS_pre(MAN_ARGS) @@ -704,6 +667,7 @@ man_RS_pre(MAN_ARGS) if (n->head->child) a2width(n->head->child, &su); + bufinit(h); bufcat_su(h, "margin-left", &su); PAIR_STYLE_INIT(&tag, h); print_otag(h, TAG_DIV, 1, &tag);