=================================================================== RCS file: /cvs/mandoc/mdoc_html.c,v retrieving revision 1.1 retrieving revision 1.102 diff -u -p -r1.1 -r1.102 --- mandoc/mdoc_html.c 2009/09/21 14:56:57 1.1 +++ mandoc/mdoc_html.c 2010/08/20 01:02:07 1.102 @@ -1,6 +1,6 @@ -/* $Id: mdoc_html.c,v 1.1 2009/09/21 14:56:57 kristaps Exp $ */ +/* $Id: mdoc_html.c,v 1.102 2010/08/20 01:02:07 schwarze Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009, 2010 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 @@ -14,19 +14,24 @@ * 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 #include #include +#include "mandoc.h" +#include "out.h" #include "html.h" #include "mdoc.h" +#include "main.h" #define INDENT 5 #define HALFINDENT 3 @@ -34,10 +39,11 @@ #define MDOC_ARGS const struct mdoc_meta *m, \ const struct mdoc_node *n, \ struct html *h -#define MAN_ARGS const struct man_meta *m, \ - const struct man_node *n, \ - struct html *h +#ifndef MIN +#define MIN(a,b) ((/*CONSTCOND*/(a)<(b))?(a):(b)) +#endif + struct htmlmdoc { int (*pre)(MDOC_ARGS); void (*post)(MDOC_ARGS); @@ -47,26 +53,35 @@ 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 *, + const struct mdoc_node *); -static int a2width(const char *); -static int a2offs(const char *); -static int a2list(const struct mdoc_node *); +static void a2width(const char *, struct roffsu *); +static void a2offs(const char *, struct roffsu *); static void mdoc_root_post(MDOC_ARGS); static int mdoc_root_pre(MDOC_ARGS); -static int mdoc_tbl_pre(MDOC_ARGS, int); -static int mdoc_tbl_block_pre(MDOC_ARGS, int, int, int, int); -static int mdoc_tbl_body_pre(MDOC_ARGS, int, int); -static int mdoc_tbl_head_pre(MDOC_ARGS, int, int); +static void mdoc__x_post(MDOC_ARGS); +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); @@ -81,34 +96,50 @@ static int mdoc_em_pre(MDOC_ARGS); static int mdoc_er_pre(MDOC_ARGS); static int mdoc_ev_pre(MDOC_ARGS); 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_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); +static int mdoc_lk_pre(MDOC_ARGS); +static int mdoc_mt_pre(MDOC_ARGS); +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_qq_post(MDOC_ARGS); -static int mdoc_qq_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); +static int mdoc_ud_pre(MDOC_ARGS); +static int mdoc_va_pre(MDOC_ARGS); static int mdoc_vt_pre(MDOC_ARGS); static int mdoc_xr_pre(MDOC_ARGS); static int mdoc_xx_pre(MDOC_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 htmlmdoc mdocs[MDOC_MAX] = { - {NULL, NULL}, /* Ap */ + {mdoc_ap_pre, NULL}, /* Ap */ {NULL, NULL}, /* Dd */ {NULL, NULL}, /* Dt */ {NULL, NULL}, /* Os */ @@ -136,106 +167,103 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {mdoc_fl_pre, NULL}, /* Fl */ {mdoc_fn_pre, NULL}, /* Fn */ {mdoc_ft_pre, NULL}, /* Ft */ - {NULL, NULL}, /* Ic */ - {NULL, NULL}, /* In */ - {NULL, NULL}, /* Li */ + {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_op_pre, mdoc_op_post}, /* Op */ {NULL, NULL}, /* Ot */ {mdoc_pa_pre, NULL}, /* Pa */ - {NULL, NULL}, /* Rv */ + {mdoc_rv_pre, NULL}, /* Rv */ {NULL, NULL}, /* St */ - {NULL, NULL}, /* Va */ + {mdoc_va_pre, NULL}, /* Va */ {mdoc_vt_pre, NULL}, /* Vt */ {mdoc_xr_pre, NULL}, /* Xr */ - {NULL, NULL}, /* %A */ - {NULL, NULL}, /* %B */ - {NULL, NULL}, /* %D */ - {NULL, NULL}, /* %I */ - {NULL, NULL}, /* %J */ - {NULL, NULL}, /* %N */ - {NULL, NULL}, /* %O */ - {NULL, NULL}, /* %P */ - {NULL, NULL}, /* %R */ - {NULL, NULL}, /* %T */ - {NULL, NULL}, /* %V */ + {mdoc__x_pre, mdoc__x_post}, /* %A */ + {mdoc__x_pre, mdoc__x_post}, /* %B */ + {mdoc__x_pre, mdoc__x_post}, /* %D */ + {mdoc__x_pre, mdoc__x_post}, /* %I */ + {mdoc__x_pre, mdoc__x_post}, /* %J */ + {mdoc__x_pre, mdoc__x_post}, /* %N */ + {mdoc__x_pre, mdoc__x_post}, /* %O */ + {mdoc__x_pre, mdoc__x_post}, /* %P */ + {mdoc__x_pre, mdoc__x_post}, /* %R */ + {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 */ {NULL, NULL}, /* At */ {NULL, NULL}, /* Bc */ - {NULL, NULL}, /* Bf */ - {NULL, NULL}, /* Bo */ - {NULL, NULL}, /* Bq */ + {mdoc_bf_pre, NULL}, /* Bf */ + {mdoc_bq_pre, mdoc_bq_post}, /* Bo */ + {mdoc_bq_pre, mdoc_bq_post}, /* Bq */ {mdoc_xx_pre, NULL}, /* Bsx */ - {NULL, NULL}, /* Bx */ + {mdoc_bx_pre, NULL}, /* Bx */ {NULL, NULL}, /* Db */ {NULL, NULL}, /* Dc */ - {NULL, NULL}, /* Do */ + {mdoc_dq_pre, mdoc_dq_post}, /* Do */ {mdoc_dq_pre, mdoc_dq_post}, /* Dq */ - {NULL, NULL}, /* Ec */ + {NULL, NULL}, /* Ec */ /* FIXME: no space */ {NULL, NULL}, /* Ef */ {mdoc_em_pre, NULL}, /* Em */ {NULL, NULL}, /* Eo */ {mdoc_xx_pre, NULL}, /* Fx */ - {NULL, NULL}, /* Ms */ + {mdoc_ms_pre, NULL}, /* Ms */ {NULL, NULL}, /* No */ {mdoc_ns_pre, NULL}, /* Ns */ {mdoc_xx_pre, NULL}, /* Nx */ {mdoc_xx_pre, NULL}, /* Ox */ {NULL, NULL}, /* Pc */ - {NULL, NULL}, /* Pf */ + {mdoc_pf_pre, mdoc_pf_post}, /* Pf */ {mdoc_pq_pre, mdoc_pq_post}, /* Po */ {mdoc_pq_pre, mdoc_pq_post}, /* Pq */ {NULL, NULL}, /* Qc */ - {NULL, NULL}, /* Ql */ - {mdoc_qq_pre, mdoc_qq_post}, /* Qo */ - {mdoc_qq_pre, mdoc_qq_post}, /* Qq */ + {mdoc_sq_pre, mdoc_sq_post}, /* Ql */ + {mdoc_dq_pre, mdoc_dq_post}, /* Qo */ + {mdoc_dq_pre, mdoc_dq_post}, /* Qq */ {NULL, NULL}, /* Re */ - {NULL, NULL}, /* Rs */ + {mdoc_rs_pre, NULL}, /* Rs */ {NULL, NULL}, /* Sc */ {mdoc_sq_pre, mdoc_sq_post}, /* So */ {mdoc_sq_pre, mdoc_sq_post}, /* Sq */ - {NULL, NULL}, /* Sm */ + {mdoc_sm_pre, NULL}, /* Sm */ {mdoc_sx_pre, NULL}, /* Sx */ - {NULL, NULL}, /* Sy */ + {mdoc_sy_pre, NULL}, /* Sy */ {NULL, NULL}, /* Tn */ {mdoc_xx_pre, NULL}, /* Ux */ {NULL, NULL}, /* Xc */ {NULL, NULL}, /* Xo */ - {NULL, NULL}, /* Fo */ + {mdoc_fo_pre, mdoc_fo_post}, /* Fo */ {NULL, NULL}, /* Fc */ - {NULL, NULL}, /* Oo */ + {mdoc_op_pre, mdoc_op_post}, /* Oo */ {NULL, NULL}, /* Oc */ - {NULL, NULL}, /* Bk */ + {mdoc_bk_pre, mdoc_bk_post}, /* Bk */ {NULL, NULL}, /* Ek */ - {NULL, NULL}, /* Bt */ + {mdoc_bt_pre, NULL}, /* Bt */ {NULL, NULL}, /* Hf */ {NULL, NULL}, /* Fr */ - {NULL, NULL}, /* Ud */ - {NULL, NULL}, /* Lb */ + {mdoc_ud_pre, NULL}, /* Ud */ + {mdoc_lb_pre, NULL}, /* Lb */ {mdoc_sp_pre, NULL}, /* Lp */ - {NULL, NULL}, /* Lk */ - {NULL, NULL}, /* Mt */ - {NULL, NULL}, /* Brq */ - {NULL, NULL}, /* Bro */ + {mdoc_lk_pre, NULL}, /* Lk */ + {mdoc_mt_pre, NULL}, /* Mt */ + {mdoc_brq_pre, mdoc_brq_post}, /* Brq */ + {mdoc_brq_pre, mdoc_brq_post}, /* Bro */ {NULL, NULL}, /* Brc */ - {NULL, NULL}, /* %C */ - {NULL, NULL}, /* Es */ - {NULL, NULL}, /* En */ + {mdoc__x_pre, mdoc__x_post}, /* %C */ + {NULL, NULL}, /* Es */ /* TODO */ + {NULL, NULL}, /* En */ /* TODO */ {mdoc_xx_pre, NULL}, /* Dx */ - {NULL, NULL}, /* %Q */ + {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 */ }; -static char buf[BUFSIZ]; /* XXX */ -#define bufcat(x) (void)strlcat(buf, (x), BUFSIZ) -#define bufinit() buf[0] = 0 -#define buffmt(...) (void)snprintf(buf, BUFSIZ - 1, __VA_ARGS__) - void html_mdoc(void *arg, const struct mdoc *m) { @@ -244,7 +272,7 @@ html_mdoc(void *arg, const struct mdoc *m) h = (struct html *)arg; - print_gen_doctype(h); + print_gen_decls(h); t = print_otag(h, TAG_HTML, 0, NULL); print_mdoc(mdoc_meta(m), mdoc_node(m), h); print_tagq(h, t); @@ -253,90 +281,92 @@ html_mdoc(void *arg, const struct mdoc *m) } -static int -a2list(const struct mdoc_node *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 + * the value. + */ +static void +a2width(const char *p, struct roffsu *su) { - int i; - assert(MDOC_BLOCK == n->type && MDOC_Bl == n->tok); - assert(n->args); - - for (i = 0; i < (int)n->args->argc; i++) - switch (n->args->argv[i].arg) { - case (MDOC_Enum): - /* FALLTHROUGH */ - case (MDOC_Dash): - /* FALLTHROUGH */ - case (MDOC_Hyphen): - /* FALLTHROUGH */ - case (MDOC_Bullet): - /* FALLTHROUGH */ - case (MDOC_Tag): - /* FALLTHROUGH */ - case (MDOC_Hang): - /* FALLTHROUGH */ - case (MDOC_Inset): - /* FALLTHROUGH */ - case (MDOC_Diag): - /* FALLTHROUGH */ - case (MDOC_Item): - /* FALLTHROUGH */ - case (MDOC_Column): - /* FALLTHROUGH */ - case (MDOC_Ohang): - return(n->args->argv[i].arg); - default: - break; - } - - abort(); - /* NOTREACHED */ + if ( ! a2roffsu(p, su, SCALE_MAX)) { + su->unit = SCALE_EM; + su->scale = (int)strlen(p); + } } -static int -a2width(const char *p) +/* + * See the same function in mdoc_term.c for documentation. + */ +static void +synopsis_pre(struct html *h, const struct mdoc_node *n) { - int i, len; + struct roffsu su; + struct htmlpair tag; - if (0 == (len = (int)strlen(p))) - return(0); - for (i = 0; i < len - 1; i++) - if ( ! isdigit((u_char)p[i])) - break; + if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags)) + return; - if (i == len - 1) - if ('n' == p[len - 1] || 'm' == p[len - 1]) - return(atoi(p) + 2); + SCALE_VS_INIT(&su, 1); + bufcat_su(h, "margin-top", &su); + PAIR_STYLE_INIT(&tag, h); - return(len + 2); + if (n->prev->tok == n->tok && + MDOC_Fo != n->tok && + MDOC_Ft != n->tok && + MDOC_Fn != n->tok) { + print_otag(h, TAG_DIV, 0, NULL); + return; + } + + switch (n->prev->tok) { + case (MDOC_Fd): + /* FALLTHROUGH */ + case (MDOC_Fn): + /* FALLTHROUGH */ + case (MDOC_Fo): + /* FALLTHROUGH */ + case (MDOC_In): + /* FALLTHROUGH */ + case (MDOC_Vt): + print_otag(h, TAG_DIV, 1, &tag); + break; + case (MDOC_Ft): + if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) { + print_otag(h, TAG_DIV, 1, &tag); + break; + } + /* FALLTHROUGH */ + default: + print_otag(h, TAG_DIV, 0, NULL); + break; + } } -static int -a2offs(const char *p) +/* + * 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 + * predefined strings (indent, etc.), or the string length of the value. + */ +static void +a2offs(const char *p, struct roffsu *su) { - int len, i; - if (0 == strcmp(p, "left")) - return(0); - if (0 == strcmp(p, "indent")) - return(INDENT + 1); - if (0 == strcmp(p, "indent-two")) - return((INDENT + 1) * 2); + /* FIXME: "right"? */ - if (0 == (len = (int)strlen(p))) - return(0); - - for (i = 0; i < len - 1; i++) - if ( ! isdigit((u_char)p[i])) - break; - - if (i == len - 1) - if ('n' == p[len - 1] || 'm' == p[len - 1]) - return(atoi(p)); - - return(len); + if (0 == strcmp(p, "left")) + SCALE_HS_INIT(su, 0); + else if (0 == strcmp(p, "indent")) + SCALE_HS_INIT(su, INDENT); + else if (0 == strcmp(p, "indent-two")) + SCALE_HS_INIT(su, INDENT * 2); + else if ( ! a2roffsu(p, su, SCALE_MAX)) { + su->unit = SCALE_EM; + su->scale = (int)strlen(p); + } } @@ -365,21 +395,19 @@ print_mdoc(MDOC_ARGS) static void print_mdoc_head(MDOC_ARGS) { - char b[BUFSIZ]; print_gen_head(h); + bufinit(h); + buffmt(h, "%s(%s)", m->title, m->msec); - (void)snprintf(b, BUFSIZ - 1, - "%s(%d)", m->title, m->msec); - if (m->arch) { - (void)strlcat(b, " (", BUFSIZ); - (void)strlcat(b, m->arch, BUFSIZ); - (void)strlcat(b, ")", BUFSIZ); + bufcat(h, " ("); + bufcat(h, m->arch); + bufcat(h, ")"); } print_otag(h, TAG_TITLE, 0, NULL); - print_text(h, b); + print_text(h, h->buf); } @@ -400,38 +428,46 @@ print_mdoc_node(MDOC_ARGS) struct tag *t; child = 1; - t = SLIST_FIRST(&h->tags); + t = h->tags.head; - bufinit(); - + bufinit(h); switch (n->type) { case (MDOC_ROOT): child = mdoc_root_pre(m, n, h); break; case (MDOC_TEXT): print_text(h, n->string); - break; + return; default: - if (mdocs[n->tok].pre) + if (mdocs[n->tok].pre && ENDBODY_NOT == n->end) child = (*mdocs[n->tok].pre)(m, n, h); break; } + if (HTML_KEEP & h->flags) { + if (n->prev && n->prev->line != n->line) { + h->flags &= ~HTML_KEEP; + h->flags |= HTML_PREKEEP; + } else if (NULL == n->prev) { + if (n->parent && n->parent->line != n->line) { + h->flags &= ~HTML_KEEP; + h->flags |= HTML_PREKEEP; + } + } + } + if (child && n->child) print_mdoc_nodelist(m, n->child, h); print_stagq(h, t); - bufinit(); - + bufinit(h); switch (n->type) { case (MDOC_ROOT): mdoc_root_post(m, n, h); break; - case (MDOC_TEXT): - break; default: - if (mdocs[n->tok].post) + if (mdocs[n->tok].post && ENDBODY_NOT == n->end) (*mdocs[n->tok].post)(m, n, h); break; } @@ -442,31 +478,37 @@ print_mdoc_node(MDOC_ARGS) static void mdoc_root_post(MDOC_ARGS) { - struct tm tm; - struct htmlpair tag[2]; + struct htmlpair tag[3]; struct tag *t, *tt; - char b[BUFSIZ]; + char b[DATESIZ]; - (void)localtime_r(&m->date, &tm); + time2a(m->date, b, DATESIZ); - if (0 == strftime(b, BUFSIZ - 1, "%B %e, %Y", &tm)) - err(EXIT_FAILURE, "strftime"); + /* + * XXX: this should use divs, but in Firefox, divs with nested + * divs for some reason puke when trying to put a border line + * below. So I use tables, instead. + */ - tag[0].key = ATTR_CLASS; - tag[0].val = "footer"; - tag[1].key = ATTR_STYLE; - tag[1].val = "width: 100%;"; - t = print_otag(h, TAG_TABLE, 2, tag); + PAIR_CLASS_INIT(&tag[0], "footer"); + bufcat_style(h, "width", "100%"); + PAIR_STYLE_INIT(&tag[1], h); + PAIR_SUMMARY_INIT(&tag[2], "footer"); + + t = print_otag(h, TAG_TABLE, 3, tag); tt = print_otag(h, TAG_TR, 0, NULL); - tag[0].key = ATTR_STYLE; - tag[0].val = "width: 50%;"; + bufinit(h); + bufcat_style(h, "width", "50%"); + PAIR_STYLE_INIT(&tag[0], h); print_otag(h, TAG_TD, 1, tag); print_text(h, b); print_stagq(h, tt); - tag[0].key = ATTR_STYLE; - tag[0].val = "width: 50%; text-align: right;"; + bufinit(h); + bufcat_style(h, "width", "50%"); + bufcat_style(h, "text-align", "right"); + PAIR_STYLE_INIT(&tag[0], h); print_otag(h, TAG_TD, 1, tag); print_text(h, m->os); print_tagq(h, t); @@ -477,7 +519,7 @@ mdoc_root_post(MDOC_ARGS) static int mdoc_root_pre(MDOC_ARGS) { - struct htmlpair tag[2]; + struct htmlpair tag[3]; struct tag *t, *tt; char b[BUFSIZ], title[BUFSIZ]; @@ -490,33 +532,42 @@ mdoc_root_pre(MDOC_ARGS) } (void)snprintf(title, BUFSIZ - 1, - "%s(%d)", m->title, m->msec); + "%s(%s)", m->title, m->msec); - tag[0].key = ATTR_CLASS; - tag[0].val = "header"; - tag[1].key = ATTR_STYLE; - tag[1].val = "width: 100%;"; - t = print_otag(h, TAG_TABLE, 2, tag); + /* XXX: see note in mdoc_root_post() about divs. */ + + PAIR_CLASS_INIT(&tag[0], "header"); + bufcat_style(h, "width", "100%"); + PAIR_STYLE_INIT(&tag[1], h); + PAIR_SUMMARY_INIT(&tag[2], "header"); + + t = print_otag(h, TAG_TABLE, 3, tag); + tt = print_otag(h, TAG_TR, 0, NULL); - tag[0].key = ATTR_STYLE; - tag[0].val = "width: 33%;"; + bufinit(h); + bufcat_style(h, "width", "10%"); + PAIR_STYLE_INIT(&tag[0], h); print_otag(h, TAG_TD, 1, tag); - print_text(h, b); + print_text(h, title); print_stagq(h, tt); - tag[0].key = ATTR_STYLE; - tag[0].val = "width: 33%; text-align: center;"; + bufinit(h); + bufcat_style(h, "text-align", "center"); + bufcat_style(h, "white-space", "nowrap"); + bufcat_style(h, "width", "80%"); + PAIR_STYLE_INIT(&tag[0], h); print_otag(h, TAG_TD, 1, tag); - print_text(h, title); + print_text(h, b); print_stagq(h, tt); - tag[0].key = ATTR_STYLE; - tag[0].val = "width: 33%; text-align: right;"; + bufinit(h); + bufcat_style(h, "text-align", "right"); + bufcat_style(h, "width", "10%"); + PAIR_STYLE_INIT(&tag[0], h); print_otag(h, TAG_TD, 1, tag); - print_text(h, b); + print_text(h, title); print_tagq(h, t); - return(1); } @@ -527,49 +578,43 @@ mdoc_sh_pre(MDOC_ARGS) { struct htmlpair tag[2]; const struct mdoc_node *nn; + char buf[BUFSIZ]; + struct roffsu su; - if (MDOC_HEAD == n->type) { - tag[0].key = ATTR_CLASS; - tag[0].val = "sec-head"; - print_otag(h, TAG_DIV, 1, tag); - print_otag(h, TAG_SPAN, 1, tag); - - for (nn = n->child; nn; nn = nn->next) { - bufcat(nn->string); - if (nn->next) - bufcat(" "); - } - tag[0].key = ATTR_NAME; - tag[0].val = buf; - print_otag(h, TAG_A, 1, tag); + if (MDOC_BODY == n->type) { + SCALE_HS_INIT(&su, INDENT); + bufcat_su(h, "margin-left", &su); + PAIR_CLASS_INIT(&tag[0], "sec-body"); + PAIR_STYLE_INIT(&tag[1], h); + print_otag(h, TAG_DIV, 2, tag); return(1); } else if (MDOC_BLOCK == n->type) { - tag[0].key = ATTR_CLASS; - tag[0].val = "sec-block"; - + PAIR_CLASS_INIT(&tag[0], "sec-block"); if (n->prev && NULL == n->prev->body->child) { print_otag(h, TAG_DIV, 1, tag); return(1); } - - bufcat("margin-top: 1em;"); + + SCALE_VS_INIT(&su, 1); + bufcat_su(h, "margin-top", &su); if (NULL == n->next) - bufcat("margin-bottom: 1em;"); + bufcat_su(h, "margin-bottom", &su); - tag[1].key = ATTR_STYLE; - tag[1].val = buf; - + PAIR_STYLE_INIT(&tag[1], h); print_otag(h, TAG_DIV, 2, tag); return(1); } - buffmt("margin-left: %dem;", INDENT); - - tag[0].key = ATTR_CLASS; - tag[0].val = "sec-body"; - tag[1].key = ATTR_STYLE; - tag[1].val = buf; + buf[0] = '\0'; + for (nn = n->child; nn; nn = nn->next) { + html_idcat(buf, nn->string, BUFSIZ); + if (nn->next) + html_idcat(buf, " ", BUFSIZ); + } + PAIR_CLASS_INIT(&tag[0], "sec-head"); + PAIR_ID_INIT(&tag[1], buf); + print_otag(h, TAG_DIV, 2, tag); return(1); } @@ -579,54 +624,51 @@ mdoc_sh_pre(MDOC_ARGS) static int mdoc_ss_pre(MDOC_ARGS) { - struct htmlpair tag[2]; - int i; + struct htmlpair tag[3]; const struct mdoc_node *nn; + char buf[BUFSIZ]; + struct roffsu su; - i = 0; + SCALE_VS_INIT(&su, 1); if (MDOC_BODY == n->type) { - tag[i].key = ATTR_CLASS; - tag[i++].val = "ssec-body"; + PAIR_CLASS_INIT(&tag[0], "ssec-body"); if (n->parent->next && n->child) { - bufcat("margin-bottom: 1em;"); - tag[i].key = ATTR_STYLE; - tag[i++].val = buf; - } - print_otag(h, TAG_DIV, i, tag); + bufcat_su(h, "margin-bottom", &su); + PAIR_STYLE_INIT(&tag[1], h); + print_otag(h, TAG_DIV, 2, tag); + } else + print_otag(h, TAG_DIV, 1, tag); return(1); } else if (MDOC_BLOCK == n->type) { - tag[i].key = ATTR_CLASS; - tag[i++].val = "ssec-block"; + PAIR_CLASS_INIT(&tag[0], "ssec-block"); if (n->prev) { - bufcat("margin-top: 1em;"); - tag[i].key = ATTR_STYLE; - tag[i++].val = buf; - } - print_otag(h, TAG_DIV, i, tag); + bufcat_su(h, "margin-top", &su); + PAIR_STYLE_INIT(&tag[1], h); + print_otag(h, TAG_DIV, 2, tag); + } else + print_otag(h, TAG_DIV, 1, tag); return(1); } - buffmt("margin-left: -%dem;", INDENT - HALFINDENT); + /* TODO: see note in mdoc_sh_pre() about duplicates. */ - tag[0].key = ATTR_CLASS; - tag[0].val = "ssec-head"; - tag[1].key = ATTR_STYLE; - tag[1].val = buf; - - print_otag(h, TAG_DIV, 2, tag); - print_otag(h, TAG_SPAN, 1, tag); - - bufinit(); + buf[0] = '\0'; for (nn = n->child; nn; nn = nn->next) { - bufcat(nn->string); + html_idcat(buf, nn->string, BUFSIZ); if (nn->next) - bufcat(" "); + html_idcat(buf, " ", BUFSIZ); } - tag[0].key = ATTR_NAME; - tag[0].val = buf; - print_otag(h, TAG_A, 1, tag); + SCALE_HS_INIT(&su, INDENT - HALFINDENT); + su.scale = -su.scale; + bufcat_su(h, "margin-left", &su); + + PAIR_CLASS_INIT(&tag[0], "ssec-head"); + PAIR_STYLE_INIT(&tag[1], h); + PAIR_ID_INIT(&tag[2], buf); + + print_otag(h, TAG_DIV, 3, tag); return(1); } @@ -637,14 +679,21 @@ mdoc_fl_pre(MDOC_ARGS) { struct htmlpair tag; - tag.key = ATTR_CLASS; - tag.val = "flag"; - + PAIR_CLASS_INIT(&tag, "flag"); print_otag(h, TAG_SPAN, 1, &tag); - if (MDOC_Fl == n->tok) { - print_text(h, "\\-"); + + /* `Cm' has no leading hyphen. */ + + if (MDOC_Cm == n->tok) + return(1); + + print_text(h, "\\-"); + + if (n->child) h->flags |= HTML_NOSPACE; - } + else if (n->next && n->next->line == n->line) + h->flags |= HTML_NOSPACE; + return(1); } @@ -658,10 +707,10 @@ mdoc_nd_pre(MDOC_ARGS) if (MDOC_BODY != n->type) return(1); - /* XXX - this can contain block elements! */ + /* XXX: this tag in theory can contain block elements. */ + print_text(h, "\\(em"); - tag.key = ATTR_CLASS; - tag.val = "desc-body"; + PAIR_CLASS_INIT(&tag, "desc-body"); print_otag(h, TAG_SPAN, 1, &tag); return(1); } @@ -676,11 +725,11 @@ mdoc_op_pre(MDOC_ARGS) if (MDOC_BODY != n->type) return(1); - /* XXX - this can contain block elements! */ + /* XXX: this tag in theory can contain block elements. */ + print_text(h, "\\(lB"); h->flags |= HTML_NOSPACE; - tag.key = ATTR_CLASS; - tag.val = "opt"; + PAIR_CLASS_INIT(&tag, "opt"); print_otag(h, TAG_SPAN, 1, &tag); return(1); } @@ -701,22 +750,70 @@ mdoc_op_post(MDOC_ARGS) static int mdoc_nm_pre(MDOC_ARGS) { - struct htmlpair tag; + struct htmlpair tag; + struct roffsu su; + const char *cp; - if ( ! (HTML_NEWLINE & h->flags)) - if (SEC_SYNOPSIS == n->sec) { - tag.key = ATTR_STYLE; - tag.val = "clear: both;"; - print_otag(h, TAG_BR, 1, &tag); + /* + * Accomodate for `Nm' being both an element (which may have + * NULL children AND no m->name) and a block. + */ + + cp = NULL; + + if (MDOC_ELEM == n->type) { + if (NULL == n->child && NULL == m->name) + return(1); + synopsis_pre(h, n); + PAIR_CLASS_INIT(&tag, "name"); + print_otag(h, TAG_SPAN, 1, &tag); + if (NULL == n->child) + print_text(h, m->name); + } else if (MDOC_BLOCK == n->type) { + synopsis_pre(h, n); + + bufcat_style(h, "clear", "both"); + if (n->head->child || m->name) { + if (n->head->child && MDOC_TEXT == + n->head->child->type) + cp = n->head->child->string; + if (NULL == cp || '\0' == *cp) + cp = m->name; + + SCALE_HS_INIT(&su, (double)strlen(cp)); + bufcat_su(h, "padding-left", &su); } - tag.key = ATTR_CLASS; - tag.val = "name"; + PAIR_STYLE_INIT(&tag, h); + print_otag(h, TAG_DIV, 1, &tag); + } else if (MDOC_HEAD == n->type) { + if (NULL == n->child && NULL == m->name) + return(1); - print_otag(h, TAG_SPAN, 1, &tag); - if (NULL == n->child) - print_text(h, m->name); + if (n->child && MDOC_TEXT == n->child->type) + cp = n->child->string; + if (NULL == cp || '\0' == *cp) + cp = m->name; + SCALE_HS_INIT(&su, (double)strlen(cp)); + + bufcat_style(h, "float", "left"); + bufcat_su(h, "min-width", &su); + SCALE_INVERT(&su); + bufcat_su(h, "margin-left", &su); + + PAIR_STYLE_INIT(&tag, h); + print_otag(h, TAG_DIV, 1, &tag); + + if (NULL == n->child) + print_text(h, m->name); + } else if (MDOC_BODY == n->type) { + SCALE_HS_INIT(&su, 2); + bufcat_su(h, "margin-left", &su); + PAIR_STYLE_INIT(&tag, h); + print_otag(h, TAG_DIV, 1, &tag); + } + return(1); } @@ -726,24 +823,25 @@ static int mdoc_xr_pre(MDOC_ARGS) { struct htmlpair tag[2]; - const char *name, *sec; const struct mdoc_node *nn; - nn = n->child; - name = nn && nn->string ? nn->string : ""; - nn = nn ? nn->next : NULL; - sec = nn && nn->string ? nn->string : ""; + if (NULL == n->child) + return(0); - buffmt("%s%s%s.html", name, name && sec ? "." : "", sec); + PAIR_CLASS_INIT(&tag[0], "link-man"); - tag[0].key = ATTR_CLASS; - tag[0].val = "link-man"; - tag[1].key = ATTR_HREF; - tag[1].val = buf; - print_otag(h, TAG_A, 2, tag); + if (h->base_man) { + 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 + print_otag(h, TAG_A, 1, tag); nn = n->child; print_text(h, nn->string); + if (NULL == (nn = nn->next)) return(0); @@ -753,7 +851,6 @@ mdoc_xr_pre(MDOC_ARGS) print_text(h, nn->string); h->flags |= HTML_NOSPACE; print_text(h, ")"); - return(0); } @@ -774,9 +871,7 @@ mdoc_ar_pre(MDOC_ARGS) { struct htmlpair tag; - tag.key = ATTR_CLASS; - tag.val = "arg"; - + PAIR_CLASS_INIT(&tag, "arg"); print_otag(h, TAG_SPAN, 1, &tag); return(1); } @@ -794,7 +889,7 @@ mdoc_xx_pre(MDOC_ARGS) pp = "BSDI BSD/OS"; break; case (MDOC_Dx): - pp = "DragonFlyBSD"; + pp = "DragonFly"; break; case (MDOC_Fx): pp = "FreeBSD"; @@ -812,9 +907,7 @@ mdoc_xx_pre(MDOC_ARGS) return(1); } - tag.key = ATTR_CLASS; - tag.val = "unix"; - + PAIR_CLASS_INIT(&tag, "unix"); print_otag(h, TAG_SPAN, 1, &tag); print_text(h, pp); return(1); @@ -823,32 +916,74 @@ mdoc_xx_pre(MDOC_ARGS) /* ARGSUSED */ static int -mdoc_tbl_block_pre(MDOC_ARGS, int t, int w, int o, int c) +mdoc_bx_pre(MDOC_ARGS) { - struct htmlpair tag; + const struct mdoc_node *nn; + struct htmlpair tag; - switch (t) { - case (MDOC_Column): - /* FALLTHROUGH */ - case (MDOC_Item): - /* FALLTHROUGH */ - case (MDOC_Ohang): - buffmt("margin-left: %dem; clear: both;", o); - break; - default: - buffmt("margin-left: %dem; clear: both;", w + o); - break; + PAIR_CLASS_INIT(&tag, "unix"); + print_otag(h, TAG_SPAN, 1, &tag); + + for (nn = n->child; nn; nn = nn->next) + print_mdoc_node(m, nn, h); + + if (n->child) + h->flags |= HTML_NOSPACE; + + print_text(h, "BSD"); + return(0); +} + + +/* ARGSUSED */ +static int +mdoc_it_block_pre(MDOC_ARGS, enum mdoc_list type, int comp, + struct roffsu *offs, struct roffsu *width) +{ + struct htmlpair tag; + const struct mdoc_node *nn; + struct roffsu su; + + nn = n->parent->parent; + + /* XXX: see notes in mdoc_it_pre(). */ + + 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; - if ( ! c && MDOC_Column != t) { - if (n->prev && n->prev->body->child) - bufcat("padding-top: 1em;"); - else if (NULL == n->prev) - bufcat("padding-top: 1em;"); + 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); + + PAIR_STYLE_INIT(&tag, 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) + break; } - tag.key = ATTR_STYLE; - tag.val = buf; + 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); } @@ -856,68 +991,90 @@ mdoc_tbl_block_pre(MDOC_ARGS, int t, int w, int o, int /* ARGSUSED */ static int -mdoc_tbl_body_pre(MDOC_ARGS, int t, int w) +mdoc_it_body_pre(MDOC_ARGS, enum mdoc_list type, struct roffsu *width) { + struct htmlpair tag; + struct roffsu su; - print_otag(h, TAG_DIV, 0, NULL); + 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; + } + return(1); } /* ARGSUSED */ static int -mdoc_tbl_head_pre(MDOC_ARGS, int t, int w) +mdoc_it_head_pre(MDOC_ARGS, enum mdoc_list type, struct roffsu *width) { struct htmlpair tag; struct ord *ord; char nbuf[BUFSIZ]; - switch (t) { - case (MDOC_Item): - /* FALLTHROUGH */ - case (MDOC_Ohang): - print_otag(h, TAG_DIV, 0, NULL); + switch (type) { + case (LIST_item): + return(0); + case (LIST_ohang): + print_otag(h, TAG_DIV, 0, &tag); + return(1); + case (LIST_column): break; - case (MDOC_Column): - buffmt("min-width: %dem;", w); - bufcat("clear: none;"); - if (n->next && MDOC_HEAD == n->next->type) - bufcat("float: left;"); - tag.key = ATTR_STYLE; - tag.val = buf; - print_otag(h, TAG_DIV, 1, &tag); - break; default: - buffmt("margin-left: -%dem;", w); - bufcat("clear: left;"); - bufcat("float: left;"); - bufcat("padding-right: 1em;"); - tag.key = ATTR_STYLE; - tag.val = buf; + 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 (t) { - case (MDOC_Diag): - tag.key = ATTR_CLASS; - tag.val = "diag"; + switch (type) { + case (LIST_diag): + PAIR_CLASS_INIT(&tag, "diag"); print_otag(h, TAG_SPAN, 1, &tag); break; - case (MDOC_Enum): - ord = SLIST_FIRST(&h->ords); + 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 (MDOC_Dash): + case (LIST_dash): print_text(h, "\\(en"); return(0); - case (MDOC_Hyphen): - print_text(h, "\\-"); + case (LIST_hyphen): + print_text(h, "\\(hy"); return(0); - case (MDOC_Bullet): + case (LIST_bullet): print_text(h, "\\(bu"); return(0); default: @@ -929,78 +1086,83 @@ mdoc_tbl_head_pre(MDOC_ARGS, int t, int w) static int -mdoc_tbl_pre(MDOC_ARGS, int type) +mdoc_it_pre(MDOC_ARGS) { - int i, w, o, c, wp; + 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) + if (MDOC_BLOCK != n->type) bl = bl->parent; - /* FIXME: fmt_vspace() equivalent. */ + SCALE_HS_INIT(&offs, 0); - assert(bl->args); + assert(bl->data.Bl); + type = bl->data.Bl->type; + comp = bl->data.Bl->comp; - w = o = c = 0; - wp = -1; + if (bl->data.Bl->offs) + a2offs(bl->data.Bl->offs, &offs); - for (i = 0; i < (int)bl->args->argc; i++) - if (MDOC_Width == bl->args->argv[i].arg) { - assert(bl->args->argv[i].sz); - wp = i; - w = a2width(bl->args->argv[i].value[0]); - } else if (MDOC_Offset == bl->args->argv[i].arg) { - assert(bl->args->argv[i].sz); - o = a2offs(bl->args->argv[i].value[0]); - } else if (MDOC_Compact == bl->args->argv[i].arg) - c = 1; - - if (MDOC_HEAD == n->type && MDOC_Column == type) { - nn = n->parent->child; - assert(nn && MDOC_HEAD == nn->type); - for (i = 0; nn && nn != n; nn = nn->next, i++) - /* Counter... */ ; - assert(nn); - if (wp >= 0 && i < (int)bl->args[wp].argv->sz) - w = a2width(bl->args->argv[wp].value[i]); - } - switch (type) { - case (MDOC_Enum): + case (LIST_enum): /* FALLTHROUGH */ - case (MDOC_Dash): + case (LIST_dash): /* FALLTHROUGH */ - case (MDOC_Hyphen): + case (LIST_hyphen): /* FALLTHROUGH */ - case (MDOC_Bullet): - if (w < 4) - w = 4; + case (LIST_bullet): + SCALE_HS_INIT(&width, 2); break; - case (MDOC_Inset): - /* FALLTHROUGH */ - case (MDOC_Diag): - w = 1; - break; default: - if (0 == w) - w = 10; + SCALE_HS_INIT(&width, INDENT); break; } - switch (n->type) { - case (MDOC_BLOCK): + if (bl->data.Bl->width) + a2width(bl->data.Bl->width, &width); + + /* Override width in some cases. */ + + switch (type) { + case (LIST_ohang): + /* FALLTHROUGH */ + case (LIST_item): + /* FALLTHROUGH */ + case (LIST_inset): + /* FALLTHROUGH */ + case (LIST_diag): + SCALE_HS_INIT(&width, 0); break; - case (MDOC_HEAD): - return(mdoc_tbl_head_pre(m, n, h, type, w)); - case (MDOC_BODY): - return(mdoc_tbl_body_pre(m, n, h, type, w)); default: - abort(); - /* NOTREACHED */ + if (0 == width.scale) + SCALE_HS_INIT(&width, INDENT); + break; } - return(mdoc_tbl_block_pre(m, n, h, type, w, o, c)); + 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)); } @@ -1010,18 +1172,23 @@ mdoc_bl_pre(MDOC_ARGS) { struct ord *ord; + if (MDOC_HEAD == n->type) + return(0); if (MDOC_BLOCK != n->type) return(1); - if (MDOC_Enum != a2list(n)) + assert(n->data.Bl); + if (LIST_enum != n->data.Bl->type) return(1); ord = malloc(sizeof(struct ord)); - if (NULL == ord) - err(EXIT_FAILURE, "malloc"); + if (NULL == ord) { + perror(NULL); + exit(MANDOCLEVEL_SYSERR); + } ord->cookie = n; ord->pos = 1; - SLIST_INSERT_HEAD(&h->ords, ord, entry); - + ord->next = h->ords.head; + h->ords.head = ord; return(1); } @@ -1034,30 +1201,16 @@ mdoc_bl_post(MDOC_ARGS) if (MDOC_BLOCK != n->type) return; - if (MDOC_Enum != a2list(n)) + if (LIST_enum != n->data.Bl->type) return; - ord = SLIST_FIRST(&h->ords); + ord = h->ords.head; assert(ord); - SLIST_REMOVE_HEAD(&h->ords, entry); + h->ords.head = ord->next; free(ord); } -static int -mdoc_it_pre(MDOC_ARGS) -{ - int type; - - if (MDOC_BLOCK == n->type) - type = a2list(n->parent->parent); - else - type = a2list(n->parent->parent->parent); - - return(mdoc_tbl_pre(m, n, h, type)); -} - - /* ARGSUSED */ static int mdoc_ex_pre(MDOC_ARGS) @@ -1066,11 +1219,9 @@ mdoc_ex_pre(MDOC_ARGS) struct tag *t; struct htmlpair tag; - print_text(h, "The"); + PAIR_CLASS_INIT(&tag, "utility"); - tag.key = ATTR_CLASS; - tag.val = "utility"; - + print_text(h, "The"); for (nn = n->child; nn; nn = nn->next) { t = print_otag(h, TAG_SPAN, 1, &tag); print_text(h, nn->string); @@ -1086,7 +1237,7 @@ mdoc_ex_pre(MDOC_ARGS) h->flags &= ~HTML_NOSPACE; } - if (n->child->next) + if (n->child && n->child->next) print_text(h, "utilities exit"); else print_text(h, "utility exits"); @@ -1176,9 +1327,7 @@ mdoc_em_pre(MDOC_ARGS) { struct htmlpair tag; - tag.key = ATTR_CLASS; - tag.val = "emph"; - + PAIR_CLASS_INIT(&tag, "emph"); print_otag(h, TAG_SPAN, 1, &tag); return(1); } @@ -1188,18 +1337,18 @@ mdoc_em_pre(MDOC_ARGS) static int mdoc_d1_pre(MDOC_ARGS) { - struct htmlpair tag[2]; + struct htmlpair tag[2]; + struct roffsu su; if (MDOC_BLOCK != n->type) return(1); - buffmt("margin-left: %dem;", INDENT); + /* FIXME: D1 shouldn't be literal. */ - tag[0].key = ATTR_CLASS; - tag[0].val = "lit-block"; - tag[1].key = ATTR_STYLE; - tag[1].val = buf; - + SCALE_VS_INIT(&su, INDENT - 2); + bufcat_su(h, "margin-left", &su); + PAIR_CLASS_INIT(&tag[0], "lit"); + PAIR_STYLE_INIT(&tag[1], h); print_otag(h, TAG_DIV, 2, tag); return(1); } @@ -1211,18 +1360,17 @@ mdoc_sx_pre(MDOC_ARGS) { struct htmlpair tag[2]; const struct mdoc_node *nn; + char buf[BUFSIZ]; - bufcat("#"); + strlcpy(buf, "#", BUFSIZ); for (nn = n->child; nn; nn = nn->next) { - bufcat(nn->string); + html_idcat(buf, nn->string, BUFSIZ); if (nn->next) - bufcat(" "); + html_idcat(buf, " ", BUFSIZ); } - tag[0].key = ATTR_HREF; - tag[0].val = buf; - tag[1].key = ATTR_CLASS; - tag[1].val = "link-sec"; + PAIR_CLASS_INIT(&tag[0], "link-sec"); + PAIR_HREF_INIT(&tag[1], buf); print_otag(h, TAG_A, 2, tag); return(1); @@ -1259,71 +1407,61 @@ static int mdoc_bd_pre(MDOC_ARGS) { struct htmlpair tag[2]; - int t, c, o, i; - const struct mdoc_node *bl; + int comp; + const struct mdoc_node *nn; + struct roffsu su; - /* FIXME: fmt_vspace() shit. */ - - if (MDOC_BLOCK == n->type) - bl = n; - else if (MDOC_HEAD == n->type) + if (MDOC_HEAD == n->type) return(0); - else - bl = n->parent; - t = o = c = 0; + SCALE_VS_INIT(&su, 0); - for (i = 0; i < (int)bl->args->argc; i++) - switch (bl->args->argv[i].arg) { - case (MDOC_Offset): - assert(bl->args->argv[i].sz); - o = a2offs (bl->args->argv[i].value[0]); - break; - case (MDOC_Compact): - c = 1; - break; - case (MDOC_Ragged): - /* FALLTHROUGH */ - case (MDOC_Filled): - /* FALLTHROUGH */ - case (MDOC_Unfilled): - /* FALLTHROUGH */ - case (MDOC_Literal): - t = bl->args->argv[i].arg; - break; - } + assert(n->data.Bd); + if (n->data.Bd->offs) + a2offs(n->data.Bd->offs, &su); + comp = n->data.Bd->comp; + + /* FIXME: -centered, etc. formatting. */ + /* FIXME: does not respect -offset ??? */ + if (MDOC_BLOCK == n->type) { - if (o) - buffmt("margin-left: %dem;", o); - bufcat("margin-top: 1em;"); - tag[0].key = ATTR_STYLE; - tag[0].val = buf; + bufcat_su(h, "margin-left", &su); + 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) + break; + } + if (comp) { + PAIR_STYLE_INIT(&tag[0], h); + print_otag(h, TAG_DIV, 1, tag); + return(1); + } + SCALE_VS_INIT(&su, 1); + bufcat_su(h, "margin-top", &su); + PAIR_STYLE_INIT(&tag[0], h); print_otag(h, TAG_DIV, 1, tag); return(1); } - switch (t) { - case (MDOC_Unfilled): - case (MDOC_Literal): - break; - default: + if (DISP_unfilled != n->data.Bd->type && + DISP_literal != n->data.Bd->type) return(1); - } - bufcat("white-space: pre;"); - tag[0].key = ATTR_STYLE; - tag[0].val = buf; - tag[1].key = ATTR_CLASS; - tag[1].val = "lit-block"; - + PAIR_CLASS_INIT(&tag[0], "lit"); + bufcat_style(h, "white-space", "pre"); + PAIR_STYLE_INIT(&tag[1], h); print_otag(h, TAG_DIV, 2, tag); - for (n = n->child; n; n = n->next) { + for (nn = n->child; nn; nn = nn->next) { + print_mdoc_node(m, nn, h); + if (nn->next && nn->next->line == nn->line) + continue; + print_text(h, "\n"); h->flags |= HTML_NOSPACE; - print_mdoc_node(m, n, h); - if (n->next) - print_text(h, "\n"); } return(0); @@ -1336,9 +1474,7 @@ mdoc_pa_pre(MDOC_ARGS) { struct htmlpair tag; - tag.key = ATTR_CLASS; - tag.val = "file"; - + PAIR_CLASS_INIT(&tag, "file"); print_otag(h, TAG_SPAN, 1, &tag); return(1); } @@ -1346,37 +1482,11 @@ mdoc_pa_pre(MDOC_ARGS) /* ARGSUSED */ static int -mdoc_qq_pre(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return(1); - print_text(h, "\\*q"); - h->flags |= HTML_NOSPACE; - return(1); -} - - -/* ARGSUSED */ -static void -mdoc_qq_post(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return; - h->flags |= HTML_NOSPACE; - print_text(h, "\\*q"); -} - - -/* ARGSUSED */ -static int mdoc_ad_pre(MDOC_ARGS) { struct htmlpair tag; - tag.key = ATTR_CLASS; - tag.val = "addr"; + PAIR_CLASS_INIT(&tag, "addr"); print_otag(h, TAG_SPAN, 1, &tag); return(1); } @@ -1388,8 +1498,9 @@ mdoc_an_pre(MDOC_ARGS) { struct htmlpair tag; - tag.key = ATTR_CLASS; - tag.val = "author"; + /* TODO: -split and -nosplit (see termp_an_pre()). */ + + PAIR_CLASS_INIT(&tag, "author"); print_otag(h, TAG_SPAN, 1, &tag); return(1); } @@ -1401,8 +1512,8 @@ mdoc_cd_pre(MDOC_ARGS) { struct htmlpair tag; - tag.key = ATTR_CLASS; - tag.val = "config"; + synopsis_pre(h, n); + PAIR_CLASS_INIT(&tag, "config"); print_otag(h, TAG_SPAN, 1, &tag); return(1); } @@ -1414,8 +1525,7 @@ mdoc_dv_pre(MDOC_ARGS) { struct htmlpair tag; - tag.key = ATTR_CLASS; - tag.val = "define"; + PAIR_CLASS_INIT(&tag, "define"); print_otag(h, TAG_SPAN, 1, &tag); return(1); } @@ -1427,8 +1537,7 @@ mdoc_ev_pre(MDOC_ARGS) { struct htmlpair tag; - tag.key = ATTR_CLASS; - tag.val = "env"; + PAIR_CLASS_INIT(&tag, "env"); print_otag(h, TAG_SPAN, 1, &tag); return(1); } @@ -1440,8 +1549,7 @@ mdoc_er_pre(MDOC_ARGS) { struct htmlpair tag; - tag.key = ATTR_CLASS; - tag.val = "errno"; + PAIR_CLASS_INIT(&tag, "errno"); print_otag(h, TAG_SPAN, 1, &tag); return(1); } @@ -1455,9 +1563,7 @@ mdoc_fa_pre(MDOC_ARGS) struct htmlpair tag; struct tag *t; - tag.key = ATTR_CLASS; - tag.val = "farg"; - + PAIR_CLASS_INIT(&tag, "farg"); if (n->parent->tok != MDOC_Fo) { print_otag(h, TAG_SPAN, 1, &tag); return(1); @@ -1482,19 +1588,11 @@ mdoc_fa_pre(MDOC_ARGS) static int mdoc_fd_pre(MDOC_ARGS) { - struct htmlpair tag; + struct htmlpair tag; - if (SEC_SYNOPSIS == n->sec) { - if (n->next && MDOC_Fd != n->next->tok) { - tag.key = ATTR_STYLE; - tag.val = "margin-bottom: 1em;"; - print_otag(h, TAG_DIV, 1, &tag); - } else - print_otag(h, TAG_DIV, 0, NULL); - } + synopsis_pre(h, n); - tag.key = ATTR_CLASS; - tag.val = "macro"; + PAIR_CLASS_INIT(&tag, "macro"); print_otag(h, TAG_SPAN, 1, &tag); return(1); } @@ -1504,40 +1602,30 @@ mdoc_fd_pre(MDOC_ARGS) static int mdoc_vt_pre(MDOC_ARGS) { - struct htmlpair tag; + struct htmlpair tag; - if (SEC_SYNOPSIS == n->sec) { - if (n->next && MDOC_Vt != n->next->tok) { - tag.key = ATTR_STYLE; - tag.val = "margin-bottom: 1em;"; - print_otag(h, TAG_DIV, 1, &tag); - } else - print_otag(h, TAG_DIV, 0, NULL); - } + if (MDOC_BLOCK == n->type) { + synopsis_pre(h, n); + return(1); + } else if (MDOC_ELEM == n->type) { + synopsis_pre(h, n); + } else if (MDOC_HEAD == n->type) + return(0); - tag.key = ATTR_CLASS; - tag.val = "type"; + PAIR_CLASS_INIT(&tag, "type"); print_otag(h, TAG_SPAN, 1, &tag); return(1); } + /* ARGSUSED */ static int mdoc_ft_pre(MDOC_ARGS) { - struct htmlpair tag; + struct htmlpair tag; - if (SEC_SYNOPSIS == n->sec) { - if (n->prev && MDOC_Fo == n->prev->tok) { - tag.key = ATTR_STYLE; - tag.val = "magin-bottom: 1em;"; - print_otag(h, TAG_DIV, 1, &tag); - } else - print_otag(h, TAG_DIV, 0, NULL); - } - - tag.key = ATTR_CLASS; - tag.val = "type"; + synopsis_pre(h, n); + PAIR_CLASS_INIT(&tag, "ftype"); print_otag(h, TAG_SPAN, 1, &tag); return(1); } @@ -1548,32 +1636,74 @@ static int mdoc_fn_pre(MDOC_ARGS) { struct tag *t; - struct htmlpair tag; + struct htmlpair tag[2]; const struct mdoc_node *nn; + char nbuf[BUFSIZ]; + const char *sp, *ep; + int sz, i; - if (SEC_SYNOPSIS == n->sec) { - if (n->next) { - tag.key = ATTR_STYLE; - tag.val = "margin-bottom: 1em"; - print_otag(h, TAG_DIV, 1, &tag); - } else - print_otag(h, TAG_DIV, 0, NULL); + synopsis_pre(h, n); + + /* Split apart into type and name. */ + assert(n->child->string); + sp = n->child->string; + + ep = strchr(sp, ' '); + if (NULL != ep) { + PAIR_CLASS_INIT(&tag[0], "ftype"); + t = print_otag(h, TAG_SPAN, 1, tag); + + while (ep) { + sz = MIN((int)(ep - sp), BUFSIZ - 1); + (void)memcpy(nbuf, sp, (size_t)sz); + nbuf[sz] = '\0'; + print_text(h, nbuf); + sp = ++ep; + ep = strchr(sp, ' '); + } + print_tagq(h, t); } - tag.key = ATTR_CLASS; - tag.val = "type"; + PAIR_CLASS_INIT(&tag[0], "fname"); - t = print_otag(h, TAG_SPAN, 1, &tag); - print_text(h, n->child->string); + /* + * FIXME: only refer to IDs that we know exist. + */ + +#if 0 + if (MDOC_SYNPRETTY & n->flags) { + nbuf[0] = '\0'; + html_idcat(nbuf, sp, BUFSIZ); + PAIR_ID_INIT(&tag[1], nbuf); + } else { + strlcpy(nbuf, "#", BUFSIZ); + html_idcat(nbuf, sp, BUFSIZ); + PAIR_HREF_INIT(&tag[1], nbuf); + } +#endif + + t = print_otag(h, TAG_SPAN, 1, tag); + + if (sp) { + strlcpy(nbuf, sp, BUFSIZ); + print_text(h, nbuf); + } + print_tagq(h, t); h->flags |= HTML_NOSPACE; print_text(h, "("); + bufinit(h); + PAIR_CLASS_INIT(&tag[0], "farg"); + bufcat_style(h, "white-space", "nowrap"); + PAIR_STYLE_INIT(&tag[1], h); + for (nn = n->child->next; nn; nn = nn->next) { - tag.key = ATTR_CLASS; - tag.val = "farg"; - t = print_otag(h, TAG_SPAN, 1, &tag); + i = 1; + if (MDOC_SYNPRETTY & n->flags) + i = 2; + t = print_otag(h, TAG_SPAN, i, tag); print_text(h, nn->string); print_tagq(h, t); if (nn->next) @@ -1581,8 +1711,7 @@ mdoc_fn_pre(MDOC_ARGS) } print_text(h, ")"); - - if (SEC_SYNOPSIS == n->sec) + if (MDOC_SYNPRETTY & n->flags) print_text(h, ";"); return(0); @@ -1591,27 +1720,575 @@ mdoc_fn_pre(MDOC_ARGS) /* 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... */ + h->flags &= ~HTML_NOSPACE; + h->flags &= ~HTML_NONOSPACE; + } else + h->flags |= HTML_NONOSPACE; + + return(0); +} + + +/* ARGSUSED */ +static int mdoc_sp_pre(MDOC_ARGS) { - int len; - struct htmlpair tag; + int len; + struct htmlpair tag; + struct roffsu su; switch (n->tok) { case (MDOC_sp): + /* FIXME: can this have a scaling indicator? */ len = n->child ? atoi(n->child->string) : 1; break; case (MDOC_br): len = 0; break; default: + assert(n->parent); + if ((NULL == n->next || NULL == n->prev) && + (MDOC_Ss == n->parent->tok || + MDOC_Sh == n->parent->tok)) + return(0); len = 1; break; } - buffmt("height: %dem", len); - tag.key = ATTR_STYLE; - tag.val = buf; + SCALE_VS_INIT(&su, len); + 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, "\\~"); + + return(0); + +} + + +/* 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; + struct htmlpair tag[2]; + + nn = n->child; + + PAIR_CLASS_INIT(&tag[0], "link-ext"); + PAIR_HREF_INIT(&tag[1], nn->string); + print_otag(h, TAG_A, 2, tag); + + if (NULL == nn->next) + return(1); + + for (nn = nn->next; nn; nn = nn->next) + print_text(h, nn->string); + + return(0); +} + + +/* ARGSUSED */ +static int +mdoc_mt_pre(MDOC_ARGS) +{ + struct htmlpair tag[2]; + struct tag *t; + const struct mdoc_node *nn; + + PAIR_CLASS_INIT(&tag[0], "link-mail"); + + for (nn = n->child; nn; nn = nn->next) { + bufinit(h); + bufcat(h, "mailto:"); + bufcat(h, nn->string); + PAIR_HREF_INIT(&tag[1], h->buf); + t = print_otag(h, TAG_A, 2, tag); + print_text(h, nn->string); + print_tagq(h, t); + } + + return(0); +} + + +/* ARGSUSED */ +static int +mdoc_fo_pre(MDOC_ARGS) +{ + struct htmlpair tag; + struct tag *t; + + if (MDOC_BODY == n->type) { + h->flags |= HTML_NOSPACE; + print_text(h, "("); + h->flags |= HTML_NOSPACE; + return(1); + } else if (MDOC_BLOCK == n->type) { + synopsis_pre(h, n); + return(1); + } + + /* XXX: we drop non-initial arguments as per groff. */ + + assert(n->child); + assert(n->child->string); + + PAIR_CLASS_INIT(&tag, "fname"); + t = print_otag(h, TAG_SPAN, 1, &tag); + print_text(h, n->child->string); + print_tagq(h, t); + return(0); +} + + +/* ARGSUSED */ +static void +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, ";"); +} + + +/* ARGSUSED */ +static int +mdoc_in_pre(MDOC_ARGS) +{ + const struct mdoc_node *nn; + struct tag *t; + struct htmlpair tag[2]; + int i; + + synopsis_pre(h, n); + + PAIR_CLASS_INIT(&tag[0], "includes"); + print_otag(h, TAG_SPAN, 1, tag); + + if (MDOC_SYNPRETTY & n->flags && MDOC_LINE & n->flags) + print_text(h, "#include"); + + print_text(h, "<"); + h->flags |= HTML_NOSPACE; + + for (nn = n->child; nn; nn = nn->next) { + PAIR_CLASS_INIT(&tag[0], "link-includes"); + i = 1; + bufinit(h); + if (h->base_includes) { + buffmt_includes(h, nn->string); + PAIR_HREF_INIT(&tag[i], h->buf); + i++; + } + t = print_otag(h, TAG_A, i, tag); + print_mdoc_node(m, nn, h); + print_tagq(h, t); + } + + h->flags |= HTML_NOSPACE; + print_text(h, ">"); + + return(0); +} + + +/* ARGSUSED */ +static int +mdoc_ic_pre(MDOC_ARGS) +{ + struct htmlpair tag; + + PAIR_CLASS_INIT(&tag, "cmd"); + print_otag(h, TAG_SPAN, 1, &tag); + return(1); +} + + +/* ARGSUSED */ +static int +mdoc_rv_pre(MDOC_ARGS) +{ + const struct mdoc_node *nn; + struct htmlpair tag; + struct tag *t; + + print_otag(h, TAG_DIV, 0, NULL); + print_text(h, "The"); + + for (nn = n->child; nn; nn = nn->next) { + PAIR_CLASS_INIT(&tag, "fname"); + t = print_otag(h, TAG_SPAN, 1, &tag); + print_text(h, nn->string); + print_tagq(h, t); + + h->flags |= HTML_NOSPACE; + if (nn->next && NULL == nn->next->next) + print_text(h, "(), and"); + else if (nn->next) + print_text(h, "(),"); + else + print_text(h, "()"); + } + + if (n->child && n->child->next) + print_text(h, "functions return"); + else + print_text(h, "function returns"); + + print_text(h, "the value 0 if successful; otherwise the value " + "-1 is returned and the global variable"); + + PAIR_CLASS_INIT(&tag, "var"); + t = print_otag(h, TAG_SPAN, 1, &tag); + print_text(h, "errno"); + print_tagq(h, t); + print_text(h, "is set to indicate the error."); + return(0); +} + + +/* ARGSUSED */ +static int +mdoc_va_pre(MDOC_ARGS) +{ + struct htmlpair tag; + + PAIR_CLASS_INIT(&tag, "var"); + print_otag(h, TAG_SPAN, 1, &tag); + return(1); +} + + +/* 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) +{ + + h->flags |= HTML_NOSPACE; + print_text(h, "\\(aq"); + h->flags |= HTML_NOSPACE; + return(1); +} + + +/* ARGSUSED */ +static int +mdoc_bf_pre(MDOC_ARGS) +{ + struct htmlpair tag[2]; + struct roffsu su; + + if (MDOC_HEAD == n->type) + return(0); + else if (MDOC_BODY != n->type) + return(1); + + assert(n->data.Bf); + + if (FONT_Em == n->data.Bf->font) + PAIR_CLASS_INIT(&tag[0], "emph"); + else if (FONT_Sy == n->data.Bf->font) + PAIR_CLASS_INIT(&tag[0], "symb"); + else if (FONT_Li == n->data.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. + */ + bufcat_style(h, "display", "inline"); + SCALE_HS_INIT(&su, 1); + /* Needs a left-margin for spacing. */ + bufcat_su(h, "margin-left", &su); + PAIR_STYLE_INIT(&tag[1], h); + print_otag(h, TAG_DIV, 2, tag); + return(1); +} + + +/* ARGSUSED */ +static int +mdoc_ms_pre(MDOC_ARGS) +{ + struct htmlpair tag; + + PAIR_CLASS_INIT(&tag, "symb"); + print_otag(h, TAG_SPAN, 1, &tag); + return(1); +} + + +/* ARGSUSED */ +static int +mdoc_pf_pre(MDOC_ARGS) +{ + + h->flags |= HTML_IGNDELIM; + return(1); +} + + +/* ARGSUSED */ +static void +mdoc_pf_post(MDOC_ARGS) +{ + + h->flags &= ~HTML_IGNDELIM; + h->flags |= HTML_NOSPACE; +} + + +/* ARGSUSED */ +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); + } + + PAIR_CLASS_INIT(&tag, "ref"); + print_otag(h, TAG_SPAN, 1, &tag); + return(1); +} + + + +/* ARGSUSED */ +static int +mdoc_li_pre(MDOC_ARGS) +{ + struct htmlpair tag; + + PAIR_CLASS_INIT(&tag, "lit"); + print_otag(h, TAG_SPAN, 1, &tag); + return(1); +} + + +/* ARGSUSED */ +static int +mdoc_sy_pre(MDOC_ARGS) +{ + struct htmlpair tag; + + PAIR_CLASS_INIT(&tag, "symb"); + print_otag(h, TAG_SPAN, 1, &tag); + return(1); +} + + +/* ARGSUSED */ +static int +mdoc_bt_pre(MDOC_ARGS) +{ + + print_text(h, "is currently in beta test."); + return(0); +} + + +/* ARGSUSED */ +static int +mdoc_ud_pre(MDOC_ARGS) +{ + + print_text(h, "currently under development."); + return(0); +} + + +/* ARGSUSED */ +static int +mdoc_lb_pre(MDOC_ARGS) +{ + struct htmlpair tag; + + if (SEC_LIBRARY == n->sec && MDOC_LINE & n->flags) + print_otag(h, TAG_DIV, 0, NULL); + PAIR_CLASS_INIT(&tag, "lib"); + print_otag(h, TAG_SPAN, 1, &tag); + return(1); +} + + +/* ARGSUSED */ +static int +mdoc__x_pre(MDOC_ARGS) +{ + struct htmlpair tag[2]; + + switch (n->tok) { + case(MDOC__A): + PAIR_CLASS_INIT(&tag[0], "ref-auth"); + break; + case(MDOC__B): + PAIR_CLASS_INIT(&tag[0], "ref-book"); + break; + case(MDOC__C): + PAIR_CLASS_INIT(&tag[0], "ref-city"); + break; + case(MDOC__D): + PAIR_CLASS_INIT(&tag[0], "ref-date"); + break; + case(MDOC__I): + PAIR_CLASS_INIT(&tag[0], "ref-issue"); + break; + case(MDOC__J): + PAIR_CLASS_INIT(&tag[0], "ref-jrnl"); + break; + case(MDOC__N): + PAIR_CLASS_INIT(&tag[0], "ref-num"); + break; + case(MDOC__O): + PAIR_CLASS_INIT(&tag[0], "ref-opt"); + break; + case(MDOC__P): + PAIR_CLASS_INIT(&tag[0], "ref-page"); + break; + case(MDOC__Q): + PAIR_CLASS_INIT(&tag[0], "ref-corp"); + break; + case(MDOC__R): + PAIR_CLASS_INIT(&tag[0], "ref-rep"); + break; + case(MDOC__T): + PAIR_CLASS_INIT(&tag[0], "ref-title"); + break; + case(MDOC__U): + PAIR_CLASS_INIT(&tag[0], "link-ref"); + break; + case(MDOC__V): + PAIR_CLASS_INIT(&tag[0], "ref-vol"); + break; + default: + abort(); + /* NOTREACHED */ + } + + if (MDOC__U != n->tok) { + print_otag(h, TAG_SPAN, 1, tag); + return(1); + } + + PAIR_HREF_INIT(&tag[1], n->child->string); + print_otag(h, TAG_A, 2, tag); + return(1); +} + + +/* ARGSUSED */ +static void +mdoc__x_post(MDOC_ARGS) +{ + + /* TODO: %U */ + + h->flags |= HTML_NOSPACE; + print_text(h, n->next ? "," : "."); +} + + +/* ARGSUSED */ +static int +mdoc_bk_pre(MDOC_ARGS) +{ + + switch (n->type) { + case (MDOC_BLOCK): + break; + case (MDOC_HEAD): + return(0); + case (MDOC_BODY): + h->flags |= HTML_PREKEEP; + break; + default: + abort(); + /* NOTREACHED */ + } + + return(1); +} + + +/* ARGSUSED */ +static void +mdoc_bk_post(MDOC_ARGS) +{ + + if (MDOC_BODY == n->type) + h->flags &= ~(HTML_KEEP | HTML_PREKEEP); }