=================================================================== RCS file: /cvs/mandoc/mdoc_html.c,v retrieving revision 1.102 retrieving revision 1.116 diff -u -p -r1.102 -r1.116 --- mandoc/mdoc_html.c 2010/08/20 01:02:07 1.102 +++ mandoc/mdoc_html.c 2010/12/15 15:32:01 1.116 @@ -1,4 +1,4 @@ -/* $Id: mdoc_html.c,v 1.102 2010/08/20 01:02:07 schwarze Exp $ */ +/* $Id: mdoc_html.c,v 1.116 2010/12/15 15:32:01 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons * @@ -67,25 +67,16 @@ static int mdoc__x_pre(MDOC_ARGS); static int mdoc_ad_pre(MDOC_ARGS); static int mdoc_an_pre(MDOC_ARGS); static int mdoc_ap_pre(MDOC_ARGS); -static void mdoc_aq_post(MDOC_ARGS); -static int mdoc_aq_pre(MDOC_ARGS); static int mdoc_ar_pre(MDOC_ARGS); static int mdoc_bd_pre(MDOC_ARGS); static int mdoc_bf_pre(MDOC_ARGS); static void mdoc_bk_post(MDOC_ARGS); static int mdoc_bk_pre(MDOC_ARGS); -static void mdoc_bl_post(MDOC_ARGS); static int mdoc_bl_pre(MDOC_ARGS); -static void mdoc_bq_post(MDOC_ARGS); -static int mdoc_bq_pre(MDOC_ARGS); -static void mdoc_brq_post(MDOC_ARGS); -static int mdoc_brq_pre(MDOC_ARGS); static int mdoc_bt_pre(MDOC_ARGS); static int mdoc_bx_pre(MDOC_ARGS); static int mdoc_cd_pre(MDOC_ARGS); static int mdoc_d1_pre(MDOC_ARGS); -static void mdoc_dq_post(MDOC_ARGS); -static int mdoc_dq_pre(MDOC_ARGS); static int mdoc_dv_pre(MDOC_ARGS); static int mdoc_fa_pre(MDOC_ARGS); static int mdoc_fd_pre(MDOC_ARGS); @@ -99,13 +90,8 @@ static int mdoc_ex_pre(MDOC_ARGS); static void mdoc_fo_post(MDOC_ARGS); static int mdoc_fo_pre(MDOC_ARGS); static int mdoc_ic_pre(MDOC_ARGS); +static int mdoc_igndelim_pre(MDOC_ARGS); static int mdoc_in_pre(MDOC_ARGS); -static int mdoc_it_block_pre(MDOC_ARGS, enum mdoc_list, - int, struct roffsu *, struct roffsu *); -static int mdoc_it_head_pre(MDOC_ARGS, enum mdoc_list, - struct roffsu *); -static int mdoc_it_body_pre(MDOC_ARGS, enum mdoc_list, - struct roffsu *); static int mdoc_it_pre(MDOC_ARGS); static int mdoc_lb_pre(MDOC_ARGS); static int mdoc_li_pre(MDOC_ARGS); @@ -115,20 +101,15 @@ static int mdoc_ms_pre(MDOC_ARGS); static int mdoc_nd_pre(MDOC_ARGS); static int mdoc_nm_pre(MDOC_ARGS); static int mdoc_ns_pre(MDOC_ARGS); -static void mdoc_op_post(MDOC_ARGS); -static int mdoc_op_pre(MDOC_ARGS); static int mdoc_pa_pre(MDOC_ARGS); static void mdoc_pf_post(MDOC_ARGS); -static int mdoc_pf_pre(MDOC_ARGS); -static void mdoc_pq_post(MDOC_ARGS); -static int mdoc_pq_pre(MDOC_ARGS); +static void mdoc_quote_post(MDOC_ARGS); +static int mdoc_quote_pre(MDOC_ARGS); static int mdoc_rs_pre(MDOC_ARGS); static int mdoc_rv_pre(MDOC_ARGS); static int mdoc_sh_pre(MDOC_ARGS); static int mdoc_sm_pre(MDOC_ARGS); static int mdoc_sp_pre(MDOC_ARGS); -static void mdoc_sq_post(MDOC_ARGS); -static int mdoc_sq_pre(MDOC_ARGS); static int mdoc_ss_pre(MDOC_ARGS); static int mdoc_sx_pre(MDOC_ARGS); static int mdoc_sy_pre(MDOC_ARGS); @@ -150,7 +131,7 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {mdoc_d1_pre, NULL}, /* Dl */ {mdoc_bd_pre, NULL}, /* Bd */ {NULL, NULL}, /* Ed */ - {mdoc_bl_pre, mdoc_bl_post}, /* Bl */ + {mdoc_bl_pre, NULL}, /* Bl */ {NULL, NULL}, /* El */ {mdoc_it_pre, NULL}, /* It */ {mdoc_ad_pre, NULL}, /* Ad */ @@ -172,7 +153,7 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {mdoc_li_pre, NULL}, /* Li */ {mdoc_nd_pre, NULL}, /* Nd */ {mdoc_nm_pre, NULL}, /* Nm */ - {mdoc_op_pre, mdoc_op_post}, /* Op */ + {mdoc_quote_pre, mdoc_quote_post}, /* Op */ {NULL, NULL}, /* Ot */ {mdoc_pa_pre, NULL}, /* Pa */ {mdoc_rv_pre, NULL}, /* Rv */ @@ -192,42 +173,42 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {mdoc__x_pre, mdoc__x_post}, /* %T */ {mdoc__x_pre, mdoc__x_post}, /* %V */ {NULL, NULL}, /* Ac */ - {mdoc_aq_pre, mdoc_aq_post}, /* Ao */ - {mdoc_aq_pre, mdoc_aq_post}, /* Aq */ + {mdoc_quote_pre, mdoc_quote_post}, /* Ao */ + {mdoc_quote_pre, mdoc_quote_post}, /* Aq */ {NULL, NULL}, /* At */ {NULL, NULL}, /* Bc */ {mdoc_bf_pre, NULL}, /* Bf */ - {mdoc_bq_pre, mdoc_bq_post}, /* Bo */ - {mdoc_bq_pre, mdoc_bq_post}, /* Bq */ + {mdoc_quote_pre, mdoc_quote_post}, /* Bo */ + {mdoc_quote_pre, mdoc_quote_post}, /* Bq */ {mdoc_xx_pre, NULL}, /* Bsx */ {mdoc_bx_pre, NULL}, /* Bx */ {NULL, NULL}, /* Db */ {NULL, NULL}, /* Dc */ - {mdoc_dq_pre, mdoc_dq_post}, /* Do */ - {mdoc_dq_pre, mdoc_dq_post}, /* Dq */ + {mdoc_quote_pre, mdoc_quote_post}, /* Do */ + {mdoc_quote_pre, mdoc_quote_post}, /* Dq */ {NULL, NULL}, /* Ec */ /* FIXME: no space */ {NULL, NULL}, /* Ef */ {mdoc_em_pre, NULL}, /* Em */ {NULL, NULL}, /* Eo */ {mdoc_xx_pre, NULL}, /* Fx */ {mdoc_ms_pre, NULL}, /* Ms */ - {NULL, NULL}, /* No */ + {mdoc_igndelim_pre, NULL}, /* No */ {mdoc_ns_pre, NULL}, /* Ns */ {mdoc_xx_pre, NULL}, /* Nx */ {mdoc_xx_pre, NULL}, /* Ox */ {NULL, NULL}, /* Pc */ - {mdoc_pf_pre, mdoc_pf_post}, /* Pf */ - {mdoc_pq_pre, mdoc_pq_post}, /* Po */ - {mdoc_pq_pre, mdoc_pq_post}, /* Pq */ + {mdoc_igndelim_pre, mdoc_pf_post}, /* Pf */ + {mdoc_quote_pre, mdoc_quote_post}, /* Po */ + {mdoc_quote_pre, mdoc_quote_post}, /* Pq */ {NULL, NULL}, /* Qc */ - {mdoc_sq_pre, mdoc_sq_post}, /* Ql */ - {mdoc_dq_pre, mdoc_dq_post}, /* Qo */ - {mdoc_dq_pre, mdoc_dq_post}, /* Qq */ + {mdoc_quote_pre, mdoc_quote_post}, /* Ql */ + {mdoc_quote_pre, mdoc_quote_post}, /* Qo */ + {mdoc_quote_pre, mdoc_quote_post}, /* Qq */ {NULL, NULL}, /* Re */ {mdoc_rs_pre, NULL}, /* Rs */ {NULL, NULL}, /* Sc */ - {mdoc_sq_pre, mdoc_sq_post}, /* So */ - {mdoc_sq_pre, mdoc_sq_post}, /* Sq */ + {mdoc_quote_pre, mdoc_quote_post}, /* So */ + {mdoc_quote_pre, mdoc_quote_post}, /* Sq */ {mdoc_sm_pre, NULL}, /* Sm */ {mdoc_sx_pre, NULL}, /* Sx */ {mdoc_sy_pre, NULL}, /* Sy */ @@ -237,7 +218,7 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {NULL, NULL}, /* Xo */ {mdoc_fo_pre, mdoc_fo_post}, /* Fo */ {NULL, NULL}, /* Fc */ - {mdoc_op_pre, mdoc_op_post}, /* Oo */ + {mdoc_quote_pre, mdoc_quote_post}, /* Oo */ {NULL, NULL}, /* Oc */ {mdoc_bk_pre, mdoc_bk_post}, /* Bk */ {NULL, NULL}, /* Ek */ @@ -249,8 +230,8 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {mdoc_sp_pre, NULL}, /* Lp */ {mdoc_lk_pre, NULL}, /* Lk */ {mdoc_mt_pre, NULL}, /* Mt */ - {mdoc_brq_pre, mdoc_brq_post}, /* Brq */ - {mdoc_brq_pre, mdoc_brq_post}, /* Bro */ + {mdoc_quote_pre, mdoc_quote_post}, /* Brq */ + {mdoc_quote_pre, mdoc_quote_post}, /* Bro */ {NULL, NULL}, /* Brc */ {mdoc__x_pre, mdoc__x_post}, /* %C */ {NULL, NULL}, /* Es */ /* TODO */ @@ -263,6 +244,20 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {NULL, NULL}, /* Ta */ }; +static const char * const lists[LIST_MAX] = { + NULL, + "list-bul", + "list-col", + "list-dash", + "list-diag", + "list-enum", + "list-hang", + "list-hyph", + "list-inset", + "list-item", + "list-ohang", + "list-tag" +}; void html_mdoc(void *arg, const struct mdoc *m) @@ -716,38 +711,7 @@ mdoc_nd_pre(MDOC_ARGS) } -/* ARGSUSED */ static int -mdoc_op_pre(MDOC_ARGS) -{ - struct htmlpair tag; - - if (MDOC_BODY != n->type) - return(1); - - /* XXX: this tag in theory can contain block elements. */ - - print_text(h, "\\(lB"); - h->flags |= HTML_NOSPACE; - PAIR_CLASS_INIT(&tag, "opt"); - print_otag(h, TAG_SPAN, 1, &tag); - return(1); -} - - -/* ARGSUSED */ -static void -mdoc_op_post(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return; - h->flags |= HTML_NOSPACE; - print_text(h, "\\(rB"); -} - - -static int mdoc_nm_pre(MDOC_ARGS) { struct htmlpair tag; @@ -886,7 +850,7 @@ mdoc_xx_pre(MDOC_ARGS) switch (n->tok) { case (MDOC_Bsx): - pp = "BSDI BSD/OS"; + pp = "BSD/OS"; break; case (MDOC_Dx): pp = "DragonFly"; @@ -934,284 +898,190 @@ mdoc_bx_pre(MDOC_ARGS) return(0); } - -/* ARGSUSED */ static int -mdoc_it_block_pre(MDOC_ARGS, enum mdoc_list type, int comp, - struct roffsu *offs, struct roffsu *width) +mdoc_it_pre(MDOC_ARGS) { - struct htmlpair tag; - const struct mdoc_node *nn; - struct roffsu su; + struct roffsu su; + enum mdoc_list type; + struct htmlpair tag[2]; + const struct mdoc_node *bl; - nn = n->parent->parent; + bl = n->parent; + while (bl && MDOC_Bl != bl->tok) + bl = bl->parent; - /* XXX: see notes in mdoc_it_pre(). */ + assert(bl); - if (LIST_column == type) { - /* Don't width-pad on the left. */ - SCALE_HS_INIT(width, 0); - /* Also disallow non-compact. */ - comp = 1; - } - if (LIST_diag == type) - /* Mandate non-compact with empty prior. */ - if (n->prev && NULL == n->prev->body->child) - comp = 1; + type = bl->data.Bl->type; - bufcat_style(h, "clear", "both"); - if (offs->scale > 0) - bufcat_su(h, "margin-left", offs); - if (width->scale > 0) - bufcat_su(h, "padding-left", width); + assert(lists[type]); + PAIR_CLASS_INIT(&tag[0], lists[type]); - PAIR_STYLE_INIT(&tag, h); + SCALE_VS_INIT(&su, ! bl->data.Bl->comp); + bufcat_su(h, "margin-top", &su); + PAIR_STYLE_INIT(&tag[1], h); - /* Mandate compact following `Ss' and `Sh' starts. */ - - for (nn = n; nn && ! comp; nn = nn->parent) { - if (MDOC_BLOCK != nn->type) - continue; - if (MDOC_Ss == nn->tok || MDOC_Sh == nn->tok) - comp = 1; - if (nn->prev) + if (MDOC_HEAD == n->type) { + switch (type) { + case(LIST_bullet): + /* FALLTHROUGH */ + case(LIST_dash): + /* FALLTHROUGH */ + case(LIST_item): + /* FALLTHROUGH */ + case(LIST_hyphen): + /* FALLTHROUGH */ + case(LIST_enum): + return(0); + case(LIST_diag): + /* FALLTHROUGH */ + case(LIST_hang): + /* FALLTHROUGH */ + case(LIST_inset): + /* FALLTHROUGH */ + case(LIST_ohang): + /* FALLTHROUGH */ + case(LIST_tag): + print_otag(h, TAG_DT, 2, tag); break; + case(LIST_column): + break; + default: + break; + } + } else if (MDOC_BODY == n->type) { + switch (type) { + case(LIST_bullet): + /* FALLTHROUGH */ + case(LIST_hyphen): + /* FALLTHROUGH */ + case(LIST_dash): + /* FALLTHROUGH */ + case(LIST_enum): + /* FALLTHROUGH */ + case(LIST_item): + /* FALLTHROUGH */ + print_otag(h, TAG_LI, 2, tag); + break; + case(LIST_diag): + /* FALLTHROUGH */ + case(LIST_hang): + /* FALLTHROUGH */ + case(LIST_inset): + /* FALLTHROUGH */ + case(LIST_ohang): + /* FALLTHROUGH */ + case(LIST_tag): + print_otag(h, TAG_DD, 1, tag); + break; + case(LIST_column): + print_otag(h, TAG_TD, 2, tag); + break; + default: + break; + } + } else { + switch (type) { + case (LIST_column): + print_otag(h, TAG_TR, 1, tag); + break; + default: + break; + } } - if ( ! comp) { - SCALE_VS_INIT(&su, 1); - bufcat_su(h, "padding-top", &su); - } - - PAIR_STYLE_INIT(&tag, h); - print_otag(h, TAG_DIV, 1, &tag); return(1); } - /* ARGSUSED */ static int -mdoc_it_body_pre(MDOC_ARGS, enum mdoc_list type, struct roffsu *width) +mdoc_bl_pre(MDOC_ARGS) { - struct htmlpair tag; + size_t i; + struct htmlpair tag[2]; struct roffsu su; - switch (type) { - case (LIST_item): - /* FALLTHROUGH */ - case (LIST_ohang): - /* FALLTHROUGH */ - case (LIST_column): - bufcat_su(h, "min-width", width); - bufcat_style(h, "clear", "none"); - if (n->next) - bufcat_style(h, "float", "left"); - PAIR_STYLE_INIT(&tag, h); - print_otag(h, TAG_DIV, 1, &tag); - break; - default: - /* - * XXX: this tricks CSS into aligning the bodies with - * the right-padding in the head. - */ - SCALE_HS_INIT(&su, 2); - bufcat_su(h, "margin-left", &su); - PAIR_STYLE_INIT(&tag, h); - print_otag(h, TAG_DIV, 1, &tag); - break; + if (MDOC_BODY == n->type) { + if (LIST_column == n->data.Bl->type) + print_otag(h, TAG_TBODY, 0, NULL); + return(1); } - return(1); -} + if (MDOC_HEAD == n->type) { + if (LIST_column != n->data.Bl->type) + return(0); + /* + * For each column, print out the tag with our + * suggested width. The last column gets min-width, as + * in terminal mode it auto-sizes to the width of the + * screen and we want to preserve that behaviour. + */ -/* ARGSUSED */ -static int -mdoc_it_head_pre(MDOC_ARGS, enum mdoc_list type, struct roffsu *width) -{ - struct htmlpair tag; - struct ord *ord; - char nbuf[BUFSIZ]; + for (i = 0; i < n->data.Bl->ncols; i++) { + a2width(n->data.Bl->cols[i], &su); + bufinit(h); + if (i < n->data.Bl->ncols - 1) + bufcat_su(h, "width", &su); + else + bufcat_su(h, "min-width", &su); + PAIR_STYLE_INIT(&tag[0], h); + print_otag(h, TAG_COL, 1, tag); + } - switch (type) { - case (LIST_item): return(0); - case (LIST_ohang): - print_otag(h, TAG_DIV, 0, &tag); - return(1); - case (LIST_column): - break; - default: - bufcat_su(h, "min-width", width); - SCALE_INVERT(width); - bufcat_su(h, "margin-left", width); - if (n->next && n->next->child) - bufcat_style(h, "float", "left"); - - /* XXX: buffer if we run into body. */ - SCALE_HS_INIT(width, 1); - bufcat_su(h, "margin-right", width); - PAIR_STYLE_INIT(&tag, h); - print_otag(h, TAG_DIV, 1, &tag); - break; } - switch (type) { - case (LIST_diag): - PAIR_CLASS_INIT(&tag, "diag"); - print_otag(h, TAG_SPAN, 1, &tag); - break; - case (LIST_enum): - ord = h->ords.head; - assert(ord); - nbuf[BUFSIZ - 1] = 0; - (void)snprintf(nbuf, BUFSIZ - 1, "%d.", ord->pos++); - print_text(h, nbuf); - return(0); - case (LIST_dash): - print_text(h, "\\(en"); - return(0); - case (LIST_hyphen): - print_text(h, "\\(hy"); - return(0); - case (LIST_bullet): - print_text(h, "\\(bu"); - return(0); - default: - break; - } + assert(lists[n->data.Bl->type]); + PAIR_CLASS_INIT(&tag[0], lists[n->data.Bl->type]); + i = 1; - return(1); -} + /* Set the block's left-hand margin. */ + if (n->data.Bl->offs) { + a2offs(n->data.Bl->offs, &su); + bufcat_su(h, "margin-left", &su); + PAIR_STYLE_INIT(&tag[1], h); + i = 2; -static int -mdoc_it_pre(MDOC_ARGS) -{ - int i, comp; - const struct mdoc_node *bl, *nn; - struct roffsu width, offs; - enum mdoc_list type; + } - /* - * XXX: be very careful in changing anything, here. Lists in - * mandoc have many peculiarities; furthermore, they don't - * translate well into HTML and require a bit of mangling. - */ - - bl = n->parent->parent; - if (MDOC_BLOCK != n->type) - bl = bl->parent; - - SCALE_HS_INIT(&offs, 0); - - assert(bl->data.Bl); - type = bl->data.Bl->type; - comp = bl->data.Bl->comp; - - if (bl->data.Bl->offs) - a2offs(bl->data.Bl->offs, &offs); - - switch (type) { - case (LIST_enum): + switch (n->data.Bl->type) { + case(LIST_bullet): /* FALLTHROUGH */ - case (LIST_dash): + case(LIST_dash): /* FALLTHROUGH */ - case (LIST_hyphen): + case(LIST_hyphen): /* FALLTHROUGH */ - case (LIST_bullet): - SCALE_HS_INIT(&width, 2); + case(LIST_item): + print_otag(h, TAG_UL, i, tag); break; - default: - SCALE_HS_INIT(&width, INDENT); + case(LIST_enum): + print_otag(h, TAG_OL, i, tag); break; - } - - if (bl->data.Bl->width) - a2width(bl->data.Bl->width, &width); - - /* Override width in some cases. */ - - switch (type) { - case (LIST_ohang): + case(LIST_diag): /* FALLTHROUGH */ - case (LIST_item): + case(LIST_hang): /* FALLTHROUGH */ - case (LIST_inset): + case(LIST_inset): /* FALLTHROUGH */ - case (LIST_diag): - SCALE_HS_INIT(&width, 0); + case(LIST_ohang): + /* FALLTHROUGH */ + case(LIST_tag): + print_otag(h, TAG_DL, i, tag); break; - default: - if (0 == width.scale) - SCALE_HS_INIT(&width, INDENT); + case(LIST_column): + print_otag(h, TAG_TABLE, i, tag); break; + default: + abort(); + /* NOTREACHED */ } - if (LIST_column == type && MDOC_BODY == n->type) { - nn = n->parent->child; - for (i = 0; nn && nn != n; nn = nn->next) - if (MDOC_BODY == nn->type) - i++; - if (i < (int)bl->data.Bl->ncols) - a2width(bl->data.Bl->cols[i], &width); - } - - if (MDOC_HEAD == n->type) - return(mdoc_it_head_pre(m, n, h, type, &width)); - else if (MDOC_BODY == n->type) - return(mdoc_it_body_pre(m, n, h, type, &width)); - - return(mdoc_it_block_pre(m, n, h, type, comp, &offs, &width)); -} - - -/* ARGSUSED */ -static int -mdoc_bl_pre(MDOC_ARGS) -{ - struct ord *ord; - - if (MDOC_HEAD == n->type) - return(0); - if (MDOC_BLOCK != n->type) - return(1); - assert(n->data.Bl); - if (LIST_enum != n->data.Bl->type) - return(1); - - ord = malloc(sizeof(struct ord)); - if (NULL == ord) { - perror(NULL); - exit(MANDOCLEVEL_SYSERR); - } - ord->cookie = n; - ord->pos = 1; - ord->next = h->ords.head; - h->ords.head = ord; return(1); } - /* ARGSUSED */ -static void -mdoc_bl_post(MDOC_ARGS) -{ - struct ord *ord; - - if (MDOC_BLOCK != n->type) - return; - if (LIST_enum != n->data.Bl->type) - return; - - ord = h->ords.head; - assert(ord); - h->ords.head = ord->next; - free(ord); -} - - -/* ARGSUSED */ static int mdoc_ex_pre(MDOC_ARGS) { @@ -1249,80 +1119,6 @@ mdoc_ex_pre(MDOC_ARGS) /* ARGSUSED */ static int -mdoc_dq_pre(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return(1); - print_text(h, "\\(lq"); - h->flags |= HTML_NOSPACE; - return(1); -} - - -/* ARGSUSED */ -static void -mdoc_dq_post(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return; - h->flags |= HTML_NOSPACE; - print_text(h, "\\(rq"); -} - - -/* ARGSUSED */ -static int -mdoc_pq_pre(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return(1); - print_text(h, "\\&("); - h->flags |= HTML_NOSPACE; - return(1); -} - - -/* ARGSUSED */ -static void -mdoc_pq_post(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return; - print_text(h, ")"); -} - - -/* ARGSUSED */ -static int -mdoc_sq_pre(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return(1); - print_text(h, "\\(oq"); - h->flags |= HTML_NOSPACE; - return(1); -} - - -/* ARGSUSED */ -static void -mdoc_sq_post(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return; - h->flags |= HTML_NOSPACE; - print_text(h, "\\(aq"); -} - - -/* ARGSUSED */ -static int mdoc_em_pre(MDOC_ARGS) { struct htmlpair tag; @@ -1379,31 +1175,6 @@ mdoc_sx_pre(MDOC_ARGS) /* ARGSUSED */ static int -mdoc_aq_pre(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return(1); - print_text(h, "\\(la"); - h->flags |= HTML_NOSPACE; - return(1); -} - - -/* ARGSUSED */ -static void -mdoc_aq_post(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return; - h->flags |= HTML_NOSPACE; - print_text(h, "\\(ra"); -} - - -/* ARGSUSED */ -static int mdoc_bd_pre(MDOC_ARGS) { struct htmlpair tag[2]; @@ -1458,6 +1229,32 @@ mdoc_bd_pre(MDOC_ARGS) for (nn = n->child; nn; nn = nn->next) { print_mdoc_node(m, nn, h); + /* + * If the printed node flushes its own line, then we + * needn't do it here as well. This is hacky, but the + * notion of selective eoln whitespace is pretty dumb + * anyway, so don't sweat it. + */ + switch (nn->tok) { + case (MDOC_Sm): + /* FALLTHROUGH */ + case (MDOC_br): + /* FALLTHROUGH */ + case (MDOC_sp): + /* FALLTHROUGH */ + case (MDOC_Bl): + /* FALLTHROUGH */ + case (MDOC_D1): + /* FALLTHROUGH */ + case (MDOC_Dl): + /* FALLTHROUGH */ + case (MDOC_Lp): + /* FALLTHROUGH */ + case (MDOC_Pp): + continue; + default: + break; + } if (nn->next && nn->next->line == nn->line) continue; print_text(h, "\n"); @@ -1725,7 +1522,16 @@ mdoc_sm_pre(MDOC_ARGS) assert(n->child && MDOC_TEXT == n->child->type); if (0 == strcmp("on", n->child->string)) { - /* FIXME: no p->col to check... */ + /* + * FIXME: no p->col to check. Thus, if we have + * .Bd -literal + * .Sm off + * 1 2 + * .Sm on + * 3 + * .Ed + * the "3" is preceded by a space. + */ h->flags &= ~HTML_NOSPACE; h->flags &= ~HTML_NONOSPACE; } else @@ -1775,31 +1581,6 @@ mdoc_sp_pre(MDOC_ARGS) /* ARGSUSED */ static int -mdoc_brq_pre(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return(1); - print_text(h, "\\(lC"); - h->flags |= HTML_NOSPACE; - return(1); -} - - -/* ARGSUSED */ -static void -mdoc_brq_post(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return; - h->flags |= HTML_NOSPACE; - print_text(h, "\\(rC"); -} - - -/* ARGSUSED */ -static int mdoc_lk_pre(MDOC_ARGS) { const struct mdoc_node *nn; @@ -1811,7 +1592,7 @@ mdoc_lk_pre(MDOC_ARGS) PAIR_HREF_INIT(&tag[1], nn->string); print_otag(h, TAG_A, 2, tag); - if (NULL == nn->next) + if (NULL == nn || NULL == nn->next) return(1); for (nn = nn->next; nn; nn = nn->next) @@ -1882,9 +1663,7 @@ mdoc_fo_post(MDOC_ARGS) if (MDOC_BODY != n->type) return; - h->flags |= HTML_NOSPACE; print_text(h, ")"); - h->flags |= HTML_NOSPACE; print_text(h, ";"); } @@ -1999,31 +1778,6 @@ mdoc_va_pre(MDOC_ARGS) /* ARGSUSED */ static int -mdoc_bq_pre(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return(1); - print_text(h, "\\(lB"); - h->flags |= HTML_NOSPACE; - return(1); -} - - -/* ARGSUSED */ -static void -mdoc_bq_post(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return; - h->flags |= HTML_NOSPACE; - print_text(h, "\\(rB"); -} - - -/* ARGSUSED */ -static int mdoc_ap_pre(MDOC_ARGS) { @@ -2085,7 +1839,7 @@ mdoc_ms_pre(MDOC_ARGS) /* ARGSUSED */ static int -mdoc_pf_pre(MDOC_ARGS) +mdoc_igndelim_pre(MDOC_ARGS) { h->flags |= HTML_IGNDELIM; @@ -2098,7 +1852,6 @@ static void mdoc_pf_post(MDOC_ARGS) { - h->flags &= ~HTML_IGNDELIM; h->flags |= HTML_NOSPACE; } @@ -2108,17 +1861,14 @@ static int mdoc_rs_pre(MDOC_ARGS) { struct htmlpair tag; - struct roffsu su; if (MDOC_BLOCK != n->type) return(1); if (n->prev && SEC_SEE_ALSO == n->sec) { - SCALE_VS_INIT(&su, 1); - bufcat_su(h, "margin-top", &su); - PAIR_STYLE_INIT(&tag, h); - print_otag(h, TAG_DIV, 1, &tag); - } + print_otag(h, TAG_BR, 0, NULL); + print_otag(h, TAG_BR, 0, NULL); + } PAIR_CLASS_INIT(&tag, "ref"); print_otag(h, TAG_SPAN, 1, &tag); @@ -2194,6 +1944,9 @@ mdoc__x_pre(MDOC_ARGS) switch (n->tok) { case(MDOC__A): PAIR_CLASS_INIT(&tag[0], "ref-auth"); + if (n->prev && MDOC__A == n->prev->tok) + if (NULL == n->next || MDOC__A != n->next->tok) + print_text(h, "and"); break; case(MDOC__B): PAIR_CLASS_INIT(&tag[0], "ref-book"); @@ -2246,6 +1999,7 @@ mdoc__x_pre(MDOC_ARGS) PAIR_HREF_INIT(&tag[1], n->child->string); print_otag(h, TAG_A, 2, tag); + return(1); } @@ -2255,9 +2009,16 @@ static void mdoc__x_post(MDOC_ARGS) { + if (MDOC__A == n->tok && n->next && MDOC__A == n->next->tok) + if (NULL == n->next->next || MDOC__A != n->next->next->tok) + if (NULL == n->prev || MDOC__A != n->prev->tok) + return; + /* TODO: %U */ - h->flags |= HTML_NOSPACE; + if (NULL == n->parent || MDOC_Rs != n->parent->tok) + return; + print_text(h, n->next ? "," : "."); } @@ -2292,3 +2053,127 @@ mdoc_bk_post(MDOC_ARGS) if (MDOC_BODY == n->type) h->flags &= ~(HTML_KEEP | HTML_PREKEEP); } + + +/* ARGSUSED */ +static int +mdoc_quote_pre(MDOC_ARGS) +{ + struct htmlpair tag; + + if (MDOC_BODY != n->type) + return(1); + + switch (n->tok) { + case (MDOC_Ao): + /* FALLTHROUGH */ + case (MDOC_Aq): + print_text(h, "\\(la"); + break; + case (MDOC_Bro): + /* FALLTHROUGH */ + case (MDOC_Brq): + print_text(h, "\\(lC"); + break; + case (MDOC_Bo): + /* FALLTHROUGH */ + case (MDOC_Bq): + print_text(h, "\\(lB"); + break; + case (MDOC_Oo): + /* FALLTHROUGH */ + case (MDOC_Op): + print_text(h, "\\(lB"); + h->flags |= HTML_NOSPACE; + PAIR_CLASS_INIT(&tag, "opt"); + print_otag(h, TAG_SPAN, 1, &tag); + break; + case (MDOC_Do): + /* FALLTHROUGH */ + case (MDOC_Dq): + /* FALLTHROUGH */ + case (MDOC_Qo): + /* FALLTHROUGH */ + case (MDOC_Qq): + print_text(h, "\\(lq"); + break; + case (MDOC_Po): + /* FALLTHROUGH */ + case (MDOC_Pq): + print_text(h, "("); + break; + case (MDOC_Ql): + /* FALLTHROUGH */ + case (MDOC_So): + /* FALLTHROUGH */ + case (MDOC_Sq): + print_text(h, "\\(oq"); + break; + default: + abort(); + /* NOTREACHED */ + } + + h->flags |= HTML_NOSPACE; + return(1); +} + + +/* ARGSUSED */ +static void +mdoc_quote_post(MDOC_ARGS) +{ + + if (MDOC_BODY != n->type) + return; + + h->flags |= HTML_NOSPACE; + + switch (n->tok) { + case (MDOC_Ao): + /* FALLTHROUGH */ + case (MDOC_Aq): + print_text(h, "\\(ra"); + break; + case (MDOC_Bro): + /* FALLTHROUGH */ + case (MDOC_Brq): + print_text(h, "\\(rC"); + break; + case (MDOC_Oo): + /* FALLTHROUGH */ + case (MDOC_Op): + /* FALLTHROUGH */ + case (MDOC_Bo): + /* FALLTHROUGH */ + case (MDOC_Bq): + print_text(h, "\\(rB"); + break; + case (MDOC_Qo): + /* FALLTHROUGH */ + case (MDOC_Qq): + /* FALLTHROUGH */ + case (MDOC_Do): + /* FALLTHROUGH */ + case (MDOC_Dq): + print_text(h, "\\(rq"); + break; + case (MDOC_Po): + /* FALLTHROUGH */ + case (MDOC_Pq): + print_text(h, ")"); + break; + case (MDOC_Ql): + /* FALLTHROUGH */ + case (MDOC_So): + /* FALLTHROUGH */ + case (MDOC_Sq): + print_text(h, "\\(aq"); + break; + default: + abort(); + /* NOTREACHED */ + } +} + +