=================================================================== RCS file: /cvs/mandoc/html.c,v retrieving revision 1.44 retrieving revision 1.96 diff -u -p -r1.44 -r1.96 --- mandoc/html.c 2009/09/21 13:42:01 1.44 +++ mandoc/html.c 2010/02/17 19:48:33 1.96 @@ -1,4 +1,4 @@ -/* $Id: html.c,v 1.44 2009/09/21 13:42:01 kristaps Exp $ */ +/* $Id: html.c,v 1.96 2010/02/17 19:48:33 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -14,98 +14,65 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include -#include #include #include -#include +#include #include +#include #include #include +#include +#include "out.h" #include "chars.h" -#include "mdoc.h" -#include "man.h" +#include "html.h" +#include "main.h" -#define DOCTYPE "-//W3C//DTD HTML 4.01//EN" -#define DTD "http://www.w3.org/TR/html4/strict.dtd" +#define UNCONST(a) ((void *)(uintptr_t)(const void *)(a)) -#define INDENT 5 -#define HALFINDENT 3 - -enum htmltag { - TAG_HTML, - TAG_HEAD, - TAG_BODY, - TAG_META, - TAG_TITLE, - TAG_DIV, - TAG_H1, - TAG_H2, - TAG_P, - TAG_SPAN, - TAG_LINK, - TAG_BR, - TAG_A, - TAG_TABLE, - TAG_COL, - TAG_TR, - TAG_TD, - TAG_LI, - TAG_UL, - TAG_OL, - TAG_BASE, - TAG_MAX -}; - -enum htmlattr { - ATTR_HTTPEQUIV, - ATTR_CONTENT, - ATTR_NAME, - ATTR_REL, - ATTR_HREF, - ATTR_TYPE, - ATTR_MEDIA, - ATTR_CLASS, - ATTR_STYLE, - ATTR_WIDTH, - ATTR_VALIGN, - ATTR_MAX -}; - struct htmldata { - char *name; + const char *name; int flags; #define HTML_CLRLINE (1 << 0) #define HTML_NOSTACK (1 << 1) +#define HTML_AUTOCLOSE (1 << 2) /* Tag has auto-closure. */ }; static const struct htmldata htmltags[TAG_MAX] = { {"html", HTML_CLRLINE}, /* TAG_HTML */ {"head", HTML_CLRLINE}, /* TAG_HEAD */ {"body", HTML_CLRLINE}, /* TAG_BODY */ - {"meta", HTML_CLRLINE | HTML_NOSTACK}, /* TAG_META */ + {"meta", HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_META */ {"title", HTML_CLRLINE}, /* TAG_TITLE */ {"div", HTML_CLRLINE}, /* TAG_DIV */ {"h1", 0}, /* TAG_H1 */ {"h2", 0}, /* TAG_H2 */ - {"p", HTML_CLRLINE}, /* TAG_P */ {"span", 0}, /* TAG_SPAN */ {"link", HTML_CLRLINE | HTML_NOSTACK}, /* TAG_LINK */ - {"br", HTML_CLRLINE | HTML_NOSTACK}, /* TAG_LINK */ + {"br", HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_BR */ {"a", 0}, /* TAG_A */ {"table", HTML_CLRLINE}, /* TAG_TABLE */ - {"col", HTML_CLRLINE | HTML_NOSTACK}, /* TAG_COL */ + {"col", HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_COL */ {"tr", HTML_CLRLINE}, /* TAG_TR */ {"td", HTML_CLRLINE}, /* TAG_TD */ {"li", HTML_CLRLINE}, /* TAG_LI */ {"ul", HTML_CLRLINE}, /* TAG_UL */ {"ol", HTML_CLRLINE}, /* TAG_OL */ - {"base", HTML_CLRLINE | HTML_NOSTACK}, /* TAG_BASE */ }; -static const char *const htmlattrs[ATTR_MAX] = { +static const char *const htmlfonts[HTMLFONT_MAX] = { + "roman", + "bold", + "italic" +}; + +static const char *const htmlattrs[ATTR_MAX] = { "http-equiv", "content", "name", @@ -117,320 +84,57 @@ static const char *const htmlattrs[ATTR_MAX] = { "style", "width", "valign", + "target", + "id", + "summary", }; -struct htmlpair { - enum htmlattr key; - char *val; -}; - -struct tag { - enum htmltag tag; - SLIST_ENTRY(tag) entry; -}; - -struct ord { - int pos; - const void *cookie; - SLIST_ENTRY(ord) entry; -}; - -SLIST_HEAD(tagq, tag); -SLIST_HEAD(ordq, ord); - -struct html { - int flags; -#define HTML_NOSPACE (1 << 0) -#define HTML_NEWLINE (1 << 1) - struct tagq tags; - struct ordq ords; - void *symtab; - char *base; - char *style; -}; - -#define MDOC_ARGS const struct mdoc_meta *m, \ - const struct mdoc_node *n, \ - struct html *h -#define MAN_ARGS const struct man_meta *m, \ - const struct man_node *n, \ - struct html *h -struct htmlmdoc { - int (*pre)(MDOC_ARGS); - void (*post)(MDOC_ARGS); -}; - -static void print_gen_doctype(struct html *); -static void print_gen_head(struct html *); -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 print_man(MAN_ARGS); -static void print_man_head(MAN_ARGS); -static struct tag *print_otag(struct html *, enum htmltag, - int, const struct htmlpair *); -static void print_tagq(struct html *, const struct tag *); -static void print_stagq(struct html *, const struct tag *); +static void print_spec(struct html *, const char *, size_t); +static void print_res(struct html *, const char *, size_t); static void print_ctag(struct html *, enum htmltag); -static void print_encode(struct html *, const char *); -static void print_escape(struct html *, const char **); -static void print_text(struct html *, const char *); -static void print_res(struct html *, const char *, int); -static void print_spec(struct html *, const char *, int); +static void print_doctype(struct html *); +static void print_xmltype(struct html *); +static int print_encode(struct html *, const char *, int); +static void print_metaf(struct html *, enum roffdeco); +static void print_attr(struct html *, + const char *, const char *); +static void *ml_alloc(char *, enum htmltype); -static int a2width(const char *); -static int a2offs(const char *); -static int a2list(const struct mdoc_node *); -static void mdoc_root_post(MDOC_ARGS); -static int mdoc_root_pre(MDOC_ARGS); -static int mdoc_tbl_pre(MDOC_ARGS, int); -static int mdoc_tbl_block_pre(MDOC_ARGS, int, int, int, int); -static int mdoc_tbl_body_pre(MDOC_ARGS, int, int); -static int mdoc_tbl_head_pre(MDOC_ARGS, int, int); - -static int mdoc_ad_pre(MDOC_ARGS); -static int mdoc_an_pre(MDOC_ARGS); -static void mdoc_aq_post(MDOC_ARGS); -static int mdoc_aq_pre(MDOC_ARGS); -static int mdoc_ar_pre(MDOC_ARGS); -static int mdoc_bd_pre(MDOC_ARGS); -static void mdoc_bl_post(MDOC_ARGS); -static int mdoc_bl_pre(MDOC_ARGS); -static int mdoc_cd_pre(MDOC_ARGS); -static int mdoc_d1_pre(MDOC_ARGS); -static void mdoc_dq_post(MDOC_ARGS); -static int mdoc_dq_pre(MDOC_ARGS); -static int mdoc_dv_pre(MDOC_ARGS); -static int mdoc_fa_pre(MDOC_ARGS); -static int mdoc_fd_pre(MDOC_ARGS); -static int mdoc_fl_pre(MDOC_ARGS); -static int mdoc_fn_pre(MDOC_ARGS); -static int mdoc_ft_pre(MDOC_ARGS); -static int mdoc_em_pre(MDOC_ARGS); -static int mdoc_er_pre(MDOC_ARGS); -static int mdoc_ev_pre(MDOC_ARGS); -static int mdoc_ex_pre(MDOC_ARGS); -static int mdoc_it_pre(MDOC_ARGS); -static int mdoc_nd_pre(MDOC_ARGS); -static int mdoc_nm_pre(MDOC_ARGS); -static int mdoc_ns_pre(MDOC_ARGS); -static void mdoc_op_post(MDOC_ARGS); -static int mdoc_op_pre(MDOC_ARGS); -static int mdoc_pa_pre(MDOC_ARGS); -static int mdoc_pp_pre(MDOC_ARGS); -static void mdoc_pq_post(MDOC_ARGS); -static int mdoc_pq_pre(MDOC_ARGS); -static void mdoc_qq_post(MDOC_ARGS); -static int mdoc_qq_pre(MDOC_ARGS); -static int mdoc_sh_pre(MDOC_ARGS); -static void mdoc_sq_post(MDOC_ARGS); -static int mdoc_sq_pre(MDOC_ARGS); -static int mdoc_ss_pre(MDOC_ARGS); -static int mdoc_sx_pre(MDOC_ARGS); -static int mdoc_vt_pre(MDOC_ARGS); -static int mdoc_xr_pre(MDOC_ARGS); -static int mdoc_xx_pre(MDOC_ARGS); - -#ifdef __linux__ -extern int getsubopt(char **, char * const *, char **); -extern size_t strlcpy(char *, const char *, size_t); -extern size_t strlcat(char *, const char *, size_t); -#endif - -static const struct htmlmdoc mdocs[MDOC_MAX] = { - {mdoc_pp_pre, NULL}, /* Ap */ - {NULL, NULL}, /* Dd */ - {NULL, NULL}, /* Dt */ - {NULL, NULL}, /* Os */ - {mdoc_sh_pre, NULL }, /* Sh */ - {mdoc_ss_pre, NULL }, /* Ss */ - {mdoc_pp_pre, NULL}, /* Pp */ - {mdoc_d1_pre, NULL}, /* D1 */ - {mdoc_d1_pre, NULL}, /* Dl */ - {mdoc_bd_pre, NULL}, /* Bd */ - {NULL, NULL}, /* Ed */ - {mdoc_bl_pre, mdoc_bl_post}, /* Bl */ - {NULL, NULL}, /* El */ - {mdoc_it_pre, NULL}, /* It */ - {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_ex_pre, NULL}, /* Ex */ - {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 */ - {NULL, NULL}, /* Ic */ - {NULL, NULL}, /* In */ - {NULL, NULL}, /* Li */ - {mdoc_nd_pre, NULL}, /* Nd */ - {mdoc_nm_pre, NULL}, /* Nm */ - {mdoc_op_pre, mdoc_op_post}, /* Op */ - {NULL, NULL}, /* Ot */ - {mdoc_pa_pre, NULL}, /* Pa */ - {NULL, NULL}, /* Rv */ - {NULL, NULL}, /* St */ - {NULL, NULL}, /* Va */ - {mdoc_vt_pre, NULL}, /* Vt */ - {mdoc_xr_pre, NULL}, /* Xr */ - {NULL, NULL}, /* %A */ - {NULL, NULL}, /* %B */ - {NULL, NULL}, /* %D */ - {NULL, NULL}, /* %I */ - {NULL, NULL}, /* %J */ - {NULL, NULL}, /* %N */ - {NULL, NULL}, /* %O */ - {NULL, NULL}, /* %P */ - {NULL, NULL}, /* %R */ - {NULL, NULL}, /* %T */ - {NULL, NULL}, /* %V */ - {NULL, NULL}, /* Ac */ - {mdoc_aq_pre, mdoc_aq_post}, /* Ao */ - {mdoc_aq_pre, mdoc_aq_post}, /* Aq */ - {NULL, NULL}, /* At */ - {NULL, NULL}, /* Bc */ - {NULL, NULL}, /* Bf */ - {NULL, NULL}, /* Bo */ - {NULL, NULL}, /* Bq */ - {mdoc_xx_pre, NULL}, /* Bsx */ - {NULL, NULL}, /* Bx */ - {NULL, NULL}, /* Db */ - {NULL, NULL}, /* Dc */ - {NULL, NULL}, /* Do */ - {mdoc_dq_pre, mdoc_dq_post}, /* Dq */ - {NULL, NULL}, /* Ec */ - {NULL, NULL}, /* Ef */ - {mdoc_em_pre, NULL}, /* Em */ - {NULL, NULL}, /* Eo */ - {mdoc_xx_pre, NULL}, /* Fx */ - {NULL, NULL}, /* Ms */ - {NULL, NULL}, /* No */ - {mdoc_ns_pre, NULL}, /* Ns */ - {mdoc_xx_pre, NULL}, /* Nx */ - {mdoc_xx_pre, NULL}, /* Ox */ - {NULL, NULL}, /* Pc */ - {NULL, NULL}, /* Pf */ - {mdoc_pq_pre, mdoc_pq_post}, /* Po */ - {mdoc_pq_pre, mdoc_pq_post}, /* Pq */ - {NULL, NULL}, /* Qc */ - {NULL, NULL}, /* Ql */ - {mdoc_qq_pre, mdoc_qq_post}, /* Qo */ - {mdoc_qq_pre, mdoc_qq_post}, /* Qq */ - {NULL, NULL}, /* Re */ - {NULL, NULL}, /* Rs */ - {NULL, NULL}, /* Sc */ - {mdoc_sq_pre, mdoc_sq_post}, /* So */ - {mdoc_sq_pre, mdoc_sq_post}, /* Sq */ - {NULL, NULL}, /* Sm */ - {mdoc_sx_pre, NULL}, /* Sx */ - {NULL, NULL}, /* Sy */ - {NULL, NULL}, /* Tn */ - {mdoc_xx_pre, NULL}, /* Ux */ - {NULL, NULL}, /* Xc */ - {NULL, NULL}, /* Xo */ - {NULL, NULL}, /* Fo */ - {NULL, NULL}, /* Fc */ - {NULL, NULL}, /* Oo */ - {NULL, NULL}, /* Oc */ - {NULL, NULL}, /* Bk */ - {NULL, NULL}, /* Ek */ - {NULL, NULL}, /* Bt */ - {NULL, NULL}, /* Hf */ - {NULL, NULL}, /* Fr */ - {NULL, NULL}, /* Ud */ - {NULL, NULL}, /* Lb */ - {NULL, NULL}, /* Lp */ - {NULL, NULL}, /* Lk */ - {NULL, NULL}, /* Mt */ - {NULL, NULL}, /* Brq */ - {NULL, NULL}, /* Bro */ - {NULL, NULL}, /* Brc */ - {NULL, NULL}, /* %C */ - {NULL, NULL}, /* Es */ - {NULL, NULL}, /* En */ - {mdoc_xx_pre, NULL}, /* Dx */ - {NULL, NULL}, /* %Q */ - {NULL, NULL}, /* br */ - {NULL, NULL}, /* sp */ -}; - -static char buf[BUFSIZ]; /* XXX */ - -#define bufcat(x) (void)strlcat(buf, (x), BUFSIZ) -#define bufinit() buf[0] = 0 -#define buffmt(...) (void)snprintf(buf, BUFSIZ - 1, __VA_ARGS__) - -void -html_mdoc(void *arg, const struct mdoc *m) +static void * +ml_alloc(char *outopts, enum htmltype type) { - struct html *h; - struct tag *t; - - h = (struct html *)arg; - - print_gen_doctype(h); - t = print_otag(h, TAG_HTML, 0, NULL); - print_mdoc(mdoc_meta(m), mdoc_node(m), h); - print_tagq(h, t); - - printf("\n"); -} - - -void -html_man(void *arg, const struct man *m) -{ struct html *h; - struct tag *t; + const char *toks[4]; + char *v; - h = (struct html *)arg; - - print_gen_doctype(h); - t = print_otag(h, TAG_HTML, 0, NULL); - print_man(man_meta(m), man_node(m), h); - print_tagq(h, t); - - printf("\n"); -} - - -void * -html_alloc(char *outopts) -{ - struct html *h; - char *toks[3], *v; - toks[0] = "style"; - toks[1] = "base"; - toks[2] = NULL; + toks[1] = "man"; + toks[2] = "includes"; + toks[3] = NULL; - if (NULL == (h = calloc(1, sizeof(struct html)))) - return(NULL); - - SLIST_INIT(&h->tags); - SLIST_INIT(&h->ords); - - if (NULL == (h->symtab = chars_init(CHARS_HTML))) { - free(h); - return(NULL); + h = calloc(1, sizeof(struct html)); + if (NULL == h) { + perror(NULL); + exit(EXIT_FAILURE); } - while (*outopts) - switch (getsubopt(&outopts, toks, &v)) { + h->type = type; + h->tags.head = NULL; + h->ords.head = NULL; + h->symtab = chars_init(CHARS_HTML); + + while (outopts && *outopts) + switch (getsubopt(&outopts, UNCONST(toks), &v)) { case (0): h->style = v; break; case (1): - h->base = v; + h->base_man = v; break; + case (2): + h->base_includes = v; + break; default: break; } @@ -438,7 +142,22 @@ html_alloc(char *outopts) return(h); } +void * +html_alloc(char *outopts) +{ + return(ml_alloc(outopts, HTML_HTML_4_01_STRICT)); +} + + +void * +xhtml_alloc(char *outopts) +{ + + return(ml_alloc(outopts, HTML_XHTML_1_0_STRICT)); +} + + void html_free(void *p) { @@ -448,127 +167,24 @@ html_free(void *p) h = (struct html *)p; - while ( ! SLIST_EMPTY(&h->ords)) { - ord = SLIST_FIRST(&h->ords); - SLIST_REMOVE_HEAD(&h->ords, entry); + while ((ord = h->ords.head) != NULL) { + h->ords.head = ord->next; free(ord); } - while ( ! SLIST_EMPTY(&h->tags)) { - tag = SLIST_FIRST(&h->tags); - SLIST_REMOVE_HEAD(&h->tags, entry); + while ((tag = h->tags.head) != NULL) { + h->tags.head = tag->next; free(tag); } if (h->symtab) chars_free(h->symtab); + free(h); } -static int -a2list(const struct mdoc_node *n) -{ - int i; - - assert(MDOC_BLOCK == n->type && MDOC_Bl == n->tok); - assert(n->args); - - for (i = 0; i < (int)n->args->argc; i++) - switch (n->args->argv[i].arg) { - case (MDOC_Enum): - /* FALLTHROUGH */ - case (MDOC_Dash): - /* FALLTHROUGH */ - case (MDOC_Hyphen): - /* FALLTHROUGH */ - case (MDOC_Bullet): - /* FALLTHROUGH */ - case (MDOC_Tag): - /* FALLTHROUGH */ - case (MDOC_Hang): - /* FALLTHROUGH */ - case (MDOC_Inset): - /* FALLTHROUGH */ - case (MDOC_Diag): - /* FALLTHROUGH */ - case (MDOC_Item): - /* FALLTHROUGH */ - case (MDOC_Column): - /* FALLTHROUGH */ - case (MDOC_Ohang): - return(n->args->argv[i].arg); - default: - break; - } - - abort(); - /* NOTREACHED */ -} - - -static int -a2width(const char *p) -{ - int i, len; - - if (0 == (len = (int)strlen(p))) - return(0); - for (i = 0; i < len - 1; i++) - if ( ! isdigit((u_char)p[i])) - break; - - if (i == len - 1) - if ('n' == p[len - 1] || 'm' == p[len - 1]) - return(atoi(p) + 2); - - return(len + 2); -} - - -static int -a2offs(const char *p) -{ - int len, i; - - if (0 == strcmp(p, "left")) - return(0); - if (0 == strcmp(p, "indent")) - return(INDENT + 1); - if (0 == strcmp(p, "indent-two")) - return((INDENT + 1) * 2); - - if (0 == (len = (int)strlen(p))) - return(0); - - for (i = 0; i < len - 1; i++) - if ( ! isdigit((u_char)p[i])) - break; - - if (i == len - 1) - if ('n' == p[len - 1] || 'm' == p[len - 1]) - return(atoi(p)); - - return(len); -} - - -static void -print_mdoc(MDOC_ARGS) -{ - struct tag *t; - - t = print_otag(h, TAG_HEAD, 0, NULL); - print_mdoc_head(m, n, h); - print_tagq(h, t); - - t = print_otag(h, TAG_BODY, 0, NULL); - print_mdoc_nodelist(m, n, h); - print_tagq(h, t); -} - - -static void +void print_gen_head(struct html *h) { struct htmlpair tag[4]; @@ -596,329 +212,281 @@ print_gen_head(struct html *h) tag[3].val = "all"; print_otag(h, TAG_LINK, 4, tag); } - - if (h->base) { - tag[0].key = ATTR_HREF; - tag[1].val = h->base; - print_otag(h, TAG_BASE, 1, tag); - } } -/* ARGSUSED */ static void -print_mdoc_head(MDOC_ARGS) +print_spec(struct html *h, const char *p, size_t len) { + const char *rhs; + size_t sz; - print_gen_head(h); - print_otag(h, TAG_TITLE, 0, NULL); - print_text(h, m->title); -} + rhs = chars_a2ascii(h->symtab, p, len, &sz); - -static void -print_mdoc_nodelist(MDOC_ARGS) -{ - - print_mdoc_node(m, n, h); - if (n->next) - print_mdoc_nodelist(m, n->next, h); + if (NULL == rhs) + return; + fwrite(rhs, 1, sz, stdout); } static void -print_mdoc_node(MDOC_ARGS) +print_res(struct html *h, const char *p, size_t len) { - int child; - struct tag *t; + const char *rhs; + size_t sz; - child = 1; - t = SLIST_FIRST(&h->tags); + rhs = chars_a2res(h->symtab, p, len, &sz); - bufinit(); - - switch (n->type) { - case (MDOC_ROOT): - child = mdoc_root_pre(m, n, h); - break; - case (MDOC_TEXT): - print_text(h, n->string); - break; - default: - if (mdocs[n->tok].pre) - child = (*mdocs[n->tok].pre)(m, n, h); - break; - } - - if (child && n->child) - print_mdoc_nodelist(m, n->child, h); - - print_stagq(h, t); - - bufinit(); - - switch (n->type) { - case (MDOC_ROOT): - mdoc_root_post(m, n, h); - break; - case (MDOC_TEXT): - break; - default: - if (mdocs[n->tok].post) - (*mdocs[n->tok].post)(m, n, h); - break; - } + if (NULL == rhs) + return; + fwrite(rhs, 1, sz, stdout); } -static void -print_man(MAN_ARGS) +struct tag * +print_ofont(struct html *h, enum htmlfont font) { - struct tag *t; + struct htmlpair tag; - t = print_otag(h, TAG_HEAD, 0, NULL); - print_man_head(m, n, h); - print_tagq(h, t); + h->metal = h->metac; + h->metac = font; - t = print_otag(h, TAG_BODY, 0, NULL); - /*print_man_body(m, n, h);*/ - print_tagq(h, t); -} + /* FIXME: DECO_ROMAN should just close out preexisting. */ + if (h->metaf && h->tags.head == h->metaf) + print_tagq(h, h->metaf); -/* ARGSUSED */ -static void -print_man_head(MAN_ARGS) -{ - - print_gen_head(h); - print_otag(h, TAG_TITLE, 0, NULL); - print_text(h, m->title); + PAIR_CLASS_INIT(&tag, htmlfonts[font]); + h->metaf = print_otag(h, TAG_SPAN, 1, &tag); + return(h->metaf); } static void -print_spec(struct html *h, const char *p, int len) +print_metaf(struct html *h, enum roffdeco deco) { - const char *rhs; - int i; - size_t sz; + enum htmlfont font; - rhs = chars_a2ascii(h->symtab, p, (size_t)len, &sz); + switch (deco) { + case (DECO_PREVIOUS): + font = h->metal; + break; + case (DECO_ITALIC): + font = HTMLFONT_ITALIC; + break; + case (DECO_BOLD): + font = HTMLFONT_BOLD; + break; + case (DECO_ROMAN): + font = HTMLFONT_NONE; + break; + default: + abort(); + /* NOTREACHED */ + } - if (NULL == rhs) - return; - for (i = 0; i < (int)sz; i++) - putchar(rhs[i]); + (void)print_ofont(h, font); } -static void -print_res(struct html *h, const char *p, int len) +static int +print_encode(struct html *h, const char *p, int norecurse) { - const char *rhs; - int i; size_t sz; + int len, nospace; + const char *seq; + enum roffdeco deco; - rhs = chars_a2res(h->symtab, p, (size_t)len, &sz); + nospace = 0; - if (NULL == rhs) - return; - for (i = 0; i < (int)sz; i++) - putchar(rhs[i]); -} + for (; *p; p++) { + sz = strcspn(p, "\\<>&"); + fwrite(p, 1, sz, stdout); + p += /* LINTED */ + sz; -static void -print_escape(struct html *h, const char **p) -{ - int j, type; - const char *wp; + if ('<' == *p) { + printf("<"); + continue; + } else if ('>' == *p) { + printf(">"); + continue; + } else if ('&' == *p) { + printf("&"); + continue; + } else if ('\0' == *p) + break; - wp = *p; - type = 1; + seq = ++p; + len = a2roffdeco(&deco, &seq, &sz); - if (0 == *(++wp)) { - *p = wp; - return; - } - - if ('(' == *wp) { - wp++; - if (0 == *wp || 0 == *(wp + 1)) { - *p = 0 == *wp ? wp : wp + 1; - return; - } - - print_spec(h, wp, 2); - *p = ++wp; - return; - - } else if ('*' == *wp) { - if (0 == *(++wp)) { - *p = wp; - return; - } - - switch (*wp) { - case ('('): - wp++; - if (0 == *wp || 0 == *(wp + 1)) { - *p = 0 == *wp ? wp : wp + 1; - return; - } - - print_res(h, wp, 2); - *p = ++wp; - return; - case ('['): - type = 0; + switch (deco) { + case (DECO_RESERVED): + print_res(h, seq, sz); break; - default: - print_res(h, wp, 1); - *p = wp; - return; - } - - } else if ('f' == *wp) { - if (0 == *(++wp)) { - *p = wp; - return; - } - - switch (*wp) { - case ('B'): - /* TODO */ + case (DECO_SPECIAL): + print_spec(h, seq, sz); break; - case ('I'): - /* TODO */ - break; - case ('P'): + case (DECO_PREVIOUS): /* FALLTHROUGH */ - case ('R'): - /* TODO */ + case (DECO_BOLD): + /* FALLTHROUGH */ + case (DECO_ITALIC): + /* FALLTHROUGH */ + case (DECO_ROMAN): + if (norecurse) + break; + print_metaf(h, deco); break; default: break; } - *p = wp; - return; + p += len - 1; - } else if ('[' != *wp) { - print_spec(h, wp, 1); - *p = wp; - return; + if (DECO_NOSPACE == deco && '\0' == *(p + 1)) + nospace = 1; } - wp++; - for (j = 0; *wp && ']' != *wp; wp++, j++) - /* Loop... */ ; - - if (0 == *wp) { - *p = wp; - return; - } - - if (type) - print_spec(h, wp - j, j); - else - print_res(h, wp - j, j); - - *p = wp; + return(nospace); } static void -print_encode(struct html *h, const char *p) +print_attr(struct html *h, const char *key, const char *val) { - - for (; *p; p++) { - if ('\\' == *p) { - print_escape(h, &p); - continue; - } - switch (*p) { - case ('<'): - printf("<"); - break; - case ('>'): - printf(">"); - break; - case ('&'): - printf("&"); - break; - default: - putchar(*p); - break; - } - } + printf(" %s=\"", key); + (void)print_encode(h, val, 1); + putchar('\"'); } -static struct tag * +struct tag * print_otag(struct html *h, enum htmltag tag, int sz, const struct htmlpair *p) { int i; struct tag *t; + /* Push this tags onto the stack of open scopes. */ + if ( ! (HTML_NOSTACK & htmltags[tag].flags)) { - if (NULL == (t = malloc(sizeof(struct tag)))) - err(EXIT_FAILURE, "malloc"); + t = malloc(sizeof(struct tag)); + if (NULL == t) { + perror(NULL); + exit(EXIT_FAILURE); + } t->tag = tag; - SLIST_INSERT_HEAD(&h->tags, t, entry); + t->next = h->tags.head; + h->tags.head = t; } else t = NULL; if ( ! (HTML_NOSPACE & h->flags)) if ( ! (HTML_CLRLINE & htmltags[tag].flags)) - printf(" "); + putchar(' '); + /* Print out the tag name and attributes. */ + printf("<%s", htmltags[tag].name); - for (i = 0; i < sz; i++) { - printf(" %s=\"", htmlattrs[p[i].key]); - assert(p->val); - print_encode(h, p[i].val); - printf("\""); + for (i = 0; i < sz; i++) + print_attr(h, htmlattrs[p[i].key], p[i].val); + + /* Add non-overridable attributes. */ + + if (TAG_HTML == tag && HTML_XHTML_1_0_STRICT == h->type) { + print_attr(h, "xmlns", "http://www.w3.org/1999/xhtml"); + print_attr(h, "xml:lang", "en"); + print_attr(h, "lang", "en"); } - printf(">"); - h->flags |= HTML_NOSPACE; - if (HTML_CLRLINE & htmltags[tag].flags) - h->flags |= HTML_NEWLINE; - else - h->flags &= ~HTML_NEWLINE; + /* Accomodate for XML "well-formed" singleton escaping. */ + if (HTML_AUTOCLOSE & htmltags[tag].flags) + switch (h->type) { + case (HTML_XHTML_1_0_STRICT): + putchar('/'); + break; + default: + break; + } + + putchar('>'); + + h->flags |= HTML_NOSPACE; return(t); } -/* ARGSUSED */ static void print_ctag(struct html *h, enum htmltag tag) { printf("", htmltags[tag].name); - if (HTML_CLRLINE & htmltags[tag].flags) + if (HTML_CLRLINE & htmltags[tag].flags) { h->flags |= HTML_NOSPACE; - if (HTML_CLRLINE & htmltags[tag].flags) - h->flags |= HTML_NEWLINE; - else - h->flags &= ~HTML_NEWLINE; + putchar('\n'); + } } -/* ARGSUSED */ +void +print_gen_decls(struct html *h) +{ + + print_xmltype(h); + print_doctype(h); +} + + static void -print_gen_doctype(struct html *h) +print_xmltype(struct html *h) { - - printf("\n", DOCTYPE, DTD); + const char *decl; + + switch (h->type) { + case (HTML_XHTML_1_0_STRICT): + decl = ""; + break; + default: + decl = NULL; + break; + } + + if (NULL == decl) + return; + + printf("%s\n", decl); } static void +print_doctype(struct html *h) +{ + const char *doctype; + const char *dtd; + const char *name; + + switch (h->type) { + case (HTML_HTML_4_01_STRICT): + name = "HTML"; + doctype = "-//W3C//DTD HTML 4.01//EN"; + dtd = "http://www.w3.org/TR/html4/strict.dtd"; + break; + default: + name = "html"; + doctype = "-//W3C//DTD XHTML 1.0 Strict//EN"; + dtd = "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"; + break; + } + + printf("\n", + name, doctype, dtd); +} + + +void print_text(struct html *h, const char *p) { @@ -941,21 +509,20 @@ print_text(struct html *h, const char *p) case(']'): /* FALLTHROUGH */ case('}'): - h->flags |= HTML_NOSPACE; + if ( ! (HTML_IGNDELIM & h->flags)) + h->flags |= HTML_NOSPACE; break; default: break; } if ( ! (h->flags & HTML_NOSPACE)) - printf(" "); + putchar(' '); - h->flags &= ~HTML_NOSPACE; - h->flags &= ~HTML_NEWLINE; + assert(p); + if ( ! print_encode(h, p, 0)) + h->flags &= ~HTML_NOSPACE; - if (p) - print_encode(h, p); - if (*p && 0 == *(p + 1)) switch (*p) { case('('): @@ -971,15 +538,16 @@ print_text(struct html *h, const char *p) } -static void +void print_tagq(struct html *h, const struct tag *until) { struct tag *tag; - while ( ! SLIST_EMPTY(&h->tags)) { - tag = SLIST_FIRST(&h->tags); + while ((tag = h->tags.head) != NULL) { + if (tag == h->metaf) + h->metaf = NULL; print_ctag(h, tag->tag); - SLIST_REMOVE_HEAD(&h->tags, entry); + h->tags.head = tag->next; free(tag); if (until && tag == until) return; @@ -987,1180 +555,203 @@ print_tagq(struct html *h, const struct tag *until) } -static void +void print_stagq(struct html *h, const struct tag *suntil) { struct tag *tag; - while ( ! SLIST_EMPTY(&h->tags)) { - tag = SLIST_FIRST(&h->tags); + while ((tag = h->tags.head) != NULL) { if (suntil && tag == suntil) return; + if (tag == h->metaf) + h->metaf = NULL; print_ctag(h, tag->tag); - SLIST_REMOVE_HEAD(&h->tags, entry); + h->tags.head = tag->next; free(tag); } } -/* ARGSUSED */ -static void -mdoc_root_post(MDOC_ARGS) +void +bufinit(struct html *h) { - struct tm tm; - struct htmlpair tag[2]; - struct tag *t, *tt; - char b[BUFSIZ]; - (void)localtime_r(&m->date, &tm); - - if (0 == strftime(b, BUFSIZ - 1, "%B %e, %Y", &tm)) - err(EXIT_FAILURE, "strftime"); - - tag[0].key = ATTR_CLASS; - tag[0].val = "footer"; - tag[1].key = ATTR_STYLE; - tag[1].val = "width: 100%;"; - t = print_otag(h, TAG_TABLE, 2, tag); - tt = print_otag(h, TAG_TR, 0, NULL); - - tag[0].key = ATTR_STYLE; - tag[0].val = "width: 50%;"; - print_otag(h, TAG_TD, 1, tag); - print_text(h, b); - print_stagq(h, tt); - - tag[0].key = ATTR_STYLE; - tag[0].val = "width: 50%; text-align: right;"; - print_otag(h, TAG_TD, 1, tag); - print_text(h, m->os); - print_tagq(h, t); + h->buf[0] = '\0'; + h->buflen = 0; } -/* ARGSUSED */ -static int -mdoc_root_pre(MDOC_ARGS) +void +bufcat_style(struct html *h, const char *key, const char *val) { - struct htmlpair tag[2]; - struct tag *t, *tt; - char b[BUFSIZ], title[BUFSIZ]; - (void)strlcpy(b, m->vol, BUFSIZ); - - if (m->arch) { - (void)strlcat(b, " (", BUFSIZ); - (void)strlcat(b, m->arch, BUFSIZ); - (void)strlcat(b, ")", BUFSIZ); - } - - (void)snprintf(title, BUFSIZ - 1, - "%s(%d)", m->title, m->msec); - - tag[0].key = ATTR_CLASS; - tag[0].val = "body"; - t = print_otag(h, TAG_DIV, 1, tag); - - tag[0].key = ATTR_CLASS; - tag[0].val = "header"; - tag[1].key = ATTR_STYLE; - tag[1].val = "width: 100%;"; - print_otag(h, TAG_TABLE, 2, tag); - tt = print_otag(h, TAG_TR, 0, NULL); - - tag[0].key = ATTR_STYLE; - tag[0].val = "width: 33%;"; - print_otag(h, TAG_TD, 1, tag); - print_text(h, b); - print_stagq(h, tt); - - tag[0].key = ATTR_STYLE; - tag[0].val = "width: 33%; text-align: center;"; - print_otag(h, TAG_TD, 1, tag); - print_text(h, title); - print_stagq(h, tt); - - tag[0].key = ATTR_STYLE; - tag[0].val = "width: 33%; text-align: right;"; - print_otag(h, TAG_TD, 1, tag); - print_text(h, b); - print_stagq(h, t); - - return(1); + bufcat(h, key); + bufncat(h, ":", 1); + bufcat(h, val); + bufncat(h, ";", 1); } -/* ARGSUSED */ -static int -mdoc_sh_pre(MDOC_ARGS) +void +bufcat(struct html *h, const char *p) { - struct htmlpair tag[2]; - const struct mdoc_node *nn; - if (MDOC_HEAD == n->type) { - tag[0].key = ATTR_CLASS; - tag[0].val = "sec-head"; - print_otag(h, TAG_DIV, 1, tag); - print_otag(h, TAG_SPAN, 1, tag); - - for (nn = n->child; nn; nn = nn->next) { - bufcat(nn->string); - if (nn->next) - bufcat(" "); - } - tag[0].key = ATTR_NAME; - tag[0].val = buf; - print_otag(h, TAG_A, 1, tag); - return(1); - } else if (MDOC_BLOCK == n->type) { - tag[0].key = ATTR_CLASS; - tag[0].val = "sec-block"; - - if (n->prev && NULL == n->prev->body->child) { - print_otag(h, TAG_DIV, 1, tag); - return(1); - } - - bufcat("margin-top: 1em;"); - if (NULL == n->next) - bufcat("margin-bottom: 1em;"); - - tag[1].key = ATTR_STYLE; - tag[1].val = buf; - - print_otag(h, TAG_DIV, 2, tag); - return(1); - } - - buffmt("margin-left: %dem;", INDENT); - - tag[0].key = ATTR_CLASS; - tag[0].val = "sec-body"; - tag[1].key = ATTR_STYLE; - tag[1].val = buf; - - print_otag(h, TAG_DIV, 2, tag); - return(1); + bufncat(h, p, strlen(p)); } -/* ARGSUSED */ -static int -mdoc_ss_pre(MDOC_ARGS) +void +buffmt(struct html *h, const char *fmt, ...) { - struct htmlpair tag[2]; - int i; - const struct mdoc_node *nn; + va_list ap; - i = 0; - - if (MDOC_BODY == n->type) { - tag[i].key = ATTR_CLASS; - tag[i++].val = "ssec-body"; - if (n->parent->next && n->child) { - bufcat("margin-bottom: 1em;"); - tag[i].key = ATTR_STYLE; - tag[i++].val = buf; - } - print_otag(h, TAG_DIV, i, tag); - return(1); - } else if (MDOC_BLOCK == n->type) { - tag[i].key = ATTR_CLASS; - tag[i++].val = "ssec-block"; - if (n->prev) { - bufcat("margin-top: 1em;"); - tag[i].key = ATTR_STYLE; - tag[i++].val = buf; - } - print_otag(h, TAG_DIV, i, tag); - return(1); - } - - buffmt("margin-left: -%dem;", INDENT - HALFINDENT); - - tag[0].key = ATTR_CLASS; - tag[0].val = "ssec-head"; - tag[1].key = ATTR_STYLE; - tag[1].val = buf; - - print_otag(h, TAG_DIV, 2, tag); - print_otag(h, TAG_SPAN, 1, tag); - - bufinit(); - for (nn = n->child; nn; nn = nn->next) { - bufcat(nn->string); - if (nn->next) - bufcat(" "); - } - tag[0].key = ATTR_NAME; - tag[0].val = buf; - print_otag(h, TAG_A, 1, tag); - - return(1); + va_start(ap, fmt); + (void)vsnprintf(h->buf + (int)h->buflen, + BUFSIZ - h->buflen - 1, fmt, ap); + va_end(ap); + h->buflen = strlen(h->buf); } -/* ARGSUSED */ -static int -mdoc_fl_pre(MDOC_ARGS) +void +bufncat(struct html *h, const char *p, size_t sz) { - struct htmlpair tag; - tag.key = ATTR_CLASS; - tag.val = "flag"; + if (h->buflen + sz > BUFSIZ - 1) + sz = BUFSIZ - 1 - h->buflen; - print_otag(h, TAG_SPAN, 1, &tag); - if (MDOC_Fl == n->tok) { - print_text(h, "\\-"); - h->flags |= HTML_NOSPACE; - } - return(1); + (void)strncat(h->buf, p, sz); + h->buflen += sz; } -/* ARGSUSED */ -static int -mdoc_pp_pre(MDOC_ARGS) +void +buffmt_includes(struct html *h, const char *name) { - struct htmlpair tag; + const char *p, *pp; - tag.key = ATTR_STYLE; - tag.val = "clear: both; height: 1em;"; - print_otag(h, TAG_DIV, 1, &tag); - return(0); -} - - -/* ARGSUSED */ -static int -mdoc_nd_pre(MDOC_ARGS) -{ - struct htmlpair tag; - - if (MDOC_BODY != n->type) - return(1); - - /* XXX - this can contain block elements! */ - print_text(h, "\\(em"); - tag.key = ATTR_CLASS; - tag.val = "desc-body"; - print_otag(h, TAG_SPAN, 1, &tag); - return(1); -} - - -/* ARGSUSED */ -static int -mdoc_op_pre(MDOC_ARGS) -{ - struct htmlpair tag; - - if (MDOC_BODY != n->type) - return(1); - - /* XXX - this can contain block elements! */ - print_text(h, "\\(lB"); - tag.key = ATTR_CLASS; - tag.val = "opt"; - print_otag(h, TAG_SPAN, 1, &tag); - return(1); -} - - -/* ARGSUSED */ -static void -mdoc_op_post(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return; - h->flags |= HTML_NOSPACE; - print_text(h, "\\(rB"); -} - - -static int -mdoc_nm_pre(MDOC_ARGS) -{ - struct htmlpair tag; - - if ( ! (HTML_NEWLINE & h->flags)) - if (SEC_SYNOPSIS == n->sec) { - tag.key = ATTR_STYLE; - tag.val = "clear: both;"; - print_otag(h, TAG_BR, 1, &tag); + pp = h->base_includes; + + while (NULL != (p = strchr(pp, '%'))) { + bufncat(h, pp, (size_t)(p - pp)); + switch (*(p + 1)) { + case('I'): + bufcat(h, name); + break; + default: + bufncat(h, p, 2); + break; } - - tag.key = ATTR_CLASS; - tag.val = "name"; - - print_otag(h, TAG_SPAN, 1, &tag); - if (NULL == n->child) - print_text(h, m->name); - - return(1); -} - - -/* ARGSUSED */ -static int -mdoc_xr_pre(MDOC_ARGS) -{ - struct htmlpair tag[2]; - const char *name, *sec; - const struct mdoc_node *nn; - - nn = n->child; - name = nn && nn->string ? nn->string : ""; - nn = nn ? nn->next : NULL; - sec = nn && nn->string ? nn->string : ""; - - buffmt("%s%s%s.html", name, name && sec ? "." : "", sec); - - tag[0].key = ATTR_CLASS; - tag[0].val = "link-man"; - tag[1].key = ATTR_HREF; - tag[1].val = buf; - print_otag(h, TAG_A, 2, tag); - - nn = n->child; - print_text(h, nn->string); - if (NULL == (nn = nn->next)) - return(0); - - h->flags |= HTML_NOSPACE; - print_text(h, "("); - h->flags |= HTML_NOSPACE; - print_text(h, nn->string); - h->flags |= HTML_NOSPACE; - print_text(h, ")"); - - return(0); -} - - -/* ARGSUSED */ -static int -mdoc_ns_pre(MDOC_ARGS) -{ - - h->flags |= HTML_NOSPACE; - return(1); -} - - -/* ARGSUSED */ -static int -mdoc_ar_pre(MDOC_ARGS) -{ - struct htmlpair tag; - - tag.key = ATTR_CLASS; - tag.val = "arg"; - - print_otag(h, TAG_SPAN, 1, &tag); - return(1); -} - - -/* ARGSUSED */ -static int -mdoc_xx_pre(MDOC_ARGS) -{ - const char *pp; - struct htmlpair tag; - - switch (n->tok) { - case (MDOC_Bsx): - pp = "BSDI BSD/OS"; - break; - case (MDOC_Dx): - pp = "DragonFlyBSD"; - break; - case (MDOC_Fx): - pp = "FreeBSD"; - break; - case (MDOC_Nx): - pp = "NetBSD"; - break; - case (MDOC_Ox): - pp = "OpenBSD"; - break; - case (MDOC_Ux): - pp = "UNIX"; - break; - default: - return(1); + pp = p + 2; } - - tag.key = ATTR_CLASS; - tag.val = "unix"; - - print_otag(h, TAG_SPAN, 1, &tag); - print_text(h, pp); - return(1); + if (pp) + bufcat(h, pp); } -/* ARGSUSED */ -static int -mdoc_tbl_block_pre(MDOC_ARGS, int t, int w, int o, int c) +void +buffmt_man(struct html *h, + const char *name, const char *sec) { - struct htmlpair tag; + const char *p, *pp; - switch (t) { - case (MDOC_Column): - /* FALLTHROUGH */ - case (MDOC_Item): - /* FALLTHROUGH */ - case (MDOC_Ohang): - buffmt("margin-left: %dem; clear: both;", o); - break; - default: - buffmt("margin-left: %dem; clear: both;", w + o); - break; + pp = h->base_man; + + /* LINTED */ + while (NULL != (p = strchr(pp, '%'))) { + bufncat(h, pp, (size_t)(p - pp)); + switch (*(p + 1)) { + case('S'): + bufcat(h, sec ? sec : "1"); + break; + case('N'): + buffmt(h, name); + break; + default: + bufncat(h, p, 2); + break; + } + pp = p + 2; } - - if ( ! c && n->prev && n->prev->body->child) - bufcat("padding-top: 1em;"); - - tag.key = ATTR_STYLE; - tag.val = buf; - print_otag(h, TAG_DIV, 1, &tag); - return(1); + if (pp) + bufcat(h, pp); } -/* ARGSUSED */ -static int -mdoc_tbl_body_pre(MDOC_ARGS, int t, int w) +void +bufcat_su(struct html *h, const char *p, const struct roffsu *su) { + double v; + const char *u; - print_otag(h, TAG_DIV, 0, NULL); - return(1); -} + v = su->scale; - -/* ARGSUSED */ -static int -mdoc_tbl_head_pre(MDOC_ARGS, int t, int w) -{ - struct htmlpair tag; - struct ord *ord; - char nbuf[BUFSIZ]; - - switch (t) { - case (MDOC_Item): - /* FALLTHROUGH */ - case (MDOC_Ohang): - print_otag(h, TAG_DIV, 0, NULL); + switch (su->unit) { + case (SCALE_CM): + u = "cm"; break; - case (MDOC_Column): - buffmt("min-width: %dem;", w); - bufcat("clear: none;"); - if (n->next && MDOC_HEAD == n->next->type) - bufcat("float: left;"); - tag.key = ATTR_STYLE; - tag.val = buf; - print_otag(h, TAG_DIV, 1, &tag); + case (SCALE_IN): + u = "in"; break; - default: - buffmt("margin-left: -%dem;", w); - bufcat("clear: left;"); - bufcat("float: left;"); - bufcat("padding-right: 1em;"); - tag.key = ATTR_STYLE; - tag.val = buf; - print_otag(h, TAG_DIV, 1, &tag); + case (SCALE_PC): + u = "pc"; break; - } - - switch (t) { - case (MDOC_Diag): - tag.key = ATTR_CLASS; - tag.val = "diag"; - print_otag(h, TAG_SPAN, 1, &tag); + case (SCALE_PT): + u = "pt"; break; - case (MDOC_Enum): - ord = SLIST_FIRST(&h->ords); - assert(ord); - nbuf[BUFSIZ - 1] = 0; - (void)snprintf(nbuf, BUFSIZ - 1, "%d.", ord->pos++); - print_text(h, nbuf); - return(0); - case (MDOC_Dash): - print_text(h, "\\(en"); - return(0); - case (MDOC_Hyphen): - print_text(h, "\\-"); - return(0); - case (MDOC_Bullet): - print_text(h, "\\(bu"); - return(0); - default: + case (SCALE_EM): + u = "em"; break; - } - - return(1); -} - - -static int -mdoc_tbl_pre(MDOC_ARGS, int type) -{ - int i, w, o, c, wp; - const struct mdoc_node *bl, *nn; - - bl = n->parent->parent; - if (MDOC_BLOCK != n->type) - bl = bl->parent; - - /* FIXME: fmt_vspace() equivalent. */ - - assert(bl->args); - - w = o = c = 0; - wp = -1; - - for (i = 0; i < (int)bl->args->argc; i++) - if (MDOC_Width == bl->args->argv[i].arg) { - assert(bl->args->argv[i].sz); - wp = i; - w = a2width(bl->args->argv[i].value[0]); - } else if (MDOC_Offset == bl->args->argv[i].arg) { - assert(bl->args->argv[i].sz); - o = a2offs(bl->args->argv[i].value[0]); - } else if (MDOC_Compact == bl->args->argv[i].arg) - c = 1; - - if (MDOC_HEAD == n->type && MDOC_Column == type) { - nn = n->parent->child; - assert(nn && MDOC_HEAD == nn->type); - for (i = 0; nn && nn != n; nn = nn->next, i++) - /* Counter... */ ; - assert(nn); - if (wp >= 0 && i < (int)bl->args[wp].argv->sz) - w = a2width(bl->args->argv[wp].value[i]); - } - - switch (type) { - case (MDOC_Enum): - /* FALLTHROUGH */ - case (MDOC_Dash): - /* FALLTHROUGH */ - case (MDOC_Hyphen): - /* FALLTHROUGH */ - case (MDOC_Bullet): - if (w < 4) - w = 4; + case (SCALE_MM): + if (0 == (v /= 100)) + v = 1; + u = "em"; break; - case (MDOC_Inset): - /* FALLTHROUGH */ - case (MDOC_Diag): - w = 1; + case (SCALE_EN): + u = "ex"; break; - default: - if (0 == w) - w = 10; + case (SCALE_BU): + u = "ex"; break; - } - - switch (n->type) { - case (MDOC_BLOCK): + case (SCALE_VS): + u = "em"; break; - case (MDOC_HEAD): - return(mdoc_tbl_head_pre(m, n, h, type, w)); - case (MDOC_BODY): - return(mdoc_tbl_body_pre(m, n, h, type, w)); default: - abort(); - /* NOTREACHED */ + u = "ex"; + break; } - return(mdoc_tbl_block_pre(m, n, h, type, w, o, c)); -} - - -/* ARGSUSED */ -static int -mdoc_bl_pre(MDOC_ARGS) -{ - struct ord *ord; - - if (MDOC_BLOCK != n->type) - return(1); - if (MDOC_Enum != a2list(n)) - return(1); - - ord = malloc(sizeof(struct ord)); - if (NULL == ord) - err(EXIT_FAILURE, "malloc"); - ord->cookie = n; - ord->pos = 1; - SLIST_INSERT_HEAD(&h->ords, ord, entry); - - return(1); -} - - -/* ARGSUSED */ -static void -mdoc_bl_post(MDOC_ARGS) -{ - struct ord *ord; - - if (MDOC_BLOCK != n->type) - return; - if (MDOC_Enum != a2list(n)) - return; - - ord = SLIST_FIRST(&h->ords); - assert(ord); - SLIST_REMOVE_HEAD(&h->ords, entry); - free(ord); -} - - -static int -mdoc_it_pre(MDOC_ARGS) -{ - int type; - - if (MDOC_BLOCK == n->type) - type = a2list(n->parent->parent); + if (su->pt) + buffmt(h, "%s: %f%s;", p, v, u); else - type = a2list(n->parent->parent->parent); - - return(mdoc_tbl_pre(m, n, h, type)); + /* LINTED */ + buffmt(h, "%s: %d%s;", p, (int)v, u); } -/* ARGSUSED */ -static int -mdoc_ex_pre(MDOC_ARGS) +void +html_idcat(char *dst, const char *src, int sz) { - const struct mdoc_node *nn; - struct tag *t; - struct htmlpair tag; + int ssz; - print_text(h, "The"); + assert(sz); - tag.key = ATTR_CLASS; - tag.val = "utility"; + /* Cf. . */ - for (nn = n->child; nn; nn = nn->next) { - t = print_otag(h, TAG_SPAN, 1, &tag); - print_text(h, nn->string); - print_tagq(h, t); + for ( ; *dst != '\0' && sz; dst++, sz--) + /* Jump to end. */ ; - h->flags |= HTML_NOSPACE; + assert(sz > 2); - if (nn->next && NULL == nn->next->next) - print_text(h, ", and"); - else if (nn->next) - print_text(h, ","); - else - h->flags &= ~HTML_NOSPACE; - } + /* We can't start with a number (bah). */ - if (n->child->next) - print_text(h, "utilities exit"); - else - print_text(h, "utility exits"); + *dst++ = 'x'; + *dst = '\0'; + sz--; - print_text(h, "0 on success, and >0 if an error occurs."); - return(0); -} - - -/* ARGSUSED */ -static int -mdoc_dq_pre(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return(1); - print_text(h, "\\(lq"); - h->flags |= HTML_NOSPACE; - return(1); -} - - -/* ARGSUSED */ -static void -mdoc_dq_post(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return; - h->flags |= HTML_NOSPACE; - print_text(h, "\\(rq"); -} - - -/* ARGSUSED */ -static int -mdoc_pq_pre(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return(1); - print_text(h, "\\&("); - h->flags |= HTML_NOSPACE; - return(1); -} - - -/* ARGSUSED */ -static void -mdoc_pq_post(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return; - print_text(h, ")"); -} - - -/* ARGSUSED */ -static int -mdoc_sq_pre(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return(1); - print_text(h, "\\(oq"); - h->flags |= HTML_NOSPACE; - return(1); -} - - -/* ARGSUSED */ -static void -mdoc_sq_post(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return; - h->flags |= HTML_NOSPACE; - print_text(h, "\\(aq"); -} - - -/* ARGSUSED */ -static int -mdoc_em_pre(MDOC_ARGS) -{ - struct htmlpair tag; - - tag.key = ATTR_CLASS; - tag.val = "emph"; - - print_otag(h, TAG_SPAN, 1, &tag); - return(1); -} - - -/* ARGSUSED */ -static int -mdoc_d1_pre(MDOC_ARGS) -{ - struct htmlpair tag[2]; - - if (MDOC_BLOCK != n->type) - return(1); - - buffmt("margin-left: %dem;", INDENT); - - tag[0].key = ATTR_CLASS; - tag[0].val = "lit-block"; - tag[1].key = ATTR_STYLE; - tag[1].val = buf; - - print_otag(h, TAG_DIV, 2, tag); - return(1); -} - - -/* ARGSUSED */ -static int -mdoc_sx_pre(MDOC_ARGS) -{ - struct htmlpair tag[2]; - const struct mdoc_node *nn; - - bufcat("#"); - for (nn = n->child; nn; nn = nn->next) { - bufcat(nn->string); - if (nn->next) - bufcat(" "); + for ( ; *src != '\0' && sz > 1; src++) { + ssz = snprintf(dst, (size_t)sz, "%.2x", *src); + sz -= ssz; + dst += ssz; } - - tag[0].key = ATTR_HREF; - tag[0].val = buf; - tag[1].key = ATTR_CLASS; - tag[1].val = "link-sec"; - - print_otag(h, TAG_A, 2, tag); - return(1); -} - - -/* ARGSUSED */ -static int -mdoc_aq_pre(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return(1); - print_text(h, "\\(la"); - h->flags |= HTML_NOSPACE; - return(1); -} - - -/* ARGSUSED */ -static void -mdoc_aq_post(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return; - h->flags |= HTML_NOSPACE; - print_text(h, "\\(ra"); -} - - -/* ARGSUSED */ -static int -mdoc_bd_pre(MDOC_ARGS) -{ - struct htmlpair tag[2]; - int t, c, o, i; - const struct mdoc_node *bl; - - /* FIXME: fmt_vspace() shit. */ - - if (MDOC_BLOCK == n->type) - bl = n; - else if (MDOC_HEAD == n->type) - return(0); - else - bl = n->parent; - - t = o = c = 0; - - for (i = 0; i < (int)bl->args->argc; i++) - switch (bl->args->argv[i].arg) { - case (MDOC_Offset): - assert(bl->args->argv[i].sz); - o = a2offs (bl->args->argv[i].value[0]); - break; - case (MDOC_Compact): - c = 1; - break; - case (MDOC_Ragged): - /* FALLTHROUGH */ - case (MDOC_Filled): - /* FALLTHROUGH */ - case (MDOC_Unfilled): - /* FALLTHROUGH */ - case (MDOC_Literal): - t = bl->args->argv[i].arg; - break; - } - - if (MDOC_BLOCK == n->type) { - if (o) - buffmt("margin-left: %dem;", o); - bufcat("margin-top: 1em;"); - tag[0].key = ATTR_STYLE; - tag[0].val = buf; - print_otag(h, TAG_DIV, 1, tag); - return(1); - } - - switch (t) { - case (MDOC_Unfilled): - case (MDOC_Literal): - break; - default: - return(1); - } - - bufcat("white-space: pre;"); - tag[0].key = ATTR_STYLE; - tag[0].val = buf; - tag[1].key = ATTR_CLASS; - tag[1].val = "lit-block"; - - print_otag(h, TAG_DIV, 2, tag); - - for (n = n->child; n; n = n->next) { - h->flags |= HTML_NOSPACE; - print_mdoc_node(m, n, h); - if (n->next) - print_text(h, "\n"); - } - - return(0); -} - - -/* ARGSUSED */ -static int -mdoc_pa_pre(MDOC_ARGS) -{ - struct htmlpair tag; - - tag.key = ATTR_CLASS; - tag.val = "file"; - - print_otag(h, TAG_SPAN, 1, &tag); - return(1); -} - - -/* ARGSUSED */ -static int -mdoc_qq_pre(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return(1); - print_text(h, "\\*q"); - h->flags |= HTML_NOSPACE; - return(1); -} - - -/* ARGSUSED */ -static void -mdoc_qq_post(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return; - h->flags |= HTML_NOSPACE; - print_text(h, "\\*q"); -} - - -/* ARGSUSED */ -static int -mdoc_ad_pre(MDOC_ARGS) -{ - struct htmlpair tag; - - tag.key = ATTR_CLASS; - tag.val = "addr"; - print_otag(h, TAG_SPAN, 1, &tag); - return(1); -} - - -/* ARGSUSED */ -static int -mdoc_an_pre(MDOC_ARGS) -{ - struct htmlpair tag; - - tag.key = ATTR_CLASS; - tag.val = "author"; - print_otag(h, TAG_SPAN, 1, &tag); - return(1); -} - - -/* ARGSUSED */ -static int -mdoc_cd_pre(MDOC_ARGS) -{ - struct htmlpair tag; - - tag.key = ATTR_CLASS; - tag.val = "config"; - print_otag(h, TAG_SPAN, 1, &tag); - return(1); -} - - -/* ARGSUSED */ -static int -mdoc_dv_pre(MDOC_ARGS) -{ - struct htmlpair tag; - - tag.key = ATTR_CLASS; - tag.val = "define"; - print_otag(h, TAG_SPAN, 1, &tag); - return(1); -} - - -/* ARGSUSED */ -static int -mdoc_ev_pre(MDOC_ARGS) -{ - struct htmlpair tag; - - tag.key = ATTR_CLASS; - tag.val = "env"; - print_otag(h, TAG_SPAN, 1, &tag); - return(1); -} - - -/* ARGSUSED */ -static int -mdoc_er_pre(MDOC_ARGS) -{ - struct htmlpair tag; - - tag.key = ATTR_CLASS; - tag.val = "errno"; - print_otag(h, TAG_SPAN, 1, &tag); - return(1); -} - - -/* ARGSUSED */ -static int -mdoc_fa_pre(MDOC_ARGS) -{ - const struct mdoc_node *nn; - struct htmlpair tag; - struct tag *t; - - tag.key = ATTR_CLASS; - tag.val = "farg"; - - if (n->parent->tok != MDOC_Fo) { - print_otag(h, TAG_SPAN, 1, &tag); - return(1); - } - - for (nn = n->child; nn; nn = nn->next) { - t = print_otag(h, TAG_SPAN, 1, &tag); - print_text(h, nn->string); - print_tagq(h, t); - if (nn->next) - print_text(h, ","); - } - - if (n->child && n->next && n->next->tok == MDOC_Fa) - print_text(h, ","); - - return(0); -} - - -/* ARGSUSED */ -static int -mdoc_fd_pre(MDOC_ARGS) -{ - struct htmlpair tag; - - if (SEC_SYNOPSIS == n->sec) { - if (n->next && MDOC_Fd != n->next->tok) { - tag.key = ATTR_STYLE; - tag.val = "margin-bottom: 1em;"; - print_otag(h, TAG_DIV, 1, &tag); - } else - print_otag(h, TAG_DIV, 0, NULL); - } - - tag.key = ATTR_CLASS; - tag.val = "macro"; - print_otag(h, TAG_SPAN, 1, &tag); - return(1); -} - - -/* ARGSUSED */ -static int -mdoc_vt_pre(MDOC_ARGS) -{ - struct htmlpair tag; - - if (SEC_SYNOPSIS == n->sec) { - if (n->next && MDOC_Vt != n->next->tok) { - tag.key = ATTR_STYLE; - tag.val = "margin-bottom: 1em;"; - print_otag(h, TAG_DIV, 1, &tag); - } else - print_otag(h, TAG_DIV, 0, NULL); - } - - tag.key = ATTR_CLASS; - tag.val = "type"; - print_otag(h, TAG_SPAN, 1, &tag); - return(1); -} - -/* ARGSUSED */ -static int -mdoc_ft_pre(MDOC_ARGS) -{ - struct htmlpair tag; - - if (SEC_SYNOPSIS == n->sec) { - if (n->prev && MDOC_Fo == n->prev->tok) { - tag.key = ATTR_STYLE; - tag.val = "magin-bottom: 1em;"; - print_otag(h, TAG_DIV, 1, &tag); - } else - print_otag(h, TAG_DIV, 0, NULL); - } - - tag.key = ATTR_CLASS; - tag.val = "type"; - print_otag(h, TAG_SPAN, 1, &tag); - return(1); -} - - -/* ARGSUSED */ -static int -mdoc_fn_pre(MDOC_ARGS) -{ - struct tag *t; - struct htmlpair tag; - const struct mdoc_node *nn; - - if (SEC_SYNOPSIS == n->sec) { - if (n->next) { - tag.key = ATTR_STYLE; - tag.val = "margin-bottom: 1em"; - print_otag(h, TAG_DIV, 1, &tag); - } else - print_otag(h, TAG_DIV, 0, NULL); - } - - tag.key = ATTR_CLASS; - tag.val = "type"; - - t = print_otag(h, TAG_SPAN, 1, &tag); - print_text(h, n->child->string); - print_tagq(h, t); - - h->flags |= HTML_NOSPACE; - print_text(h, "("); - - for (nn = n->child->next; nn; nn = nn->next) { - tag.key = ATTR_CLASS; - tag.val = "farg"; - t = print_otag(h, TAG_SPAN, 1, &tag); - print_text(h, nn->string); - print_tagq(h, t); - if (nn->next) - print_text(h, ","); - } - - print_text(h, ")"); - - if (SEC_SYNOPSIS == n->sec) - print_text(h, ";"); - - return(0); }