=================================================================== RCS file: /cvs/mandoc/mdoc_html.c,v retrieving revision 1.16 retrieving revision 1.342 diff -u -p -r1.16 -r1.342 --- mandoc/mdoc_html.c 2009/10/03 15:08:09 1.16 +++ mandoc/mdoc_html.c 2021/03/30 19:26:20 1.342 @@ -1,186 +1,161 @@ -/* $Id: mdoc_html.c,v 1.16 2009/10/03 15:08:09 kristaps Exp $ */ +/* $Id: mdoc_html.c,v 1.342 2021/03/30 19:26:20 schwarze Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2014-2021 Ingo Schwarze + * Copyright (c) 2008-2011, 2014 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 * copyright notice and this permission notice appear in all copies. * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + * HTML formatter for mdoc(7) used by mandoc(1). */ +#include "config.h" + #include -#include -#include #include #include -#include -#include #include #include #include #include -#include "html.h" +#include "mandoc_aux.h" +#include "mandoc.h" +#include "roff.h" #include "mdoc.h" +#include "out.h" +#include "html.h" +#include "main.h" -#define INDENT 5 -#define HALFINDENT 3 - -#define MDOC_ARGS const struct mdoc_meta *m, \ - const struct mdoc_node *n, \ +#define MDOC_ARGS const struct roff_meta *meta, \ + struct roff_node *n, \ struct html *h -#define MAN_ARGS const struct man_meta *m, \ - const struct man_node *n, \ - struct html *h -struct htmlmdoc { +#ifndef MIN +#define MIN(a,b) ((/*CONSTCOND*/(a)<(b))?(a):(b)) +#endif + +struct mdoc_html_act { int (*pre)(MDOC_ARGS); void (*post)(MDOC_ARGS); }; -static void print_mdoc(MDOC_ARGS); -static void print_mdoc_head(MDOC_ARGS); +static void print_mdoc_head(const struct roff_meta *, + struct html *); static void print_mdoc_node(MDOC_ARGS); static void print_mdoc_nodelist(MDOC_ARGS); +static void synopsis_pre(struct html *, struct roff_node *); -static int a2width(const char *); -static int a2offs(const char *); -static int a2list(const struct mdoc_node *); +static void mdoc_root_post(const struct roff_meta *, + struct html *); +static int mdoc_root_pre(const struct roff_meta *, + struct html *); -static void buffmt_man(struct html *, - const char *, const char *); -static void buffmt(struct html *, const char *, ...); -static void bufcat(struct html *, const char *); -static void bufncat(struct html *, const char *, size_t); - - -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_abort_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_bl_post(MDOC_ARGS); +static void mdoc_bk_post(MDOC_ARGS); +static int mdoc_bk_pre(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_code_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); static int mdoc_fl_pre(MDOC_ARGS); static int mdoc_fn_pre(MDOC_ARGS); static int mdoc_ft_pre(MDOC_ARGS); static int mdoc_em_pre(MDOC_ARGS); -static int mdoc_er_pre(MDOC_ARGS); -static int mdoc_ev_pre(MDOC_ARGS); +static void mdoc_eo_post(MDOC_ARGS); +static int mdoc_eo_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_igndelim_pre(MDOC_ARGS); static int mdoc_in_pre(MDOC_ARGS); 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_no_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 int mdoc_pp_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_sp_pre(MDOC_ARGS); -static void mdoc_sq_post(MDOC_ARGS); -static int mdoc_sq_pre(MDOC_ARGS); +static int mdoc_skip_pre(MDOC_ARGS); +static int mdoc_sm_pre(MDOC_ARGS); static int mdoc_ss_pre(MDOC_ARGS); +static int mdoc_st_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_tg_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] = { - {mdoc_ap_pre, NULL}, /* Ap */ +static const struct mdoc_html_act mdoc_html_acts[MDOC_MAX - MDOC_Dd] = { {NULL, NULL}, /* Dd */ {NULL, NULL}, /* Dt */ {NULL, NULL}, /* Os */ {mdoc_sh_pre, NULL }, /* Sh */ - {mdoc_ss_pre, NULL }, /* Ss */ - {mdoc_sp_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 */ {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 */ + {mdoc_ad_pre, NULL}, /* Ad */ {mdoc_an_pre, NULL}, /* An */ + {mdoc_ap_pre, NULL}, /* Ap */ {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_code_pre, NULL}, /* Cm */ + {mdoc_code_pre, NULL}, /* Dv */ + {mdoc_code_pre, NULL}, /* Er */ + {mdoc_code_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_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_fn_pre, NULL}, /* Fn */ + {mdoc_ft_pre, NULL}, /* Ft */ + {mdoc_code_pre, NULL}, /* Ic */ + {mdoc_in_pre, NULL}, /* In */ + {mdoc_code_pre, NULL}, /* Li */ + {mdoc_nd_pre, NULL}, /* Nd */ + {mdoc_nm_pre, NULL}, /* Nm */ + {mdoc_quote_pre, mdoc_quote_post}, /* Op */ + {mdoc_abort_pre, NULL}, /* Ot */ {mdoc_pa_pre, NULL}, /* Pa */ - {mdoc_rv_pre, NULL}, /* Rv */ - {NULL, NULL}, /* St */ + {mdoc_ex_pre, NULL}, /* Rv */ + {mdoc_st_pre, 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 */ @@ -194,1695 +169,1155 @@ 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 */ - {NULL, NULL}, /* At */ + {mdoc_quote_pre, mdoc_quote_post}, /* Ao */ + {mdoc_quote_pre, mdoc_quote_post}, /* Aq */ + {mdoc_xx_pre, 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_bf_pre, NULL}, /* Bf */ + {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 */ + {mdoc_xx_pre, NULL}, /* Bx */ + {mdoc_skip_pre, NULL}, /* Db */ {NULL, NULL}, /* Dc */ - {mdoc_dq_pre, mdoc_dq_post}, /* Do */ - {mdoc_dq_pre, mdoc_dq_post}, /* Dq */ - {NULL, NULL}, /* Ec */ + {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_em_pre, NULL}, /* Em */ + {mdoc_eo_pre, mdoc_eo_post}, /* Eo */ {mdoc_xx_pre, NULL}, /* Fx */ - {mdoc_ms_pre, NULL}, /* Ms */ /* FIXME: convert to symbol? */ - {NULL, NULL}, /* No */ + {mdoc_no_pre, NULL}, /* Ms */ + {mdoc_no_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 */ - {NULL, NULL}, /* Sm */ /* FIXME - no idea. */ + {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 */ {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_op_pre, mdoc_op_post}, /* Oo */ + {mdoc_fo_pre, mdoc_fo_post}, /* Fo */ + {NULL, NULL}, /* Fc */ + {mdoc_quote_pre, mdoc_quote_post}, /* Oo */ {NULL, NULL}, /* Oc */ - {NULL, NULL}, /* Bk */ + {mdoc_bk_pre, mdoc_bk_post}, /* Bk */ {NULL, NULL}, /* Ek */ - {mdoc_bt_pre, NULL}, /* Bt */ + {NULL, NULL}, /* Bt */ {NULL, NULL}, /* Hf */ - {NULL, NULL}, /* Fr */ - {mdoc_ud_pre, NULL}, /* Ud */ + {mdoc_em_pre, NULL}, /* Fr */ + {NULL, NULL}, /* Ud */ {mdoc_lb_pre, NULL}, /* Lb */ - {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 */ - {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_sp_pre, NULL}, /* br */ - {mdoc_sp_pre, NULL}, /* sp */ + {mdoc_abort_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__x_pre, mdoc__x_post}, /* %U */ + {NULL, NULL}, /* Ta */ + {mdoc_tg_pre, NULL}, /* Tg */ }; -void -html_mdoc(void *arg, const struct mdoc *m) -{ - struct html *h; - struct tag *t; - - h = (struct html *)arg; - - print_gen_doctype(h); - t = print_otag(h, TAG_HTML, 0, NULL); - print_mdoc(mdoc_meta(m), mdoc_node(m), h); - print_tagq(h, t); - - printf("\n"); -} - - +/* + * See the same function in mdoc_term.c for documentation. + */ static void -bufinit(struct html *h) +synopsis_pre(struct html *h, struct roff_node *n) { + struct roff_node *np; - h->buf[0] = '\0'; - h->buflen = 0; -} + if ((n->flags & NODE_SYNPRETTY) == 0 || + (np = roff_node_prev(n)) == NULL) + return; + if (np->tok == n->tok && + MDOC_Fo != n->tok && + MDOC_Ft != n->tok && + MDOC_Fn != n->tok) { + print_otag(h, TAG_BR, ""); + return; + } -static void -bufcat(struct html *h, const char *p) -{ - - bufncat(h, p, strlen(p)); -} - - -static void -buffmt(struct html *h, const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - (void)vsnprintf(h->buf + h->buflen, - BUFSIZ - h->buflen - 1, fmt, ap); - va_end(ap); - h->buflen = strlen(h->buf); - assert('\0' == h->buf[h->buflen]); -} - - -static void -bufncat(struct html *h, const char *p, size_t sz) -{ - - if (h->buflen + sz > BUFSIZ - 1) - sz = BUFSIZ - 1 - h->buflen; - - (void)strncat(h->buf, p, sz); - h->buflen += sz; - assert('\0' == h->buf[h->buflen]); -} - - -static void -buffmt_man(struct html *h, - const char *name, const char *sec) -{ - const char *p, *pp; - - pp = h->base_man; - - /* FIXME: URL-encode contents. */ - - while ((p = strchr(pp, '%'))) { - bufncat(h, pp, p - pp); - switch (*(p + 1)) { - case('S'): - bufcat(h, sec); + switch (np->tok) { + case MDOC_Fd: + case MDOC_Fn: + case MDOC_Fo: + case MDOC_In: + case MDOC_Vt: + break; + case MDOC_Ft: + if (n->tok != MDOC_Fn && n->tok != MDOC_Fo) break; - case('N'): - buffmt(h, name ? name : "1"); - break; - default: - bufncat(h, p, 2); - break; - } - pp = p + 2; + /* FALLTHROUGH */ + default: + print_otag(h, TAG_BR, ""); + return; } - if (pp) - bufcat(h, pp); + html_close_paragraph(h); + print_otag(h, TAG_P, "c", "Pp"); } - -static int -a2list(const struct mdoc_node *n) +void +html_mdoc(void *arg, const struct roff_meta *mdoc) { - int i; + struct html *h; + struct roff_node *n; + struct tag *t; - assert(MDOC_BLOCK == n->type && MDOC_Bl == n->tok); - assert(n->args); + h = (struct html *)arg; + n = mdoc->first->child; - 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; - } + if ((h->oflags & HTML_FRAGMENT) == 0) { + print_gen_decls(h); + print_otag(h, TAG_HTML, ""); + if (n != NULL && n->type == ROFFT_COMMENT) + print_gen_comment(h, n); + t = print_otag(h, TAG_HEAD, ""); + print_mdoc_head(mdoc, h); + print_tagq(h, t); + print_otag(h, TAG_BODY, ""); + } - abort(); - /* NOTREACHED */ -} - - -static int -a2width(const char *p) -{ - int i, len; - - 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) + 2); - - return(len + 2); -} - - -static int -a2offs(const char *p) -{ - 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); - - 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); -} - - -static void -print_mdoc(MDOC_ARGS) -{ - struct tag *t; - struct htmlpair tag; - - t = print_otag(h, TAG_HEAD, 0, NULL); - print_mdoc_head(m, n, h); + mdoc_root_pre(mdoc, h); + t = print_otag(h, TAG_DIV, "c", "manual-text"); + print_mdoc_nodelist(mdoc, n, h); print_tagq(h, t); - - t = print_otag(h, TAG_BODY, 0, NULL); - - tag.key = ATTR_CLASS; - tag.val = "body"; - print_otag(h, TAG_DIV, 1, &tag); - - print_mdoc_nodelist(m, n, h); - print_tagq(h, t); + mdoc_root_post(mdoc, h); + print_tagq(h, NULL); } - -/* ARGSUSED */ static void -print_mdoc_head(MDOC_ARGS) +print_mdoc_head(const struct roff_meta *meta, struct html *h) { - char b[BUFSIZ]; + char *cp; print_gen_head(h); - (void)snprintf(b, BUFSIZ - 1, - "%s(%d)", m->title, m->msec); + if (meta->arch != NULL && meta->msec != NULL) + mandoc_asprintf(&cp, "%s(%s) (%s)", meta->title, + meta->msec, meta->arch); + else if (meta->msec != NULL) + mandoc_asprintf(&cp, "%s(%s)", meta->title, meta->msec); + else if (meta->arch != NULL) + mandoc_asprintf(&cp, "%s (%s)", meta->title, meta->arch); + else + cp = mandoc_strdup(meta->title); - if (m->arch) { - (void)strlcat(b, " (", BUFSIZ); - (void)strlcat(b, m->arch, BUFSIZ); - (void)strlcat(b, ")", BUFSIZ); - } - - print_otag(h, TAG_TITLE, 0, NULL); - print_text(h, b); + print_otag(h, TAG_TITLE, ""); + print_text(h, cp); + free(cp); } - static void print_mdoc_nodelist(MDOC_ARGS) { - print_mdoc_node(m, n, h); - if (n->next) - print_mdoc_nodelist(m, n->next, h); + while (n != NULL) { + print_mdoc_node(meta, n, h); + n = n->next; + } } - static void print_mdoc_node(MDOC_ARGS) { - int child; struct tag *t; + int child; - child = 1; - t = SLIST_FIRST(&h->tags); + if (n->type == ROFFT_COMMENT || n->flags & NODE_NOPRT) + return; - bufinit(h); + if ((n->flags & NODE_NOFILL) == 0) + html_fillmode(h, ROFF_fi); + else if (html_fillmode(h, ROFF_nf) == ROFF_nf && + n->tok != ROFF_fi && n->flags & NODE_LINE) + print_endline(h); + child = 1; + n->flags &= ~NODE_ENDED; switch (n->type) { - case (MDOC_ROOT): - child = mdoc_root_pre(m, n, h); + case ROFFT_TEXT: + if (n->flags & NODE_LINE) { + switch (*n->string) { + case '\0': + h->col = 1; + print_endline(h); + return; + case ' ': + if ((h->flags & HTML_NONEWLINE) == 0 && + (n->flags & NODE_NOFILL) == 0) + print_otag(h, TAG_BR, ""); + break; + default: + break; + } + } + t = h->tag; + t->refcnt++; + if (n->flags & NODE_DELIMC) + h->flags |= HTML_NOSPACE; + if (n->flags & NODE_HREF) + print_tagged_text(h, n->string, n); + else + print_text(h, n->string); + if (n->flags & NODE_DELIMO) + h->flags |= HTML_NOSPACE; break; - case (MDOC_TEXT): - print_text(h, n->string); + case ROFFT_EQN: + t = h->tag; + t->refcnt++; + print_eqn(h, n->eqn); break; + case ROFFT_TBL: + /* + * This will take care of initialising all of the table + * state data for the first table, then tearing it down + * for the last one. + */ + print_tbl(h, n->span); + return; default: - if (mdocs[n->tok].pre) - child = (*mdocs[n->tok].pre)(m, n, h); + /* + * Close out the current table, if it's open, and unset + * the "meta" table state. This will be reopened on the + * next table element. + */ + if (h->tblt != NULL) + print_tblclose(h); + assert(h->tblt == NULL); + t = h->tag; + t->refcnt++; + if (n->tok < ROFF_MAX) { + roff_html_pre(h, n); + t->refcnt--; + print_stagq(h, t); + return; + } + assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX); + if (mdoc_html_acts[n->tok - MDOC_Dd].pre != NULL && + (n->end == ENDBODY_NOT || n->child != NULL)) + child = (*mdoc_html_acts[n->tok - MDOC_Dd].pre)(meta, + n, h); break; } - if (child && n->child) - print_mdoc_nodelist(m, n->child, h); + if (h->flags & HTML_KEEP && n->flags & NODE_LINE) { + h->flags &= ~HTML_KEEP; + h->flags |= HTML_PREKEEP; + } + if (child && n->child != NULL) + print_mdoc_nodelist(meta, n->child, h); + + t->refcnt--; print_stagq(h, t); - bufinit(h); - switch (n->type) { - case (MDOC_ROOT): - mdoc_root_post(m, n, h); + case ROFFT_TEXT: + case ROFFT_EQN: break; - case (MDOC_TEXT): - break; default: - if (mdocs[n->tok].post) - (*mdocs[n->tok].post)(m, n, h); + if (mdoc_html_acts[n->tok - MDOC_Dd].post == NULL || + n->flags & NODE_ENDED) + break; + (*mdoc_html_acts[n->tok - MDOC_Dd].post)(meta, n, h); + if (n->end != ENDBODY_NOT) + n->body->flags |= NODE_ENDED; break; } } - -/* ARGSUSED */ static void -mdoc_root_post(MDOC_ARGS) +mdoc_root_post(const struct roff_meta *meta, struct html *h) { - struct tm tm; - struct htmlpair tag[2]; struct tag *t, *tt; - char b[BUFSIZ]; - (void)localtime_r(&m->date, &tm); + t = print_otag(h, TAG_TABLE, "c", "foot"); + tt = print_otag(h, TAG_TR, ""); - if (0 == strftime(b, BUFSIZ - 1, "%B %e, %Y", &tm)) - err(EXIT_FAILURE, "strftime"); - - 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); - tt = print_otag(h, TAG_TR, 0, NULL); - - tag[0].key = ATTR_STYLE; - tag[0].val = "width: 50%;"; - print_otag(h, TAG_TD, 1, tag); - print_text(h, b); + print_otag(h, TAG_TD, "c", "foot-date"); + print_text(h, meta->date); print_stagq(h, tt); - tag[0].key = ATTR_STYLE; - tag[0].val = "width: 50%; text-align: right;"; - print_otag(h, TAG_TD, 1, tag); - print_text(h, m->os); + print_otag(h, TAG_TD, "c", "foot-os"); + print_text(h, meta->os); print_tagq(h, t); } - -/* ARGSUSED */ static int -mdoc_root_pre(MDOC_ARGS) +mdoc_root_pre(const struct roff_meta *meta, struct html *h) { - struct htmlpair tag[2]; struct tag *t, *tt; - char b[BUFSIZ], title[BUFSIZ]; + char *volume, *title; - (void)strlcpy(b, m->vol, BUFSIZ); + if (NULL == meta->arch) + volume = mandoc_strdup(meta->vol); + else + mandoc_asprintf(&volume, "%s (%s)", + meta->vol, meta->arch); - if (m->arch) { - (void)strlcat(b, " (", BUFSIZ); - (void)strlcat(b, m->arch, BUFSIZ); - (void)strlcat(b, ")", BUFSIZ); - } + if (NULL == meta->msec) + title = mandoc_strdup(meta->title); + else + mandoc_asprintf(&title, "%s(%s)", + meta->title, meta->msec); - (void)snprintf(title, BUFSIZ - 1, - "%s(%d)", m->title, m->msec); + t = print_otag(h, TAG_TABLE, "c", "head"); + tt = print_otag(h, TAG_TR, ""); - 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); - tt = print_otag(h, TAG_TR, 0, NULL); - - tag[0].key = ATTR_STYLE; - tag[0].val = "width: 10%;"; - print_otag(h, TAG_TD, 1, tag); + print_otag(h, TAG_TD, "c", "head-ltitle"); print_text(h, title); print_stagq(h, tt); - tag[0].key = ATTR_STYLE; - tag[0].val = "width: 80%; white-space: nowrap; text-align: center;"; - print_otag(h, TAG_TD, 1, tag); - print_text(h, b); + print_otag(h, TAG_TD, "c", "head-vol"); + print_text(h, volume); print_stagq(h, tt); - tag[0].key = ATTR_STYLE; - tag[0].val = "width: 10%; text-align: right;"; - print_otag(h, TAG_TD, 1, tag); + print_otag(h, TAG_TD, "c", "head-rtitle"); print_text(h, title); print_tagq(h, t); - return(1); + free(title); + free(volume); + return 1; } +static int +mdoc_code_pre(MDOC_ARGS) +{ + print_otag_id(h, TAG_CODE, roff_name[n->tok], n); + return 1; +} -/* ARGSUSED */ static int mdoc_sh_pre(MDOC_ARGS) { - struct htmlpair tag[2]; - const struct mdoc_node *nn; + struct roff_node *sn, *subn; + struct tag *t, *tsec, *tsub; + char *id; + int sc; - 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(h, nn->string); - if (nn->next) - bufncat(h, " ", 1); + switch (n->type) { + case ROFFT_BLOCK: + html_close_paragraph(h); + if ((h->oflags & HTML_TOC) == 0 || + h->flags & HTML_TOCDONE || + n->sec <= SEC_SYNOPSIS) { + print_otag(h, TAG_SECTION, "c", "Sh"); + break; } - tag[0].key = ATTR_NAME; - tag[0].val = h->buf; - print_otag(h, TAG_A, 1, tag); - return(1); - } else if (MDOC_BLOCK == n->type) { - tag[0].key = ATTR_CLASS; - tag[0].val = "sec-block"; - - if (n->prev && NULL == n->prev->body->child) { - print_otag(h, TAG_DIV, 1, tag); - return(1); + h->flags |= HTML_TOCDONE; + sc = 0; + for (sn = n->next; sn != NULL; sn = sn->next) + if (sn->sec == SEC_CUSTOM) + if (++sc == 2) + break; + if (sc < 2) + break; + t = print_otag(h, TAG_H1, "c", "Sh"); + print_text(h, "TABLE OF CONTENTS"); + print_tagq(h, t); + t = print_otag(h, TAG_UL, "c", "Bl-compact"); + for (sn = n; sn != NULL; sn = sn->next) { + tsec = print_otag(h, TAG_LI, ""); + id = html_make_id(sn->head, 0); + tsub = print_otag(h, TAG_A, "hR", id); + free(id); + print_mdoc_nodelist(meta, sn->head->child, h); + print_tagq(h, tsub); + tsub = NULL; + for (subn = sn->body->child; subn != NULL; + subn = subn->next) { + if (subn->tok != MDOC_Ss) + continue; + id = html_make_id(subn->head, 0); + if (id == NULL) + continue; + if (tsub == NULL) + print_otag(h, TAG_UL, + "c", "Bl-compact"); + tsub = print_otag(h, TAG_LI, ""); + print_otag(h, TAG_A, "hR", id); + free(id); + print_mdoc_nodelist(meta, + subn->head->child, h); + print_tagq(h, tsub); + } + print_tagq(h, tsec); } - - bufcat(h, "margin-top: 1em;"); - if (NULL == n->next) - bufcat(h, "margin-bottom: 1em;"); - - tag[1].key = ATTR_STYLE; - tag[1].val = h->buf; - - print_otag(h, TAG_DIV, 2, tag); - return(1); + print_tagq(h, t); + print_otag(h, TAG_SECTION, "c", "Sh"); + break; + case ROFFT_HEAD: + print_otag_id(h, TAG_H1, "Sh", n); + break; + case ROFFT_BODY: + if (n->sec == SEC_AUTHORS) + h->flags &= ~(HTML_SPLIT|HTML_NOSPLIT); + break; + default: + break; } - - buffmt(h, "margin-left: %dem;", INDENT); - - tag[0].key = ATTR_CLASS; - tag[0].val = "sec-body"; - tag[1].key = ATTR_STYLE; - tag[1].val = h->buf; - - print_otag(h, TAG_DIV, 2, tag); - return(1); + return 1; } - -/* ARGSUSED */ static int mdoc_ss_pre(MDOC_ARGS) { - struct htmlpair tag[2]; - int i; - const struct mdoc_node *nn; - - i = 0; - - if (MDOC_BODY == n->type) { - tag[i].key = ATTR_CLASS; - tag[i++].val = "ssec-body"; - if (n->parent->next && n->child) { - bufcat(h, "margin-bottom: 1em;"); - tag[i].key = ATTR_STYLE; - tag[i++].val = h->buf; - } - print_otag(h, TAG_DIV, i, tag); - return(1); - } else if (MDOC_BLOCK == n->type) { - tag[i].key = ATTR_CLASS; - tag[i++].val = "ssec-block"; - if (n->prev) { - bufcat(h, "margin-top: 1em;"); - tag[i].key = ATTR_STYLE; - tag[i++].val = h->buf; - } - print_otag(h, TAG_DIV, i, tag); - return(1); + switch (n->type) { + case ROFFT_BLOCK: + html_close_paragraph(h); + print_otag(h, TAG_SECTION, "c", "Ss"); + break; + case ROFFT_HEAD: + print_otag_id(h, TAG_H2, "Ss", n); + break; + case ROFFT_BODY: + break; + default: + abort(); } - - buffmt(h, "margin-left: -%dem;", INDENT - HALFINDENT); - - tag[0].key = ATTR_CLASS; - tag[0].val = "ssec-head"; - tag[1].key = ATTR_STYLE; - tag[1].val = h->buf; - - print_otag(h, TAG_DIV, 2, tag); - print_otag(h, TAG_SPAN, 1, tag); - - bufinit(h); - for (nn = n->child; nn; nn = nn->next) { - bufcat(h, nn->string); - if (nn->next) - bufcat(h, " "); - } - tag[0].key = ATTR_NAME; - tag[0].val = h->buf; - print_otag(h, TAG_A, 1, tag); - - return(1); + return 1; } - -/* ARGSUSED */ static int mdoc_fl_pre(MDOC_ARGS) { - struct htmlpair tag; + struct roff_node *nn; - tag.key = ATTR_CLASS; - tag.val = "flag"; - - print_otag(h, TAG_SPAN, 1, &tag); - if (MDOC_Fl == n->tok) { - print_text(h, "\\-"); + print_otag_id(h, TAG_CODE, "Fl", n); + print_text(h, "\\-"); + if (n->child != NULL || + ((nn = roff_node_next(n)) != NULL && + nn->type != ROFFT_TEXT && + (nn->flags & NODE_LINE) == 0)) h->flags |= HTML_NOSPACE; - } - return(1); + + return 1; } - -/* ARGSUSED */ static int mdoc_nd_pre(MDOC_ARGS) { - struct htmlpair tag; - - if (MDOC_BODY != n->type) - return(1); - - /* XXX - this can contain block elements! */ + switch (n->type) { + case ROFFT_BLOCK: + return 1; + case ROFFT_HEAD: + return 0; + case ROFFT_BODY: + break; + default: + abort(); + } print_text(h, "\\(em"); - tag.key = ATTR_CLASS; - tag.val = "desc-body"; - print_otag(h, TAG_SPAN, 1, &tag); - return(1); + print_otag(h, TAG_SPAN, "c", "Nd"); + return 1; } - -/* ARGSUSED */ static int -mdoc_op_pre(MDOC_ARGS) -{ - struct htmlpair tag; - - if (MDOC_BODY != n->type) - return(1); - - /* XXX - this can contain block elements! */ - print_text(h, "\\(lB"); - h->flags |= HTML_NOSPACE; - tag.key = ATTR_CLASS; - tag.val = "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; - - 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); - } - - tag.key = ATTR_CLASS; - tag.val = "name"; - - print_otag(h, TAG_SPAN, 1, &tag); - if (NULL == n->child) - print_text(h, m->name); - - return(1); + switch (n->type) { + case ROFFT_BLOCK: + break; + case ROFFT_HEAD: + print_otag(h, TAG_TD, ""); + /* FALLTHROUGH */ + case ROFFT_ELEM: + print_otag(h, TAG_CODE, "c", "Nm"); + return 1; + case ROFFT_BODY: + print_otag(h, TAG_TD, ""); + return 1; + default: + abort(); + } + html_close_paragraph(h); + synopsis_pre(h, n); + print_otag(h, TAG_TABLE, "c", "Nm"); + print_otag(h, TAG_TR, ""); + return 1; } - -/* ARGSUSED */ static int mdoc_xr_pre(MDOC_ARGS) { - struct htmlpair tag[2]; - const struct mdoc_node *nn; + if (NULL == n->child) + return 0; - buffmt_man(h, n->child->string, - n->child->next ? - n->child->next->string : NULL); + if (h->base_man1) + print_otag(h, TAG_A, "chM", "Xr", + n->child->string, n->child->next == NULL ? + NULL : n->child->next->string); + else + print_otag(h, TAG_A, "c", "Xr"); - tag[0].key = ATTR_CLASS; - tag[0].val = "link-man"; - tag[1].key = ATTR_HREF; - tag[1].val = h->buf; - print_otag(h, TAG_A, 2, tag); + n = n->child; + print_text(h, n->string); - nn = n->child; - print_text(h, nn->string); + if (NULL == (n = n->next)) + return 0; - if (NULL == (nn = nn->next)) - return(0); - h->flags |= HTML_NOSPACE; print_text(h, "("); h->flags |= HTML_NOSPACE; - print_text(h, nn->string); + print_text(h, n->string); h->flags |= HTML_NOSPACE; print_text(h, ")"); - - return(0); + return 0; } - -/* ARGSUSED */ static int -mdoc_ns_pre(MDOC_ARGS) +mdoc_tg_pre(MDOC_ARGS) { + char *id; - h->flags |= HTML_NOSPACE; - return(1); -} - - -/* ARGSUSED */ -static int -mdoc_ar_pre(MDOC_ARGS) -{ - struct htmlpair tag; - - tag.key = ATTR_CLASS; - tag.val = "arg"; - - print_otag(h, TAG_SPAN, 1, &tag); - return(1); -} - - -/* ARGSUSED */ -static int -mdoc_xx_pre(MDOC_ARGS) -{ - const char *pp; - struct htmlpair tag; - - switch (n->tok) { - case (MDOC_Bsx): - pp = "BSDI BSD/OS"; - break; - case (MDOC_Dx): - pp = "DragonFlyBSD"; - break; - case (MDOC_Fx): - pp = "FreeBSD"; - break; - case (MDOC_Nx): - pp = "NetBSD"; - break; - case (MDOC_Ox): - pp = "OpenBSD"; - break; - case (MDOC_Ux): - pp = "UNIX"; - break; - default: - return(1); + if ((id = html_make_id(n, 1)) != NULL) { + print_tagq(h, print_otag(h, TAG_MARK, "i", id)); + free(id); } - - tag.key = ATTR_CLASS; - tag.val = "unix"; - - print_otag(h, TAG_SPAN, 1, &tag); - print_text(h, pp); - return(1); + return 0; } - -/* ARGSUSED */ static int -mdoc_bx_pre(MDOC_ARGS) +mdoc_ns_pre(MDOC_ARGS) { - const struct mdoc_node *nn; - struct htmlpair tag; - tag.key = ATTR_CLASS; - tag.val = "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) + if ( ! (NODE_LINE & n->flags)) h->flags |= HTML_NOSPACE; - - print_text(h, "BSD"); - return(0); + return 1; } - -/* ARGSUSED */ static int -mdoc_tbl_block_pre(MDOC_ARGS, int t, int w, int o, int c) +mdoc_ar_pre(MDOC_ARGS) { - struct htmlpair tag; - const struct mdoc_node *nn; - - switch (t) { - case (MDOC_Column): - /* FALLTHROUGH */ - case (MDOC_Item): - /* FALLTHROUGH */ - case (MDOC_Ohang): - buffmt(h, "margin-left: %dem; clear: both;", o); - break; - default: - buffmt(h, "margin-left: %dem; clear: both;", w + o); - break; - } - - if ( ! c && MDOC_Column != t) { - for (nn = n; nn; nn = nn->parent) { - if (MDOC_BLOCK != nn->type) - continue; - switch (nn->tok) { - case (MDOC_Ss): - /* FALLTHROUGH */ - case (MDOC_Sh): - c = 1; - break; - default: - break; - } - if (nn->prev) - break; - } - if (MDOC_Diag == t && n->prev) - if (NULL == n->prev->body->child) - c = 1; - if ( ! c) - bufcat(h, "padding-top: 1em;"); - } - - tag.key = ATTR_STYLE; - tag.val = h->buf; - print_otag(h, TAG_DIV, 1, &tag); - return(1); + print_otag(h, TAG_VAR, "c", "Ar"); + return 1; } - -/* ARGSUSED */ static int -mdoc_tbl_body_pre(MDOC_ARGS, int t, int w) +mdoc_xx_pre(MDOC_ARGS) { - - print_otag(h, TAG_DIV, 0, NULL); - return(1); + print_otag(h, TAG_SPAN, "c", "Ux"); + return 1; } - -/* ARGSUSED */ static int -mdoc_tbl_head_pre(MDOC_ARGS, int t, int w) +mdoc_it_pre(MDOC_ARGS) { - struct htmlpair tag; - struct ord *ord; - char nbuf[BUFSIZ]; + const struct roff_node *bl; + enum mdoc_list type; - switch (t) { - case (MDOC_Item): - /* FALLTHROUGH */ - case (MDOC_Ohang): - print_otag(h, TAG_DIV, 0, NULL); + bl = n->parent; + while (bl->tok != MDOC_Bl) + bl = bl->parent; + type = bl->norm->Bl.type; + + switch (type) { + case LIST_bullet: + case LIST_dash: + case LIST_hyphen: + case LIST_item: + case LIST_enum: + switch (n->type) { + case ROFFT_HEAD: + return 0; + case ROFFT_BODY: + print_otag_id(h, TAG_LI, NULL, n); + break; + default: + break; + } break; - case (MDOC_Column): - buffmt(h, "min-width: %dem;", w); - bufcat(h, "clear: none;"); - if (n->next && MDOC_HEAD == n->next->type) - bufcat(h, "float: left;"); - tag.key = ATTR_STYLE; - tag.val = h->buf; - print_otag(h, TAG_DIV, 1, &tag); + case LIST_diag: + case LIST_hang: + case LIST_inset: + case LIST_ohang: + switch (n->type) { + case ROFFT_HEAD: + print_otag_id(h, TAG_DT, NULL, n); + break; + case ROFFT_BODY: + print_otag(h, TAG_DD, ""); + break; + default: + break; + } break; - default: - buffmt(h, "margin-left: -%dem; min-width: %dem;", - w, w ? w - 1 : 0); - bufcat(h, "clear: left;"); - if (n->next && n->next->child) - bufcat(h, "float: left;"); - bufcat(h, "padding-right: 1em;"); - tag.key = ATTR_STYLE; - tag.val = h->buf; - print_otag(h, TAG_DIV, 1, &tag); + case LIST_tag: + switch (n->type) { + case ROFFT_HEAD: + print_otag_id(h, TAG_DT, NULL, n); + break; + case ROFFT_BODY: + if (n->child == NULL) { + print_otag(h, TAG_DD, "s", "width", "auto"); + print_text(h, "\\ "); + } else + print_otag(h, TAG_DD, ""); + break; + default: + break; + } break; - } - - switch (t) { - case (MDOC_Diag): - tag.key = ATTR_CLASS; - tag.val = "diag"; - print_otag(h, TAG_SPAN, 1, &tag); - break; - case (MDOC_Enum): - ord = SLIST_FIRST(&h->ords); - assert(ord); - nbuf[BUFSIZ - 1] = 0; - (void)snprintf(nbuf, BUFSIZ - 1, "%d.", ord->pos++); - print_text(h, nbuf); - return(0); - case (MDOC_Dash): - print_text(h, "\\(en"); - return(0); - case (MDOC_Hyphen): - print_text(h, "\\(hy"); - return(0); - case (MDOC_Bullet): - print_text(h, "\\(bu"); - return(0); + case LIST_column: + switch (n->type) { + case ROFFT_HEAD: + break; + case ROFFT_BODY: + print_otag(h, TAG_TD, ""); + break; + default: + print_otag_id(h, TAG_TR, NULL, n); + } default: break; } - return(1); + return 1; } - static int -mdoc_tbl_pre(MDOC_ARGS, int type) +mdoc_bl_pre(MDOC_ARGS) { - int i, w, o, c, wp; - const struct mdoc_node *bl, *nn; + char cattr[32]; + struct mdoc_bl *bl; + enum htmltag elemtype; - bl = n->parent->parent; - if (MDOC_BLOCK != n->type) - bl = bl->parent; - - assert(bl->args); - - w = o = c = 0; - wp = -1; - - 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 (n->type) { + case ROFFT_BLOCK: + html_close_paragraph(h); + break; + case ROFFT_HEAD: + return 0; + case ROFFT_BODY: + return 1; + default: + abort(); } - switch (type) { - case (MDOC_Enum): - /* FALLTHROUGH */ - case (MDOC_Dash): - /* FALLTHROUGH */ - case (MDOC_Hyphen): - /* FALLTHROUGH */ - case (MDOC_Bullet): - if (w < 4) - w = 4; + bl = &n->norm->Bl; + switch (bl->type) { + case LIST_bullet: + elemtype = TAG_UL; + (void)strlcpy(cattr, "Bl-bullet", sizeof(cattr)); break; - case (MDOC_Inset): - /* FALLTHROUGH */ - case (MDOC_Diag): - w = 1; + case LIST_dash: + case LIST_hyphen: + elemtype = TAG_UL; + (void)strlcpy(cattr, "Bl-dash", sizeof(cattr)); break; - default: - if (0 == w) - w = 10; + case LIST_item: + elemtype = TAG_UL; + (void)strlcpy(cattr, "Bl-item", sizeof(cattr)); break; - } - - switch (n->type) { - case (MDOC_BLOCK): + case LIST_enum: + elemtype = TAG_OL; + (void)strlcpy(cattr, "Bl-enum", sizeof(cattr)); 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)); + case LIST_diag: + elemtype = TAG_DL; + (void)strlcpy(cattr, "Bl-diag", sizeof(cattr)); + break; + case LIST_hang: + elemtype = TAG_DL; + (void)strlcpy(cattr, "Bl-hang", sizeof(cattr)); + break; + case LIST_inset: + elemtype = TAG_DL; + (void)strlcpy(cattr, "Bl-inset", sizeof(cattr)); + break; + case LIST_ohang: + elemtype = TAG_DL; + (void)strlcpy(cattr, "Bl-ohang", sizeof(cattr)); + break; + case LIST_tag: + if (bl->offs) + print_otag(h, TAG_DIV, "c", "Bd-indent"); + print_otag_id(h, TAG_DL, + bl->comp ? "Bl-tag Bl-compact" : "Bl-tag", n->body); + return 1; + case LIST_column: + elemtype = TAG_TABLE; + (void)strlcpy(cattr, "Bl-column", sizeof(cattr)); + break; default: abort(); - /* NOTREACHED */ } - - return(mdoc_tbl_block_pre(m, n, h, type, w, o, c)); + if (bl->offs != NULL) + (void)strlcat(cattr, " Bd-indent", sizeof(cattr)); + if (bl->comp) + (void)strlcat(cattr, " Bl-compact", sizeof(cattr)); + print_otag_id(h, elemtype, cattr, n->body); + return 1; } - -/* ARGSUSED */ static int -mdoc_bl_pre(MDOC_ARGS) -{ - struct ord *ord; - - if (MDOC_BLOCK != n->type) - return(1); - if (MDOC_Enum != a2list(n)) - return(1); - - /* Allocate an -enum on the stack of indices. */ - - ord = malloc(sizeof(struct ord)); - if (NULL == ord) - err(EXIT_FAILURE, "malloc"); - ord->cookie = n; - ord->pos = 1; - SLIST_INSERT_HEAD(&h->ords, ord, entry); - - return(1); -} - - -/* ARGSUSED */ -static void -mdoc_bl_post(MDOC_ARGS) -{ - struct ord *ord; - - if (MDOC_BLOCK != n->type) - return; - if (MDOC_Enum != a2list(n)) - return; - - ord = SLIST_FIRST(&h->ords); - assert(ord); - SLIST_REMOVE_HEAD(&h->ords, entry); - 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) { - const struct mdoc_node *nn; - struct tag *t; - struct htmlpair tag; - - print_text(h, "The"); - - tag.key = ATTR_CLASS; - tag.val = "utility"; - - for (nn = n->child; nn; nn = nn->next) { - 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 - h->flags &= ~HTML_NOSPACE; - } - - if (n->child->next) - print_text(h, "utilities exit"); - else - print_text(h, "utility exits"); - - print_text(h, "0 on success, and >0 if an error occurs."); - return(0); + if (roff_node_prev(n) != NULL) + print_otag(h, TAG_BR, ""); + return 1; } - -/* ARGSUSED */ static int -mdoc_dq_pre(MDOC_ARGS) +mdoc_st_pre(MDOC_ARGS) { - - if (MDOC_BODY != n->type) - return(1); - print_text(h, "\\(lq"); - h->flags |= HTML_NOSPACE; - return(1); + print_otag(h, TAG_SPAN, "c", "St"); + 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; - - tag.key = ATTR_CLASS; - tag.val = "emph"; - - print_otag(h, TAG_SPAN, 1, &tag); - return(1); + print_otag_id(h, TAG_I, "Em", n); + return 1; } - -/* ARGSUSED */ static int mdoc_d1_pre(MDOC_ARGS) { - struct htmlpair tag[2]; - - if (MDOC_BLOCK != n->type) - return(1); - - buffmt(h, "margin-left: %dem;", INDENT); - - tag[0].key = ATTR_CLASS; - tag[0].val = "lit"; - tag[1].key = ATTR_STYLE; - tag[1].val = h->buf; - - print_otag(h, TAG_DIV, 2, tag); - return(1); + switch (n->type) { + case ROFFT_BLOCK: + html_close_paragraph(h); + return 1; + case ROFFT_HEAD: + return 0; + case ROFFT_BODY: + break; + default: + abort(); + } + print_otag_id(h, TAG_DIV, "Bd Bd-indent", n); + if (n->tok == MDOC_Dl) + print_otag(h, TAG_CODE, "c", "Li"); + return 1; } - -/* ARGSUSED */ static int mdoc_sx_pre(MDOC_ARGS) { - struct htmlpair tag[2]; - const struct mdoc_node *nn; + char *id; - bufcat(h, "#"); - for (nn = n->child; nn; nn = nn->next) { - bufcat(h, nn->string); - if (nn->next) - bufcat(h, " "); - } - - tag[0].key = ATTR_HREF; - tag[0].val = h->buf; - tag[1].key = ATTR_CLASS; - tag[1].val = "link-sec"; - - print_otag(h, TAG_A, 2, tag); - return(1); + id = html_make_id(n, 0); + print_otag(h, TAG_A, "chR", "Sx", id); + free(id); + return 1; } - -/* 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]; - int t, c, o, i; - const struct mdoc_node *bl, *nn; + char buf[20]; + struct roff_node *nn; + int comp; - if (MDOC_BLOCK == n->type) - bl = n; - else if (MDOC_HEAD == n->type) - return(0); - else - bl = n->parent; + switch (n->type) { + case ROFFT_BLOCK: + html_close_paragraph(h); + return 1; + case ROFFT_HEAD: + return 0; + case ROFFT_BODY: + break; + default: + abort(); + } - t = o = c = 0; + /* Handle preceding whitespace. */ - 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]); + comp = n->norm->Bd.comp; + for (nn = n; nn != NULL && comp == 0; nn = nn->parent) { + if (nn->type != ROFFT_BLOCK) + continue; + if (nn->tok == MDOC_Sh || nn->tok == MDOC_Ss) + comp = 1; + if (roff_node_prev(nn) != NULL) 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; - } - - if (MDOC_BLOCK == n->type) { - if (o) - buffmt(h, "margin-left: %dem;", o); - if ( ! c) { - for (nn = n; nn; nn = nn->parent) { - if (MDOC_BLOCK != nn->type) - continue; - switch (nn->tok) { - case (MDOC_Ss): - /* FALLTHROUGH */ - case (MDOC_Sh): - c = 1; - break; - default: - break; - } - if (nn->prev) - break; - } - if ( ! c) - bufcat(h, "margin-top: 1em;"); - } - tag[0].key = ATTR_STYLE; - tag[0].val = h->buf; - print_otag(h, TAG_DIV, 1, tag); - return(1); } + (void)strlcpy(buf, "Bd", sizeof(buf)); + if (comp == 0) + (void)strlcat(buf, " Pp", sizeof(buf)); - if (MDOC_Unfilled != t && MDOC_Literal != t) - return(1); + /* Handle the -offset argument. */ - bufcat(h, "white-space: pre;"); - tag[0].key = ATTR_STYLE; - tag[0].val = h->buf; - tag[1].key = ATTR_CLASS; - tag[1].val = "lit"; + if (n->norm->Bd.offs != NULL && + strcmp(n->norm->Bd.offs, "left") != 0) + (void)strlcat(buf, " Bd-indent", sizeof(buf)); - print_otag(h, TAG_DIV, 2, tag); + if (n->norm->Bd.type == DISP_literal) + (void)strlcat(buf, " Li", sizeof(buf)); - for (nn = n->child; nn; nn = nn->next) { - print_mdoc_node(m, nn, h); - if (NULL == nn->next) - continue; - if (nn->prev && nn->prev->line < nn->line) - print_text(h, "\n"); - } - - return(0); + print_otag_id(h, TAG_DIV, buf, n); + return 1; } - -/* ARGSUSED */ static int mdoc_pa_pre(MDOC_ARGS) { - struct htmlpair tag; - - tag.key = ATTR_CLASS; - tag.val = "file"; - - print_otag(h, TAG_SPAN, 1, &tag); - return(1); + print_otag(h, TAG_SPAN, "c", "Pa"); + return 1; } - -/* ARGSUSED */ static int mdoc_ad_pre(MDOC_ARGS) { - struct htmlpair tag; - - tag.key = ATTR_CLASS; - tag.val = "addr"; - print_otag(h, TAG_SPAN, 1, &tag); - return(1); + print_otag(h, TAG_SPAN, "c", "Ad"); + return 1; } - -/* ARGSUSED */ static int mdoc_an_pre(MDOC_ARGS) { - struct htmlpair tag; + if (n->norm->An.auth == AUTH_split) { + h->flags &= ~HTML_NOSPLIT; + h->flags |= HTML_SPLIT; + return 0; + } + if (n->norm->An.auth == AUTH_nosplit) { + h->flags &= ~HTML_SPLIT; + h->flags |= HTML_NOSPLIT; + return 0; + } - tag.key = ATTR_CLASS; - tag.val = "author"; - print_otag(h, TAG_SPAN, 1, &tag); - return(1); -} + if (h->flags & HTML_SPLIT) + print_otag(h, TAG_BR, ""); + if (n->sec == SEC_AUTHORS && ! (h->flags & HTML_NOSPLIT)) + h->flags |= HTML_SPLIT; -/* ARGSUSED */ -static int -mdoc_cd_pre(MDOC_ARGS) -{ - struct htmlpair tag; - - tag.key = ATTR_CLASS; - tag.val = "config"; - print_otag(h, TAG_SPAN, 1, &tag); - return(1); + print_otag(h, TAG_SPAN, "c", "An"); + return 1; } - -/* ARGSUSED */ static int -mdoc_dv_pre(MDOC_ARGS) +mdoc_cd_pre(MDOC_ARGS) { - struct htmlpair tag; - - tag.key = ATTR_CLASS; - tag.val = "define"; - print_otag(h, TAG_SPAN, 1, &tag); - return(1); + synopsis_pre(h, n); + print_otag(h, TAG_CODE, "c", "Cd"); + return 1; } - -/* ARGSUSED */ static int -mdoc_ev_pre(MDOC_ARGS) -{ - struct htmlpair tag; - - tag.key = ATTR_CLASS; - tag.val = "env"; - print_otag(h, TAG_SPAN, 1, &tag); - return(1); -} - - -/* ARGSUSED */ -static int -mdoc_er_pre(MDOC_ARGS) -{ - struct htmlpair tag; - - tag.key = ATTR_CLASS; - tag.val = "errno"; - print_otag(h, TAG_SPAN, 1, &tag); - return(1); -} - - -/* ARGSUSED */ -static int mdoc_fa_pre(MDOC_ARGS) { - const struct mdoc_node *nn; - struct htmlpair tag; + const struct roff_node *nn; struct tag *t; - tag.key = ATTR_CLASS; - tag.val = "farg"; - if (n->parent->tok != MDOC_Fo) { - print_otag(h, TAG_SPAN, 1, &tag); - return(1); + print_otag(h, TAG_VAR, "c", "Fa"); + return 1; } - - for (nn = n->child; nn; nn = nn->next) { - t = print_otag(h, TAG_SPAN, 1, &tag); + for (nn = n->child; nn != NULL; nn = nn->next) { + t = print_otag(h, TAG_VAR, "c", "Fa"); print_text(h, nn->string); print_tagq(h, t); - if (nn->next) + if (nn->next != NULL) { + h->flags |= HTML_NOSPACE; print_text(h, ","); + } } - - if (n->child && n->next && n->next->tok == MDOC_Fa) + if (n->child != NULL && + (nn = roff_node_next(n)) != NULL && + nn->tok == MDOC_Fa) { + h->flags |= HTML_NOSPACE; print_text(h, ","); - - return(0); + } + return 0; } - -/* ARGSUSED */ static int mdoc_fd_pre(MDOC_ARGS) { - struct htmlpair tag; + struct tag *t; + char *buf, *cp; - 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); + synopsis_pre(h, n); + + if (NULL == (n = n->child)) + return 0; + + assert(n->type == ROFFT_TEXT); + + if (strcmp(n->string, "#include")) { + print_otag(h, TAG_CODE, "c", "Fd"); + return 1; + } + + print_otag(h, TAG_CODE, "c", "In"); + print_text(h, n->string); + + if (NULL != (n = n->next)) { + assert(n->type == ROFFT_TEXT); + + if (h->base_includes) { + cp = n->string; + if (*cp == '<' || *cp == '"') + cp++; + buf = mandoc_strdup(cp); + cp = strchr(buf, '\0') - 1; + if (cp >= buf && (*cp == '>' || *cp == '"')) + *cp = '\0'; + t = print_otag(h, TAG_A, "chI", "In", buf); + free(buf); } else - print_otag(h, TAG_DIV, 0, NULL); + t = print_otag(h, TAG_A, "c", "In"); + + print_text(h, n->string); + print_tagq(h, t); + + n = n->next; } - tag.key = ATTR_CLASS; - tag.val = "macro"; - print_otag(h, TAG_SPAN, 1, &tag); - return(1); + for ( ; n; n = n->next) { + assert(n->type == ROFFT_TEXT); + print_text(h, n->string); + } + + return 0; } - -/* ARGSUSED */ static int mdoc_vt_pre(MDOC_ARGS) { - struct htmlpair tag; + if (n->type == ROFFT_BLOCK) { + synopsis_pre(h, n); + return 1; + } else if (n->type == ROFFT_ELEM) { + synopsis_pre(h, n); + } else if (n->type == ROFFT_HEAD) + return 0; - 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); - } - - tag.key = ATTR_CLASS; - tag.val = "type"; - print_otag(h, TAG_SPAN, 1, &tag); - return(1); + print_otag(h, TAG_VAR, "c", "Vt"); + return 1; } - -/* ARGSUSED */ static int mdoc_ft_pre(MDOC_ARGS) { - struct htmlpair tag; - - if (SEC_SYNOPSIS == n->sec) { - if (n->prev && MDOC_Fo == n->prev->tok) { - tag.key = ATTR_STYLE; - tag.val = "margin-top: 1em;"; - print_otag(h, TAG_DIV, 1, &tag); - } else - print_otag(h, TAG_DIV, 0, NULL); - } - - tag.key = ATTR_CLASS; - tag.val = "ftype"; - print_otag(h, TAG_SPAN, 1, &tag); - return(1); + synopsis_pre(h, n); + print_otag(h, TAG_VAR, "c", "Ft"); + return 1; } - -/* ARGSUSED */ static int mdoc_fn_pre(MDOC_ARGS) { - struct tag *t; - struct htmlpair tag[2]; - const struct mdoc_node *nn; - char nbuf[BUFSIZ]; - const char *sp, *ep; - int sz, i; + struct tag *t; + char nbuf[BUFSIZ]; + const char *sp, *ep; + int sz, pretty; - if (SEC_SYNOPSIS == n->sec) { - bufcat(h, "margin-left: 6em;"); - bufcat(h, "text-indent: -6em;"); - if (n->next) - bufcat(h, "margin-bottom: 1em;"); - tag[0].key = ATTR_STYLE; - tag[0].val = h->buf; - print_otag(h, TAG_DIV, 1, tag); - } + pretty = NODE_SYNPRETTY & n->flags; + synopsis_pre(h, n); /* Split apart into type and name. */ - - tag[0].key = ATTR_CLASS; - tag[0].val = "ftype"; - t = print_otag(h, TAG_SPAN, 1, tag); - assert(n->child->string); sp = n->child->string; - while (NULL != (ep = strchr(sp, ' '))) { - sz = MIN((int)(ep - sp), BUFSIZ - 1); - (void)memcpy(nbuf, sp, (size_t)sz); - nbuf[sz] = '\0'; - print_text(h, nbuf); - sp = ++ep; - } - print_tagq(h, t); + ep = strchr(sp, ' '); + if (NULL != ep) { + t = print_otag(h, TAG_VAR, "c", "Ft"); - tag[0].key = ATTR_CLASS; - tag[0].val = "fname"; - t = print_otag(h, TAG_SPAN, 1, tag); - - if (sp) { - (void)strlcpy(nbuf, sp, BUFSIZ); - print_text(h, nbuf); + 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); } + t = print_otag_id(h, TAG_CODE, "Fn", n); + + if (sp) + print_text(h, sp); + print_tagq(h, t); h->flags |= HTML_NOSPACE; print_text(h, "("); + h->flags |= HTML_NOSPACE; - for (nn = n->child->next; nn; nn = nn->next) { - i = 0; - tag[i].key = ATTR_CLASS; - tag[i++].val = "farg"; - if (SEC_SYNOPSIS == n->sec) { - tag[i].key = ATTR_STYLE; - tag[i++].val = "white-space: nowrap;"; - } - - t = print_otag(h, TAG_SPAN, i, tag); - print_text(h, nn->string); + for (n = n->child->next; n; n = n->next) { + if (NODE_SYNPRETTY & n->flags) + t = print_otag(h, TAG_VAR, "cs", "Fa", + "white-space", "nowrap"); + else + t = print_otag(h, TAG_VAR, "c", "Fa"); + print_text(h, n->string); print_tagq(h, t); - if (nn->next) + if (n->next) { + h->flags |= HTML_NOSPACE; print_text(h, ","); + } } + h->flags |= HTML_NOSPACE; print_text(h, ")"); - if (SEC_SYNOPSIS == n->sec) + if (pretty) { + h->flags |= HTML_NOSPACE; print_text(h, ";"); + } - return(0); + return 0; } - -/* ARGSUSED */ static int -mdoc_sp_pre(MDOC_ARGS) +mdoc_sm_pre(MDOC_ARGS) { - int len; - struct htmlpair tag; - switch (n->tok) { - case (MDOC_sp): - len = n->child ? atoi(n->child->string) : 1; - break; - case (MDOC_br): - len = 0; - break; - default: - len = 1; - break; - } + if (NULL == n->child) + h->flags ^= HTML_NONOSPACE; + else if (0 == strcmp("on", n->child->string)) + h->flags &= ~HTML_NONOSPACE; + else + h->flags |= HTML_NONOSPACE; - buffmt(h, "height: %dem", len); - tag.key = ATTR_STYLE; - tag.val = h->buf; - print_otag(h, TAG_DIV, 1, &tag); - return(1); + if ( ! (HTML_NONOSPACE & h->flags)) + h->flags &= ~HTML_NOSPACE; + return 0; } - -/* ARGSUSED */ static int -mdoc_brq_pre(MDOC_ARGS) +mdoc_skip_pre(MDOC_ARGS) { - if (MDOC_BODY != n->type) - return(1); - print_text(h, "\\(lC"); - h->flags |= HTML_NOSPACE; - return(1); + return 0; } - -/* ARGSUSED */ -static void -mdoc_brq_post(MDOC_ARGS) +static int +mdoc_pp_pre(MDOC_ARGS) { + char *id; - if (MDOC_BODY != n->type) - return; - h->flags |= HTML_NOSPACE; - print_text(h, "\\(rC"); + if (n->flags & NODE_NOFILL) { + print_endline(h); + if (n->flags & NODE_ID) + mdoc_tg_pre(meta, n, h); + else { + h->col = 1; + print_endline(h); + } + } else { + html_close_paragraph(h); + id = n->flags & NODE_ID ? html_make_id(n, 1) : NULL; + print_otag(h, TAG_P, "ci", "Pp", id); + free(id); + } + return 0; } - -/* ARGSUSED */ static int mdoc_lk_pre(MDOC_ARGS) { - const struct mdoc_node *nn; - struct htmlpair tag[2]; + const struct roff_node *link, *descr, *punct; + struct tag *t; - nn = n->child; + if ((link = n->child) == NULL) + return 0; - tag[0].key = ATTR_CLASS; - tag[0].val = "link-ext"; - tag[1].key = ATTR_HREF; - tag[1].val = nn->string; + /* Find beginning of trailing punctuation. */ + punct = n->last; + while (punct != link && punct->flags & NODE_DELIMC) + punct = punct->prev; + punct = punct->next; - print_otag(h, TAG_A, 2, tag); + /* Link target and link text. */ + descr = link->next; + if (descr == punct) + descr = link; /* no text */ + t = print_otag(h, TAG_A, "ch", "Lk", link->string); + do { + if (descr->flags & (NODE_DELIMC | NODE_DELIMO)) + h->flags |= HTML_NOSPACE; + print_text(h, descr->string); + descr = descr->next; + } while (descr != punct); + print_tagq(h, t); - if (NULL == nn->next) - return(1); - - for (nn = nn->next; nn; nn = nn->next) - print_text(h, nn->string); - - return(0); + /* Trailing punctuation. */ + while (punct != NULL) { + h->flags |= HTML_NOSPACE; + print_text(h, punct->string); + punct = punct->next; + } + return 0; } - -/* ARGSUSED */ static int mdoc_mt_pre(MDOC_ARGS) { - struct htmlpair tag[2]; - struct tag *t; - const struct mdoc_node *nn; + struct tag *t; + char *cp; - tag[0].key = ATTR_CLASS; - tag[0].val = "link-mail"; - - for (nn = n->child; nn; nn = nn->next) { - bufinit(h); - bufcat(h, "mailto:"); - bufcat(h, nn->string); - - tag[1].key = ATTR_HREF; - tag[1].val = h->buf; - - t = print_otag(h, TAG_A, 2, tag); - print_text(h, nn->string); + for (n = n->child; n; n = n->next) { + assert(n->type == ROFFT_TEXT); + mandoc_asprintf(&cp, "mailto:%s", n->string); + t = print_otag(h, TAG_A, "ch", "Mt", cp); + print_text(h, n->string); print_tagq(h, t); + free(cp); } - - return(0); + return 0; } - -/* ARGSUSED */ static int mdoc_fo_pre(MDOC_ARGS) { - struct htmlpair tag; + struct tag *t; - if (MDOC_BODY == n->type) { + switch (n->type) { + case ROFFT_BLOCK: + synopsis_pre(h, n); + return 1; + case ROFFT_HEAD: + if (n->child != NULL) { + t = print_otag_id(h, TAG_CODE, "Fn", n); + print_text(h, n->child->string); + print_tagq(h, t); + } + return 0; + case ROFFT_BODY: h->flags |= HTML_NOSPACE; print_text(h, "("); h->flags |= HTML_NOSPACE; - return(1); - } else if (MDOC_BLOCK == n->type) - return(1); - - tag.key = ATTR_CLASS; - tag.val = "fname"; - print_otag(h, TAG_SPAN, 1, &tag); - return(1); + return 1; + default: + abort(); + } } - -/* ARGSUSED */ static void mdoc_fo_post(MDOC_ARGS) { - if (MDOC_BODY != n->type) + if (n->type != ROFFT_BODY) return; h->flags |= HTML_NOSPACE; print_text(h, ")"); @@ -1890,400 +1325,438 @@ mdoc_fo_post(MDOC_ARGS) print_text(h, ";"); } - -/* ARGSUSED */ static int mdoc_in_pre(MDOC_ARGS) { - const struct mdoc_node *nn; - struct htmlpair tag; + struct tag *t; - if (SEC_SYNOPSIS == n->sec) { - if (n->next && MDOC_In != 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); + print_otag(h, TAG_CODE, "c", "In"); - tag.key = ATTR_CLASS; - tag.val = "includes"; + /* + * The first argument of the `In' gets special treatment as + * being a linked value. Subsequent values are printed + * afterward. groff does similarly. This also handles the case + * of no children. + */ - print_otag(h, TAG_SPAN, 1, &tag); - - if (SEC_SYNOPSIS == n->sec) + if (NODE_SYNPRETTY & n->flags && NODE_LINE & n->flags) print_text(h, "#include"); print_text(h, "<"); h->flags |= HTML_NOSPACE; - /* XXX -- see warning in termp_in_post(). */ + if (NULL != (n = n->child)) { + assert(n->type == ROFFT_TEXT); - for (nn = n->child; nn; nn = nn->next) - print_mdoc_node(m, nn, h); - - h->flags |= HTML_NOSPACE; - print_text(h, ">"); - - return(0); -} - - -/* ARGSUSED */ -static int -mdoc_ic_pre(MDOC_ARGS) -{ - struct htmlpair tag; - - tag.key = ATTR_CLASS; - tag.val = "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) { - tag.key = ATTR_CLASS; - tag.val = "fname"; - t = print_otag(h, TAG_SPAN, 1, &tag); - print_text(h, nn->string); + if (h->base_includes) + t = print_otag(h, TAG_A, "chI", "In", n->string); + else + t = print_otag(h, TAG_A, "c", "In"); + print_text(h, n->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, "()"); + n = n->next; } - if (n->child->next) - print_text(h, "functions return"); - else - print_text(h, "function returns"); + h->flags |= HTML_NOSPACE; + print_text(h, ">"); - print_text(h, "the value 0 if successful; otherwise the value " - "-1 is returned and the global variable"); - - tag.key = ATTR_CLASS; - tag.val = "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); + for ( ; n; n = n->next) { + assert(n->type == ROFFT_TEXT); + print_text(h, n->string); + } + return 0; } - -/* ARGSUSED */ static int mdoc_va_pre(MDOC_ARGS) { - struct htmlpair tag; - - tag.key = ATTR_CLASS; - tag.val = "var"; - print_otag(h, TAG_SPAN, 1, &tag); - return(1); + print_otag(h, TAG_VAR, "c", "Va"); + 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); + return 1; } - -/* ARGSUSED */ static int mdoc_bf_pre(MDOC_ARGS) { - int i; - struct htmlpair tag[2]; + const char *cattr; - if (MDOC_HEAD == n->type) - return(0); - else if (MDOC_BLOCK != n->type) - return(1); - - tag[0].key = ATTR_CLASS; - tag[0].val = NULL; - - if (n->head->child) { - if ( ! strcmp("Em", n->head->child->string)) - tag[0].val = "emph"; - else if ( ! strcmp("Sy", n->head->child->string)) - tag[0].val = "symb"; - else if ( ! strcmp("Li", n->head->child->string)) - tag[0].val = "lit"; - } else { - assert(n->args); - for (i = 0; i < (int)n->args->argc; i++) - switch (n->args->argv[i].arg) { - case (MDOC_Symbolic): - tag[0].val = "symb"; - break; - case (MDOC_Literal): - tag[0].val = "lit"; - break; - case (MDOC_Emphasis): - tag[0].val = "emph"; - break; - default: - break; - } + switch (n->type) { + case ROFFT_BLOCK: + html_close_paragraph(h); + return 1; + case ROFFT_HEAD: + return 0; + case ROFFT_BODY: + break; + default: + abort(); } - /* FIXME: div's have spaces stripped--we want them. */ + if (FONT_Em == n->norm->Bf.font) + cattr = "Bf Em"; + else if (FONT_Sy == n->norm->Bf.font) + cattr = "Bf Sy"; + else if (FONT_Li == n->norm->Bf.font) + cattr = "Bf Li"; + else + cattr = "Bf No"; - assert(tag[0].val); - tag[1].key = ATTR_STYLE; - tag[1].val = "display: inline; margin-right: 1em;"; - print_otag(h, TAG_DIV, 2, tag); - return(1); + /* Cannot use TAG_SPAN because it may contain blocks. */ + print_otag(h, TAG_DIV, "c", cattr); + return 1; } - -/* ARGSUSED */ static int -mdoc_ms_pre(MDOC_ARGS) +mdoc_igndelim_pre(MDOC_ARGS) { - struct htmlpair tag; - - tag.key = ATTR_CLASS; - tag.val = "symb"; - print_otag(h, TAG_SPAN, 1, &tag); - return(1); -} - - -/* ARGSUSED */ -static int -mdoc_pf_pre(MDOC_ARGS) -{ - h->flags |= HTML_IGNDELIM; - return(1); + return 1; } - -/* ARGSUSED */ static void mdoc_pf_post(MDOC_ARGS) { - - h->flags &= ~HTML_IGNDELIM; - h->flags |= HTML_NOSPACE; + if ( ! (n->next == NULL || n->next->flags & NODE_LINE)) + h->flags |= HTML_NOSPACE; } - -/* ARGSUSED */ static int mdoc_rs_pre(MDOC_ARGS) { - struct htmlpair tag; - - if (MDOC_BLOCK != n->type) - return(1); - - if (n->prev && SEC_SEE_ALSO == n->sec) { - tag.key = ATTR_STYLE; - tag.val = "margin-top: 1em;"; - print_otag(h, TAG_DIV, 1, &tag); + switch (n->type) { + case ROFFT_BLOCK: + if (n->sec == SEC_SEE_ALSO) + html_close_paragraph(h); + break; + case ROFFT_HEAD: + return 0; + case ROFFT_BODY: + if (n->sec == SEC_SEE_ALSO) + print_otag(h, TAG_P, "c", "Pp"); + print_otag(h, TAG_CITE, "c", "Rs"); + break; + default: + abort(); } - - tag.key = ATTR_CLASS; - tag.val = "ref"; - print_otag(h, TAG_SPAN, 1, &tag); - return(1); + return 1; } - - -/* ARGSUSED */ static int -mdoc_li_pre(MDOC_ARGS) +mdoc_no_pre(MDOC_ARGS) { - struct htmlpair tag; - - tag.key = ATTR_CLASS; - tag.val = "lit"; - - print_otag(h, TAG_SPAN, 1, &tag); - return(1); + print_otag_id(h, TAG_SPAN, roff_name[n->tok], n); + return 1; } - -/* ARGSUSED */ static int mdoc_sy_pre(MDOC_ARGS) { - struct htmlpair tag; - - tag.key = ATTR_CLASS; - tag.val = "symb"; - - print_otag(h, TAG_SPAN, 1, &tag); - return(1); + print_otag_id(h, TAG_B, "Sy", n); + return 1; } - -/* ARGSUSED */ static int -mdoc_bt_pre(MDOC_ARGS) +mdoc_lb_pre(MDOC_ARGS) { + if (n->sec == SEC_LIBRARY && + n->flags & NODE_LINE && + roff_node_prev(n) != NULL) + print_otag(h, TAG_BR, ""); - print_text(h, "is currently in beta test."); - return(0); + print_otag(h, TAG_SPAN, "c", "Lb"); + return 1; } - -/* ARGSUSED */ static int -mdoc_ud_pre(MDOC_ARGS) +mdoc__x_pre(MDOC_ARGS) { + struct roff_node *nn; + const char *cattr; + enum htmltag t; - print_text(h, "currently under development."); - return(0); + t = TAG_SPAN; + + switch (n->tok) { + case MDOC__A: + cattr = "RsA"; + if ((nn = roff_node_prev(n)) != NULL && nn->tok == MDOC__A && + ((nn = roff_node_next(n)) == NULL || nn->tok != MDOC__A)) + print_text(h, "and"); + break; + case MDOC__B: + t = TAG_I; + cattr = "RsB"; + break; + case MDOC__C: + cattr = "RsC"; + break; + case MDOC__D: + cattr = "RsD"; + break; + case MDOC__I: + t = TAG_I; + cattr = "RsI"; + break; + case MDOC__J: + t = TAG_I; + cattr = "RsJ"; + break; + case MDOC__N: + cattr = "RsN"; + break; + case MDOC__O: + cattr = "RsO"; + break; + case MDOC__P: + cattr = "RsP"; + break; + case MDOC__Q: + cattr = "RsQ"; + break; + case MDOC__R: + cattr = "RsR"; + break; + case MDOC__T: + cattr = "RsT"; + break; + case MDOC__U: + print_otag(h, TAG_A, "ch", "RsU", n->child->string); + return 1; + case MDOC__V: + cattr = "RsV"; + break; + default: + abort(); + } + + print_otag(h, t, "c", cattr); + return 1; } +static void +mdoc__x_post(MDOC_ARGS) +{ + struct roff_node *nn; -/* ARGSUSED */ + if (n->tok == MDOC__A && + (nn = roff_node_next(n)) != NULL && nn->tok == MDOC__A && + ((nn = roff_node_next(nn)) == NULL || nn->tok != MDOC__A) && + ((nn = roff_node_prev(n)) == NULL || nn->tok != MDOC__A)) + return; + + /* TODO: %U */ + + if (n->parent == NULL || n->parent->tok != MDOC_Rs) + return; + + h->flags |= HTML_NOSPACE; + print_text(h, roff_node_next(n) ? "," : "."); +} + static int -mdoc_lb_pre(MDOC_ARGS) +mdoc_bk_pre(MDOC_ARGS) { - struct htmlpair tag; - tag.key = ATTR_CLASS; - tag.val = "lib"; + switch (n->type) { + case ROFFT_BLOCK: + break; + case ROFFT_HEAD: + return 0; + case ROFFT_BODY: + if (n->parent->args != NULL || n->prev->child == NULL) + h->flags |= HTML_PREKEEP; + break; + default: + abort(); + } - if (SEC_SYNOPSIS == n->sec) - print_otag(h, TAG_DIV, 0, NULL); - - print_otag(h, TAG_SPAN, 1, &tag); - return(1); + return 1; } +static void +mdoc_bk_post(MDOC_ARGS) +{ -/* ARGSUSED */ + if (n->type == ROFFT_BODY) + h->flags &= ~(HTML_KEEP | HTML_PREKEEP); +} + static int -mdoc__x_pre(MDOC_ARGS) +mdoc_quote_pre(MDOC_ARGS) { - struct htmlpair tag; + if (n->type != ROFFT_BODY) + return 1; - tag.key = ATTR_CLASS; - switch (n->tok) { - case(MDOC__A): - tag.val = "ref-auth"; + case MDOC_Ao: + case MDOC_Aq: + print_text(h, n->child != NULL && n->child->next == NULL && + n->child->tok == MDOC_Mt ? "<" : "\\(la"); break; - case(MDOC__B): - tag.val = "ref-book"; + case MDOC_Bro: + case MDOC_Brq: + print_text(h, "\\(lC"); break; - case(MDOC__C): - tag.val = "ref-city"; + case MDOC_Bo: + case MDOC_Bq: + print_text(h, "\\(lB"); break; - case(MDOC__D): - tag.val = "ref-date"; + case MDOC_Oo: + case MDOC_Op: + print_text(h, "\\(lB"); + /* + * Give up on semantic markup for now. + * We cannot use TAG_SPAN because .Oo may contain blocks. + * We cannot use TAG_DIV because we might be in a + * phrasing context (like .Dl or .Pp); we cannot + * close out a .Pp at this point either because + * that would break the line. + */ + /* XXX print_otag(h, TAG_???, "c", "Op"); */ break; - case(MDOC__I): - tag.val = "ref-issue"; + 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__J): - tag.val = "ref-jrnl"; + case MDOC_Do: + case MDOC_Dq: + print_text(h, "\\(lq"); break; - case(MDOC__N): - tag.val = "ref-num"; + case MDOC_Qo: + case MDOC_Qq: + print_text(h, "\""); break; - case(MDOC__O): - tag.val = "ref-opt"; + case MDOC_Po: + case MDOC_Pq: + print_text(h, "("); break; - case(MDOC__P): - tag.val = "ref-page"; - break; - case(MDOC__Q): - tag.val = "ref-corp"; - break; - case(MDOC__R): - tag.val = "ref-rep"; - break; - case(MDOC__T): - print_text(h, "\\(lq"); + case MDOC_Ql: + print_text(h, "\\(oq"); h->flags |= HTML_NOSPACE; - tag.val = "ref-title"; + print_otag(h, TAG_CODE, "c", "Li"); break; - case(MDOC__V): - tag.val = "ref-vol"; + case MDOC_So: + case MDOC_Sq: + print_text(h, "\\(oq"); break; default: abort(); - /* NOTREACHED */ } - print_otag(h, TAG_SPAN, 1, &tag); - return(1); + h->flags |= HTML_NOSPACE; + return 1; } - -/* ARGSUSED */ static void -mdoc__x_post(MDOC_ARGS) +mdoc_quote_post(MDOC_ARGS) { + if (n->type != ROFFT_BODY && n->type != ROFFT_ELEM) + return; + h->flags |= HTML_NOSPACE; + switch (n->tok) { - case (MDOC__T): + case MDOC_Ao: + case MDOC_Aq: + print_text(h, n->child != NULL && n->child->next == NULL && + n->child->tok == MDOC_Mt ? ">" : "\\(ra"); + break; + case MDOC_Bro: + case MDOC_Brq: + print_text(h, "\\(rC"); + break; + case MDOC_Oo: + case MDOC_Op: + case MDOC_Bo: + case MDOC_Bq: + print_text(h, "\\(rB"); + break; + case MDOC_En: + if (n->norm->Es == NULL || + n->norm->Es->child == NULL || + n->norm->Es->child->next == NULL) + h->flags &= ~HTML_NOSPACE; + else + print_text(h, n->norm->Es->child->next->string); + break; + case MDOC_Do: + case MDOC_Dq: print_text(h, "\\(rq"); - h->flags |= HTML_NOSPACE; break; - default: + case MDOC_Qo: + case MDOC_Qq: + print_text(h, "\""); break; + case MDOC_Po: + case MDOC_Pq: + print_text(h, ")"); + break; + case MDOC_Ql: + case MDOC_So: + case MDOC_Sq: + print_text(h, "\\(cq"); + break; + default: + abort(); } - print_text(h, n->next ? "," : "."); +} + +static int +mdoc_eo_pre(MDOC_ARGS) +{ + + if (n->type != ROFFT_BODY) + return 1; + + if (n->end == ENDBODY_NOT && + n->parent->head->child == NULL && + n->child != NULL && + n->child->end != ENDBODY_NOT) + print_text(h, "\\&"); + else if (n->end != ENDBODY_NOT ? n->child != NULL : + n->parent->head->child != NULL && (n->child != NULL || + (n->parent->tail != NULL && n->parent->tail->child != NULL))) + h->flags |= HTML_NOSPACE; + return 1; +} + +static void +mdoc_eo_post(MDOC_ARGS) +{ + int body, tail; + + if (n->type != ROFFT_BODY) + return; + + if (n->end != ENDBODY_NOT) { + h->flags &= ~HTML_NOSPACE; + return; + } + + body = n->child != NULL || n->parent->head->child != NULL; + tail = n->parent->tail != NULL && n->parent->tail->child != NULL; + + if (body && tail) + h->flags |= HTML_NOSPACE; + else if ( ! tail) + h->flags &= ~HTML_NOSPACE; +} + +static int +mdoc_abort_pre(MDOC_ARGS) +{ + abort(); }