diff options
Diffstat (limited to 'contrib/mdocml/mdoc_html.c')
| -rw-r--r-- | contrib/mdocml/mdoc_html.c | 646 |
1 files changed, 282 insertions, 364 deletions
diff --git a/contrib/mdocml/mdoc_html.c b/contrib/mdocml/mdoc_html.c index a7aa722..9fe241e 100644 --- a/contrib/mdocml/mdoc_html.c +++ b/contrib/mdocml/mdoc_html.c @@ -1,6 +1,7 @@ -/* $Id: mdoc_html.c,v 1.186 2013/12/24 20:45:27 schwarze Exp $ */ +/* $Id: mdoc_html.c,v 1.195 2014/08/06 15:09:05 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> + * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -28,6 +29,7 @@ #include <unistd.h> #include "mandoc.h" +#include "mandoc_aux.h" #include "out.h" #include "html.h" #include "mdoc.h" @@ -52,7 +54,7 @@ static void print_mdoc(MDOC_ARGS); static void print_mdoc_head(MDOC_ARGS); static void print_mdoc_node(MDOC_ARGS); static void print_mdoc_nodelist(MDOC_ARGS); -static void synopsis_pre(struct html *, +static void synopsis_pre(struct html *, const struct mdoc_node *); static void a2width(const char *, struct roffsu *); @@ -108,6 +110,7 @@ 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_skip_pre(MDOC_ARGS); static int mdoc_sm_pre(MDOC_ARGS); static int mdoc_sp_pre(MDOC_ARGS); static int mdoc_ss_pre(MDOC_ARGS); @@ -125,8 +128,8 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {NULL, NULL}, /* Dt */ {NULL, NULL}, /* Os */ {mdoc_sh_pre, NULL }, /* Sh */ - {mdoc_ss_pre, NULL }, /* Ss */ - {mdoc_pp_pre, NULL}, /* Pp */ + {mdoc_ss_pre, NULL }, /* Ss */ + {mdoc_pp_pre, NULL}, /* Pp */ {mdoc_d1_pre, NULL}, /* D1 */ {mdoc_d1_pre, NULL}, /* Dl */ {mdoc_bd_pre, NULL}, /* Bd */ @@ -134,32 +137,32 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {mdoc_bl_pre, NULL}, /* Bl */ {NULL, NULL}, /* El */ {mdoc_it_pre, NULL}, /* It */ - {mdoc_ad_pre, NULL}, /* Ad */ + {mdoc_ad_pre, NULL}, /* Ad */ {mdoc_an_pre, NULL}, /* An */ {mdoc_ar_pre, NULL}, /* Ar */ {mdoc_cd_pre, NULL}, /* Cd */ {mdoc_fl_pre, NULL}, /* Cm */ - {mdoc_dv_pre, NULL}, /* Dv */ - {mdoc_er_pre, NULL}, /* Er */ - {mdoc_ev_pre, NULL}, /* Ev */ + {mdoc_dv_pre, NULL}, /* Dv */ + {mdoc_er_pre, NULL}, /* Er */ + {mdoc_ev_pre, NULL}, /* Ev */ {mdoc_ex_pre, NULL}, /* Ex */ - {mdoc_fa_pre, NULL}, /* Fa */ - {mdoc_fd_pre, NULL}, /* Fd */ + {mdoc_fa_pre, NULL}, /* Fa */ + {mdoc_fd_pre, NULL}, /* Fd */ {mdoc_fl_pre, NULL}, /* Fl */ - {mdoc_fn_pre, NULL}, /* Fn */ - {mdoc_ft_pre, NULL}, /* Ft */ - {mdoc_ic_pre, NULL}, /* Ic */ - {mdoc_in_pre, NULL}, /* In */ + {mdoc_fn_pre, NULL}, /* Fn */ + {mdoc_ft_pre, NULL}, /* Ft */ + {mdoc_ic_pre, NULL}, /* Ic */ + {mdoc_in_pre, NULL}, /* In */ {mdoc_li_pre, NULL}, /* Li */ - {mdoc_nd_pre, NULL}, /* Nd */ - {mdoc_nm_pre, NULL}, /* Nm */ + {mdoc_nd_pre, NULL}, /* Nd */ + {mdoc_nm_pre, NULL}, /* Nm */ {mdoc_quote_pre, mdoc_quote_post}, /* Op */ - {NULL, NULL}, /* Ot */ + {mdoc_ft_pre, NULL}, /* Ot */ {mdoc_pa_pre, NULL}, /* Pa */ {mdoc_rv_pre, NULL}, /* Rv */ - {NULL, NULL}, /* St */ + {NULL, NULL}, /* St */ {mdoc_va_pre, NULL}, /* Va */ - {mdoc_vt_pre, NULL}, /* Vt */ + {mdoc_vt_pre, NULL}, /* Vt */ {mdoc_xr_pre, NULL}, /* Xr */ {mdoc__x_pre, mdoc__x_post}, /* %A */ {mdoc__x_pre, mdoc__x_post}, /* %B */ @@ -177,7 +180,7 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {mdoc_quote_pre, mdoc_quote_post}, /* Aq */ {NULL, NULL}, /* At */ {NULL, NULL}, /* Bc */ - {mdoc_bf_pre, NULL}, /* Bf */ + {mdoc_bf_pre, NULL}, /* Bf */ {mdoc_quote_pre, mdoc_quote_post}, /* Bo */ {mdoc_quote_pre, mdoc_quote_post}, /* Bq */ {mdoc_xx_pre, NULL}, /* Bsx */ @@ -188,7 +191,7 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {mdoc_quote_pre, mdoc_quote_post}, /* Dq */ {NULL, NULL}, /* Ec */ /* FIXME: no space */ {NULL, NULL}, /* Ef */ - {mdoc_em_pre, NULL}, /* Em */ + {mdoc_em_pre, NULL}, /* Em */ {mdoc_quote_pre, mdoc_quote_post}, /* Eo */ {mdoc_xx_pre, NULL}, /* Fx */ {mdoc_ms_pre, NULL}, /* Ms */ @@ -209,39 +212,40 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {NULL, NULL}, /* Sc */ {mdoc_quote_pre, mdoc_quote_post}, /* So */ {mdoc_quote_pre, mdoc_quote_post}, /* Sq */ - {mdoc_sm_pre, NULL}, /* Sm */ + {mdoc_sm_pre, NULL}, /* Sm */ {mdoc_sx_pre, NULL}, /* Sx */ {mdoc_sy_pre, NULL}, /* Sy */ {NULL, NULL}, /* Tn */ {mdoc_xx_pre, NULL}, /* Ux */ {NULL, NULL}, /* Xc */ {NULL, NULL}, /* Xo */ - {mdoc_fo_pre, mdoc_fo_post}, /* Fo */ - {NULL, NULL}, /* Fc */ + {mdoc_fo_pre, mdoc_fo_post}, /* Fo */ + {NULL, NULL}, /* Fc */ {mdoc_quote_pre, mdoc_quote_post}, /* Oo */ {NULL, NULL}, /* Oc */ {mdoc_bk_pre, mdoc_bk_post}, /* Bk */ {NULL, NULL}, /* Ek */ {mdoc_bt_pre, NULL}, /* Bt */ {NULL, NULL}, /* Hf */ - {NULL, NULL}, /* Fr */ + {mdoc_em_pre, NULL}, /* Fr */ {mdoc_ud_pre, NULL}, /* Ud */ {mdoc_lb_pre, NULL}, /* Lb */ - {mdoc_pp_pre, NULL}, /* Lp */ - {mdoc_lk_pre, NULL}, /* Lk */ - {mdoc_mt_pre, NULL}, /* Mt */ - {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 */ - {NULL, NULL}, /* En */ /* TODO */ - {mdoc_xx_pre, NULL}, /* Dx */ - {mdoc__x_pre, mdoc__x_post}, /* %Q */ + {mdoc_pp_pre, NULL}, /* Lp */ + {mdoc_lk_pre, NULL}, /* Lk */ + {mdoc_mt_pre, NULL}, /* Mt */ + {mdoc_quote_pre, mdoc_quote_post}, /* Brq */ + {mdoc_quote_pre, mdoc_quote_post}, /* Bro */ + {NULL, NULL}, /* Brc */ + {mdoc__x_pre, mdoc__x_post}, /* %C */ + {mdoc_skip_pre, NULL}, /* Es */ + {mdoc_quote_pre, mdoc_quote_post}, /* En */ + {mdoc_xx_pre, NULL}, /* Dx */ + {mdoc__x_pre, mdoc__x_post}, /* %Q */ {mdoc_sp_pre, NULL}, /* br */ - {mdoc_sp_pre, NULL}, /* sp */ - {mdoc__x_pre, mdoc__x_post}, /* %U */ - {NULL, NULL}, /* Ta */ + {mdoc_sp_pre, NULL}, /* sp */ + {mdoc__x_pre, mdoc__x_post}, /* %U */ + {NULL, NULL}, /* Ta */ + {mdoc_skip_pre, NULL}, /* ll */ }; static const char * const lists[LIST_MAX] = { @@ -259,16 +263,16 @@ static const char * const lists[LIST_MAX] = { "list-tag" }; + void html_mdoc(void *arg, const struct mdoc *mdoc) { print_mdoc(mdoc_meta(mdoc), mdoc_node(mdoc), - (struct html *)arg); + (struct html *)arg); putchar('\n'); } - /* * Calculate the scaling unit passed in a `-width' argument. This uses * either a native scaling unit (e.g., 1i, 2m) or the string length of @@ -284,7 +288,6 @@ a2width(const char *p, struct roffsu *su) } } - /* * See the same function in mdoc_term.c for documentation. */ @@ -295,27 +298,27 @@ synopsis_pre(struct html *h, const struct mdoc_node *n) if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags)) return; - if (n->prev->tok == n->tok && - MDOC_Fo != n->tok && - MDOC_Ft != n->tok && - MDOC_Fn != n->tok) { + if (n->prev->tok == n->tok && + MDOC_Fo != n->tok && + MDOC_Ft != n->tok && + MDOC_Fn != n->tok) { print_otag(h, TAG_BR, 0, NULL); return; } switch (n->prev->tok) { - case (MDOC_Fd): + case MDOC_Fd: /* FALLTHROUGH */ - case (MDOC_Fn): + case MDOC_Fn: /* FALLTHROUGH */ - case (MDOC_Fo): + case MDOC_Fo: /* FALLTHROUGH */ - case (MDOC_In): + case MDOC_In: /* FALLTHROUGH */ - case (MDOC_Vt): + case MDOC_Vt: print_otag(h, TAG_P, 0, NULL); break; - case (MDOC_Ft): + case MDOC_Ft: if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) { print_otag(h, TAG_P, 0, NULL); break; @@ -327,7 +330,6 @@ synopsis_pre(struct html *h, const struct mdoc_node *n) } } - /* * Calculate the scaling unit passed in an `-offset' argument. This * uses either a native scaling unit (e.g., 1i, 2m), one of a set of @@ -349,7 +351,6 @@ a2offs(const char *p, struct roffsu *su) SCALE_HS_INIT(su, html_strlen(p)); } - static void print_mdoc(MDOC_ARGS) { @@ -366,23 +367,22 @@ print_mdoc(MDOC_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_mdoc_nodelist(meta, n, h); print_tagq(h, t); } - -/* ARGSUSED */ static void print_mdoc_head(MDOC_ARGS) { print_gen_head(h); bufinit(h); - bufcat_fmt(h, "%s(%s)", meta->title, meta->msec); - + bufcat(h, meta->title); + if (meta->msec) + bufcat_fmt(h, "(%s)", meta->msec); if (meta->arch) bufcat_fmt(h, " (%s)", meta->arch); @@ -390,7 +390,6 @@ print_mdoc_head(MDOC_ARGS) print_text(h, h->buf); } - static void print_mdoc_nodelist(MDOC_ARGS) { @@ -400,7 +399,6 @@ print_mdoc_nodelist(MDOC_ARGS) print_mdoc_nodelist(meta, n->next, h); } - static void print_mdoc_node(MDOC_ARGS) { @@ -411,10 +409,10 @@ print_mdoc_node(MDOC_ARGS) t = h->tags.head; switch (n->type) { - case (MDOC_ROOT): + case MDOC_ROOT: child = mdoc_root_pre(meta, n, h); break; - case (MDOC_TEXT): + case MDOC_TEXT: /* No tables in this mode... */ assert(NULL == h->tblt); @@ -431,10 +429,10 @@ print_mdoc_node(MDOC_ARGS) if (MDOC_DELIMO & n->flags) h->flags |= HTML_NOSPACE; return; - case (MDOC_EQN): + case MDOC_EQN: print_eqn(h, n->eqn); break; - case (MDOC_TBL): + case MDOC_TBL: /* * This will take care of initialising all of the table * state data for the first table, then tearing it down @@ -473,10 +471,10 @@ print_mdoc_node(MDOC_ARGS) print_stagq(h, t); switch (n->type) { - case (MDOC_ROOT): + case MDOC_ROOT: mdoc_root_post(meta, n, h); break; - case (MDOC_EQN): + case MDOC_EQN: break; default: if (mdocs[n->tok].post && ENDBODY_NOT == n->end) @@ -485,7 +483,6 @@ print_mdoc_node(MDOC_ARGS) } } -/* ARGSUSED */ static void mdoc_root_post(MDOC_ARGS) { @@ -516,24 +513,24 @@ mdoc_root_post(MDOC_ARGS) print_tagq(h, t); } - -/* ARGSUSED */ static int mdoc_root_pre(MDOC_ARGS) { struct htmlpair tag[3]; struct tag *t, *tt; - char b[BUFSIZ], title[BUFSIZ]; - - strlcpy(b, meta->vol, BUFSIZ); + char *volume, *title; - if (meta->arch) { - strlcat(b, " (", BUFSIZ); - strlcat(b, meta->arch, BUFSIZ); - strlcat(b, ")", BUFSIZ); - } + if (NULL == meta->arch) + volume = mandoc_strdup(meta->vol); + else + mandoc_asprintf(&volume, "%s (%s)", + meta->vol, meta->arch); - snprintf(title, BUFSIZ - 1, "%s(%s)", meta->title, meta->msec); + if (NULL == meta->msec) + title = mandoc_strdup(meta->title); + else + mandoc_asprintf(&title, "%s(%s)", + meta->title, meta->msec); PAIR_SUMMARY_INIT(&tag[0], "Document Header"); PAIR_CLASS_INIT(&tag[1], "head"); @@ -556,7 +553,7 @@ mdoc_root_pre(MDOC_ARGS) PAIR_CLASS_INIT(&tag[0], "head-vol"); PAIR_INIT(&tag[1], ATTR_ALIGN, "center"); print_otag(h, TAG_TD, 2, tag); - print_text(h, b); + print_text(h, volume); print_stagq(h, tt); PAIR_CLASS_INIT(&tag[0], "head-rtitle"); @@ -564,11 +561,12 @@ mdoc_root_pre(MDOC_ARGS) print_otag(h, TAG_TD, 2, tag); print_text(h, title); print_tagq(h, t); + + free(title); + free(volume); return(1); } - -/* ARGSUSED */ static int mdoc_sh_pre(MDOC_ARGS) { @@ -599,7 +597,6 @@ mdoc_sh_pre(MDOC_ARGS) return(1); } -/* ARGSUSED */ static int mdoc_ss_pre(MDOC_ARGS) { @@ -630,8 +627,6 @@ mdoc_ss_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_fl_pre(MDOC_ARGS) { @@ -655,8 +650,6 @@ mdoc_fl_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_nd_pre(MDOC_ARGS) { @@ -673,7 +666,6 @@ mdoc_nd_pre(MDOC_ARGS) return(1); } - static int mdoc_nm_pre(MDOC_ARGS) { @@ -682,19 +674,19 @@ mdoc_nm_pre(MDOC_ARGS) int len; switch (n->type) { - case (MDOC_ELEM): + case MDOC_ELEM: synopsis_pre(h, n); PAIR_CLASS_INIT(&tag, "name"); print_otag(h, TAG_B, 1, &tag); if (NULL == n->child && meta->name) print_text(h, meta->name); return(1); - case (MDOC_HEAD): + case MDOC_HEAD: print_otag(h, TAG_TD, 0, NULL); if (NULL == n->child && meta->name) print_text(h, meta->name); return(1); - case (MDOC_BODY): + case MDOC_BODY: print_otag(h, TAG_TD, 0, NULL); return(1); default: @@ -712,7 +704,7 @@ mdoc_nm_pre(MDOC_ARGS) if (0 == len && meta->name) len = html_strlen(meta->name); - SCALE_HS_INIT(&su, (double)len); + SCALE_HS_INIT(&su, len); bufinit(h); bufcat_su(h, "width", &su); PAIR_STYLE_INIT(&tag, h); @@ -723,8 +715,6 @@ mdoc_nm_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_xr_pre(MDOC_ARGS) { @@ -736,9 +726,9 @@ mdoc_xr_pre(MDOC_ARGS) PAIR_CLASS_INIT(&tag[0], "link-man"); if (h->base_man) { - buffmt_man(h, n->child->string, - n->child->next ? - n->child->next->string : NULL); + buffmt_man(h, n->child->string, + n->child->next ? + n->child->next->string : NULL); PAIR_HREF_INIT(&tag[1], h->buf); print_otag(h, TAG_A, 2, tag); } else @@ -759,8 +749,6 @@ mdoc_xr_pre(MDOC_ARGS) return(0); } - -/* ARGSUSED */ static int mdoc_ns_pre(MDOC_ARGS) { @@ -770,8 +758,6 @@ mdoc_ns_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_ar_pre(MDOC_ARGS) { @@ -782,8 +768,6 @@ mdoc_ar_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_xx_pre(MDOC_ARGS) { @@ -792,22 +776,22 @@ mdoc_xx_pre(MDOC_ARGS) int flags; switch (n->tok) { - case (MDOC_Bsx): + case MDOC_Bsx: pp = "BSD/OS"; break; - case (MDOC_Dx): + case MDOC_Dx: pp = "DragonFly"; break; - case (MDOC_Fx): + case MDOC_Fx: pp = "FreeBSD"; break; - case (MDOC_Nx): + case MDOC_Nx: pp = "NetBSD"; break; - case (MDOC_Ox): + case MDOC_Ox: pp = "OpenBSD"; break; - case (MDOC_Ux): + case MDOC_Ux: pp = "UNIX"; break; default: @@ -827,8 +811,6 @@ mdoc_xx_pre(MDOC_ARGS) return(0); } - -/* ARGSUSED */ static int mdoc_bx_pre(MDOC_ARGS) { @@ -856,7 +838,6 @@ mdoc_bx_pre(MDOC_ARGS) return(0); } -/* ARGSUSED */ static int mdoc_it_pre(MDOC_ARGS) { @@ -880,25 +861,25 @@ mdoc_it_pre(MDOC_ARGS) if (MDOC_HEAD == n->type) { switch (type) { - case(LIST_bullet): + case LIST_bullet: /* FALLTHROUGH */ - case(LIST_dash): + case LIST_dash: /* FALLTHROUGH */ - case(LIST_item): + case LIST_item: /* FALLTHROUGH */ - case(LIST_hyphen): + case LIST_hyphen: /* FALLTHROUGH */ - case(LIST_enum): + case LIST_enum: return(0); - case(LIST_diag): + case LIST_diag: /* FALLTHROUGH */ - case(LIST_hang): + case LIST_hang: /* FALLTHROUGH */ - case(LIST_inset): + case LIST_inset: /* FALLTHROUGH */ - case(LIST_ohang): + case LIST_ohang: /* FALLTHROUGH */ - case(LIST_tag): + case LIST_tag: SCALE_VS_INIT(&su, ! bl->norm->Bl.comp); bufcat_su(h, "margin-top", &su); PAIR_STYLE_INIT(&tag[1], h); @@ -908,36 +889,36 @@ mdoc_it_pre(MDOC_ARGS) PAIR_CLASS_INIT(&tag[0], "diag"); print_otag(h, TAG_B, 1, tag); break; - case(LIST_column): + case LIST_column: break; default: break; } } else if (MDOC_BODY == n->type) { switch (type) { - case(LIST_bullet): + case LIST_bullet: /* FALLTHROUGH */ - case(LIST_hyphen): + case LIST_hyphen: /* FALLTHROUGH */ - case(LIST_dash): + case LIST_dash: /* FALLTHROUGH */ - case(LIST_enum): + case LIST_enum: /* FALLTHROUGH */ - case(LIST_item): + case LIST_item: SCALE_VS_INIT(&su, ! bl->norm->Bl.comp); bufcat_su(h, "margin-top", &su); PAIR_STYLE_INIT(&tag[1], h); print_otag(h, TAG_LI, 2, tag); break; - case(LIST_diag): + case LIST_diag: /* FALLTHROUGH */ - case(LIST_hang): + case LIST_hang: /* FALLTHROUGH */ - case(LIST_inset): + case LIST_inset: /* FALLTHROUGH */ - case(LIST_ohang): + case LIST_ohang: /* FALLTHROUGH */ - case(LIST_tag): + case LIST_tag: if (NULL == bl->norm->Bl.width) { print_otag(h, TAG_DD, 1, tag); break; @@ -947,7 +928,7 @@ mdoc_it_pre(MDOC_ARGS) PAIR_STYLE_INIT(&tag[1], h); print_otag(h, TAG_DD, 2, tag); break; - case(LIST_column): + case LIST_column: SCALE_VS_INIT(&su, ! bl->norm->Bl.comp); bufcat_su(h, "margin-top", &su); PAIR_STYLE_INIT(&tag[1], h); @@ -958,7 +939,7 @@ mdoc_it_pre(MDOC_ARGS) } } else { switch (type) { - case (LIST_column): + case LIST_column: print_otag(h, TAG_TR, 1, tag); break; default: @@ -969,7 +950,6 @@ mdoc_it_pre(MDOC_ARGS) return(1); } -/* ARGSUSED */ static int mdoc_bl_pre(MDOC_ARGS) { @@ -1016,8 +996,8 @@ mdoc_bl_pre(MDOC_ARGS) PAIR_STYLE_INIT(&tag[0], h); assert(lists[n->norm->Bl.type]); - strlcpy(buf, "list ", BUFSIZ); - strlcat(buf, lists[n->norm->Bl.type], BUFSIZ); + (void)strlcpy(buf, "list ", BUFSIZ); + (void)strlcat(buf, lists[n->norm->Bl.type], BUFSIZ); PAIR_INIT(&tag[1], ATTR_CLASS, buf); /* Set the block's left-hand margin. */ @@ -1028,30 +1008,30 @@ mdoc_bl_pre(MDOC_ARGS) } switch (n->norm->Bl.type) { - case(LIST_bullet): + case LIST_bullet: /* FALLTHROUGH */ - case(LIST_dash): + case LIST_dash: /* FALLTHROUGH */ - case(LIST_hyphen): + case LIST_hyphen: /* FALLTHROUGH */ - case(LIST_item): + case LIST_item: print_otag(h, TAG_UL, 2, tag); break; - case(LIST_enum): + case LIST_enum: print_otag(h, TAG_OL, 2, tag); break; - case(LIST_diag): + case LIST_diag: /* FALLTHROUGH */ - case(LIST_hang): + case LIST_hang: /* FALLTHROUGH */ - case(LIST_inset): + case LIST_inset: /* FALLTHROUGH */ - case(LIST_ohang): + case LIST_ohang: /* FALLTHROUGH */ - case(LIST_tag): + case LIST_tag: print_otag(h, TAG_DL, 2, tag); break; - case(LIST_column): + case LIST_column: print_otag(h, TAG_TABLE, 2, tag); break; default: @@ -1062,7 +1042,6 @@ mdoc_bl_pre(MDOC_ARGS) return(1); } -/* ARGSUSED */ static int mdoc_ex_pre(MDOC_ARGS) { @@ -1095,16 +1074,14 @@ mdoc_ex_pre(MDOC_ARGS) } if (nchild > 1) - print_text(h, "utilities exit"); + print_text(h, "utilities exit\\~0"); else - print_text(h, "utility exits"); + print_text(h, "utility exits\\~0"); - print_text(h, "0 on success, and >0 if an error occurs."); + print_text(h, "on success, and\\~>0 if an error occurs."); return(0); } - -/* ARGSUSED */ static int mdoc_em_pre(MDOC_ARGS) { @@ -1115,8 +1092,6 @@ mdoc_em_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_d1_pre(MDOC_ARGS) { @@ -1141,13 +1116,11 @@ mdoc_d1_pre(MDOC_ARGS) if (MDOC_Dl == n->tok) { PAIR_CLASS_INIT(&tag[0], "lit"); print_otag(h, TAG_CODE, 1, tag); - } + } return(1); } - -/* ARGSUSED */ static int mdoc_sx_pre(MDOC_ARGS) { @@ -1170,13 +1143,11 @@ mdoc_sx_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_bd_pre(MDOC_ARGS) { - struct htmlpair tag[2]; - int comp, sv; + struct htmlpair tag[2]; + int comp, sv; const struct mdoc_node *nn; struct roffsu su; @@ -1201,13 +1172,13 @@ mdoc_bd_pre(MDOC_ARGS) SCALE_HS_INIT(&su, 0); if (n->norm->Bd.offs) a2offs(n->norm->Bd.offs, &su); - + bufinit(h); bufcat_su(h, "margin-left", &su); PAIR_STYLE_INIT(&tag[0], h); - if (DISP_unfilled != n->norm->Bd.type && - DISP_literal != n->norm->Bd.type) { + if (DISP_unfilled != n->norm->Bd.type && + DISP_literal != n->norm->Bd.type) { PAIR_CLASS_INIT(&tag[1], "display"); print_otag(h, TAG_DIV, 2, tag); return(1); @@ -1230,21 +1201,21 @@ mdoc_bd_pre(MDOC_ARGS) * anyway, so don't sweat it. */ switch (nn->tok) { - case (MDOC_Sm): + case MDOC_Sm: /* FALLTHROUGH */ - case (MDOC_br): + case MDOC_br: /* FALLTHROUGH */ - case (MDOC_sp): + case MDOC_sp: /* FALLTHROUGH */ - case (MDOC_Bl): + case MDOC_Bl: /* FALLTHROUGH */ - case (MDOC_D1): + case MDOC_D1: /* FALLTHROUGH */ - case (MDOC_Dl): + case MDOC_Dl: /* FALLTHROUGH */ - case (MDOC_Lp): + case MDOC_Lp: /* FALLTHROUGH */ - case (MDOC_Pp): + case MDOC_Pp: continue; default: break; @@ -1263,8 +1234,6 @@ mdoc_bd_pre(MDOC_ARGS) return(0); } - -/* ARGSUSED */ static int mdoc_pa_pre(MDOC_ARGS) { @@ -1275,8 +1244,6 @@ mdoc_pa_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_ad_pre(MDOC_ARGS) { @@ -1287,8 +1254,6 @@ mdoc_ad_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_an_pre(MDOC_ARGS) { @@ -1301,8 +1266,6 @@ mdoc_an_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_cd_pre(MDOC_ARGS) { @@ -1314,8 +1277,6 @@ mdoc_cd_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_dv_pre(MDOC_ARGS) { @@ -1326,8 +1287,6 @@ mdoc_dv_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_ev_pre(MDOC_ARGS) { @@ -1338,8 +1297,6 @@ mdoc_ev_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_er_pre(MDOC_ARGS) { @@ -1350,8 +1307,6 @@ mdoc_er_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_fa_pre(MDOC_ARGS) { @@ -1383,8 +1338,6 @@ mdoc_fa_pre(MDOC_ARGS) return(0); } - -/* ARGSUSED */ static int mdoc_fd_pre(MDOC_ARGS) { @@ -1413,21 +1366,30 @@ mdoc_fd_pre(MDOC_ARGS) if (NULL != (n = n->next)) { assert(MDOC_TEXT == n->type); - strlcpy(buf, '<' == *n->string || '"' == *n->string ? - n->string + 1 : n->string, BUFSIZ); + + /* + * XXX This is broken and not easy to fix. + * When using -Oincludes, truncation may occur. + * Dynamic allocation wouldn't help because + * passing long strings to buffmt_includes() + * does not work either. + */ + + strlcpy(buf, '<' == *n->string || '"' == *n->string ? + n->string + 1 : n->string, BUFSIZ); sz = strlen(buf); if (sz && ('>' == buf[sz - 1] || '"' == buf[sz - 1])) buf[sz - 1] = '\0'; PAIR_CLASS_INIT(&tag[0], "link-includes"); - + i = 1; if (h->base_includes) { buffmt_includes(h, buf); PAIR_HREF_INIT(&tag[i], h->buf); i++; - } + } t = print_otag(h, TAG_A, i, tag); print_text(h, n->string); @@ -1444,8 +1406,6 @@ mdoc_fd_pre(MDOC_ARGS) return(0); } - -/* ARGSUSED */ static int mdoc_vt_pre(MDOC_ARGS) { @@ -1464,8 +1424,6 @@ mdoc_vt_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_ft_pre(MDOC_ARGS) { @@ -1477,8 +1435,6 @@ mdoc_ft_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_fn_pre(MDOC_ARGS) { @@ -1499,7 +1455,7 @@ mdoc_fn_pre(MDOC_ARGS) if (NULL != ep) { PAIR_CLASS_INIT(&tag[0], "ftype"); t = print_otag(h, TAG_I, 1, tag); - + while (ep) { sz = MIN((int)(ep - sp), BUFSIZ - 1); (void)memcpy(nbuf, sp, (size_t)sz); @@ -1531,10 +1487,8 @@ mdoc_fn_pre(MDOC_ARGS) t = print_otag(h, TAG_B, 1, tag); - if (sp) { - strlcpy(nbuf, sp, BUFSIZ); - print_text(h, nbuf); - } + if (sp) + print_text(h, sp); print_tagq(h, t); @@ -1571,43 +1525,38 @@ mdoc_fn_pre(MDOC_ARGS) return(0); } - -/* ARGSUSED */ static int 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. 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; + if (NULL == n->child) + h->flags ^= HTML_NONOSPACE; + else if (0 == strcmp("on", n->child->string)) h->flags &= ~HTML_NONOSPACE; - } else + else h->flags |= HTML_NONOSPACE; + if ( ! (HTML_NONOSPACE & h->flags)) + h->flags &= ~HTML_NOSPACE; + + return(0); +} + +static int +mdoc_skip_pre(MDOC_ARGS) +{ + return(0); } -/* ARGSUSED */ static int mdoc_pp_pre(MDOC_ARGS) { print_otag(h, TAG_P, 0, NULL); return(0); - } -/* ARGSUSED */ static int mdoc_sp_pre(MDOC_ARGS) { @@ -1621,7 +1570,7 @@ mdoc_sp_pre(MDOC_ARGS) if ( ! a2roffsu(n->string, &su, SCALE_VS)) SCALE_VS_INIT(&su, atoi(n->string)); } else - su.scale = 0; + su.scale = 0.0; bufinit(h); bufcat_su(h, "height", &su); @@ -1635,7 +1584,6 @@ mdoc_sp_pre(MDOC_ARGS) } -/* ARGSUSED */ static int mdoc_lk_pre(MDOC_ARGS) { @@ -1660,8 +1608,6 @@ mdoc_lk_pre(MDOC_ARGS) return(0); } - -/* ARGSUSED */ static int mdoc_mt_pre(MDOC_ARGS) { @@ -1682,12 +1628,10 @@ mdoc_mt_pre(MDOC_ARGS) print_text(h, n->string); print_tagq(h, t); } - + return(0); } - -/* ARGSUSED */ static int mdoc_fo_pre(MDOC_ARGS) { @@ -1716,8 +1660,6 @@ mdoc_fo_pre(MDOC_ARGS) return(0); } - -/* ARGSUSED */ static void mdoc_fo_post(MDOC_ARGS) { @@ -1730,8 +1672,6 @@ mdoc_fo_post(MDOC_ARGS) print_text(h, ";"); } - -/* ARGSUSED */ static int mdoc_in_pre(MDOC_ARGS) { @@ -1767,7 +1707,7 @@ mdoc_in_pre(MDOC_ARGS) buffmt_includes(h, n->string); PAIR_HREF_INIT(&tag[i], h->buf); i++; - } + } t = print_otag(h, TAG_A, i, tag); print_text(h, n->string); @@ -1787,8 +1727,6 @@ mdoc_in_pre(MDOC_ARGS) return(0); } - -/* ARGSUSED */ static int mdoc_ic_pre(MDOC_ARGS) { @@ -1799,8 +1737,6 @@ mdoc_ic_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_rv_pre(MDOC_ARGS) { @@ -1813,46 +1749,50 @@ mdoc_rv_pre(MDOC_ARGS) PAIR_CLASS_INIT(&tag, "fname"); - print_text(h, "The"); - nchild = n->nchild; - for (n = n->child; n; n = n->next) { - assert(MDOC_TEXT == n->type); + if (nchild > 0) { + print_text(h, "The"); - t = print_otag(h, TAG_B, 1, &tag); - print_text(h, n->string); - print_tagq(h, t); - - h->flags |= HTML_NOSPACE; - print_text(h, "()"); + for (n = n->child; n; n = n->next) { + t = print_otag(h, TAG_B, 1, &tag); + print_text(h, n->string); + print_tagq(h, t); - if (nchild > 2 && n->next) { h->flags |= HTML_NOSPACE; - print_text(h, ","); + print_text(h, "()"); + + if (n->next == NULL) + continue; + + if (nchild > 2) { + h->flags |= HTML_NOSPACE; + print_text(h, ","); + } + if (n->next->next == NULL) + print_text(h, "and"); } - if (n->next && NULL == n->next->next) - print_text(h, "and"); - } + if (nchild > 1) + print_text(h, "functions return"); + else + print_text(h, "function returns"); - if (nchild > 1) - print_text(h, "functions return"); - else - print_text(h, "function returns"); + print_text(h, "the value\\~0 if successful;"); + } else + print_text(h, "Upon successful completion," + " the value\\~0 is returned;"); - print_text(h, "the value 0 if successful; otherwise the value " - "-1 is returned and the global variable"); + print_text(h, "otherwise the value\\~\\-1 is returned" + " and the global variable"); PAIR_CLASS_INIT(&tag, "var"); t = print_otag(h, TAG_B, 1, &tag); print_text(h, "errno"); print_tagq(h, t); - print_text(h, "is set to indicate the error."); + print_text(h, "is set to indicate the error."); return(0); } - -/* ARGSUSED */ static int mdoc_va_pre(MDOC_ARGS) { @@ -1863,20 +1803,16 @@ mdoc_va_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_ap_pre(MDOC_ARGS) { - + h->flags |= HTML_NOSPACE; print_text(h, "\\(aq"); h->flags |= HTML_NOSPACE; return(1); } - -/* ARGSUSED */ static int mdoc_bf_pre(MDOC_ARGS) { @@ -1888,18 +1824,18 @@ mdoc_bf_pre(MDOC_ARGS) else if (MDOC_BODY != n->type) return(1); - if (FONT_Em == n->norm->Bf.font) + if (FONT_Em == n->norm->Bf.font) PAIR_CLASS_INIT(&tag[0], "emph"); - else if (FONT_Sy == n->norm->Bf.font) + else if (FONT_Sy == n->norm->Bf.font) PAIR_CLASS_INIT(&tag[0], "symb"); - else if (FONT_Li == n->norm->Bf.font) + else if (FONT_Li == n->norm->Bf.font) PAIR_CLASS_INIT(&tag[0], "lit"); else PAIR_CLASS_INIT(&tag[0], "none"); - /* + /* * We want this to be inline-formatted, but needs to be div to - * accept block children. + * accept block children. */ bufinit(h); bufcat_style(h, "display", "inline"); @@ -1911,8 +1847,6 @@ mdoc_bf_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_ms_pre(MDOC_ARGS) { @@ -1923,8 +1857,6 @@ mdoc_ms_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_igndelim_pre(MDOC_ARGS) { @@ -1933,8 +1865,6 @@ mdoc_igndelim_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static void mdoc_pf_post(MDOC_ARGS) { @@ -1942,8 +1872,6 @@ mdoc_pf_post(MDOC_ARGS) h->flags |= HTML_NOSPACE; } - -/* ARGSUSED */ static int mdoc_rs_pre(MDOC_ARGS) { @@ -1960,9 +1888,6 @@ mdoc_rs_pre(MDOC_ARGS) return(1); } - - -/* ARGSUSED */ static int mdoc_li_pre(MDOC_ARGS) { @@ -1973,8 +1898,6 @@ mdoc_li_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_sy_pre(MDOC_ARGS) { @@ -1985,8 +1908,6 @@ mdoc_sy_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_bt_pre(MDOC_ARGS) { @@ -1995,8 +1916,6 @@ mdoc_bt_pre(MDOC_ARGS) return(0); } - -/* ARGSUSED */ static int mdoc_ud_pre(MDOC_ARGS) { @@ -2005,8 +1924,6 @@ mdoc_ud_pre(MDOC_ARGS) return(0); } - -/* ARGSUSED */ static int mdoc_lb_pre(MDOC_ARGS) { @@ -2020,8 +1937,6 @@ mdoc_lb_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc__x_pre(MDOC_ARGS) { @@ -2031,52 +1946,52 @@ mdoc__x_pre(MDOC_ARGS) t = TAG_SPAN; switch (n->tok) { - case(MDOC__A): + 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): + case MDOC__B: PAIR_CLASS_INIT(&tag[0], "ref-book"); t = TAG_I; break; - case(MDOC__C): + case MDOC__C: PAIR_CLASS_INIT(&tag[0], "ref-city"); break; - case(MDOC__D): + case MDOC__D: PAIR_CLASS_INIT(&tag[0], "ref-date"); break; - case(MDOC__I): + case MDOC__I: PAIR_CLASS_INIT(&tag[0], "ref-issue"); t = TAG_I; break; - case(MDOC__J): + case MDOC__J: PAIR_CLASS_INIT(&tag[0], "ref-jrnl"); t = TAG_I; break; - case(MDOC__N): + case MDOC__N: PAIR_CLASS_INIT(&tag[0], "ref-num"); break; - case(MDOC__O): + case MDOC__O: PAIR_CLASS_INIT(&tag[0], "ref-opt"); break; - case(MDOC__P): + case MDOC__P: PAIR_CLASS_INIT(&tag[0], "ref-page"); break; - case(MDOC__Q): + case MDOC__Q: PAIR_CLASS_INIT(&tag[0], "ref-corp"); break; - case(MDOC__R): + case MDOC__R: PAIR_CLASS_INIT(&tag[0], "ref-rep"); break; - case(MDOC__T): + case MDOC__T: PAIR_CLASS_INIT(&tag[0], "ref-title"); break; - case(MDOC__U): + case MDOC__U: PAIR_CLASS_INIT(&tag[0], "link-ref"); break; - case(MDOC__V): + case MDOC__V: PAIR_CLASS_INIT(&tag[0], "ref-vol"); break; default: @@ -2095,8 +2010,6 @@ mdoc__x_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static void mdoc__x_post(MDOC_ARGS) { @@ -2115,18 +2028,16 @@ mdoc__x_post(MDOC_ARGS) print_text(h, n->next ? "," : "."); } - -/* ARGSUSED */ static int mdoc_bk_pre(MDOC_ARGS) { switch (n->type) { - case (MDOC_BLOCK): + case MDOC_BLOCK: break; - case (MDOC_HEAD): + case MDOC_HEAD: return(0); - case (MDOC_BODY): + case MDOC_BODY: if (n->parent->args || 0 == n->prev->nchild) h->flags |= HTML_PREKEEP; break; @@ -2138,8 +2049,6 @@ mdoc_bk_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static void mdoc_bk_post(MDOC_ARGS) { @@ -2148,8 +2057,6 @@ mdoc_bk_post(MDOC_ARGS) h->flags &= ~(HTML_KEEP | HTML_PREKEEP); } - -/* ARGSUSED */ static int mdoc_quote_pre(MDOC_ARGS) { @@ -2159,54 +2066,60 @@ mdoc_quote_pre(MDOC_ARGS) return(1); switch (n->tok) { - case (MDOC_Ao): + case MDOC_Ao: /* FALLTHROUGH */ - case (MDOC_Aq): + case MDOC_Aq: print_text(h, "\\(la"); break; - case (MDOC_Bro): + case MDOC_Bro: /* FALLTHROUGH */ - case (MDOC_Brq): + case MDOC_Brq: print_text(h, "\\(lC"); break; - case (MDOC_Bo): + case MDOC_Bo: /* FALLTHROUGH */ - case (MDOC_Bq): + case MDOC_Bq: print_text(h, "\\(lB"); break; - case (MDOC_Oo): + case MDOC_Oo: /* FALLTHROUGH */ - case (MDOC_Op): + 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_Eo): + case MDOC_En: + if (NULL == n->norm->Es || + NULL == n->norm->Es->child) + return(1); + print_text(h, n->norm->Es->child->string); break; - case (MDOC_Do): + case MDOC_Eo: + break; + case MDOC_Do: /* FALLTHROUGH */ - case (MDOC_Dq): + case MDOC_Dq: /* FALLTHROUGH */ - case (MDOC_Qo): + case MDOC_Qo: /* FALLTHROUGH */ - case (MDOC_Qq): + case MDOC_Qq: print_text(h, "\\(lq"); break; - case (MDOC_Po): + case MDOC_Po: /* FALLTHROUGH */ - case (MDOC_Pq): + case MDOC_Pq: print_text(h, "("); break; - case (MDOC_Ql): + case MDOC_Ql: print_text(h, "\\(oq"); h->flags |= HTML_NOSPACE; PAIR_CLASS_INIT(&tag, "lit"); print_otag(h, TAG_CODE, 1, &tag); break; - case (MDOC_So): + case MDOC_So: /* FALLTHROUGH */ - case (MDOC_Sq): + case MDOC_Sq: print_text(h, "\\(oq"); break; default: @@ -2218,8 +2131,6 @@ mdoc_quote_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static void mdoc_quote_post(MDOC_ARGS) { @@ -2227,49 +2138,58 @@ mdoc_quote_post(MDOC_ARGS) if (MDOC_BODY != n->type) return; - h->flags |= HTML_NOSPACE; + if (MDOC_En != n->tok) + h->flags |= HTML_NOSPACE; switch (n->tok) { - case (MDOC_Ao): + case MDOC_Ao: /* FALLTHROUGH */ - case (MDOC_Aq): + case MDOC_Aq: print_text(h, "\\(ra"); break; - case (MDOC_Bro): + case MDOC_Bro: /* FALLTHROUGH */ - case (MDOC_Brq): + case MDOC_Brq: print_text(h, "\\(rC"); break; - case (MDOC_Oo): + case MDOC_Oo: /* FALLTHROUGH */ - case (MDOC_Op): + case MDOC_Op: /* FALLTHROUGH */ - case (MDOC_Bo): + case MDOC_Bo: /* FALLTHROUGH */ - case (MDOC_Bq): + case MDOC_Bq: print_text(h, "\\(rB"); break; - case (MDOC_Eo): + case MDOC_En: + if (NULL != n->norm->Es && + NULL != n->norm->Es->child && + NULL != n->norm->Es->child->next) { + h->flags |= HTML_NOSPACE; + print_text(h, n->norm->Es->child->next->string); + } break; - case (MDOC_Qo): + case MDOC_Eo: + break; + case MDOC_Qo: /* FALLTHROUGH */ - case (MDOC_Qq): + case MDOC_Qq: /* FALLTHROUGH */ - case (MDOC_Do): + case MDOC_Do: /* FALLTHROUGH */ - case (MDOC_Dq): + case MDOC_Dq: print_text(h, "\\(rq"); break; - case (MDOC_Po): + case MDOC_Po: /* FALLTHROUGH */ - case (MDOC_Pq): + case MDOC_Pq: print_text(h, ")"); break; - case (MDOC_Ql): + case MDOC_Ql: /* FALLTHROUGH */ - case (MDOC_So): + case MDOC_So: /* FALLTHROUGH */ - case (MDOC_Sq): + case MDOC_Sq: print_text(h, "\\(cq"); break; default: @@ -2277,5 +2197,3 @@ mdoc_quote_post(MDOC_ARGS) /* NOTREACHED */ } } - - |
