=================================================================== RCS file: /cvs/mandoc/mdoc_html.c,v retrieving revision 1.156 retrieving revision 1.191 diff -u -p -r1.156 -r1.191 --- mandoc/mdoc_html.c 2011/04/04 15:33:03 1.156 +++ mandoc/mdoc_html.c 2014/07/02 03:48:07 1.191 @@ -1,6 +1,7 @@ -/* $Id: mdoc_html.c,v 1.156 2011/04/04 15:33:03 kristaps Exp $ */ +/* $Id: mdoc_html.c,v 1.191 2014/07/02 03:48:07 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons + * Copyright (c) 2014 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 @@ -28,15 +29,15 @@ #include #include "mandoc.h" +#include "mandoc_aux.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, \ +#define MDOC_ARGS const struct mdoc_meta *meta, \ const struct mdoc_node *n, \ struct html *h @@ -53,7 +54,7 @@ static void print_mdoc(MDOC_ARGS); static void print_mdoc_head(MDOC_ARGS); static void print_mdoc_node(MDOC_ARGS); static void print_mdoc_nodelist(MDOC_ARGS); -static void synopsis_pre(struct html *, +static void synopsis_pre(struct html *, const struct mdoc_node *); static void a2width(const char *, struct roffsu *); @@ -109,6 +110,7 @@ static int mdoc_quote_pre(MDOC_ARGS); static int mdoc_rs_pre(MDOC_ARGS); static int mdoc_rv_pre(MDOC_ARGS); static int mdoc_sh_pre(MDOC_ARGS); +static int mdoc_skip_pre(MDOC_ARGS); static int mdoc_sm_pre(MDOC_ARGS); static int mdoc_sp_pre(MDOC_ARGS); static int mdoc_ss_pre(MDOC_ARGS); @@ -126,8 +128,8 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {NULL, NULL}, /* Dt */ {NULL, NULL}, /* Os */ {mdoc_sh_pre, NULL }, /* Sh */ - {mdoc_ss_pre, NULL }, /* Ss */ - {mdoc_pp_pre, NULL}, /* Pp */ + {mdoc_ss_pre, NULL }, /* Ss */ + {mdoc_pp_pre, NULL}, /* Pp */ {mdoc_d1_pre, NULL}, /* D1 */ {mdoc_d1_pre, NULL}, /* Dl */ {mdoc_bd_pre, NULL}, /* Bd */ @@ -135,32 +137,32 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {mdoc_bl_pre, NULL}, /* Bl */ {NULL, NULL}, /* El */ {mdoc_it_pre, NULL}, /* It */ - {mdoc_ad_pre, NULL}, /* Ad */ + {mdoc_ad_pre, NULL}, /* Ad */ {mdoc_an_pre, NULL}, /* An */ {mdoc_ar_pre, NULL}, /* Ar */ {mdoc_cd_pre, NULL}, /* Cd */ {mdoc_fl_pre, NULL}, /* Cm */ - {mdoc_dv_pre, NULL}, /* Dv */ - {mdoc_er_pre, NULL}, /* Er */ - {mdoc_ev_pre, NULL}, /* Ev */ + {mdoc_dv_pre, NULL}, /* Dv */ + {mdoc_er_pre, NULL}, /* Er */ + {mdoc_ev_pre, NULL}, /* Ev */ {mdoc_ex_pre, NULL}, /* Ex */ - {mdoc_fa_pre, NULL}, /* Fa */ - {mdoc_fd_pre, NULL}, /* Fd */ + {mdoc_fa_pre, NULL}, /* Fa */ + {mdoc_fd_pre, NULL}, /* Fd */ {mdoc_fl_pre, NULL}, /* Fl */ - {mdoc_fn_pre, NULL}, /* Fn */ - {mdoc_ft_pre, NULL}, /* Ft */ - {mdoc_ic_pre, NULL}, /* Ic */ - {mdoc_in_pre, NULL}, /* In */ + {mdoc_fn_pre, NULL}, /* Fn */ + {mdoc_ft_pre, NULL}, /* Ft */ + {mdoc_ic_pre, NULL}, /* Ic */ + {mdoc_in_pre, NULL}, /* In */ {mdoc_li_pre, NULL}, /* Li */ - {mdoc_nd_pre, NULL}, /* Nd */ - {mdoc_nm_pre, NULL}, /* Nm */ + {mdoc_nd_pre, NULL}, /* Nd */ + {mdoc_nm_pre, NULL}, /* Nm */ {mdoc_quote_pre, mdoc_quote_post}, /* Op */ - {NULL, NULL}, /* Ot */ + {mdoc_ft_pre, NULL}, /* Ot */ {mdoc_pa_pre, NULL}, /* Pa */ {mdoc_rv_pre, NULL}, /* Rv */ - {NULL, NULL}, /* St */ + {NULL, NULL}, /* St */ {mdoc_va_pre, NULL}, /* Va */ - {mdoc_vt_pre, NULL}, /* Vt */ + {mdoc_vt_pre, NULL}, /* Vt */ {mdoc_xr_pre, NULL}, /* Xr */ {mdoc__x_pre, mdoc__x_post}, /* %A */ {mdoc__x_pre, mdoc__x_post}, /* %B */ @@ -178,7 +180,7 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {mdoc_quote_pre, mdoc_quote_post}, /* Aq */ {NULL, NULL}, /* At */ {NULL, NULL}, /* Bc */ - {mdoc_bf_pre, NULL}, /* Bf */ + {mdoc_bf_pre, NULL}, /* Bf */ {mdoc_quote_pre, mdoc_quote_post}, /* Bo */ {mdoc_quote_pre, mdoc_quote_post}, /* Bq */ {mdoc_xx_pre, NULL}, /* Bsx */ @@ -189,8 +191,8 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {mdoc_quote_pre, mdoc_quote_post}, /* Dq */ {NULL, NULL}, /* Ec */ /* FIXME: no space */ {NULL, NULL}, /* Ef */ - {mdoc_em_pre, NULL}, /* Em */ - {NULL, NULL}, /* Eo */ + {mdoc_em_pre, NULL}, /* Em */ + {mdoc_quote_pre, mdoc_quote_post}, /* Eo */ {mdoc_xx_pre, NULL}, /* Fx */ {mdoc_ms_pre, NULL}, /* Ms */ {mdoc_igndelim_pre, NULL}, /* No */ @@ -210,39 +212,40 @@ static const struct htmlmdoc mdocs[MDOC_MAX] = { {NULL, NULL}, /* Sc */ {mdoc_quote_pre, mdoc_quote_post}, /* So */ {mdoc_quote_pre, mdoc_quote_post}, /* Sq */ - {mdoc_sm_pre, NULL}, /* Sm */ + {mdoc_sm_pre, NULL}, /* Sm */ {mdoc_sx_pre, NULL}, /* Sx */ {mdoc_sy_pre, NULL}, /* Sy */ {NULL, NULL}, /* Tn */ {mdoc_xx_pre, NULL}, /* Ux */ {NULL, NULL}, /* Xc */ {NULL, NULL}, /* Xo */ - {mdoc_fo_pre, mdoc_fo_post}, /* Fo */ - {NULL, NULL}, /* Fc */ + {mdoc_fo_pre, mdoc_fo_post}, /* Fo */ + {NULL, NULL}, /* Fc */ {mdoc_quote_pre, mdoc_quote_post}, /* Oo */ {NULL, NULL}, /* Oc */ {mdoc_bk_pre, mdoc_bk_post}, /* Bk */ {NULL, NULL}, /* Ek */ {mdoc_bt_pre, NULL}, /* Bt */ {NULL, NULL}, /* Hf */ - {NULL, NULL}, /* Fr */ + {mdoc_em_pre, NULL}, /* Fr */ {mdoc_ud_pre, NULL}, /* Ud */ {mdoc_lb_pre, NULL}, /* Lb */ - {mdoc_pp_pre, NULL}, /* Lp */ - {mdoc_lk_pre, NULL}, /* Lk */ - {mdoc_mt_pre, NULL}, /* Mt */ - {mdoc_quote_pre, mdoc_quote_post}, /* Brq */ - {mdoc_quote_pre, mdoc_quote_post}, /* Bro */ - {NULL, NULL}, /* Brc */ - {mdoc__x_pre, mdoc__x_post}, /* %C */ - {NULL, NULL}, /* Es */ /* TODO */ - {NULL, NULL}, /* En */ /* TODO */ - {mdoc_xx_pre, NULL}, /* Dx */ - {mdoc__x_pre, mdoc__x_post}, /* %Q */ + {mdoc_pp_pre, NULL}, /* Lp */ + {mdoc_lk_pre, NULL}, /* Lk */ + {mdoc_mt_pre, NULL}, /* Mt */ + {mdoc_quote_pre, mdoc_quote_post}, /* Brq */ + {mdoc_quote_pre, mdoc_quote_post}, /* Bro */ + {NULL, NULL}, /* Brc */ + {mdoc__x_pre, mdoc__x_post}, /* %C */ + {mdoc_skip_pre, NULL}, /* Es */ + {mdoc_quote_pre, mdoc_quote_post}, /* En */ + {mdoc_xx_pre, NULL}, /* Dx */ + {mdoc__x_pre, mdoc__x_post}, /* %Q */ {mdoc_sp_pre, NULL}, /* br */ - {mdoc_sp_pre, NULL}, /* sp */ - {mdoc__x_pre, mdoc__x_post}, /* %U */ - {NULL, NULL}, /* Ta */ + {mdoc_sp_pre, NULL}, /* sp */ + {mdoc__x_pre, mdoc__x_post}, /* %U */ + {NULL, NULL}, /* Ta */ + {mdoc_skip_pre, NULL}, /* ll */ }; static const char * const lists[LIST_MAX] = { @@ -260,23 +263,16 @@ static const char * const lists[LIST_MAX] = { "list-tag" }; + void -html_mdoc(void *arg, const struct mdoc *m) +html_mdoc(void *arg, const struct mdoc *mdoc) { - 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"); + print_mdoc(mdoc_meta(mdoc), mdoc_node(mdoc), + (struct html *)arg); + putchar('\n'); } - /* * Calculate the scaling unit passed in a `-width' argument. This uses * either a native scaling unit (e.g., 1i, 2m) or the string length of @@ -288,11 +284,10 @@ a2width(const char *p, struct roffsu *su) if ( ! a2roffsu(p, su, SCALE_MAX)) { su->unit = SCALE_BU; - su->scale = (int)strlen(p); + su->scale = html_strlen(p); } } - /* * See the same function in mdoc_term.c for documentation. */ @@ -303,27 +298,27 @@ synopsis_pre(struct html *h, const struct mdoc_node *n if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags)) return; - if (n->prev->tok == n->tok && - MDOC_Fo != n->tok && - MDOC_Ft != n->tok && - MDOC_Fn != n->tok) { + if (n->prev->tok == n->tok && + MDOC_Fo != n->tok && + MDOC_Ft != n->tok && + MDOC_Fn != n->tok) { print_otag(h, TAG_BR, 0, NULL); return; } switch (n->prev->tok) { - case (MDOC_Fd): + case MDOC_Fd: /* FALLTHROUGH */ - case (MDOC_Fn): + case MDOC_Fn: /* FALLTHROUGH */ - case (MDOC_Fo): + case MDOC_Fo: /* FALLTHROUGH */ - case (MDOC_In): + case MDOC_In: /* FALLTHROUGH */ - case (MDOC_Vt): + case MDOC_Vt: print_otag(h, TAG_P, 0, NULL); break; - case (MDOC_Ft): + case MDOC_Ft: if (MDOC_Fn != n->tok && MDOC_Fo != n->tok) { print_otag(h, TAG_P, 0, NULL); break; @@ -335,7 +330,6 @@ synopsis_pre(struct html *h, const struct mdoc_node *n } } - /* * Calculate the scaling unit passed in an `-offset' argument. This * uses either a native scaling unit (e.g., 1i, 2m), one of a set of @@ -353,74 +347,71 @@ a2offs(const char *p, struct roffsu *su) 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 = (int)strlen(p); - } + else if ( ! a2roffsu(p, su, SCALE_MAX)) + SCALE_HS_INIT(su, html_strlen(p)); } - static void print_mdoc(MDOC_ARGS) { - struct tag *t; + struct tag *t, *tt; + struct htmlpair tag; - t = print_otag(h, TAG_HEAD, 0, NULL); - print_mdoc_head(m, n, h); - print_tagq(h, t); + PAIR_CLASS_INIT(&tag, "mandoc"); - t = print_otag(h, TAG_BODY, 0, NULL); - print_mdoc_nodelist(m, n, h); + 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(meta, n, 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); + + print_mdoc_nodelist(meta, n, h); print_tagq(h, t); } - -/* ARGSUSED */ static void print_mdoc_head(MDOC_ARGS) { print_gen_head(h); bufinit(h); - buffmt(h, "%s(%s)", m->title, m->msec); + bufcat_fmt(h, "%s(%s)", meta->title, meta->msec); - if (m->arch) { - bufcat(h, " ("); - bufcat(h, m->arch); - bufcat(h, ")"); - } + if (meta->arch) + bufcat_fmt(h, " (%s)", meta->arch); 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); + print_mdoc_node(meta, n, h); if (n->next) - print_mdoc_nodelist(m, n->next, h); + print_mdoc_nodelist(meta, n->next, h); } - static void print_mdoc_node(MDOC_ARGS) { int child; struct tag *t; - struct htmlpair tag; child = 1; t = h->tags.head; - bufinit(h); switch (n->type) { - case (MDOC_ROOT): - child = mdoc_root_pre(m, n, h); + case MDOC_ROOT: + child = mdoc_root_pre(meta, n, h); break; - case (MDOC_TEXT): + case MDOC_TEXT: /* No tables in this mode... */ assert(NULL == h->tblt); @@ -437,12 +428,10 @@ 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 MDOC_EQN: + print_eqn(h, n->eqn); break; - case (MDOC_TBL): + case MDOC_TBL: /* * This will take care of initialising all of the table * state data for the first table, then tearing it down @@ -463,42 +452,36 @@ print_mdoc_node(MDOC_ARGS) assert(NULL == h->tblt); if (mdocs[n->tok].pre && ENDBODY_NOT == n->end) - child = (*mdocs[n->tok].pre)(m, n, h); + child = (*mdocs[n->tok].pre)(meta, n, h); break; } if (HTML_KEEP & h->flags) { - if (n->prev && n->prev->line != n->line) { + if (n->prev ? (n->prev->lastline != n->line) : + (n->parent && n->parent->line != n->line)) { h->flags &= ~HTML_KEEP; h->flags |= HTML_PREKEEP; - } else if (NULL == n->prev) { - if (n->parent && n->parent->line != n->line) { - h->flags &= ~HTML_KEEP; - h->flags |= HTML_PREKEEP; - } } } if (child && n->child) - print_mdoc_nodelist(m, n->child, h); + print_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 MDOC_ROOT: + mdoc_root_post(meta, n, h); break; - case (MDOC_EQN): + case MDOC_EQN: break; default: if (mdocs[n->tok].post && ENDBODY_NOT == n->end) - (*mdocs[n->tok].post)(m, n, h); + (*mdocs[n->tok].post)(meta, n, h); break; } } -/* ARGSUSED */ static void mdoc_root_post(MDOC_ARGS) { @@ -507,66 +490,51 @@ mdoc_root_post(MDOC_ARGS) 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_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); - 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); + 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_INIT(&tag[1], ATTR_ALIGN, "right"); + print_otag(h, TAG_TD, 2, tag); + print_text(h, meta->os); print_tagq(h, t); } - -/* ARGSUSED */ static int mdoc_root_pre(MDOC_ARGS) { struct htmlpair tag[3]; struct tag *t, *tt; - char b[BUFSIZ], title[BUFSIZ]; + 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); - } + mandoc_asprintf(&title, "%s(%s)", meta->title, meta->msec); - snprintf(title, BUFSIZ - 1, "%s(%s)", m->title, m->msec); - 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); + 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); print_otag(h, TAG_TBODY, 0, NULL); @@ -574,39 +542,30 @@ mdoc_root_pre(MDOC_ARGS) PAIR_CLASS_INIT(&tag[0], "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_INIT(&tag[1], ATTR_ALIGN, "center"); + print_otag(h, TAG_TD, 2, 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_INIT(&tag[1], ATTR_ALIGN, "right"); + print_otag(h, TAG_TD, 2, tag); print_text(h, title); print_tagq(h, t); + + free(title); + free(volume); return(1); } - -/* ARGSUSED */ static int mdoc_sh_pre(MDOC_ARGS) { struct htmlpair tag; - char buf[BUFSIZ]; if (MDOC_BLOCK == n->type) { PAIR_CLASS_INIT(&tag, "section"); @@ -615,25 +574,28 @@ mdoc_sh_pre(MDOC_ARGS) } else if (MDOC_BODY == n->type) 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); + bufcat(h, "x"); + + for (n = n->child; n && MDOC_TEXT == n->type; ) { + 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); + 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) { PAIR_CLASS_INIT(&tag, "subsection"); @@ -642,20 +604,24 @@ mdoc_ss_pre(MDOC_ARGS) } else if (MDOC_BODY == n->type) 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); + bufcat(h, "x"); + + for (n = n->child; n && MDOC_TEXT == n->type; ) { + 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); + 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) { @@ -679,8 +645,6 @@ mdoc_fl_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_nd_pre(MDOC_ARGS) { @@ -697,28 +661,27 @@ mdoc_nd_pre(MDOC_ARGS) return(1); } - static int mdoc_nm_pre(MDOC_ARGS) { struct htmlpair tag; struct roffsu su; - size_t len; + int len; switch (n->type) { - case (MDOC_ELEM): + case MDOC_ELEM: synopsis_pre(h, n); PAIR_CLASS_INIT(&tag, "name"); print_otag(h, TAG_B, 1, &tag); - if (NULL == n->child && m->name) - print_text(h, m->name); + if (NULL == n->child && meta->name) + print_text(h, meta->name); return(1); - case (MDOC_HEAD): + case MDOC_HEAD: print_otag(h, TAG_TD, 0, NULL); - if (NULL == n->child && m->name) - print_text(h, m->name); + if (NULL == n->child && meta->name) + print_text(h, meta->name); return(1); - case (MDOC_BODY): + case MDOC_BODY: print_otag(h, TAG_TD, 0, NULL); return(1); default: @@ -731,12 +694,13 @@ mdoc_nm_pre(MDOC_ARGS) for (len = 0, n = n->child; n; n = n->next) if (MDOC_TEXT == n->type) - len += strlen(n->string); + len += html_strlen(n->string); - if (0 == len && m->name) - len = strlen(m->name); + if (0 == len && meta->name) + len = html_strlen(meta->name); SCALE_HS_INIT(&su, (double)len); + bufinit(h); bufcat_su(h, "width", &su); PAIR_STYLE_INIT(&tag, h); print_otag(h, TAG_COL, 1, &tag); @@ -746,13 +710,10 @@ mdoc_nm_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_xr_pre(MDOC_ARGS) { - struct htmlpair tag[2]; - const struct mdoc_node *nn; + struct htmlpair tag[2]; if (NULL == n->child) return(0); @@ -760,31 +721,29 @@ mdoc_xr_pre(MDOC_ARGS) PAIR_CLASS_INIT(&tag[0], "link-man"); if (h->base_man) { - buffmt_man(h, n->child->string, - n->child->next ? - n->child->next->string : NULL); + buffmt_man(h, n->child->string, + n->child->next ? + n->child->next->string : NULL); PAIR_HREF_INIT(&tag[1], h->buf); print_otag(h, TAG_A, 2, tag); } else print_otag(h, TAG_A, 1, tag); - nn = n->child; - print_text(h, nn->string); + n = n->child; + print_text(h, n->string); - if (NULL == (nn = nn->next)) + if (NULL == (n = n->next)) return(0); h->flags |= HTML_NOSPACE; print_text(h, "("); h->flags |= HTML_NOSPACE; - print_text(h, nn->string); + print_text(h, n->string); h->flags |= HTML_NOSPACE; print_text(h, ")"); return(0); } - -/* ARGSUSED */ static int mdoc_ns_pre(MDOC_ARGS) { @@ -794,8 +753,6 @@ mdoc_ns_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_ar_pre(MDOC_ARGS) { @@ -806,8 +763,6 @@ mdoc_ar_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_xx_pre(MDOC_ARGS) { @@ -816,22 +771,22 @@ mdoc_xx_pre(MDOC_ARGS) int flags; switch (n->tok) { - case (MDOC_Bsx): + case MDOC_Bsx: pp = "BSD/OS"; break; - case (MDOC_Dx): + case MDOC_Dx: pp = "DragonFly"; break; - case (MDOC_Fx): + case MDOC_Fx: pp = "FreeBSD"; break; - case (MDOC_Nx): + case MDOC_Nx: pp = "NetBSD"; break; - case (MDOC_Ox): + case MDOC_Ox: pp = "OpenBSD"; break; - case (MDOC_Ux): + case MDOC_Ux: pp = "UNIX"; break; default: @@ -851,8 +806,6 @@ mdoc_xx_pre(MDOC_ARGS) return(0); } - -/* ARGSUSED */ static int mdoc_bx_pre(MDOC_ARGS) { @@ -880,7 +833,6 @@ mdoc_bx_pre(MDOC_ARGS) return(0); } -/* ARGSUSED */ static int mdoc_it_pre(MDOC_ARGS) { @@ -900,27 +852,29 @@ mdoc_it_pre(MDOC_ARGS) assert(lists[type]); PAIR_CLASS_INIT(&tag[0], lists[type]); + bufinit(h); + if (MDOC_HEAD == n->type) { switch (type) { - case(LIST_bullet): + case LIST_bullet: /* FALLTHROUGH */ - case(LIST_dash): + case LIST_dash: /* FALLTHROUGH */ - case(LIST_item): + case LIST_item: /* FALLTHROUGH */ - case(LIST_hyphen): + case LIST_hyphen: /* FALLTHROUGH */ - case(LIST_enum): + case LIST_enum: return(0); - case(LIST_diag): + case LIST_diag: /* FALLTHROUGH */ - case(LIST_hang): + case LIST_hang: /* FALLTHROUGH */ - case(LIST_inset): + case LIST_inset: /* FALLTHROUGH */ - case(LIST_ohang): + case LIST_ohang: /* FALLTHROUGH */ - case(LIST_tag): + case LIST_tag: SCALE_VS_INIT(&su, ! bl->norm->Bl.comp); bufcat_su(h, "margin-top", &su); PAIR_STYLE_INIT(&tag[1], h); @@ -930,36 +884,36 @@ mdoc_it_pre(MDOC_ARGS) PAIR_CLASS_INIT(&tag[0], "diag"); print_otag(h, TAG_B, 1, tag); break; - case(LIST_column): + case LIST_column: break; default: break; } } else if (MDOC_BODY == n->type) { switch (type) { - case(LIST_bullet): + case LIST_bullet: /* FALLTHROUGH */ - case(LIST_hyphen): + case LIST_hyphen: /* FALLTHROUGH */ - case(LIST_dash): + case LIST_dash: /* FALLTHROUGH */ - case(LIST_enum): + case LIST_enum: /* FALLTHROUGH */ - case(LIST_item): + case LIST_item: SCALE_VS_INIT(&su, ! bl->norm->Bl.comp); bufcat_su(h, "margin-top", &su); PAIR_STYLE_INIT(&tag[1], h); print_otag(h, TAG_LI, 2, tag); break; - case(LIST_diag): + case LIST_diag: /* FALLTHROUGH */ - case(LIST_hang): + case LIST_hang: /* FALLTHROUGH */ - case(LIST_inset): + case LIST_inset: /* FALLTHROUGH */ - case(LIST_ohang): + case LIST_ohang: /* FALLTHROUGH */ - case(LIST_tag): + case LIST_tag: if (NULL == bl->norm->Bl.width) { print_otag(h, TAG_DD, 1, tag); break; @@ -969,7 +923,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); @@ -980,7 +934,7 @@ mdoc_it_pre(MDOC_ARGS) } } else { switch (type) { - case (LIST_column): + case LIST_column: print_otag(h, TAG_TR, 1, tag); break; default: @@ -991,7 +945,6 @@ mdoc_it_pre(MDOC_ARGS) return(1); } -/* ARGSUSED */ static int mdoc_bl_pre(MDOC_ARGS) { @@ -1018,8 +971,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 @@ -1032,13 +985,14 @@ mdoc_bl_pre(MDOC_ARGS) } 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. */ @@ -1049,30 +1003,30 @@ mdoc_bl_pre(MDOC_ARGS) } switch (n->norm->Bl.type) { - case(LIST_bullet): + case LIST_bullet: /* FALLTHROUGH */ - case(LIST_dash): + case LIST_dash: /* FALLTHROUGH */ - case(LIST_hyphen): + case LIST_hyphen: /* FALLTHROUGH */ - case(LIST_item): + case LIST_item: print_otag(h, TAG_UL, 2, tag); break; - case(LIST_enum): + case LIST_enum: print_otag(h, TAG_OL, 2, tag); break; - case(LIST_diag): + case LIST_diag: /* FALLTHROUGH */ - case(LIST_hang): + case LIST_hang: /* FALLTHROUGH */ - case(LIST_inset): + case LIST_inset: /* FALLTHROUGH */ - case(LIST_ohang): + case LIST_ohang: /* FALLTHROUGH */ - case(LIST_tag): + case LIST_tag: print_otag(h, TAG_DL, 2, tag); break; - case(LIST_column): + case LIST_column: print_otag(h, TAG_TABLE, 2, tag); break; default: @@ -1083,13 +1037,12 @@ mdoc_bl_pre(MDOC_ARGS) return(1); } -/* ARGSUSED */ static int mdoc_ex_pre(MDOC_ARGS) { - const struct mdoc_node *nn; - struct tag *t; - struct htmlpair tag; + struct tag *t; + struct htmlpair tag; + int nchild; if (n->prev) print_otag(h, TAG_BR, 0, NULL); @@ -1097,32 +1050,33 @@ mdoc_ex_pre(MDOC_ARGS) PAIR_CLASS_INIT(&tag, "utility"); print_text(h, "The"); - for (nn = n->child; nn; nn = nn->next) { + + nchild = n->nchild; + for (n = n->child; n; n = n->next) { + assert(MDOC_TEXT == n->type); + t = print_otag(h, TAG_B, 1, &tag); - print_text(h, nn->string); + print_text(h, n->string); print_tagq(h, t); - h->flags |= HTML_NOSPACE; - - if (nn->next && NULL == nn->next->next) - print_text(h, ", and"); - else if (nn->next) + if (nchild > 2 && n->next) { + h->flags |= HTML_NOSPACE; print_text(h, ","); - else - h->flags &= ~HTML_NOSPACE; + } + + if (n->next && NULL == n->next->next) + print_text(h, "and"); } - if (n->child && n->child->next) + if (nchild > 1) print_text(h, "utilities exit"); else print_text(h, "utility exits"); - print_text(h, "0 on success, and >0 if an error occurs."); + print_text(h, "0 on success, and >0 if an error occurs."); return(0); } - -/* ARGSUSED */ static int mdoc_em_pre(MDOC_ARGS) { @@ -1133,8 +1087,6 @@ mdoc_em_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_d1_pre(MDOC_ARGS) { @@ -1145,6 +1097,7 @@ mdoc_d1_pre(MDOC_ARGS) 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); @@ -1158,42 +1111,38 @@ mdoc_d1_pre(MDOC_ARGS) if (MDOC_Dl == n->tok) { PAIR_CLASS_INIT(&tag[0], "lit"); print_otag(h, TAG_CODE, 1, tag); - } + } return(1); } - -/* ARGSUSED */ static int mdoc_sx_pre(MDOC_ARGS) { - struct htmlpair tag[2]; - const struct mdoc_node *nn; - char buf[BUFSIZ]; + struct htmlpair tag[2]; - strlcpy(buf, "#", BUFSIZ); - for (nn = n->child; nn; nn = nn->next) { - html_idcat(buf, nn->string, BUFSIZ); - if (nn->next) - html_idcat(buf, " ", BUFSIZ); + bufinit(h); + bufcat(h, "#x"); + + 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); } - -/* ARGSUSED */ static int mdoc_bd_pre(MDOC_ARGS) { - struct htmlpair tag[2]; - int comp, sv; + struct htmlpair tag[2]; + int comp, sv; const struct mdoc_node *nn; struct roffsu su; @@ -1219,11 +1168,12 @@ mdoc_bd_pre(MDOC_ARGS) if (n->norm->Bd.offs) a2offs(n->norm->Bd.offs, &su); + bufinit(h); bufcat_su(h, "margin-left", &su); PAIR_STYLE_INIT(&tag[0], h); - if (DISP_unfilled != n->norm->Bd.type && - DISP_literal != n->norm->Bd.type) { + if (DISP_unfilled != n->norm->Bd.type && + DISP_literal != n->norm->Bd.type) { PAIR_CLASS_INIT(&tag[1], "display"); print_otag(h, TAG_DIV, 2, tag); return(1); @@ -1238,7 +1188,7 @@ mdoc_bd_pre(MDOC_ARGS) 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 @@ -1246,21 +1196,21 @@ mdoc_bd_pre(MDOC_ARGS) * anyway, so don't sweat it. */ switch (nn->tok) { - case (MDOC_Sm): + case MDOC_Sm: /* FALLTHROUGH */ - case (MDOC_br): + case MDOC_br: /* FALLTHROUGH */ - case (MDOC_sp): + case MDOC_sp: /* FALLTHROUGH */ - case (MDOC_Bl): + case MDOC_Bl: /* FALLTHROUGH */ - case (MDOC_D1): + case MDOC_D1: /* FALLTHROUGH */ - case (MDOC_Dl): + case MDOC_Dl: /* FALLTHROUGH */ - case (MDOC_Lp): + case MDOC_Lp: /* FALLTHROUGH */ - case (MDOC_Pp): + case MDOC_Pp: continue; default: break; @@ -1279,8 +1229,6 @@ mdoc_bd_pre(MDOC_ARGS) return(0); } - -/* ARGSUSED */ static int mdoc_pa_pre(MDOC_ARGS) { @@ -1291,8 +1239,6 @@ mdoc_pa_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_ad_pre(MDOC_ARGS) { @@ -1303,8 +1249,6 @@ mdoc_ad_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_an_pre(MDOC_ARGS) { @@ -1317,8 +1261,6 @@ mdoc_an_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_cd_pre(MDOC_ARGS) { @@ -1330,8 +1272,6 @@ mdoc_cd_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_dv_pre(MDOC_ARGS) { @@ -1342,8 +1282,6 @@ mdoc_dv_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_ev_pre(MDOC_ARGS) { @@ -1354,8 +1292,6 @@ mdoc_ev_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_er_pre(MDOC_ARGS) { @@ -1366,8 +1302,6 @@ mdoc_er_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_fa_pre(MDOC_ARGS) { @@ -1399,22 +1333,74 @@ mdoc_fa_pre(MDOC_ARGS) return(0); } - -/* ARGSUSED */ static int mdoc_fd_pre(MDOC_ARGS) { - struct htmlpair tag; + struct htmlpair tag[2]; + char buf[BUFSIZ]; + size_t sz; + int i; + struct tag *t; synopsis_pre(h, n); - PAIR_CLASS_INIT(&tag, "macro"); - print_otag(h, TAG_B, 1, &tag); - return(1); -} + if (NULL == (n = n->child)) + return(0); + assert(MDOC_TEXT == n->type); -/* ARGSUSED */ + if (strcmp(n->string, "#include")) { + PAIR_CLASS_INIT(&tag[0], "macro"); + print_otag(h, TAG_B, 1, tag); + return(1); + } + + PAIR_CLASS_INIT(&tag[0], "includes"); + print_otag(h, TAG_B, 1, tag); + print_text(h, n->string); + + if (NULL != (n = n->next)) { + assert(MDOC_TEXT == n->type); + + /* + * XXX This is broken and not easy to fix. + * When using -Oincludes, truncation may occur. + * Dynamic allocation wouldn't help because + * passing long strings to buffmt_includes() + * does not work either. + */ + + strlcpy(buf, '<' == *n->string || '"' == *n->string ? + n->string + 1 : n->string, BUFSIZ); + + sz = strlen(buf); + if (sz && ('>' == buf[sz - 1] || '"' == buf[sz - 1])) + buf[sz - 1] = '\0'; + + PAIR_CLASS_INIT(&tag[0], "link-includes"); + + i = 1; + if (h->base_includes) { + buffmt_includes(h, buf); + PAIR_HREF_INIT(&tag[i], h->buf); + i++; + } + + t = print_otag(h, TAG_A, i, tag); + print_text(h, n->string); + print_tagq(h, t); + + n = n->next; + } + + for ( ; n; n = n->next) { + assert(MDOC_TEXT == n->type); + print_text(h, n->string); + } + + return(0); +} + static int mdoc_vt_pre(MDOC_ARGS) { @@ -1433,8 +1419,6 @@ mdoc_vt_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_ft_pre(MDOC_ARGS) { @@ -1446,18 +1430,16 @@ mdoc_ft_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_fn_pre(MDOC_ARGS) { - struct tag *t; - struct htmlpair tag[2]; - const struct mdoc_node *nn; - char nbuf[BUFSIZ]; - const char *sp, *ep; - int sz, i; + struct tag *t; + struct htmlpair tag[2]; + char nbuf[BUFSIZ]; + const char *sp, *ep; + int sz, i, pretty; + pretty = MDOC_SYNPRETTY & n->flags; synopsis_pre(h, n); /* Split apart into type and name. */ @@ -1468,7 +1450,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); @@ -1500,29 +1482,28 @@ 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); h->flags |= HTML_NOSPACE; 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); - for (nn = n->child->next; nn; nn = nn->next) { + for (n = n->child->next; n; n = n->next) { i = 1; if (MDOC_SYNPRETTY & n->flags) i = 2; t = print_otag(h, TAG_I, i, tag); - print_text(h, nn->string); + print_text(h, n->string); print_tagq(h, t); - if (nn->next) { + if (n->next) { h->flags |= HTML_NOSPACE; print_text(h, ","); } @@ -1531,7 +1512,7 @@ mdoc_fn_pre(MDOC_ARGS) h->flags |= HTML_NOSPACE; print_text(h, ")"); - if (MDOC_SYNPRETTY & n->flags) { + if (pretty) { h->flags |= HTML_NOSPACE; print_text(h, ";"); } @@ -1539,15 +1520,13 @@ mdoc_fn_pre(MDOC_ARGS) return(0); } - -/* ARGSUSED */ static int mdoc_sm_pre(MDOC_ARGS) { assert(n->child && MDOC_TEXT == n->child->type); if (0 == strcmp("on", n->child->string)) { - /* + /* * FIXME: no p->col to check. Thus, if we have * .Bd -literal * .Sm off @@ -1565,17 +1544,21 @@ mdoc_sm_pre(MDOC_ARGS) return(0); } -/* ARGSUSED */ static int +mdoc_skip_pre(MDOC_ARGS) +{ + + return(0); +} + +static int mdoc_pp_pre(MDOC_ARGS) { print_otag(h, TAG_P, 0, NULL); return(0); - } -/* ARGSUSED */ static int mdoc_sp_pre(MDOC_ARGS) { @@ -1585,11 +1568,13 @@ 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)) + SCALE_VS_INIT(&su, atoi(n->string)); } else su.scale = 0; + bufinit(h); bufcat_su(h, "height", &su); PAIR_STYLE_INIT(&tag, h); print_otag(h, TAG_DIV, 1, &tag); @@ -1601,54 +1586,54 @@ mdoc_sp_pre(MDOC_ARGS) } -/* ARGSUSED */ static int mdoc_lk_pre(MDOC_ARGS) { - const struct mdoc_node *nn; - struct htmlpair tag[2]; + struct htmlpair tag[2]; - nn = n->child; + if (NULL == (n = n->child)) + return(0); + assert(MDOC_TEXT == n->type); + PAIR_CLASS_INIT(&tag[0], "link-ext"); - PAIR_HREF_INIT(&tag[1], nn->string); + PAIR_HREF_INIT(&tag[1], n->string); + print_otag(h, TAG_A, 2, tag); - if (NULL == nn || NULL == nn->next) - return(1); + if (NULL == n->next) + print_text(h, n->string); - for (nn = nn->next; nn; nn = nn->next) - print_text(h, nn->string); + for (n = n->next; n; n = n->next) + print_text(h, n->string); return(0); } - -/* ARGSUSED */ static int mdoc_mt_pre(MDOC_ARGS) { - struct htmlpair tag[2]; - struct tag *t; - const struct mdoc_node *nn; + struct htmlpair tag[2]; + struct tag *t; PAIR_CLASS_INIT(&tag[0], "link-mail"); - for (nn = n->child; nn; nn = nn->next) { + for (n = n->child; n; n = n->next) { + assert(MDOC_TEXT == n->type); + bufinit(h); bufcat(h, "mailto:"); - bufcat(h, nn->string); + bufcat(h, n->string); + PAIR_HREF_INIT(&tag[1], h->buf); t = print_otag(h, TAG_A, 2, tag); - print_text(h, nn->string); + print_text(h, n->string); print_tagq(h, t); } - + return(0); } - -/* ARGSUSED */ static int mdoc_fo_pre(MDOC_ARGS) { @@ -1677,8 +1662,6 @@ mdoc_fo_pre(MDOC_ARGS) return(0); } - -/* ARGSUSED */ static void mdoc_fo_post(MDOC_ARGS) { @@ -1691,8 +1674,6 @@ mdoc_fo_post(MDOC_ARGS) print_text(h, ";"); } - -/* ARGSUSED */ static int mdoc_in_pre(MDOC_ARGS) { @@ -1722,14 +1703,13 @@ mdoc_in_pre(MDOC_ARGS) assert(MDOC_TEXT == n->type); 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); - } + PAIR_HREF_INIT(&tag[i], h->buf); + i++; + } t = print_otag(h, TAG_A, i, tag); print_text(h, n->string); @@ -1749,8 +1729,6 @@ mdoc_in_pre(MDOC_ARGS) return(0); } - -/* ARGSUSED */ static int mdoc_ic_pre(MDOC_ARGS) { @@ -1761,53 +1739,56 @@ mdoc_ic_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_rv_pre(MDOC_ARGS) { - const struct mdoc_node *nn; - struct htmlpair tag; - struct tag *t; + struct htmlpair tag; + struct tag *t; + int nchild; if (n->prev) print_otag(h, TAG_BR, 0, NULL); + PAIR_CLASS_INIT(&tag, "fname"); + print_text(h, "The"); - for (nn = n->child; nn; nn = nn->next) { - PAIR_CLASS_INIT(&tag, "fname"); + nchild = n->nchild; + for (n = n->child; n; n = n->next) { + assert(MDOC_TEXT == n->type); + t = print_otag(h, TAG_B, 1, &tag); - print_text(h, nn->string); + print_text(h, n->string); print_tagq(h, t); h->flags |= HTML_NOSPACE; - if (nn->next && NULL == nn->next->next) - print_text(h, "(), and"); - else if (nn->next) - print_text(h, "(),"); - else - print_text(h, "()"); + print_text(h, "()"); + + if (nchild > 2 && n->next) { + h->flags |= HTML_NOSPACE; + print_text(h, ","); + } + + if (n->next && NULL == n->next->next) + print_text(h, "and"); } - if (n->child && n->child->next) + if (nchild > 1) 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"); + 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_B, 1, &tag); print_text(h, "errno"); print_tagq(h, t); - print_text(h, "is set to indicate the error."); + print_text(h, "is set to indicate the error."); return(0); } - -/* ARGSUSED */ static int mdoc_va_pre(MDOC_ARGS) { @@ -1818,20 +1799,16 @@ mdoc_va_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_ap_pre(MDOC_ARGS) { - + h->flags |= HTML_NOSPACE; print_text(h, "\\(aq"); h->flags |= HTML_NOSPACE; return(1); } - -/* ARGSUSED */ static int mdoc_bf_pre(MDOC_ARGS) { @@ -1843,19 +1820,20 @@ mdoc_bf_pre(MDOC_ARGS) else if (MDOC_BODY != n->type) return(1); - if (FONT_Em == n->norm->Bf.font) + if (FONT_Em == n->norm->Bf.font) PAIR_CLASS_INIT(&tag[0], "emph"); - else if (FONT_Sy == n->norm->Bf.font) + else if (FONT_Sy == n->norm->Bf.font) PAIR_CLASS_INIT(&tag[0], "symb"); - else if (FONT_Li == n->norm->Bf.font) + else if (FONT_Li == n->norm->Bf.font) PAIR_CLASS_INIT(&tag[0], "lit"); else PAIR_CLASS_INIT(&tag[0], "none"); - /* + /* * We want this to be inline-formatted, but needs to be div to - * accept block children. + * accept block children. */ + bufinit(h); bufcat_style(h, "display", "inline"); SCALE_HS_INIT(&su, 1); /* Needs a left-margin for spacing. */ @@ -1865,8 +1843,6 @@ mdoc_bf_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_ms_pre(MDOC_ARGS) { @@ -1877,8 +1853,6 @@ mdoc_ms_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_igndelim_pre(MDOC_ARGS) { @@ -1887,8 +1861,6 @@ mdoc_igndelim_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static void mdoc_pf_post(MDOC_ARGS) { @@ -1896,8 +1868,6 @@ mdoc_pf_post(MDOC_ARGS) h->flags |= HTML_NOSPACE; } - -/* ARGSUSED */ static int mdoc_rs_pre(MDOC_ARGS) { @@ -1914,21 +1884,16 @@ mdoc_rs_pre(MDOC_ARGS) 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); + print_otag(h, TAG_CODE, 1, &tag); return(1); } - -/* ARGSUSED */ static int mdoc_sy_pre(MDOC_ARGS) { @@ -1939,8 +1904,6 @@ mdoc_sy_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc_bt_pre(MDOC_ARGS) { @@ -1949,8 +1912,6 @@ mdoc_bt_pre(MDOC_ARGS) return(0); } - -/* ARGSUSED */ static int mdoc_ud_pre(MDOC_ARGS) { @@ -1959,8 +1920,6 @@ mdoc_ud_pre(MDOC_ARGS) return(0); } - -/* ARGSUSED */ static int mdoc_lb_pre(MDOC_ARGS) { @@ -1974,8 +1933,6 @@ mdoc_lb_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static int mdoc__x_pre(MDOC_ARGS) { @@ -1985,52 +1942,52 @@ mdoc__x_pre(MDOC_ARGS) t = TAG_SPAN; switch (n->tok) { - case(MDOC__A): + case MDOC__A: PAIR_CLASS_INIT(&tag[0], "ref-auth"); if (n->prev && MDOC__A == n->prev->tok) if (NULL == n->next || MDOC__A != n->next->tok) print_text(h, "and"); break; - case(MDOC__B): + case MDOC__B: PAIR_CLASS_INIT(&tag[0], "ref-book"); t = TAG_I; break; - case(MDOC__C): + case MDOC__C: PAIR_CLASS_INIT(&tag[0], "ref-city"); break; - case(MDOC__D): + case MDOC__D: PAIR_CLASS_INIT(&tag[0], "ref-date"); break; - case(MDOC__I): + case MDOC__I: PAIR_CLASS_INIT(&tag[0], "ref-issue"); t = TAG_I; break; - case(MDOC__J): + case MDOC__J: PAIR_CLASS_INIT(&tag[0], "ref-jrnl"); t = TAG_I; break; - case(MDOC__N): + case MDOC__N: PAIR_CLASS_INIT(&tag[0], "ref-num"); break; - case(MDOC__O): + case MDOC__O: PAIR_CLASS_INIT(&tag[0], "ref-opt"); break; - case(MDOC__P): + case MDOC__P: PAIR_CLASS_INIT(&tag[0], "ref-page"); break; - case(MDOC__Q): + case MDOC__Q: PAIR_CLASS_INIT(&tag[0], "ref-corp"); break; - case(MDOC__R): + case MDOC__R: PAIR_CLASS_INIT(&tag[0], "ref-rep"); break; - case(MDOC__T): + case MDOC__T: PAIR_CLASS_INIT(&tag[0], "ref-title"); break; - case(MDOC__U): + case MDOC__U: PAIR_CLASS_INIT(&tag[0], "link-ref"); break; - case(MDOC__V): + case MDOC__V: PAIR_CLASS_INIT(&tag[0], "ref-vol"); break; default: @@ -2049,8 +2006,6 @@ mdoc__x_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static void mdoc__x_post(MDOC_ARGS) { @@ -2069,18 +2024,16 @@ mdoc__x_post(MDOC_ARGS) print_text(h, n->next ? "," : "."); } - -/* ARGSUSED */ static int mdoc_bk_pre(MDOC_ARGS) { switch (n->type) { - case (MDOC_BLOCK): + case MDOC_BLOCK: break; - case (MDOC_HEAD): + case MDOC_HEAD: return(0); - case (MDOC_BODY): + case MDOC_BODY: if (n->parent->args || 0 == n->prev->nchild) h->flags |= HTML_PREKEEP; break; @@ -2092,8 +2045,6 @@ mdoc_bk_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static void mdoc_bk_post(MDOC_ARGS) { @@ -2102,8 +2053,6 @@ mdoc_bk_post(MDOC_ARGS) h->flags &= ~(HTML_KEEP | HTML_PREKEEP); } - -/* ARGSUSED */ static int mdoc_quote_pre(MDOC_ARGS) { @@ -2113,48 +2062,60 @@ mdoc_quote_pre(MDOC_ARGS) return(1); switch (n->tok) { - case (MDOC_Ao): + case MDOC_Ao: /* FALLTHROUGH */ - case (MDOC_Aq): + case MDOC_Aq: print_text(h, "\\(la"); break; - case (MDOC_Bro): + case MDOC_Bro: /* FALLTHROUGH */ - case (MDOC_Brq): + case MDOC_Brq: print_text(h, "\\(lC"); break; - case (MDOC_Bo): + case MDOC_Bo: /* FALLTHROUGH */ - case (MDOC_Bq): + case MDOC_Bq: print_text(h, "\\(lB"); break; - case (MDOC_Oo): + case MDOC_Oo: /* FALLTHROUGH */ - case (MDOC_Op): + case MDOC_Op: print_text(h, "\\(lB"); h->flags |= HTML_NOSPACE; PAIR_CLASS_INIT(&tag, "opt"); print_otag(h, TAG_SPAN, 1, &tag); break; - case (MDOC_Do): + 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_Eo: + break; + case MDOC_Do: /* FALLTHROUGH */ - case (MDOC_Dq): + case MDOC_Dq: /* FALLTHROUGH */ - case (MDOC_Qo): + case MDOC_Qo: /* FALLTHROUGH */ - case (MDOC_Qq): + case MDOC_Qq: print_text(h, "\\(lq"); break; - case (MDOC_Po): + case MDOC_Po: /* FALLTHROUGH */ - case (MDOC_Pq): + case MDOC_Pq: print_text(h, "("); break; - case (MDOC_Ql): + case MDOC_Ql: + print_text(h, "\\(oq"); + h->flags |= HTML_NOSPACE; + PAIR_CLASS_INIT(&tag, "lit"); + print_otag(h, TAG_CODE, 1, &tag); + break; + case MDOC_So: /* FALLTHROUGH */ - case (MDOC_So): - /* FALLTHROUGH */ - case (MDOC_Sq): + case MDOC_Sq: print_text(h, "\\(oq"); break; default: @@ -2166,8 +2127,6 @@ mdoc_quote_pre(MDOC_ARGS) return(1); } - -/* ARGSUSED */ static void mdoc_quote_post(MDOC_ARGS) { @@ -2175,53 +2134,62 @@ mdoc_quote_post(MDOC_ARGS) if (MDOC_BODY != n->type) return; - h->flags |= HTML_NOSPACE; + if (MDOC_En != n->tok) + h->flags |= HTML_NOSPACE; switch (n->tok) { - case (MDOC_Ao): + case MDOC_Ao: /* FALLTHROUGH */ - case (MDOC_Aq): + case MDOC_Aq: print_text(h, "\\(ra"); break; - case (MDOC_Bro): + case MDOC_Bro: /* FALLTHROUGH */ - case (MDOC_Brq): + case MDOC_Brq: print_text(h, "\\(rC"); break; - case (MDOC_Oo): + case MDOC_Oo: /* FALLTHROUGH */ - case (MDOC_Op): + case MDOC_Op: /* FALLTHROUGH */ - case (MDOC_Bo): + case MDOC_Bo: /* FALLTHROUGH */ - case (MDOC_Bq): + case MDOC_Bq: print_text(h, "\\(rB"); break; - case (MDOC_Qo): + case MDOC_En: + if (NULL != n->norm->Es && + NULL != n->norm->Es->child && + NULL != n->norm->Es->child->next) { + h->flags |= HTML_NOSPACE; + print_text(h, n->norm->Es->child->next->string); + } + break; + case MDOC_Eo: + break; + case MDOC_Qo: /* FALLTHROUGH */ - case (MDOC_Qq): + case MDOC_Qq: /* FALLTHROUGH */ - case (MDOC_Do): + case MDOC_Do: /* FALLTHROUGH */ - case (MDOC_Dq): + case MDOC_Dq: print_text(h, "\\(rq"); break; - case (MDOC_Po): + case MDOC_Po: /* FALLTHROUGH */ - case (MDOC_Pq): + case MDOC_Pq: print_text(h, ")"); break; - case (MDOC_Ql): + case MDOC_Ql: /* FALLTHROUGH */ - case (MDOC_So): + case MDOC_So: /* FALLTHROUGH */ - case (MDOC_Sq): - print_text(h, "\\(aq"); + case MDOC_Sq: + print_text(h, "\\(cq"); break; default: abort(); /* NOTREACHED */ } } - -