=================================================================== RCS file: /cvs/mandoc/mdoc_html.c,v retrieving revision 1.167 retrieving revision 1.241 diff -u -p -r1.167 -r1.241 --- mandoc/mdoc_html.c 2011/05/17 11:19:45 1.167 +++ mandoc/mdoc_html.c 2017/01/08 22:51:55 1.241 @@ -1,22 +1,21 @@ -/* $Id: mdoc_html.c,v 1.167 2011/05/17 11:19:45 kristaps Exp $ */ +/* $Id: mdoc_html.c,v 1.241 2017/01/08 22:51:55 schwarze Exp $ */ /* - * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons + * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons + * Copyright (c) 2014, 2015, 2016, 2017 Ingo Schwarze * * 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. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include @@ -27,17 +26,17 @@ #include #include -#include "mandoc.h" +#include "mandoc_aux.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 @@ -49,15 +48,13 @@ struct htmlmdoc { void (*post)(MDOC_ARGS); }; -static void print_mdoc(MDOC_ARGS); static void print_mdoc_head(MDOC_ARGS); static void print_mdoc_node(MDOC_ARGS); static void print_mdoc_nodelist(MDOC_ARGS); -static void synopsis_pre(struct html *, - const struct mdoc_node *); +static void synopsis_pre(struct html *, + const struct roff_node *); static void a2width(const char *, struct roffsu *); -static void a2offs(const char *, struct roffsu *); static void mdoc_root_post(MDOC_ARGS); static int mdoc_root_pre(MDOC_ARGS); @@ -84,6 +81,8 @@ 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 void mdoc_eo_post(MDOC_ARGS); +static int mdoc_eo_pre(MDOC_ARGS); static int mdoc_er_pre(MDOC_ARGS); static int mdoc_ev_pre(MDOC_ARGS); static int mdoc_ex_pre(MDOC_ARGS); @@ -100,6 +99,7 @@ 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 int mdoc_pa_pre(MDOC_ARGS); static void mdoc_pf_post(MDOC_ARGS); @@ -109,6 +109,7 @@ static int mdoc_quote_pre(MDOC_ARGS); static int mdoc_rs_pre(MDOC_ARGS); static int mdoc_rv_pre(MDOC_ARGS); static int mdoc_sh_pre(MDOC_ARGS); +static int mdoc_skip_pre(MDOC_ARGS); static int mdoc_sm_pre(MDOC_ARGS); static int mdoc_sp_pre(MDOC_ARGS); static int mdoc_ss_pre(MDOC_ARGS); @@ -126,8 +127,8 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {NULL, NULL}, /* Dt */ {NULL, NULL}, /* Os */ {mdoc_sh_pre, NULL }, /* Sh */ - {mdoc_ss_pre, NULL }, /* Ss */ - {mdoc_pp_pre, NULL}, /* Pp */ + {mdoc_ss_pre, NULL }, /* Ss */ + {mdoc_pp_pre, NULL}, /* Pp */ {mdoc_d1_pre, NULL}, /* D1 */ {mdoc_d1_pre, NULL}, /* Dl */ {mdoc_bd_pre, NULL}, /* Bd */ @@ -135,32 +136,32 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {mdoc_bl_pre, NULL}, /* Bl */ {NULL, NULL}, /* El */ {mdoc_it_pre, NULL}, /* It */ - {mdoc_ad_pre, NULL}, /* Ad */ + {mdoc_ad_pre, NULL}, /* Ad */ {mdoc_an_pre, NULL}, /* An */ {mdoc_ar_pre, NULL}, /* Ar */ {mdoc_cd_pre, NULL}, /* Cd */ {mdoc_fl_pre, NULL}, /* Cm */ - {mdoc_dv_pre, NULL}, /* Dv */ - {mdoc_er_pre, NULL}, /* Er */ - {mdoc_ev_pre, NULL}, /* Ev */ + {mdoc_dv_pre, NULL}, /* Dv */ + {mdoc_er_pre, NULL}, /* Er */ + {mdoc_ev_pre, NULL}, /* Ev */ {mdoc_ex_pre, NULL}, /* Ex */ - {mdoc_fa_pre, NULL}, /* Fa */ - {mdoc_fd_pre, NULL}, /* Fd */ + {mdoc_fa_pre, NULL}, /* Fa */ + {mdoc_fd_pre, NULL}, /* Fd */ {mdoc_fl_pre, NULL}, /* Fl */ - {mdoc_fn_pre, NULL}, /* Fn */ - {mdoc_ft_pre, NULL}, /* Ft */ - {mdoc_ic_pre, NULL}, /* Ic */ - {mdoc_in_pre, NULL}, /* In */ + {mdoc_fn_pre, NULL}, /* Fn */ + {mdoc_ft_pre, NULL}, /* Ft */ + {mdoc_ic_pre, NULL}, /* Ic */ + {mdoc_in_pre, NULL}, /* In */ {mdoc_li_pre, NULL}, /* Li */ - {mdoc_nd_pre, NULL}, /* Nd */ - {mdoc_nm_pre, NULL}, /* Nm */ + {mdoc_nd_pre, NULL}, /* Nd */ + {mdoc_nm_pre, NULL}, /* Nm */ {mdoc_quote_pre, mdoc_quote_post}, /* Op */ - {NULL, NULL}, /* Ot */ + {mdoc_ft_pre, NULL}, /* Ot */ {mdoc_pa_pre, NULL}, /* Pa */ {mdoc_rv_pre, NULL}, /* Rv */ - {NULL, NULL}, /* St */ + {NULL, NULL}, /* St */ {mdoc_va_pre, NULL}, /* Va */ - {mdoc_vt_pre, NULL}, /* Vt */ + {mdoc_vt_pre, NULL}, /* Vt */ {mdoc_xr_pre, NULL}, /* Xr */ {mdoc__x_pre, mdoc__x_post}, /* %A */ {mdoc__x_pre, mdoc__x_post}, /* %B */ @@ -178,22 +179,22 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {mdoc_quote_pre, mdoc_quote_post}, /* Aq */ {NULL, NULL}, /* At */ {NULL, NULL}, /* Bc */ - {mdoc_bf_pre, NULL}, /* Bf */ + {mdoc_bf_pre, NULL}, /* Bf */ {mdoc_quote_pre, mdoc_quote_post}, /* Bo */ {mdoc_quote_pre, mdoc_quote_post}, /* Bq */ {mdoc_xx_pre, NULL}, /* Bsx */ {mdoc_bx_pre, NULL}, /* Bx */ - {NULL, NULL}, /* Db */ + {mdoc_skip_pre, NULL}, /* Db */ {NULL, NULL}, /* Dc */ {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 */ - {mdoc_igndelim_pre, NULL}, /* No */ + {mdoc_no_pre, NULL}, /* No */ {mdoc_ns_pre, NULL}, /* Ns */ {mdoc_xx_pre, NULL}, /* Nx */ {mdoc_xx_pre, NULL}, /* Ox */ @@ -210,39 +211,40 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {NULL, NULL}, /* Sc */ {mdoc_quote_pre, mdoc_quote_post}, /* So */ {mdoc_quote_pre, mdoc_quote_post}, /* Sq */ - {mdoc_sm_pre, NULL}, /* Sm */ + {mdoc_sm_pre, NULL}, /* Sm */ {mdoc_sx_pre, NULL}, /* Sx */ {mdoc_sy_pre, NULL}, /* Sy */ {NULL, NULL}, /* Tn */ {mdoc_xx_pre, NULL}, /* Ux */ {NULL, NULL}, /* Xc */ {NULL, NULL}, /* Xo */ - {mdoc_fo_pre, mdoc_fo_post}, /* Fo */ - {NULL, NULL}, /* Fc */ + {mdoc_fo_pre, mdoc_fo_post}, /* Fo */ + {NULL, NULL}, /* Fc */ {mdoc_quote_pre, mdoc_quote_post}, /* Oo */ {NULL, NULL}, /* Oc */ {mdoc_bk_pre, mdoc_bk_post}, /* Bk */ {NULL, NULL}, /* Ek */ {mdoc_bt_pre, NULL}, /* Bt */ {NULL, NULL}, /* Hf */ - {NULL, NULL}, /* Fr */ + {mdoc_em_pre, NULL}, /* Fr */ {mdoc_ud_pre, NULL}, /* Ud */ {mdoc_lb_pre, NULL}, /* Lb */ - {mdoc_pp_pre, NULL}, /* Lp */ - {mdoc_lk_pre, NULL}, /* Lk */ - {mdoc_mt_pre, NULL}, /* Mt */ - {mdoc_quote_pre, mdoc_quote_post}, /* Brq */ - {mdoc_quote_pre, mdoc_quote_post}, /* Bro */ - {NULL, NULL}, /* Brc */ - {mdoc__x_pre, mdoc__x_post}, /* %C */ - {NULL, NULL}, /* Es */ /* TODO */ - {NULL, NULL}, /* En */ /* TODO */ - {mdoc_xx_pre, NULL}, /* Dx */ - {mdoc__x_pre, mdoc__x_post}, /* %Q */ + {mdoc_pp_pre, NULL}, /* Lp */ + {mdoc_lk_pre, NULL}, /* Lk */ + {mdoc_mt_pre, NULL}, /* Mt */ + {mdoc_quote_pre, mdoc_quote_post}, /* Brq */ + {mdoc_quote_pre, mdoc_quote_post}, /* Bro */ + {NULL, NULL}, /* Brc */ + {mdoc__x_pre, mdoc__x_post}, /* %C */ + {mdoc_skip_pre, NULL}, /* Es */ + {mdoc_quote_pre, mdoc_quote_post}, /* En */ + {mdoc_xx_pre, NULL}, /* Dx */ + {mdoc__x_pre, mdoc__x_post}, /* %Q */ {mdoc_sp_pre, NULL}, /* br */ - {mdoc_sp_pre, NULL}, /* sp */ - {mdoc__x_pre, mdoc__x_post}, /* %U */ - {NULL, NULL}, /* Ta */ + {mdoc_sp_pre, NULL}, /* sp */ + {mdoc__x_pre, mdoc__x_post}, /* %U */ + {NULL, NULL}, /* Ta */ + {mdoc_skip_pre, NULL}, /* ll */ }; static const char * const lists[LIST_MAX] = { @@ -260,23 +262,7 @@ static const char * const lists[LIST_MAX] = { "list-tag" }; -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"); -} - - /* * 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 @@ -286,46 +272,42 @@ static void a2width(const char *p, struct roffsu *su) { - if ( ! a2roffsu(p, su, SCALE_MAX)) { - su->unit = SCALE_BU; + if (a2roffsu(p, su, SCALE_MAX) < 2) { + su->unit = SCALE_EN; su->scale = html_strlen(p); - } + } else if (su->scale < 0.0) + su->scale = 0.0; } - /* * See the same function in mdoc_term.c for documentation. */ static void -synopsis_pre(struct html *h, const struct mdoc_node *n) +synopsis_pre(struct html *h, const struct roff_node *n) { if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags)) return; - if (n->prev->tok == n->tok && - MDOC_Fo != n->tok && - MDOC_Ft != n->tok && - MDOC_Fn != n->tok) { + if (n->prev->tok == n->tok && + MDOC_Fo != n->tok && + MDOC_Ft != n->tok && + MDOC_Fn != n->tok) { print_otag(h, TAG_BR, 0, NULL); return; } switch (n->prev->tok) { - case (MDOC_Fd): - /* FALLTHROUGH */ - case (MDOC_Fn): - /* FALLTHROUGH */ - case (MDOC_Fo): - /* FALLTHROUGH */ - case (MDOC_In): - /* FALLTHROUGH */ - case (MDOC_Vt): - print_otag(h, TAG_P, 0, NULL); + case MDOC_Fd: + case MDOC_Fn: + case MDOC_Fo: + case MDOC_In: + case MDOC_Vt: + print_paragraph(h); break; - case (MDOC_Ft): + case MDOC_Ft: if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) { - print_otag(h, TAG_P, 0, NULL); + print_paragraph(h); break; } /* FALLTHROUGH */ @@ -335,92 +317,72 @@ synopsis_pre(struct html *h, const struct mdoc_node *n } } - -/* - * Calculate the scaling unit passed in an `-offset' argument. This - * uses either a native scaling unit (e.g., 1i, 2m), one of a set of - * 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_man *mdoc) { + struct htmlpair tag; + struct html *h; + struct tag *t, *tt; - /* FIXME: "right"? */ + PAIR_CLASS_INIT(&tag, "mandoc"); + h = (struct html *)arg; - 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_BU; - su->scale = html_strlen(p); - } -} + if ( ! (HTML_FRAGMENT & h->oflags)) { + print_gen_decls(h); + t = print_otag(h, TAG_HTML, 0, NULL); + tt = print_otag(h, TAG_HEAD, 0, NULL); + print_mdoc_head(&mdoc->meta, mdoc->first->child, h); + print_tagq(h, tt); + print_otag(h, TAG_BODY, 0, NULL); + print_otag(h, TAG_DIV, 1, &tag); + } else + t = print_otag(h, TAG_DIV, 1, &tag); - -static void -print_mdoc(MDOC_ARGS) -{ - struct tag *t; - - t = print_otag(h, TAG_HEAD, 0, NULL); - print_mdoc_head(m, n, h); + mdoc_root_pre(&mdoc->meta, mdoc->first->child, h); + print_mdoc_nodelist(&mdoc->meta, mdoc->first->child, h); + mdoc_root_post(&mdoc->meta, mdoc->first->child, h); print_tagq(h, t); - - t = print_otag(h, TAG_BODY, 0, NULL); - print_mdoc_nodelist(m, n, h); - print_tagq(h, t); + putchar('\n'); } - -/* ARGSUSED */ static void print_mdoc_head(MDOC_ARGS) { print_gen_head(h); bufinit(h); - bufcat_fmt(h, "%s(%s)", m->title, m->msec); + bufcat(h, meta->title); + if (meta->msec) + bufcat_fmt(h, "(%s)", meta->msec); + if (meta->arch) + bufcat_fmt(h, " (%s)", meta->arch); - if (m->arch) { - bufcat(h, " ("); - bufcat(h, m->arch); - bufcat(h, ")"); - } - print_otag(h, TAG_TITLE, 0, NULL); print_text(h, h->buf); } - 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; - struct htmlpair tag; child = 1; t = h->tags.head; + n->flags &= ~MDOC_ENDED; - bufinit(h); switch (n->type) { - case (MDOC_ROOT): - child = mdoc_root_pre(m, n, h); - break; - case (MDOC_TEXT): + case ROFFT_TEXT: /* No tables in this mode... */ assert(NULL == h->tblt); @@ -437,12 +399,12 @@ print_mdoc_node(MDOC_ARGS) if (MDOC_DELIMO & n->flags) h->flags |= HTML_NOSPACE; return; - case (MDOC_EQN): - PAIR_CLASS_INIT(&tag, "eqn"); - print_otag(h, TAG_SPAN, 1, &tag); - print_text(h, n->eqn->data); + case ROFFT_EQN: + if (n->flags & MDOC_LINE) + putchar('\n'); + print_eqn(h, n->eqn); break; - case (MDOC_TBL): + case ROFFT_TBL: /* * This will take care of initialising all of the table * state data for the first table, then tearing it down @@ -456,206 +418,175 @@ print_mdoc_node(MDOC_ARGS) * the "meta" table state. This will be reopened on the * next table element. */ - if (h->tblt) { + if (h->tblt != NULL) { print_tblclose(h); t = h->tags.head; } - - assert(NULL == h->tblt); - if (mdocs[n->tok].pre && ENDBODY_NOT == n->end) - child = (*mdocs[n->tok].pre)(m, n, h); + assert(h->tblt == NULL); + if (mdocs[n->tok].pre && (n->end == ENDBODY_NOT || n->child)) + child = (*mdocs[n->tok].pre)(meta, n, h); break; } - if (HTML_KEEP & h->flags) { - if (n->prev && n->prev->line != n->line) { - h->flags &= ~HTML_KEEP; - h->flags |= HTML_PREKEEP; - } else if (NULL == n->prev) { - if (n->parent && n->parent->line != n->line) { - h->flags &= ~HTML_KEEP; - h->flags |= HTML_PREKEEP; - } - } + if (h->flags & HTML_KEEP && n->flags & MDOC_LINE) { + h->flags &= ~HTML_KEEP; + h->flags |= HTML_PREKEEP; } if (child && n->child) - print_mdoc_nodelist(m, n->child, h); + print_mdoc_nodelist(meta, n->child, h); print_stagq(h, t); - bufinit(h); switch (n->type) { - case (MDOC_ROOT): - mdoc_root_post(m, n, h); + case ROFFT_EQN: break; - case (MDOC_EQN): - break; default: - if (mdocs[n->tok].post && ENDBODY_NOT == n->end) - (*mdocs[n->tok].post)(m, n, h); + if ( ! mdocs[n->tok].post || n->flags & MDOC_ENDED) + break; + (*mdocs[n->tok].post)(meta, n, h); + if (n->end != ENDBODY_NOT) + n->body->flags |= MDOC_ENDED; + if (n->end == ENDBODY_NOSPACE) + h->flags |= HTML_NOSPACE; break; } } -/* ARGSUSED */ static void mdoc_root_post(MDOC_ARGS) { - struct htmlpair tag[3]; + struct htmlpair tag; struct tag *t, *tt; - PAIR_SUMMARY_INIT(&tag[0], "Document Footer"); - PAIR_CLASS_INIT(&tag[1], "foot"); - if (NULL == h->style) { - PAIR_INIT(&tag[2], ATTR_WIDTH, "100%"); - t = print_otag(h, TAG_TABLE, 3, tag); - PAIR_INIT(&tag[0], ATTR_WIDTH, "50%"); - print_otag(h, TAG_COL, 1, tag); - print_otag(h, TAG_COL, 1, tag); - } else - t = print_otag(h, TAG_TABLE, 2, tag); + PAIR_CLASS_INIT(&tag, "foot"); + t = print_otag(h, TAG_TABLE, 1, &tag); - t = print_otag(h, TAG_TBODY, 0, NULL); + print_otag(h, TAG_TBODY, 0, NULL); tt = print_otag(h, TAG_TR, 0, NULL); - PAIR_CLASS_INIT(&tag[0], "foot-date"); - print_otag(h, TAG_TD, 1, tag); - - print_text(h, m->date); + PAIR_CLASS_INIT(&tag, "foot-date"); + print_otag(h, TAG_TD, 1, &tag); + print_text(h, meta->date); print_stagq(h, tt); - PAIR_CLASS_INIT(&tag[0], "foot-os"); - if (NULL == h->style) { - PAIR_INIT(&tag[1], ATTR_ALIGN, "right"); - print_otag(h, TAG_TD, 2, tag); - } else - print_otag(h, TAG_TD, 1, tag); - - print_text(h, m->os); + PAIR_CLASS_INIT(&tag, "foot-os"); + print_otag(h, TAG_TD, 1, &tag); + print_text(h, meta->os); print_tagq(h, t); } - -/* ARGSUSED */ static int mdoc_root_pre(MDOC_ARGS) { - struct htmlpair tag[3]; + struct htmlpair tag; struct tag *t, *tt; - char b[BUFSIZ], title[BUFSIZ]; + char *volume, *title; - 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) { - strlcat(b, " (", BUFSIZ); - strlcat(b, m->arch, BUFSIZ); - strlcat(b, ")", BUFSIZ); - } + if (NULL == meta->msec) + title = mandoc_strdup(meta->title); + else + mandoc_asprintf(&title, "%s(%s)", + meta->title, meta->msec); - snprintf(title, BUFSIZ - 1, "%s(%s)", m->title, m->msec); + PAIR_CLASS_INIT(&tag, "head"); + t = print_otag(h, TAG_TABLE, 1, &tag); - PAIR_SUMMARY_INIT(&tag[0], "Document Header"); - PAIR_CLASS_INIT(&tag[1], "head"); - if (NULL == h->style) { - PAIR_INIT(&tag[2], ATTR_WIDTH, "100%"); - t = print_otag(h, TAG_TABLE, 3, tag); - PAIR_INIT(&tag[0], ATTR_WIDTH, "30%"); - print_otag(h, TAG_COL, 1, tag); - print_otag(h, TAG_COL, 1, tag); - print_otag(h, TAG_COL, 1, tag); - } else - t = print_otag(h, TAG_TABLE, 2, tag); - print_otag(h, TAG_TBODY, 0, NULL); tt = print_otag(h, TAG_TR, 0, NULL); - PAIR_CLASS_INIT(&tag[0], "head-ltitle"); - print_otag(h, TAG_TD, 1, tag); - + PAIR_CLASS_INIT(&tag, "head-ltitle"); + print_otag(h, TAG_TD, 1, &tag); print_text(h, title); print_stagq(h, tt); - PAIR_CLASS_INIT(&tag[0], "head-vol"); - if (NULL == h->style) { - PAIR_INIT(&tag[1], ATTR_ALIGN, "center"); - print_otag(h, TAG_TD, 2, tag); - } else - print_otag(h, TAG_TD, 1, tag); - - print_text(h, b); + PAIR_CLASS_INIT(&tag, "head-vol"); + print_otag(h, TAG_TD, 1, &tag); + print_text(h, volume); print_stagq(h, tt); - PAIR_CLASS_INIT(&tag[0], "head-rtitle"); - if (NULL == h->style) { - PAIR_INIT(&tag[1], ATTR_ALIGN, "right"); - print_otag(h, TAG_TD, 2, tag); - } else - print_otag(h, TAG_TD, 1, tag); - + PAIR_CLASS_INIT(&tag, "head-rtitle"); + print_otag(h, TAG_TD, 1, &tag); print_text(h, title); print_tagq(h, t); - return(1); + + free(title); + free(volume); + return 1; } - -/* ARGSUSED */ static int mdoc_sh_pre(MDOC_ARGS) { struct htmlpair tag; - char buf[BUFSIZ]; - if (MDOC_BLOCK == n->type) { + switch (n->type) { + case ROFFT_BLOCK: PAIR_CLASS_INIT(&tag, "section"); print_otag(h, TAG_DIV, 1, &tag); - return(1); - } else if (MDOC_BODY == n->type) - return(1); + return 1; + case ROFFT_BODY: + if (n->sec == SEC_AUTHORS) + h->flags &= ~(HTML_SPLIT|HTML_NOSPLIT); + return 1; + default: + break; + } - buf[0] = '\0'; - for (n = n->child; n; n = n->next) { - html_idcat(buf, n->string, BUFSIZ); - if (n->next) - html_idcat(buf, " ", BUFSIZ); + bufinit(h); + + for (n = n->child; n != NULL && n->type == ROFFT_TEXT; ) { + bufcat_id(h, n->string); + if (NULL != (n = n->next)) + bufcat_id(h, " "); } - PAIR_ID_INIT(&tag, buf); - print_otag(h, TAG_H1, 1, &tag); - return(1); + if (NULL == n) { + PAIR_ID_INIT(&tag, h->buf); + print_otag(h, TAG_H1, 1, &tag); + } else + print_otag(h, TAG_H1, 0, NULL); + + return 1; } - -/* ARGSUSED */ static int mdoc_ss_pre(MDOC_ARGS) { struct htmlpair tag; - char buf[BUFSIZ]; - if (MDOC_BLOCK == n->type) { + if (n->type == ROFFT_BLOCK) { PAIR_CLASS_INIT(&tag, "subsection"); print_otag(h, TAG_DIV, 1, &tag); - return(1); - } else if (MDOC_BODY == n->type) - return(1); + return 1; + } else if (n->type == ROFFT_BODY) + return 1; - buf[0] = '\0'; - for (n = n->child; n; n = n->next) { - html_idcat(buf, n->string, BUFSIZ); - if (n->next) - html_idcat(buf, " ", BUFSIZ); + bufinit(h); + + for (n = n->child; n != NULL && n->type == ROFFT_TEXT; ) { + bufcat_id(h, n->string); + if (NULL != (n = n->next)) + bufcat_id(h, " "); } - PAIR_ID_INIT(&tag, buf); - print_otag(h, TAG_H2, 1, &tag); - return(1); + if (NULL == n) { + PAIR_ID_INIT(&tag, h->buf); + print_otag(h, TAG_H2, 1, &tag); + } else + print_otag(h, TAG_H2, 0, NULL); + + return 1; } - -/* ARGSUSED */ static int mdoc_fl_pre(MDOC_ARGS) { @@ -667,37 +598,35 @@ mdoc_fl_pre(MDOC_ARGS) /* `Cm' has no leading hyphen. */ if (MDOC_Cm == n->tok) - return(1); + return 1; print_text(h, "\\-"); - if (n->child) + if (!(n->child == NULL && + (n->next == NULL || + n->next->type == ROFFT_TEXT || + n->next->flags & MDOC_LINE))) 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); + if (n->type != ROFFT_BODY) + return 1; /* XXX: this tag in theory can contain block elements. */ print_text(h, "\\(em"); PAIR_CLASS_INIT(&tag, "desc"); print_otag(h, TAG_SPAN, 1, &tag); - return(1); + return 1; } - static int mdoc_nm_pre(MDOC_ARGS) { @@ -706,21 +635,18 @@ mdoc_nm_pre(MDOC_ARGS) int len; switch (n->type) { - case (MDOC_ELEM): - synopsis_pre(h, n); + case ROFFT_HEAD: + print_otag(h, TAG_TD, 0, NULL); + /* FALLTHROUGH */ + case ROFFT_ELEM: PAIR_CLASS_INIT(&tag, "name"); print_otag(h, TAG_B, 1, &tag); - if (NULL == n->child && m->name) - print_text(h, m->name); - return(1); - case (MDOC_HEAD): + if (n->child == NULL && meta->name != NULL) + print_text(h, meta->name); + return 1; + case ROFFT_BODY: print_otag(h, TAG_TD, 0, NULL); - if (NULL == n->child && m->name) - print_text(h, m->name); - return(1); - case (MDOC_BODY): - print_otag(h, TAG_TD, 0, NULL); - return(1); + return 1; default: break; } @@ -729,39 +655,38 @@ mdoc_nm_pre(MDOC_ARGS) PAIR_CLASS_INIT(&tag, "synopsis"); print_otag(h, TAG_TABLE, 1, &tag); - for (len = 0, n = n->child; n; n = n->next) - if (MDOC_TEXT == n->type) + for (len = 0, n = n->head->child; n; n = n->next) + if (n->type == ROFFT_TEXT) len += html_strlen(n->string); - if (0 == len && m->name) - len = html_strlen(m->name); + if (len == 0 && meta->name != NULL) + len = html_strlen(meta->name); - SCALE_HS_INIT(&su, (double)len); + SCALE_HS_INIT(&su, len); + bufinit(h); bufcat_su(h, "width", &su); PAIR_STYLE_INIT(&tag, h); print_otag(h, TAG_COL, 1, &tag); print_otag(h, TAG_COL, 0, NULL); print_otag(h, TAG_TBODY, 0, NULL); print_otag(h, TAG_TR, 0, NULL); - return(1); + return 1; } - -/* ARGSUSED */ static int mdoc_xr_pre(MDOC_ARGS) { struct htmlpair tag[2]; if (NULL == n->child) - return(0); + 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); + buffmt_man(h, n->child->string, + n->child->next ? + n->child->next->string : NULL); PAIR_HREF_INIT(&tag[1], h->buf); print_otag(h, TAG_A, 2, tag); } else @@ -771,7 +696,7 @@ mdoc_xr_pre(MDOC_ARGS) print_text(h, n->string); if (NULL == (n = n->next)) - return(0); + return 0; h->flags |= HTML_NOSPACE; print_text(h, "("); @@ -779,22 +704,18 @@ mdoc_xr_pre(MDOC_ARGS) print_text(h, n->string); h->flags |= HTML_NOSPACE; print_text(h, ")"); - return(0); + return 0; } - -/* ARGSUSED */ static int mdoc_ns_pre(MDOC_ARGS) { if ( ! (MDOC_LINE & n->flags)) h->flags |= HTML_NOSPACE; - return(1); + return 1; } - -/* ARGSUSED */ static int mdoc_ar_pre(MDOC_ARGS) { @@ -802,11 +723,9 @@ mdoc_ar_pre(MDOC_ARGS) PAIR_CLASS_INIT(&tag, "arg"); print_otag(h, TAG_I, 1, &tag); - return(1); + return 1; } - -/* ARGSUSED */ static int mdoc_xx_pre(MDOC_ARGS) { @@ -815,26 +734,26 @@ mdoc_xx_pre(MDOC_ARGS) int flags; switch (n->tok) { - case (MDOC_Bsx): + case MDOC_Bsx: pp = "BSD/OS"; break; - case (MDOC_Dx): + case MDOC_Dx: pp = "DragonFly"; break; - case (MDOC_Fx): + case MDOC_Fx: pp = "FreeBSD"; break; - case (MDOC_Nx): + case MDOC_Nx: pp = "NetBSD"; break; - case (MDOC_Ox): + case MDOC_Ox: pp = "OpenBSD"; break; - case (MDOC_Ux): + case MDOC_Ux: pp = "UNIX"; break; default: - return(1); + return 1; } PAIR_CLASS_INIT(&tag, "unix"); @@ -847,11 +766,9 @@ mdoc_xx_pre(MDOC_ARGS) print_text(h, n->child->string); h->flags = flags; } - return(0); + return 0; } - -/* ARGSUSED */ static int mdoc_bx_pre(MDOC_ARGS) { @@ -866,7 +783,7 @@ mdoc_bx_pre(MDOC_ARGS) print_text(h, "BSD"); } else { print_text(h, "BSD"); - return(0); + return 0; } if (NULL != (n = n->next)) { @@ -876,17 +793,16 @@ mdoc_bx_pre(MDOC_ARGS) print_text(h, n->string); } - return(0); + return 0; } -/* ARGSUSED */ static int mdoc_it_pre(MDOC_ARGS) { struct roffsu su; enum mdoc_list type; struct htmlpair tag[2]; - const struct mdoc_node *bl; + const struct roff_node *bl; bl = n->parent; while (bl && MDOC_Bl != bl->tok) @@ -899,27 +815,21 @@ mdoc_it_pre(MDOC_ARGS) assert(lists[type]); PAIR_CLASS_INIT(&tag[0], lists[type]); - if (MDOC_HEAD == n->type) { + bufinit(h); + + if (n->type == ROFFT_HEAD) { switch (type) { - case(LIST_bullet): - /* FALLTHROUGH */ - case(LIST_dash): - /* FALLTHROUGH */ - case(LIST_item): - /* FALLTHROUGH */ - case(LIST_hyphen): - /* FALLTHROUGH */ - case(LIST_enum): - return(0); - case(LIST_diag): - /* FALLTHROUGH */ - case(LIST_hang): - /* FALLTHROUGH */ - case(LIST_inset): - /* FALLTHROUGH */ - case(LIST_ohang): - /* FALLTHROUGH */ - case(LIST_tag): + case LIST_bullet: + case LIST_dash: + case LIST_item: + case LIST_hyphen: + case LIST_enum: + return 0; + case LIST_diag: + case LIST_hang: + case LIST_inset: + case LIST_ohang: + case LIST_tag: SCALE_VS_INIT(&su, ! bl->norm->Bl.comp); bufcat_su(h, "margin-top", &su); PAIR_STYLE_INIT(&tag[1], h); @@ -929,36 +839,28 @@ mdoc_it_pre(MDOC_ARGS) PAIR_CLASS_INIT(&tag[0], "diag"); print_otag(h, TAG_B, 1, tag); break; - case(LIST_column): + case LIST_column: break; default: break; } - } else if (MDOC_BODY == n->type) { + } else if (n->type == ROFFT_BODY) { switch (type) { - case(LIST_bullet): - /* FALLTHROUGH */ - case(LIST_hyphen): - /* FALLTHROUGH */ - case(LIST_dash): - /* FALLTHROUGH */ - case(LIST_enum): - /* FALLTHROUGH */ - case(LIST_item): + case LIST_bullet: + case LIST_hyphen: + case LIST_dash: + case LIST_enum: + case LIST_item: SCALE_VS_INIT(&su, ! bl->norm->Bl.comp); bufcat_su(h, "margin-top", &su); PAIR_STYLE_INIT(&tag[1], h); print_otag(h, TAG_LI, 2, tag); break; - case(LIST_diag): - /* FALLTHROUGH */ - case(LIST_hang): - /* FALLTHROUGH */ - case(LIST_inset): - /* FALLTHROUGH */ - case(LIST_ohang): - /* FALLTHROUGH */ - case(LIST_tag): + case LIST_diag: + case LIST_hang: + case LIST_inset: + case LIST_ohang: + case LIST_tag: if (NULL == bl->norm->Bl.width) { print_otag(h, TAG_DD, 1, tag); break; @@ -968,7 +870,7 @@ mdoc_it_pre(MDOC_ARGS) PAIR_STYLE_INIT(&tag[1], h); print_otag(h, TAG_DD, 2, tag); break; - case(LIST_column): + case LIST_column: SCALE_VS_INIT(&su, ! bl->norm->Bl.comp); bufcat_su(h, "margin-top", &su); PAIR_STYLE_INIT(&tag[1], h); @@ -979,7 +881,7 @@ mdoc_it_pre(MDOC_ARGS) } } else { switch (type) { - case (LIST_column): + case LIST_column: print_otag(h, TAG_TR, 1, tag); break; default: @@ -987,10 +889,9 @@ mdoc_it_pre(MDOC_ARGS) } } - return(1); + return 1; } -/* ARGSUSED */ static int mdoc_bl_pre(MDOC_ARGS) { @@ -999,15 +900,15 @@ mdoc_bl_pre(MDOC_ARGS) struct roffsu su; char buf[BUFSIZ]; - if (MDOC_BODY == n->type) { + if (n->type == ROFFT_BODY) { if (LIST_column == n->norm->Bl.type) print_otag(h, TAG_TBODY, 0, NULL); - return(1); + return 1; } - if (MDOC_HEAD == n->type) { + if (n->type == ROFFT_HEAD) { if (LIST_column != n->norm->Bl.type) - return(0); + return 0; /* * For each column, print out the tag with our @@ -1017,8 +918,8 @@ mdoc_bl_pre(MDOC_ARGS) */ for (i = 0; i < (int)n->norm->Bl.ncols; i++) { - a2width(n->norm->Bl.cols[i], &su); bufinit(h); + a2width(n->norm->Bl.cols[i], &su); if (i < (int)n->norm->Bl.ncols - 1) bufcat_su(h, "width", &su); else @@ -1027,68 +928,60 @@ mdoc_bl_pre(MDOC_ARGS) print_otag(h, TAG_COL, 1, tag); } - return(0); + return 0; } SCALE_VS_INIT(&su, 0); + bufinit(h); bufcat_su(h, "margin-top", &su); bufcat_su(h, "margin-bottom", &su); PAIR_STYLE_INIT(&tag[0], h); assert(lists[n->norm->Bl.type]); - strlcpy(buf, "list ", BUFSIZ); - strlcat(buf, lists[n->norm->Bl.type], BUFSIZ); + (void)strlcpy(buf, "list ", BUFSIZ); + (void)strlcat(buf, lists[n->norm->Bl.type], BUFSIZ); PAIR_INIT(&tag[1], ATTR_CLASS, buf); /* Set the block's left-hand margin. */ if (n->norm->Bl.offs) { - a2offs(n->norm->Bl.offs, &su); + a2width(n->norm->Bl.offs, &su); bufcat_su(h, "margin-left", &su); } switch (n->norm->Bl.type) { - case(LIST_bullet): - /* FALLTHROUGH */ - case(LIST_dash): - /* FALLTHROUGH */ - case(LIST_hyphen): - /* FALLTHROUGH */ - case(LIST_item): + case LIST_bullet: + case LIST_dash: + case LIST_hyphen: + case LIST_item: print_otag(h, TAG_UL, 2, tag); break; - case(LIST_enum): + case LIST_enum: print_otag(h, TAG_OL, 2, tag); break; - case(LIST_diag): - /* FALLTHROUGH */ - case(LIST_hang): - /* FALLTHROUGH */ - case(LIST_inset): - /* FALLTHROUGH */ - case(LIST_ohang): - /* FALLTHROUGH */ - case(LIST_tag): + case LIST_diag: + case LIST_hang: + case LIST_inset: + case LIST_ohang: + case LIST_tag: print_otag(h, TAG_DL, 2, tag); break; - case(LIST_column): + case LIST_column: print_otag(h, TAG_TABLE, 2, tag); break; default: abort(); - /* NOTREACHED */ } - return(1); + return 1; } -/* ARGSUSED */ static int mdoc_ex_pre(MDOC_ARGS) { - struct tag *t; - struct htmlpair tag; - int nchild; + struct htmlpair tag; + struct tag *t; + struct roff_node *nch; if (n->prev) print_otag(h, TAG_BR, 0, NULL); @@ -1097,34 +990,34 @@ mdoc_ex_pre(MDOC_ARGS) print_text(h, "The"); - nchild = n->nchild; - for (n = n->child; n; n = n->next) { - assert(MDOC_TEXT == n->type); + for (nch = n->child; nch != NULL; nch = nch->next) { + assert(nch->type == ROFFT_TEXT); t = print_otag(h, TAG_B, 1, &tag); - print_text(h, n->string); + print_text(h, nch->string); print_tagq(h, t); - if (nchild > 2 && n->next) { + if (nch->next == NULL) + continue; + + if (nch->prev != NULL || nch->next->next != NULL) { h->flags |= HTML_NOSPACE; print_text(h, ","); } - if (n->next && NULL == n->next->next) + if (nch->next->next == NULL) print_text(h, "and"); } - if (nchild > 1) - print_text(h, "utilities exit"); + if (n->child != NULL && n->child->next != NULL) + print_text(h, "utilities exit\\~0"); else - print_text(h, "utility exits"); + print_text(h, "utility exits\\~0"); - print_text(h, "0 on success, and >0 if an error occurs."); - return(0); + print_text(h, "on success, and\\~>0 if an error occurs."); + return 0; } - -/* ARGSUSED */ static int mdoc_em_pre(MDOC_ARGS) { @@ -1132,21 +1025,20 @@ mdoc_em_pre(MDOC_ARGS) PAIR_CLASS_INIT(&tag, "emph"); print_otag(h, TAG_SPAN, 1, &tag); - return(1); + return 1; } - -/* ARGSUSED */ static int mdoc_d1_pre(MDOC_ARGS) { struct htmlpair tag[2]; struct roffsu su; - if (MDOC_BLOCK != n->type) - return(1); + if (n->type != ROFFT_BLOCK) + return 1; SCALE_VS_INIT(&su, 0); + bufinit(h); bufcat_su(h, "margin-top", &su); bufcat_su(h, "margin-bottom", &su); PAIR_STYLE_INIT(&tag[0], h); @@ -1160,51 +1052,48 @@ mdoc_d1_pre(MDOC_ARGS) if (MDOC_Dl == n->tok) { PAIR_CLASS_INIT(&tag[0], "lit"); print_otag(h, TAG_CODE, 1, tag); - } + } - return(1); + return 1; } - -/* ARGSUSED */ static int mdoc_sx_pre(MDOC_ARGS) { struct htmlpair tag[2]; - char buf[BUFSIZ]; - strlcpy(buf, "#", BUFSIZ); - for (n = n->child; n; n = n->next) { - html_idcat(buf, n->string, BUFSIZ); - if (n->next) - html_idcat(buf, " ", BUFSIZ); + bufinit(h); + bufcat(h, "#"); + + for (n = n->child; n; ) { + bufcat_id(h, n->string); + if (NULL != (n = n->next)) + bufcat_id(h, " "); } PAIR_CLASS_INIT(&tag[0], "link-sec"); - PAIR_HREF_INIT(&tag[1], buf); + PAIR_HREF_INIT(&tag[1], h->buf); print_otag(h, TAG_I, 1, tag); print_otag(h, TAG_A, 2, tag); - return(1); + return 1; } - -/* ARGSUSED */ static int mdoc_bd_pre(MDOC_ARGS) { - struct htmlpair tag[2]; - int comp, sv; - const struct mdoc_node *nn; + struct htmlpair tag[2]; + int comp, sv; + struct roff_node *nn; struct roffsu su; - if (MDOC_HEAD == n->type) - return(0); + if (n->type == ROFFT_HEAD) + return 0; - if (MDOC_BLOCK == n->type) { + if (n->type == ROFFT_BLOCK) { comp = n->norm->Bd.comp; for (nn = n; nn && ! comp; nn = nn->parent) { - if (MDOC_BLOCK != nn->type) + if (nn->type != ROFFT_BLOCK) continue; if (MDOC_Ss == nn->tok || MDOC_Sh == nn->tok) comp = 1; @@ -1212,34 +1101,43 @@ mdoc_bd_pre(MDOC_ARGS) break; } if ( ! comp) - print_otag(h, TAG_P, 0, NULL); - return(1); + print_paragraph(h); + return 1; } - SCALE_HS_INIT(&su, 0); - if (n->norm->Bd.offs) - a2offs(n->norm->Bd.offs, &su); + /* Handle the -offset argument. */ + if (n->norm->Bd.offs == NULL || + ! strcmp(n->norm->Bd.offs, "left")) + SCALE_HS_INIT(&su, 0); + else if ( ! strcmp(n->norm->Bd.offs, "indent")) + SCALE_HS_INIT(&su, INDENT); + else if ( ! strcmp(n->norm->Bd.offs, "indent-two")) + SCALE_HS_INIT(&su, INDENT * 2); + else + a2width(n->norm->Bd.offs, &su); + + bufinit(h); bufcat_su(h, "margin-left", &su); PAIR_STYLE_INIT(&tag[0], h); - if (DISP_unfilled != n->norm->Bd.type && - DISP_literal != n->norm->Bd.type) { - PAIR_CLASS_INIT(&tag[1], "display"); - print_otag(h, TAG_DIV, 2, tag); - return(1); - } + PAIR_CLASS_INIT(&tag[1], "display"); + print_otag(h, TAG_DIV, 2, tag); - PAIR_CLASS_INIT(&tag[1], "lit display"); - print_otag(h, TAG_PRE, 2, tag); + if (n->norm->Bd.type != DISP_unfilled && + n->norm->Bd.type != DISP_literal) + return 1; + PAIR_CLASS_INIT(&tag[0], "lit"); + print_otag(h, TAG_PRE, 1, tag); + /* This can be recursive: save & set our literal state. */ sv = h->flags & HTML_LITERAL; h->flags |= HTML_LITERAL; for (nn = n->child; nn; nn = nn->next) { - print_mdoc_node(m, nn, h); + print_mdoc_node(meta, nn, h); /* * If the printed node flushes its own line, then we * needn't do it here as well. This is hacky, but the @@ -1247,26 +1145,20 @@ mdoc_bd_pre(MDOC_ARGS) * anyway, so don't sweat it. */ switch (nn->tok) { - case (MDOC_Sm): - /* FALLTHROUGH */ - case (MDOC_br): - /* FALLTHROUGH */ - case (MDOC_sp): - /* FALLTHROUGH */ - case (MDOC_Bl): - /* FALLTHROUGH */ - case (MDOC_D1): - /* FALLTHROUGH */ - case (MDOC_Dl): - /* FALLTHROUGH */ - case (MDOC_Lp): - /* FALLTHROUGH */ - case (MDOC_Pp): + case MDOC_Sm: + case MDOC_br: + case MDOC_sp: + case MDOC_Bl: + case MDOC_D1: + case MDOC_Dl: + case MDOC_Lp: + case MDOC_Pp: continue; default: break; } - if (nn->next && nn->next->line == nn->line) + if (h->flags & HTML_NONEWLINE || + (nn->next && ! (nn->next->flags & MDOC_LINE))) continue; else if (nn->next) print_text(h, "\n"); @@ -1277,11 +1169,9 @@ mdoc_bd_pre(MDOC_ARGS) if (0 == sv) h->flags &= ~HTML_LITERAL; - return(0); + return 0; } - -/* ARGSUSED */ static int mdoc_pa_pre(MDOC_ARGS) { @@ -1289,11 +1179,9 @@ mdoc_pa_pre(MDOC_ARGS) PAIR_CLASS_INIT(&tag, "file"); print_otag(h, TAG_I, 1, &tag); - return(1); + return 1; } - -/* ARGSUSED */ static int mdoc_ad_pre(MDOC_ARGS) { @@ -1301,25 +1189,36 @@ mdoc_ad_pre(MDOC_ARGS) PAIR_CLASS_INIT(&tag, "addr"); print_otag(h, TAG_I, 1, &tag); - return(1); + return 1; } - -/* ARGSUSED */ static int mdoc_an_pre(MDOC_ARGS) { struct htmlpair tag; - /* TODO: -split and -nosplit (see termp_an_pre()). */ + 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; + } + if (h->flags & HTML_SPLIT) + print_otag(h, TAG_BR, 0, NULL); + + if (n->sec == SEC_AUTHORS && ! (h->flags & HTML_NOSPLIT)) + h->flags |= HTML_SPLIT; + PAIR_CLASS_INIT(&tag, "author"); print_otag(h, TAG_SPAN, 1, &tag); - return(1); + return 1; } - -/* ARGSUSED */ static int mdoc_cd_pre(MDOC_ARGS) { @@ -1328,11 +1227,9 @@ mdoc_cd_pre(MDOC_ARGS) synopsis_pre(h, n); PAIR_CLASS_INIT(&tag, "config"); print_otag(h, TAG_B, 1, &tag); - return(1); + return 1; } - -/* ARGSUSED */ static int mdoc_dv_pre(MDOC_ARGS) { @@ -1340,11 +1237,9 @@ mdoc_dv_pre(MDOC_ARGS) PAIR_CLASS_INIT(&tag, "define"); print_otag(h, TAG_SPAN, 1, &tag); - return(1); + return 1; } - -/* ARGSUSED */ static int mdoc_ev_pre(MDOC_ARGS) { @@ -1352,11 +1247,9 @@ mdoc_ev_pre(MDOC_ARGS) PAIR_CLASS_INIT(&tag, "env"); print_otag(h, TAG_SPAN, 1, &tag); - return(1); + return 1; } - -/* ARGSUSED */ static int mdoc_er_pre(MDOC_ARGS) { @@ -1364,22 +1257,20 @@ mdoc_er_pre(MDOC_ARGS) PAIR_CLASS_INIT(&tag, "errno"); print_otag(h, TAG_SPAN, 1, &tag); - return(1); + return 1; } - -/* ARGSUSED */ static int mdoc_fa_pre(MDOC_ARGS) { - const struct mdoc_node *nn; + const struct roff_node *nn; struct htmlpair tag; struct tag *t; PAIR_CLASS_INIT(&tag, "farg"); if (n->parent->tok != MDOC_Fo) { print_otag(h, TAG_I, 1, &tag); - return(1); + return 1; } for (nn = n->child; nn; nn = nn->next) { @@ -1397,11 +1288,9 @@ mdoc_fa_pre(MDOC_ARGS) print_text(h, ","); } - return(0); + return 0; } - -/* ARGSUSED */ static int mdoc_fd_pre(MDOC_ARGS) { @@ -1414,14 +1303,14 @@ mdoc_fd_pre(MDOC_ARGS) synopsis_pre(h, n); if (NULL == (n = n->child)) - return(0); + return 0; - assert(MDOC_TEXT == n->type); + assert(n->type == ROFFT_TEXT); if (strcmp(n->string, "#include")) { PAIR_CLASS_INIT(&tag[0], "macro"); print_otag(h, TAG_B, 1, tag); - return(1); + return 1; } PAIR_CLASS_INIT(&tag[0], "includes"); @@ -1429,23 +1318,31 @@ mdoc_fd_pre(MDOC_ARGS) print_text(h, n->string); if (NULL != (n = n->next)) { - assert(MDOC_TEXT == n->type); - strlcpy(buf, '<' == *n->string || '"' == *n->string ? - n->string + 1 : n->string, BUFSIZ); + assert(n->type == ROFFT_TEXT); + /* + * XXX This is broken and not easy to fix. + * When using -Oincludes, truncation may occur. + * Dynamic allocation wouldn't help because + * passing long strings to buffmt_includes() + * does not work either. + */ + + strlcpy(buf, '<' == *n->string || '"' == *n->string ? + n->string + 1 : n->string, BUFSIZ); + sz = strlen(buf); if (sz && ('>' == buf[sz - 1] || '"' == buf[sz - 1])) buf[sz - 1] = '\0'; PAIR_CLASS_INIT(&tag[0], "link-includes"); - bufinit(h); - + i = 1; if (h->base_includes) { buffmt_includes(h, buf); PAIR_HREF_INIT(&tag[i], h->buf); i++; - } + } t = print_otag(h, TAG_A, i, tag); print_text(h, n->string); @@ -1455,35 +1352,31 @@ mdoc_fd_pre(MDOC_ARGS) } for ( ; n; n = n->next) { - assert(MDOC_TEXT == n->type); + assert(n->type == ROFFT_TEXT); print_text(h, n->string); } - return(0); + return 0; } - -/* ARGSUSED */ static int mdoc_vt_pre(MDOC_ARGS) { struct htmlpair tag; - if (MDOC_BLOCK == n->type) { + if (n->type == ROFFT_BLOCK) { synopsis_pre(h, n); - return(1); - } else if (MDOC_ELEM == n->type) { + return 1; + } else if (n->type == ROFFT_ELEM) { synopsis_pre(h, n); - } else if (MDOC_HEAD == n->type) - return(0); + } else if (n->type == ROFFT_HEAD) + return 0; PAIR_CLASS_INIT(&tag, "type"); print_otag(h, TAG_SPAN, 1, &tag); - return(1); + return 1; } - -/* ARGSUSED */ static int mdoc_ft_pre(MDOC_ARGS) { @@ -1492,11 +1385,9 @@ mdoc_ft_pre(MDOC_ARGS) synopsis_pre(h, n); PAIR_CLASS_INIT(&tag, "ftype"); print_otag(h, TAG_I, 1, &tag); - return(1); + return 1; } - -/* ARGSUSED */ static int mdoc_fn_pre(MDOC_ARGS) { @@ -1517,7 +1408,7 @@ mdoc_fn_pre(MDOC_ARGS) if (NULL != ep) { PAIR_CLASS_INIT(&tag[0], "ftype"); t = print_otag(h, TAG_I, 1, tag); - + while (ep) { sz = MIN((int)(ep - sp), BUFSIZ - 1); (void)memcpy(nbuf, sp, (size_t)sz); @@ -1549,10 +1440,8 @@ mdoc_fn_pre(MDOC_ARGS) t = print_otag(h, TAG_B, 1, tag); - if (sp) { - strlcpy(nbuf, sp, BUFSIZ); - print_text(h, nbuf); - } + if (sp) + print_text(h, sp); print_tagq(h, t); @@ -1560,8 +1449,8 @@ mdoc_fn_pre(MDOC_ARGS) print_text(h, "("); h->flags |= HTML_NOSPACE; - bufinit(h); PAIR_CLASS_INIT(&tag[0], "farg"); + bufinit(h); bufcat_style(h, "white-space", "nowrap"); PAIR_STYLE_INIT(&tag[1], h); @@ -1586,46 +1475,41 @@ mdoc_fn_pre(MDOC_ARGS) print_text(h, ";"); } - return(0); + return 0; } - -/* ARGSUSED */ static int mdoc_sm_pre(MDOC_ARGS) { - assert(n->child && MDOC_TEXT == n->child->type); - if (0 == strcmp("on", n->child->string)) { - /* - * FIXME: no p->col to check. Thus, if we have - * .Bd -literal - * .Sm off - * 1 2 - * .Sm on - * 3 - * .Ed - * the "3" is preceded by a space. - */ - h->flags &= ~HTML_NOSPACE; + if (NULL == n->child) + h->flags ^= HTML_NONOSPACE; + else if (0 == strcmp("on", n->child->string)) h->flags &= ~HTML_NONOSPACE; - } else + else h->flags |= HTML_NONOSPACE; - return(0); + if ( ! (HTML_NONOSPACE & h->flags)) + h->flags &= ~HTML_NOSPACE; + + return 0; } -/* ARGSUSED */ static int -mdoc_pp_pre(MDOC_ARGS) +mdoc_skip_pre(MDOC_ARGS) { - print_otag(h, TAG_P, 0, NULL); - return(0); + return 0; +} +static int +mdoc_pp_pre(MDOC_ARGS) +{ + + print_paragraph(h); + return 0; } -/* ARGSUSED */ static int mdoc_sp_pre(MDOC_ARGS) { @@ -1635,11 +1519,16 @@ mdoc_sp_pre(MDOC_ARGS) SCALE_VS_INIT(&su, 1); if (MDOC_sp == n->tok) { - if (n->child) - a2roffsu(n->child->string, &su, SCALE_VS); + if (NULL != (n = n->child)) { + if ( ! a2roffsu(n->string, &su, SCALE_VS)) + su.scale = 1.0; + else if (su.scale < 0.0) + su.scale = 0.0; + } } else - su.scale = 0; + su.scale = 0.0; + bufinit(h); bufcat_su(h, "height", &su); PAIR_STYLE_INIT(&tag, h); print_otag(h, TAG_DIV, 1, &tag); @@ -1647,36 +1536,34 @@ mdoc_sp_pre(MDOC_ARGS) /* So the div isn't empty: */ print_text(h, "\\~"); - return(0); + return 0; } -/* ARGSUSED */ static int mdoc_lk_pre(MDOC_ARGS) { struct htmlpair tag[2]; if (NULL == (n = n->child)) - return(0); + return 0; - assert(MDOC_TEXT == n->type); + assert(n->type == ROFFT_TEXT); PAIR_CLASS_INIT(&tag[0], "link-ext"); PAIR_HREF_INIT(&tag[1], n->string); print_otag(h, TAG_A, 2, tag); - for (n = n->next; n; n = n->next) { - assert(MDOC_TEXT == n->type); + if (NULL == n->next) print_text(h, n->string); - } - return(0); + for (n = n->next; n; n = n->next) + print_text(h, n->string); + + return 0; } - -/* ARGSUSED */ static int mdoc_mt_pre(MDOC_ARGS) { @@ -1686,7 +1573,7 @@ mdoc_mt_pre(MDOC_ARGS) PAIR_CLASS_INIT(&tag[0], "link-mail"); for (n = n->child; n; n = n->next) { - assert(MDOC_TEXT == n->type); + assert(n->type == ROFFT_TEXT); bufinit(h); bufcat(h, "mailto:"); @@ -1697,47 +1584,42 @@ mdoc_mt_pre(MDOC_ARGS) print_text(h, n->string); print_tagq(h, t); } - - return(0); + + return 0; } - -/* ARGSUSED */ static int mdoc_fo_pre(MDOC_ARGS) { struct htmlpair tag; struct tag *t; - if (MDOC_BODY == n->type) { + if (n->type == ROFFT_BODY) { h->flags |= HTML_NOSPACE; print_text(h, "("); h->flags |= HTML_NOSPACE; - return(1); - } else if (MDOC_BLOCK == n->type) { + return 1; + } else if (n->type == ROFFT_BLOCK) { synopsis_pre(h, n); - return(1); + return 1; } - /* XXX: we drop non-initial arguments as per groff. */ + if (n->child == NULL) + return 0; - assert(n->child); assert(n->child->string); - PAIR_CLASS_INIT(&tag, "fname"); t = print_otag(h, TAG_B, 1, &tag); print_text(h, n->child->string); print_tagq(h, t); - return(0); + return 0; } - -/* 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, ")"); @@ -1745,8 +1627,6 @@ mdoc_fo_post(MDOC_ARGS) print_text(h, ";"); } - -/* ARGSUSED */ static int mdoc_in_pre(MDOC_ARGS) { @@ -1773,18 +1653,16 @@ mdoc_in_pre(MDOC_ARGS) h->flags |= HTML_NOSPACE; if (NULL != (n = n->child)) { - assert(MDOC_TEXT == n->type); + assert(n->type == ROFFT_TEXT); PAIR_CLASS_INIT(&tag[0], "link-includes"); - bufinit(h); i = 1; - if (h->base_includes) { buffmt_includes(h, n->string); PAIR_HREF_INIT(&tag[i], h->buf); i++; - } + } t = print_otag(h, TAG_A, i, tag); print_text(h, n->string); @@ -1797,15 +1675,13 @@ mdoc_in_pre(MDOC_ARGS) print_text(h, ">"); for ( ; n; n = n->next) { - assert(MDOC_TEXT == n->type); + assert(n->type == ROFFT_TEXT); print_text(h, n->string); } - return(0); + return 0; } - -/* ARGSUSED */ static int mdoc_ic_pre(MDOC_ARGS) { @@ -1813,63 +1689,64 @@ mdoc_ic_pre(MDOC_ARGS) PAIR_CLASS_INIT(&tag, "cmd"); print_otag(h, TAG_B, 1, &tag); - return(1); + return 1; } - -/* ARGSUSED */ static int mdoc_rv_pre(MDOC_ARGS) { struct htmlpair tag; struct tag *t; - int nchild; + struct roff_node *nch; if (n->prev) print_otag(h, TAG_BR, 0, NULL); PAIR_CLASS_INIT(&tag, "fname"); - print_text(h, "The"); + if (n->child != NULL) { + print_text(h, "The"); - nchild = n->nchild; - for (n = n->child; n; n = n->next) { - assert(MDOC_TEXT == n->type); + for (nch = n->child; nch != NULL; nch = nch->next) { + t = print_otag(h, TAG_B, 1, &tag); + print_text(h, nch->string); + print_tagq(h, t); - t = print_otag(h, TAG_B, 1, &tag); - print_text(h, n->string); - print_tagq(h, t); + h->flags |= HTML_NOSPACE; + print_text(h, "()"); - h->flags |= HTML_NOSPACE; - print_text(h, "()"); + if (nch->next == NULL) + continue; - if (nchild > 2 && n->next) { - h->flags |= HTML_NOSPACE; - print_text(h, ","); + if (nch->prev != NULL || nch->next->next != NULL) { + h->flags |= HTML_NOSPACE; + print_text(h, ","); + } + if (nch->next->next == NULL) + print_text(h, "and"); } - if (n->next && NULL == n->next->next) - print_text(h, "and"); - } + if (n->child != NULL && n->child->next != NULL) + print_text(h, "functions return"); + else + print_text(h, "function returns"); - if (nchild > 1) - print_text(h, "functions return"); - else - print_text(h, "function returns"); + print_text(h, "the value\\~0 if successful;"); + } else + print_text(h, "Upon successful completion," + " the value\\~0 is returned;"); - print_text(h, "the value 0 if successful; otherwise the value " - "-1 is returned and the global variable"); + print_text(h, "otherwise the value\\~\\-1 is returned" + " and the global variable"); PAIR_CLASS_INIT(&tag, "var"); t = print_otag(h, TAG_B, 1, &tag); print_text(h, "errno"); print_tagq(h, t); - print_text(h, "is set to indicate the error."); - return(0); + print_text(h, "is set to indicate the error."); + return 0; } - -/* ARGSUSED */ static int mdoc_va_pre(MDOC_ARGS) { @@ -1877,58 +1754,53 @@ mdoc_va_pre(MDOC_ARGS) PAIR_CLASS_INIT(&tag, "var"); print_otag(h, TAG_B, 1, &tag); - return(1); + return 1; } - -/* 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) { struct htmlpair tag[2]; struct roffsu su; - if (MDOC_HEAD == n->type) - return(0); - else if (MDOC_BODY != n->type) - return(1); + if (n->type == ROFFT_HEAD) + return 0; + else if (n->type != ROFFT_BODY) + return 1; - if (FONT_Em == n->norm->Bf.font) + if (FONT_Em == n->norm->Bf.font) PAIR_CLASS_INIT(&tag[0], "emph"); - else if (FONT_Sy == n->norm->Bf.font) + else if (FONT_Sy == n->norm->Bf.font) PAIR_CLASS_INIT(&tag[0], "symb"); - else if (FONT_Li == n->norm->Bf.font) + else if (FONT_Li == n->norm->Bf.font) PAIR_CLASS_INIT(&tag[0], "lit"); else PAIR_CLASS_INIT(&tag[0], "none"); - /* + /* * We want this to be inline-formatted, but needs to be div to - * accept block children. + * accept block children. */ + bufinit(h); bufcat_style(h, "display", "inline"); SCALE_HS_INIT(&su, 1); /* Needs a left-margin for spacing. */ bufcat_su(h, "margin-left", &su); PAIR_STYLE_INIT(&tag[1], h); print_otag(h, TAG_DIV, 2, tag); - return(1); + return 1; } - -/* ARGSUSED */ static int mdoc_ms_pre(MDOC_ARGS) { @@ -1936,61 +1808,61 @@ mdoc_ms_pre(MDOC_ARGS) PAIR_CLASS_INIT(&tag, "symb"); print_otag(h, TAG_SPAN, 1, &tag); - return(1); + return 1; } - -/* ARGSUSED */ static int mdoc_igndelim_pre(MDOC_ARGS) { h->flags |= HTML_IGNDELIM; - return(1); + return 1; } - -/* ARGSUSED */ static void mdoc_pf_post(MDOC_ARGS) { - h->flags |= HTML_NOSPACE; + if ( ! (n->next == NULL || n->next->flags & MDOC_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->type != ROFFT_BLOCK) + return 1; if (n->prev && SEC_SEE_ALSO == n->sec) - print_otag(h, TAG_P, 0, NULL); + print_paragraph(h); PAIR_CLASS_INIT(&tag, "ref"); print_otag(h, TAG_SPAN, 1, &tag); - return(1); + return 1; } +static int +mdoc_no_pre(MDOC_ARGS) +{ + struct htmlpair tag; + PAIR_CLASS_INIT(&tag, "none"); + print_otag(h, TAG_CODE, 1, &tag); + return 1; +} -/* ARGSUSED */ static int mdoc_li_pre(MDOC_ARGS) { struct htmlpair tag; PAIR_CLASS_INIT(&tag, "lit"); - print_otag(h, TAG_SPAN, 1, &tag); - return(1); + print_otag(h, TAG_CODE, 1, &tag); + return 1; } - -/* ARGSUSED */ static int mdoc_sy_pre(MDOC_ARGS) { @@ -1998,31 +1870,25 @@ mdoc_sy_pre(MDOC_ARGS) PAIR_CLASS_INIT(&tag, "symb"); print_otag(h, TAG_SPAN, 1, &tag); - return(1); + return 1; } - -/* ARGSUSED */ static int mdoc_bt_pre(MDOC_ARGS) { print_text(h, "is currently in beta test."); - return(0); + return 0; } - -/* ARGSUSED */ static int mdoc_ud_pre(MDOC_ARGS) { print_text(h, "currently under development."); - return(0); + return 0; } - -/* ARGSUSED */ static int mdoc_lb_pre(MDOC_ARGS) { @@ -2033,11 +1899,9 @@ mdoc_lb_pre(MDOC_ARGS) PAIR_CLASS_INIT(&tag, "lib"); print_otag(h, TAG_SPAN, 1, &tag); - return(1); + return 1; } - -/* ARGSUSED */ static int mdoc__x_pre(MDOC_ARGS) { @@ -2047,72 +1911,69 @@ mdoc__x_pre(MDOC_ARGS) t = TAG_SPAN; switch (n->tok) { - case(MDOC__A): + case MDOC__A: PAIR_CLASS_INIT(&tag[0], "ref-auth"); if (n->prev && MDOC__A == n->prev->tok) if (NULL == n->next || MDOC__A != n->next->tok) print_text(h, "and"); break; - case(MDOC__B): + case MDOC__B: PAIR_CLASS_INIT(&tag[0], "ref-book"); t = TAG_I; break; - case(MDOC__C): + case MDOC__C: PAIR_CLASS_INIT(&tag[0], "ref-city"); break; - case(MDOC__D): + case MDOC__D: PAIR_CLASS_INIT(&tag[0], "ref-date"); break; - case(MDOC__I): + case MDOC__I: PAIR_CLASS_INIT(&tag[0], "ref-issue"); t = TAG_I; break; - case(MDOC__J): + case MDOC__J: PAIR_CLASS_INIT(&tag[0], "ref-jrnl"); t = TAG_I; break; - case(MDOC__N): + case MDOC__N: PAIR_CLASS_INIT(&tag[0], "ref-num"); break; - case(MDOC__O): + case MDOC__O: PAIR_CLASS_INIT(&tag[0], "ref-opt"); break; - case(MDOC__P): + case MDOC__P: PAIR_CLASS_INIT(&tag[0], "ref-page"); break; - case(MDOC__Q): + case MDOC__Q: PAIR_CLASS_INIT(&tag[0], "ref-corp"); break; - case(MDOC__R): + case MDOC__R: PAIR_CLASS_INIT(&tag[0], "ref-rep"); break; - case(MDOC__T): + case MDOC__T: PAIR_CLASS_INIT(&tag[0], "ref-title"); break; - case(MDOC__U): + case MDOC__U: PAIR_CLASS_INIT(&tag[0], "link-ref"); break; - case(MDOC__V): + case MDOC__V: PAIR_CLASS_INIT(&tag[0], "ref-vol"); break; default: abort(); - /* NOTREACHED */ } if (MDOC__U != n->tok) { print_otag(h, t, 1, tag); - return(1); + return 1; } PAIR_HREF_INIT(&tag[1], n->child->string); print_otag(h, TAG_A, 2, tag); - return(1); + return 1; } - -/* ARGSUSED */ static void mdoc__x_post(MDOC_ARGS) { @@ -2131,159 +1992,187 @@ mdoc__x_post(MDOC_ARGS) print_text(h, n->next ? "," : "."); } - -/* ARGSUSED */ static int mdoc_bk_pre(MDOC_ARGS) { switch (n->type) { - case (MDOC_BLOCK): + case ROFFT_BLOCK: break; - case (MDOC_HEAD): - return(0); - case (MDOC_BODY): - if (n->parent->args || 0 == n->prev->nchild) + case ROFFT_HEAD: + return 0; + case ROFFT_BODY: + if (n->parent->args != NULL || n->prev->child == NULL) h->flags |= HTML_PREKEEP; break; default: abort(); - /* NOTREACHED */ } - return(1); + return 1; } - -/* ARGSUSED */ static void mdoc_bk_post(MDOC_ARGS) { - if (MDOC_BODY == n->type) + if (n->type == ROFFT_BODY) h->flags &= ~(HTML_KEEP | HTML_PREKEEP); } - -/* ARGSUSED */ static int mdoc_quote_pre(MDOC_ARGS) { struct htmlpair tag; - if (MDOC_BODY != n->type) - return(1); + if (n->type != ROFFT_BODY) + return 1; switch (n->tok) { - case (MDOC_Ao): - /* FALLTHROUGH */ - case (MDOC_Aq): - print_text(h, "\\(la"); + 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_Bro): - /* FALLTHROUGH */ - case (MDOC_Brq): + case MDOC_Bro: + case MDOC_Brq: print_text(h, "\\(lC"); break; - case (MDOC_Bo): - /* FALLTHROUGH */ - case (MDOC_Bq): + case MDOC_Bo: + case MDOC_Bq: print_text(h, "\\(lB"); break; - case (MDOC_Oo): - /* FALLTHROUGH */ - case (MDOC_Op): + case MDOC_Oo: + case MDOC_Op: print_text(h, "\\(lB"); h->flags |= HTML_NOSPACE; PAIR_CLASS_INIT(&tag, "opt"); print_otag(h, TAG_SPAN, 1, &tag); break; - case (MDOC_Do): - /* FALLTHROUGH */ - case (MDOC_Dq): - /* FALLTHROUGH */ - case (MDOC_Qo): - /* FALLTHROUGH */ - case (MDOC_Qq): + case MDOC_En: + if (NULL == n->norm->Es || + NULL == n->norm->Es->child) + return 1; + print_text(h, n->norm->Es->child->string); + break; + case MDOC_Do: + case MDOC_Dq: + case MDOC_Qo: + case MDOC_Qq: print_text(h, "\\(lq"); break; - case (MDOC_Po): - /* FALLTHROUGH */ - case (MDOC_Pq): + case MDOC_Po: + case MDOC_Pq: print_text(h, "("); break; - case (MDOC_Ql): - /* FALLTHROUGH */ - case (MDOC_So): - /* FALLTHROUGH */ - case (MDOC_Sq): + case MDOC_Ql: print_text(h, "\\(oq"); + h->flags |= HTML_NOSPACE; + PAIR_CLASS_INIT(&tag, "lit"); + print_otag(h, TAG_CODE, 1, &tag); break; + case MDOC_So: + case MDOC_Sq: + print_text(h, "\\(oq"); + break; default: abort(); - /* NOTREACHED */ } h->flags |= HTML_NOSPACE; - return(1); + return 1; } - -/* ARGSUSED */ static void mdoc_quote_post(MDOC_ARGS) { - if (MDOC_BODY != n->type) + if (n->type != ROFFT_BODY && n->type != ROFFT_ELEM) return; h->flags |= HTML_NOSPACE; switch (n->tok) { - case (MDOC_Ao): - /* FALLTHROUGH */ - case (MDOC_Aq): - print_text(h, "\\(ra"); + 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): - /* FALLTHROUGH */ - case (MDOC_Brq): + case MDOC_Bro: + case MDOC_Brq: print_text(h, "\\(rC"); break; - case (MDOC_Oo): - /* FALLTHROUGH */ - case (MDOC_Op): - /* FALLTHROUGH */ - case (MDOC_Bo): - /* FALLTHROUGH */ - case (MDOC_Bq): + case MDOC_Oo: + case MDOC_Op: + case MDOC_Bo: + case MDOC_Bq: print_text(h, "\\(rB"); break; - case (MDOC_Qo): - /* FALLTHROUGH */ - case (MDOC_Qq): - /* FALLTHROUGH */ - case (MDOC_Do): - /* FALLTHROUGH */ - case (MDOC_Dq): + 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_Qo: + case MDOC_Qq: + case MDOC_Do: + case MDOC_Dq: print_text(h, "\\(rq"); break; - case (MDOC_Po): - /* FALLTHROUGH */ - case (MDOC_Pq): + case MDOC_Po: + case MDOC_Pq: print_text(h, ")"); break; - case (MDOC_Ql): - /* FALLTHROUGH */ - case (MDOC_So): - /* FALLTHROUGH */ - case (MDOC_Sq): - print_text(h, "\\(aq"); + case MDOC_Ql: + case MDOC_So: + case MDOC_Sq: + print_text(h, "\\(cq"); break; default: abort(); - /* NOTREACHED */ } } +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; +}