=================================================================== RCS file: /cvs/mandoc/mdoc_html.c,v retrieving revision 1.65 retrieving revision 1.349 diff -u -p -r1.65 -r1.349 --- mandoc/mdoc_html.c 2010/05/17 22:11:42 1.65 +++ mandoc/mdoc_html.c 2022/07/06 15:26:23 1.349 @@ -1,22 +1,24 @@ -/* $Id: mdoc_html.c,v 1.65 2010/05/17 22:11:42 kristaps Exp $ */ +/* $Id: mdoc_html.c,v 1.349 2022/07/06 15:26:23 schwarze Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2014-2022 Ingo Schwarze + * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons + * Copyright (c) 2022 Anna Vyalkova * * 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). */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include @@ -27,154 +29,134 @@ #include #include +#include "mandoc_aux.h" #include "mandoc.h" +#include "roff.h" +#include "mdoc.h" #include "out.h" #include "html.h" -#include "mdoc.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 #ifndef MIN #define MIN(a,b) ((/*CONSTCOND*/(a)<(b))?(a):(b)) #endif -struct htmlmdoc { +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 void a2width(const char *, struct roffsu *); -static void a2offs(const char *, struct roffsu *); +static void mdoc_root_post(const struct roff_meta *, + struct html *); +static int mdoc_root_pre(const struct roff_meta *, + struct html *); -static int a2list(const struct mdoc_node *); - -static void mdoc_root_post(MDOC_ARGS); -static int mdoc_root_pre(MDOC_ARGS); - 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_block_pre(MDOC_ARGS, int, int, - struct roffsu *, struct roffsu *); -static int mdoc_it_head_pre(MDOC_ARGS, int, - struct roffsu *); -static int mdoc_it_body_pre(MDOC_ARGS, int); 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); -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 */ @@ -188,1462 +170,981 @@ 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 */ + {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__x_pre, mdoc__x_post}, /* %U */ + {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_decls(h); - t = print_otag(h, TAG_HTML, 0, NULL); - print_mdoc(mdoc_meta(m), mdoc_node(m), h); - print_tagq(h, t); - - printf("\n"); -} - - /* - * Return the list type for `Bl', e.g., `Bl -column' returns - * MDOC_Column. This can ONLY be run for lists; it will abort() if no - * list type is found. + * See the same function in mdoc_term.c for documentation. */ -static int -a2list(const struct mdoc_node *n) +static void +synopsis_pre(struct html *h, struct roff_node *n) { - int i; + struct roff_node *np; - 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; - } + if ((n->flags & NODE_SYNPRETTY) == 0 || + (np = roff_node_prev(n)) == NULL) + return; - abort(); - /* NOTREACHED */ -} + if (np->tok == n->tok && + MDOC_Fo != n->tok && + MDOC_Ft != n->tok && + MDOC_Fn != n->tok) { + print_otag(h, TAG_BR, ""); + return; + } - -/* - * 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) -{ - - if ( ! a2roffsu(p, su, SCALE_MAX)) { - su->unit = SCALE_EM; - su->scale = (int)strlen(p); + 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; + /* FALLTHROUGH */ + default: + print_otag(h, TAG_BR, ""); + return; } + html_close_paragraph(h); + print_otag(h, TAG_P, "c", "Pp"); } - -/* - * 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) +void +html_mdoc(void *arg, const struct roff_meta *mdoc) { + struct html *h; + struct roff_node *n; + struct tag *t; - /* FIXME: "right"? */ + h = (struct html *)arg; + n = mdoc->first->child; - 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); + if ((h->oflags & HTML_FRAGMENT) == 0) { + print_gen_decls(h); + print_otag(h, TAG_HTML, ""); + t = print_otag(h, TAG_HEAD, ""); + print_mdoc_head(mdoc, h); + print_tagq(h, t); + if (n != NULL && n->type == ROFFT_COMMENT) + print_gen_comment(h, n); + print_otag(h, TAG_BODY, ""); } -} - -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_MAIN, "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 *cp; print_gen_head(h); - bufinit(h); - buffmt(h, "%s(%s)", m->title, m->msec); - if (m->arch) { - bufcat(h, " ("); - bufcat(h, m->arch); - bufcat(h, ")"); - } + 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); - print_otag(h, TAG_TITLE, 0, NULL); - print_text(h, h->buf); + 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 = h->tags.head; + 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; 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 htmlpair tag[3]; - struct tag *t, *tt; - char b[DATESIZ]; + struct tag *t; - time2a(m->date, b, DATESIZ); + t = print_otag(h, TAG_DIV, "cr?", "foot", "doc-pagefooter", + "aria-label", "manual footer line"); - /* - * 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. - */ + print_otag(h, TAG_SPAN, "c", "foot-left"); + print_stagq(h, t); - PAIR_CLASS_INIT(&tag[0], "footer"); - bufcat_style(h, "width", "100%"); - PAIR_STYLE_INIT(&tag[1], h); - PAIR_SUMMARY_INIT(&tag[2], "footer"); + print_otag(h, TAG_SPAN, "c", "foot-date"); + print_text(h, meta->date); + print_stagq(h, t); - t = print_otag(h, TAG_TABLE, 3, tag); - tt = print_otag(h, TAG_TR, 0, NULL); - - 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); - - 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_otag(h, TAG_SPAN, "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[3]; - struct tag *t, *tt; - char b[BUFSIZ], title[BUFSIZ]; + struct tag *t; + 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(%s)", m->title, m->msec); + t = print_otag(h, TAG_DIV, "cr?", "head", "doc-pageheader", + "aria-label", "manual header line"); - /* 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); - - bufinit(h); - bufcat_style(h, "width", "10%"); - PAIR_STYLE_INIT(&tag[0], h); - print_otag(h, TAG_TD, 1, tag); + print_otag(h, TAG_SPAN, "c", "head-ltitle"); print_text(h, title); - print_stagq(h, tt); + print_stagq(h, t); - 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, b); - print_stagq(h, tt); + print_otag(h, TAG_SPAN, "c", "head-vol"); + print_text(h, volume); + print_stagq(h, t); - 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_otag(h, TAG_SPAN, "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; - char buf[BUFSIZ]; - struct roffsu su; + struct roff_node *sn, *subn; + struct tag *t, *tnav, *tsec, *tsub; + char *id; + int sc; - 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) { - PAIR_CLASS_INIT(&tag[0], "sec-block"); - if (n->prev && NULL == n->prev->body->child) { - print_otag(h, TAG_DIV, 1, tag); - return(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; } - - SCALE_VS_INIT(&su, 1); - bufcat_su(h, "margin-top", &su); - if (NULL == n->next) - bufcat_su(h, "margin-bottom", &su); - - PAIR_STYLE_INIT(&tag[1], h); - print_otag(h, TAG_DIV, 2, 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; + tnav = print_otag(h, TAG_NAV, "r", "doc-toc"); + t = print_otag(h, TAG_H2, "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); + } + print_tagq(h, tnav); + print_otag(h, TAG_SECTION, "c", "Sh"); + break; + case ROFFT_HEAD: + print_otag_id(h, TAG_H2, "Sh", n); + break; + case ROFFT_BODY: + if (n->sec == SEC_AUTHORS) + h->flags &= ~(HTML_SPLIT|HTML_NOSPLIT); + break; + default: + break; } - - 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); + return 1; } - -/* ARGSUSED */ static int mdoc_ss_pre(MDOC_ARGS) { - struct htmlpair tag[3]; - const struct mdoc_node *nn; - char buf[BUFSIZ]; - struct roffsu su; - - SCALE_VS_INIT(&su, 1); - - if (MDOC_BODY == n->type) { - PAIR_CLASS_INIT(&tag[0], "ssec-body"); - if (n->parent->next && n->child) { - 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) { - PAIR_CLASS_INIT(&tag[0], "ssec-block"); - if (n->prev) { - 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); + 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_H3, "Ss", n); + break; + case ROFFT_BODY: + break; + default: + abort(); } - - /* TODO: see note in mdoc_sh_pre() about duplicates. */ - - buf[0] = '\0'; - for (nn = n->child; nn; nn = nn->next) { - html_idcat(buf, nn->string, BUFSIZ); - if (nn->next) - html_idcat(buf, " ", BUFSIZ); - } - - 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); + return 1; } - -/* ARGSUSED */ static int mdoc_fl_pre(MDOC_ARGS) { - struct htmlpair tag; + struct roff_node *nn; - PAIR_CLASS_INIT(&tag, "flag"); - print_otag(h, TAG_SPAN, 1, &tag); - - /* `Cm' has no leading hyphen. */ - - if (MDOC_Cm == n->tok) - return(1); - + print_otag_id(h, TAG_CODE, "Fl", n); print_text(h, "\\-"); - - if (n->child) + if (n->child != NULL || + ((nn = roff_node_next(n)) != NULL && + nn->type != ROFFT_TEXT && + (nn->flags & NODE_LINE) == 0)) h->flags |= HTML_NOSPACE; - else if (n->next && n->next->line == n->line) - 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 tag in theory 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"); - PAIR_CLASS_INIT(&tag, "desc-body"); - print_otag(h, TAG_SPAN, 1, &tag); - return(1); + print_otag(h, TAG_SPAN, "cr", "Nd", "doc-subtitle"); + return 1; } - -/* ARGSUSED */ static int -mdoc_op_pre(MDOC_ARGS) -{ - struct htmlpair tag; - - if (MDOC_BODY != n->type) - return(1); - - /* XXX: this tag in theory can contain block elements. */ - - print_text(h, "\\(lB"); - h->flags |= HTML_NOSPACE; - PAIR_CLASS_INIT(&tag, "opt"); - print_otag(h, TAG_SPAN, 1, &tag); - return(1); -} - - -/* ARGSUSED */ -static void -mdoc_op_post(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return; - h->flags |= HTML_NOSPACE; - print_text(h, "\\(rB"); -} - - -static int mdoc_nm_pre(MDOC_ARGS) { - struct htmlpair tag; - - if (NULL == n->child && NULL == m->name) - return(1); - - if (SEC_SYNOPSIS == n->sec && - n->prev && MDOC_LINE & n->flags) { - bufcat_style(h, "clear", "both"); - PAIR_STYLE_INIT(&tag, h); - print_otag(h, TAG_BR, 1, &tag); + 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(); } - - PAIR_CLASS_INIT(&tag, "name"); - print_otag(h, TAG_SPAN, 1, &tag); - if (NULL == n->child) - print_text(h, m->name); - - return(1); + 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; + char *name, *section, *label; - if (NULL == n->child) - return(0); + if (n->child == NULL) + return 0; - PAIR_CLASS_INIT(&tag[0], "link-man"); - - if (h->base_man) { - buffmt_man(h, n->child->string, - n->child->next ? - n->child->next->string : NULL); - PAIR_HREF_INIT(&tag[1], h->buf); - print_otag(h, TAG_A, 2, tag); + name = n->child->string; + if (n->child->next != NULL) { + section = n->child->next->string; + mandoc_asprintf(&label, "%s, section %s", name, section); } else - print_otag(h, TAG_A, 1, tag); + section = label = NULL; - nn = n->child; - print_text(h, nn->string); + if (h->base_man1) + print_otag(h, TAG_A, "chM?", "Xr", + name, section, "aria-label", label); + else + print_otag(h, TAG_A, "c?", "Xr", "aria-label", label); - if (NULL == (nn = nn->next)) - return(0); + free(label); + print_text(h, name); + if (section == NULL) + return 0; + h->flags |= HTML_NOSPACE; print_text(h, "("); h->flags |= HTML_NOSPACE; - print_text(h, nn->string); + print_text(h, section); 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; - - PAIR_CLASS_INIT(&tag, "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 = "DragonFly"; - 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); } - - PAIR_CLASS_INIT(&tag, "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; - 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) + if ( ! (NODE_LINE & n->flags)) h->flags |= HTML_NOSPACE; - - print_text(h, "BSD"); - return(0); + return 1; } - -/* ARGSUSED */ static int -mdoc_it_block_pre(MDOC_ARGS, int type, int comp, - struct roffsu *offs, struct roffsu *width) +mdoc_ar_pre(MDOC_ARGS) { - struct htmlpair tag; - const struct mdoc_node *nn; - struct roffsu su; - - nn = n->parent->parent; - assert(nn->args); - - /* XXX: see notes in mdoc_it_pre(). */ - - if (MDOC_Column == type) { - /* Don't width-pad on the left. */ - SCALE_HS_INIT(width, 0); - /* Also disallow non-compact. */ - comp = 1; - } - if (MDOC_Diag == type) - /* Mandate non-compact with empty prior. */ - if (n->prev && NULL == n->prev->body->child) - comp = 1; - - 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; - } - - 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); + print_otag(h, TAG_VAR, "c", "Ar"); + return 1; } - -/* ARGSUSED */ static int -mdoc_it_body_pre(MDOC_ARGS, int type) +mdoc_xx_pre(MDOC_ARGS) { - struct htmlpair tag; - struct roffsu su; - - switch (type) { - case (MDOC_Item): - /* FALLTHROUGH */ - case (MDOC_Ohang): - /* FALLTHROUGH */ - case (MDOC_Column): - 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); + print_otag(h, TAG_SPAN, "c", "Ux"); + return 1; } - -/* ARGSUSED */ static int -mdoc_it_head_pre(MDOC_ARGS, int type, struct roffsu *width) -{ - struct htmlpair tag; - struct ord *ord; - char nbuf[BUFSIZ]; - - switch (type) { - case (MDOC_Item): - return(0); - case (MDOC_Ohang): - print_otag(h, TAG_DIV, 0, &tag); - return(1); - case (MDOC_Column): - bufcat_su(h, "min-width", width); - bufcat_style(h, "clear", "none"); - if (n->next && MDOC_HEAD == n->next->type) - bufcat_style(h, "float", "left"); - PAIR_STYLE_INIT(&tag, h); - print_otag(h, TAG_DIV, 1, &tag); - break; - default: - bufcat_su(h, "min-width", width); - SCALE_INVERT(width); - bufcat_su(h, "margin-left", width); - if (n->next && n->next->child) - bufcat_style(h, "float", "left"); - - /* XXX: buffer if we run into body. */ - SCALE_HS_INIT(width, 1); - bufcat_su(h, "margin-right", width); - PAIR_STYLE_INIT(&tag, h); - print_otag(h, TAG_DIV, 1, &tag); - break; - } - - switch (type) { - case (MDOC_Diag): - PAIR_CLASS_INIT(&tag, "diag"); - print_otag(h, TAG_SPAN, 1, &tag); - break; - case (MDOC_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): - print_text(h, "\\(en"); - return(0); - case (MDOC_Hyphen): - print_text(h, "\\(hy"); - return(0); - case (MDOC_Bullet): - print_text(h, "\\(bu"); - return(0); - default: - break; - } - - return(1); -} - - -static int mdoc_it_pre(MDOC_ARGS) { - int i, type, wp, comp; - const struct mdoc_node *bl, *nn; - struct roffsu width, offs; + const struct roff_node *bl; + enum mdoc_list type; - /* - * XXX: be very careful in changing anything, here. Lists in - * mandoc have many peculiarities; furthermore, they don't - * translate well into HTML and require a bit of mangling. - */ - - bl = n->parent->parent; - if (MDOC_BLOCK != n->type) + bl = n->parent; + while (bl->tok != MDOC_Bl) bl = bl->parent; + type = bl->norm->Bl.type; - type = a2list(bl); - - /* Set default width and offset. */ - - SCALE_HS_INIT(&offs, 0); - switch (type) { - case (MDOC_Enum): - /* FALLTHROUGH */ - case (MDOC_Dash): - /* FALLTHROUGH */ - case (MDOC_Hyphen): - /* FALLTHROUGH */ - case (MDOC_Bullet): - SCALE_HS_INIT(&width, 2); + 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; - default: - SCALE_HS_INIT(&width, INDENT); - break; - } - - /* Get width, offset, and compact arguments. */ - - for (wp = -1, comp = i = 0; i < (int)bl->args->argc; i++) - switch (bl->args->argv[i].arg) { - case (MDOC_Column): - wp = i; /* Save for later. */ + 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 (MDOC_Width): - a2width(bl->args->argv[i].value[0], &width); + case ROFFT_BODY: + print_otag(h, TAG_DD, ""); break; - case (MDOC_Offset): - a2offs(bl->args->argv[i].value[0], &offs); + default: break; - case (MDOC_Compact): - comp = 1; + } + break; + 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; } - - /* Override width in some cases. */ - - switch (type) { - case (MDOC_Ohang): - /* FALLTHROUGH */ - case (MDOC_Item): - /* FALLTHROUGH */ - case (MDOC_Inset): - /* FALLTHROUGH */ - case (MDOC_Diag): - SCALE_HS_INIT(&width, 0); break; + 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: - if (0 == width.scale) - SCALE_HS_INIT(&width, INDENT); break; } - /* Flip to body/block processing. */ - - if (MDOC_BODY == n->type) - return(mdoc_it_body_pre(m, n, h, type)); - if (MDOC_BLOCK == n->type) - return(mdoc_it_block_pre(m, n, h, type, comp, - &offs, &width)); - - /* Override column widths. */ - - if (MDOC_Column == type) { - nn = n->parent->child; - for (i = 0; nn && nn != n; nn = nn->next, i++) - /* Counter... */ ; - if (i < (int)bl->args->argv[wp].sz) - a2width(bl->args->argv[wp].value[i], &width); - } - - return(mdoc_it_head_pre(m, n, h, type, &width)); + return 1; } - -/* ARGSUSED */ static int mdoc_bl_pre(MDOC_ARGS) { - struct ord *ord; + char cattr[32]; + struct mdoc_bl *bl; + enum htmltag elemtype; - if (MDOC_HEAD == n->type) - return(0); - if (MDOC_BLOCK != n->type) - return(1); - if (MDOC_Enum != a2list(n)) - return(1); + switch (n->type) { + case ROFFT_BLOCK: + html_close_paragraph(h); + break; + case ROFFT_HEAD: + return 0; + case ROFFT_BODY: + return 1; + default: + abort(); + } - ord = malloc(sizeof(struct ord)); - if (NULL == ord) { - perror(NULL); - exit(EXIT_FAILURE); + bl = &n->norm->Bl; + switch (bl->type) { + case LIST_bullet: + elemtype = TAG_UL; + (void)strlcpy(cattr, "Bl-bullet", sizeof(cattr)); + break; + case LIST_dash: + case LIST_hyphen: + elemtype = TAG_UL; + (void)strlcpy(cattr, "Bl-dash", sizeof(cattr)); + break; + case LIST_item: + elemtype = TAG_UL; + (void)strlcpy(cattr, "Bl-item", sizeof(cattr)); + break; + case LIST_enum: + elemtype = TAG_OL; + (void)strlcpy(cattr, "Bl-enum", sizeof(cattr)); + break; + 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(); } - ord->cookie = n; - ord->pos = 1; - ord->next = h->ords.head; - h->ords.head = ord; - return(1); + 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 void -mdoc_bl_post(MDOC_ARGS) -{ - struct ord *ord; - - if (MDOC_BLOCK != n->type) - return; - if (MDOC_Enum != a2list(n)) - return; - - ord = h->ords.head; - assert(ord); - h->ords.head = ord->next; - free(ord); -} - - -/* ARGSUSED */ static int mdoc_ex_pre(MDOC_ARGS) { - const struct mdoc_node *nn; - struct tag *t; - struct htmlpair tag; - - PAIR_CLASS_INIT(&tag, "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); - 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 && 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; - - PAIR_CLASS_INIT(&tag, "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]; - struct roffsu su; - - if (MDOC_BLOCK != n->type) - return(1); - - /* FIXME: D1 shouldn't be literal. */ - - SCALE_VS_INIT(&su, INDENT - 1); - 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); + 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 buf[BUFSIZ]; + char *id; - strlcpy(buf, "#", BUFSIZ); - 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], "link-sec"); - PAIR_HREF_INIT(&tag[1], buf); - - 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 type, comp, i; - const struct mdoc_node *bl, *nn; - struct roffsu su; + 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(); + } - SCALE_VS_INIT(&su, 0); + /* Handle preceding whitespace. */ - type = comp = 0; - for (i = 0; i < (int)bl->args->argc; i++) - switch (bl->args->argv[i].arg) { - case (MDOC_Offset): - a2offs(bl->args->argv[i].value[0], &su); - break; - case (MDOC_Compact): + 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_Centred): - /* FALLTHROUGH */ - case (MDOC_Ragged): - /* FALLTHROUGH */ - case (MDOC_Filled): - /* FALLTHROUGH */ - case (MDOC_Unfilled): - /* FALLTHROUGH */ - case (MDOC_Literal): - type = bl->args->argv[i].arg; - break; - default: - break; - } - - /* FIXME: -centered, etc. formatting. */ - /* FIXME: does not respect -offset ??? */ - - if (MDOC_BLOCK == n->type) { - 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); } + (void)strlcpy(buf, "Bd", sizeof(buf)); + if (comp == 0) + (void)strlcat(buf, " Pp", sizeof(buf)); - if (MDOC_Unfilled != type && MDOC_Literal != type) - return(1); + /* Handle the -offset argument. */ - 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); + if (n->norm->Bd.offs != NULL && + strcmp(n->norm->Bd.offs, "left") != 0) + (void)strlcat(buf, " Bd-indent", sizeof(buf)); - for (nn = n->child; nn; nn = nn->next) { - h->flags |= HTML_NOSPACE; - print_mdoc_node(m, nn, h); - if (NULL == nn->next) - continue; - if (nn->prev && nn->prev->line < nn->line) - print_text(h, "\n"); - else if (NULL == nn->prev) - print_text(h, "\n"); - } + if (n->norm->Bd.type == DISP_literal) + (void)strlcat(buf, " Li", sizeof(buf)); - return(0); + print_otag_id(h, TAG_DIV, buf, n); + return 1; } - -/* ARGSUSED */ static int mdoc_pa_pre(MDOC_ARGS) { - struct htmlpair tag; - - PAIR_CLASS_INIT(&tag, "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; - - PAIR_CLASS_INIT(&tag, "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; + } - /* TODO: -split and -nosplit (see termp_an_pre()). */ + if (h->flags & HTML_SPLIT) + print_otag(h, TAG_BR, ""); - PAIR_CLASS_INIT(&tag, "author"); - print_otag(h, TAG_SPAN, 1, &tag); - return(1); + if (n->sec == SEC_AUTHORS && ! (h->flags & HTML_NOSPLIT)) + h->flags |= HTML_SPLIT; + + print_otag(h, TAG_SPAN, "c", "An"); + return 1; } - -/* ARGSUSED */ static int mdoc_cd_pre(MDOC_ARGS) { - struct htmlpair tag; - - print_otag(h, TAG_DIV, 0, NULL); - PAIR_CLASS_INIT(&tag, "config"); - 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_dv_pre(MDOC_ARGS) -{ - struct htmlpair tag; - - PAIR_CLASS_INIT(&tag, "define"); - print_otag(h, TAG_SPAN, 1, &tag); - return(1); -} - - -/* ARGSUSED */ -static int -mdoc_ev_pre(MDOC_ARGS) -{ - struct htmlpair tag; - - PAIR_CLASS_INIT(&tag, "env"); - print_otag(h, TAG_SPAN, 1, &tag); - return(1); -} - - -/* ARGSUSED */ -static int -mdoc_er_pre(MDOC_ARGS) -{ - struct htmlpair tag; - - PAIR_CLASS_INIT(&tag, "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; - PAIR_CLASS_INIT(&tag, "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 roffsu su; + struct tag *t; + char *buf, *cp; - if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) { - if (n->next && MDOC_Fd != n->next->tok) { - SCALE_VS_INIT(&su, 1); - bufcat_su(h, "margin-bottom", &su); - PAIR_STYLE_INIT(&tag, h); - 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; } - PAIR_CLASS_INIT(&tag, "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; - struct roffsu su; + 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 && MDOC_BLOCK == n->type) { - if (n->next && MDOC_Vt != n->next->tok) { - SCALE_VS_INIT(&su, 1); - bufcat_su(h, "margin-bottom", &su); - PAIR_STYLE_INIT(&tag, h); - print_otag(h, TAG_DIV, 1, &tag); - } else - print_otag(h, TAG_DIV, 0, NULL); - - return(1); - } else if (MDOC_HEAD == n->type) - return(0); - - PAIR_CLASS_INIT(&tag, "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 && MDOC_LINE & n->flags) - print_otag(h, TAG_DIV, 0, NULL); - - PAIR_CLASS_INIT(&tag, "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 roffsu su; + struct tag *t; + char nbuf[BUFSIZ]; + const char *sp, *ep; + int sz, pretty; - if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) { - SCALE_HS_INIT(&su, INDENT); - bufcat_su(h, "margin-left", &su); - su.scale = -su.scale; - bufcat_su(h, "text-indent", &su); - if (n->next) { - SCALE_VS_INIT(&su, 1); - bufcat_su(h, "margin-bottom", &su); - } - PAIR_STYLE_INIT(&tag[0], h); - print_otag(h, TAG_DIV, 1, tag); - } + pretty = NODE_SYNPRETTY & n->flags; + synopsis_pre(h, n); /* Split apart into type and name. */ assert(n->child->string); @@ -1651,9 +1152,8 @@ mdoc_fn_pre(MDOC_ARGS) ep = strchr(sp, ' '); if (NULL != ep) { - PAIR_CLASS_INIT(&tag[0], "ftype"); - t = print_otag(h, TAG_SPAN, 1, tag); - + t = print_otag(h, TAG_VAR, "c", "Ft"); + while (ep) { sz = MIN((int)(ep - sp), BUFSIZ - 1); (void)memcpy(nbuf, sp, (size_t)sz); @@ -1665,196 +1165,172 @@ mdoc_fn_pre(MDOC_ARGS) print_tagq(h, t); } - PAIR_CLASS_INIT(&tag[0], "fname"); + t = print_otag_id(h, TAG_CODE, "Fn", n); - /* - * FIXME: only refer to IDs that we know exist. - */ + if (sp) + print_text(h, sp); -#if 0 - if (SEC_SYNOPSIS == n->sec) { - 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, "("); + h->flags |= HTML_NOSPACE; - 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) { - i = 1; - if (SEC_SYNOPSIS == n->sec) - i = 2; - 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; - 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: - 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; - 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, "\\~"); + if ( ! (HTML_NONOSPACE & h->flags)) + h->flags &= ~HTML_NOSPACE; - return(0); - + 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; - PAIR_CLASS_INIT(&tag[0], "link-ext"); - PAIR_HREF_INIT(&tag[1], nn->string); - print_otag(h, TAG_A, 2, tag); + /* Find beginning of trailing punctuation. */ + punct = n->last; + while (punct != link && punct->flags & NODE_DELIMC) + punct = punct->prev; + punct = punct->next; - if (NULL == nn->next) - return(1); + /* 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); - 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; - 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); + 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 roffsu su; + 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 && n->next) { - SCALE_VS_INIT(&su, 1); - bufcat_su(h, "margin-bottom", &su); - PAIR_STYLE_INIT(&tag, h); - print_otag(h, TAG_DIV, 1, &tag); - return(1); + return 1; + default: + abort(); } - - PAIR_CLASS_INIT(&tag, "fname"); - print_otag(h, TAG_SPAN, 1, &tag); - return(1); } - -/* 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, ")"); @@ -1862,402 +1338,438 @@ mdoc_fo_post(MDOC_ARGS) 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; - struct roffsu su; + struct tag *t; - if (SEC_SYNOPSIS == n->sec && MDOC_LINE & n->flags) { - if (n->next && MDOC_In != n->next->tok) { - SCALE_VS_INIT(&su, 1); - bufcat_su(h, "margin-bottom", &su); - PAIR_STYLE_INIT(&tag[0], h); - 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"); - /* FIXME: there's a buffer bug in here somewhere. */ + /* + * 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. + */ - PAIR_CLASS_INIT(&tag[0], "includes"); - 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) { - 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); + 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); + + n = n->next; } 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, "()"); + for ( ; n; n = n->next) { + assert(n->type == ROFFT_TEXT); + print_text(h, n->string); } - - 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); + 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); + 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]; - struct roffsu su; + const char *cattr; - if (MDOC_HEAD == n->type) - return(0); - else if (MDOC_BLOCK != n->type) - return(1); - - PAIR_CLASS_INIT(&tag[0], "lit"); - - if (n->head->child) { - if ( ! strcmp("Em", n->head->child->string)) - PAIR_CLASS_INIT(&tag[0], "emph"); - else if ( ! strcmp("Sy", n->head->child->string)) - PAIR_CLASS_INIT(&tag[0], "symb"); - else if ( ! strcmp("Li", n->head->child->string)) - PAIR_CLASS_INIT(&tag[0], "lit"); - } else { - assert(n->args); - for (i = 0; i < (int)n->args->argc; i++) - switch (n->args->argv[i].arg) { - case (MDOC_Symbolic): - PAIR_CLASS_INIT(&tag[0], "symb"); - break; - case (MDOC_Literal): - PAIR_CLASS_INIT(&tag[0], "lit"); - break; - case (MDOC_Emphasis): - PAIR_CLASS_INIT(&tag[0], "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"; - bufcat_style(h, "display", "inline"); - SCALE_HS_INIT(&su, 1); - bufcat_su(h, "margin-right", &su); - PAIR_STYLE_INIT(&tag[1], h); - 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; - - 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); + 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; - 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); + 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(); } - - PAIR_CLASS_INIT(&tag, "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; - - PAIR_CLASS_INIT(&tag, "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; - - PAIR_CLASS_INIT(&tag, "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; - 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); + 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(); + } + + 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[2]; + if (n->type != ROFFT_BODY) + return 1; switch (n->tok) { - case(MDOC__A): - PAIR_CLASS_INIT(&tag[0], "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): - PAIR_CLASS_INIT(&tag[0], "ref-book"); + case MDOC_Bro: + case MDOC_Brq: + print_text(h, "\\(lC"); break; - case(MDOC__C): - PAIR_CLASS_INIT(&tag[0], "ref-city"); + case MDOC_Bo: + case MDOC_Bq: + print_text(h, "\\(lB"); break; - case(MDOC__D): - PAIR_CLASS_INIT(&tag[0], "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): - PAIR_CLASS_INIT(&tag[0], "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): - PAIR_CLASS_INIT(&tag[0], "ref-jrnl"); + case MDOC_Do: + case MDOC_Dq: + print_text(h, "\\(lq"); break; - case(MDOC__N): - PAIR_CLASS_INIT(&tag[0], "ref-num"); + case MDOC_Qo: + case MDOC_Qq: + print_text(h, "\""); break; - case(MDOC__O): - PAIR_CLASS_INIT(&tag[0], "ref-opt"); + case MDOC_Po: + case MDOC_Pq: + print_text(h, "("); break; - case(MDOC__P): - PAIR_CLASS_INIT(&tag[0], "ref-page"); + case MDOC_Ql: + print_text(h, "\\(oq"); + h->flags |= HTML_NOSPACE; + print_otag(h, TAG_CODE, "c", "Li"); break; - case(MDOC__Q): - PAIR_CLASS_INIT(&tag[0], "ref-corp"); + case MDOC_So: + case MDOC_Sq: + print_text(h, "\\(oq"); break; - case(MDOC__R): - PAIR_CLASS_INIT(&tag[0], "ref-rep"); + default: + abort(); + } + + h->flags |= HTML_NOSPACE; + return 1; +} + +static void +mdoc_quote_post(MDOC_ARGS) +{ + + if (n->type != ROFFT_BODY && n->type != ROFFT_ELEM) + return; + + h->flags |= HTML_NOSPACE; + + switch (n->tok) { + 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__T): - PAIR_CLASS_INIT(&tag[0], "ref-title"); + case MDOC_Bro: + case MDOC_Brq: + print_text(h, "\\(rC"); break; - case(MDOC__U): - PAIR_CLASS_INIT(&tag[0], "link-ref"); + case MDOC_Oo: + case MDOC_Op: + case MDOC_Bo: + case MDOC_Bq: + print_text(h, "\\(rB"); break; - case(MDOC__V): - PAIR_CLASS_INIT(&tag[0], "ref-vol"); + 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"); + break; + 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(); - /* NOTREACHED */ } +} - if (MDOC__U != n->tok) { - print_otag(h, TAG_SPAN, 1, tag); - return(1); - } +static int +mdoc_eo_pre(MDOC_ARGS) +{ - PAIR_HREF_INIT(&tag[1], n->child->string); - print_otag(h, TAG_A, 2, tag); - return(1); + 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; } - -/* ARGSUSED */ static void -mdoc__x_post(MDOC_ARGS) +mdoc_eo_post(MDOC_ARGS) { + int body, tail; - /* TODO: %U */ + if (n->type != ROFFT_BODY) + return; - h->flags |= HTML_NOSPACE; - print_text(h, n->next ? "," : "."); + 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(); }