=================================================================== RCS file: /cvs/mandoc/html.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -p -r1.28 -r1.29 --- mandoc/html.c 2008/12/15 01:54:58 1.28 +++ mandoc/html.c 2009/09/16 09:41:24 1.29 @@ -1,1085 +1,638 @@ -/* $Id: html.c,v 1.28 2008/12/15 01:54:58 kristaps dead $ */ +/* $Id: html.c,v 1.29 2009/09/16 09:41:24 kristaps Exp $ */ /* - * Copyright (c) 2008 Kristaps Dzonsons + * Copyright (c) 2008, 2009 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. + * 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 WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR 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. + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR 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. */ -#include -#include - #include #include -#include -#include #include -#include -#include +#include -#include "html.h" -#include "ml.h" +#include "mdoc.h" +#include "man.h" -/* TODO: allow head/tail-less invocations (just "div" start). */ +#define DOCTYPE "-//W3C//DTD HTML 4.01//EN" +#define DTD "http://www.w3.org/TR/html4/strict.dtd" -struct htmlnode { - int tok; - enum md_ns ns; - int argc[ROFF_MAXLINEARG]; - char *argv[ROFF_MAXLINEARG]; - struct htmlnode *parent; +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_MAX }; -struct htmlq { - struct htmlnode *last; +enum htmlattr { + ATTR_HTTPEQUIV, + ATTR_CONTENT, + ATTR_NAME, + ATTR_REL, + ATTR_HREF, + ATTR_TYPE, + ATTR_MEDIA, + ATTR_CLASS, + ATTR_MAX }; +struct htmldata { + char *name; + int flags; +#define HTML_BLOCK (1 << 0) +}; -static int html_loadcss(struct md_mbuf *, - const char *); -static int html_alloc(void **); -static void html_free(void *); -static ssize_t html_endtag(struct ml_args *, - enum md_ns, int); -static ssize_t html_beginstring(struct ml_args *, - const char *, size_t); -static ssize_t html_endstring(struct ml_args *, - const char *, size_t); -static ssize_t html_begintag(struct ml_args *, - enum md_ns, int, - const int *, const char **); -static int html_begin(struct ml_args *, - const struct tm *, - const char *, const char *, - enum roffmsec, enum roffvol); -static int html_end(struct ml_args *, - const struct tm *, - const char *, const char *, - enum roffmsec, enum roffvol); -static int html_printargs(struct md_mbuf *, int, - const char *, const int *, - const char **, size_t *); -static ssize_t html_beginhttp(struct md_mbuf *, - const struct md_args *, - const char *, size_t); -static ssize_t html_endhttp(struct md_mbuf *, - const struct md_args *, - const char *, size_t); -static int html_blocktagname(struct md_mbuf *, - const struct md_args *, int, - struct htmlq *, const int *, - const char **, size_t *); -static int html_blocktagargs(struct md_mbuf *, - const struct md_args *, int, - const int *, const char **, size_t *); -static int html_headtagname(struct md_mbuf *, - const struct md_args *, int, - struct htmlq *, const int *, - const char **, size_t *); -static int html_headtagargs(struct md_mbuf *, - const struct md_args *, int, - const int *, const char **, size_t *); -static int html_bodytagname(struct md_mbuf *, - const struct md_args *, - int, struct htmlq *, const int *, - const char **, size_t *); -static int html_bodytagargs(struct md_mbuf *, - const struct md_args *, int, - const int *, const char **, size_t *); -static int html_inlinetagname(struct md_mbuf *, - const struct md_args *, int, size_t *); -static int html_inlinetagargs(struct md_mbuf *, - const struct md_args *, int, - const int *, const char **, size_t *); -static int html_Bl_bodytagname(struct md_mbuf *, - struct htmlq *, const int *, - const char **, size_t *); -static int html_It_blocktagname(struct md_mbuf *, - struct htmlq *, const int *, - const char **, size_t *); -static int html_It_headtagname(struct md_mbuf *, - struct htmlq *, const int *, - const char **, size_t *); -static int html_It_bodytagname(struct md_mbuf *, - struct htmlq *, const int *, - const char **, size_t *); -static int html_tputln(struct md_mbuf *, - enum ml_scope, int, enum html_tag); -static int html_aputln(struct md_mbuf *, enum ml_scope, - int, enum html_tag, - int, const struct html_pair *); +static const struct htmldata htmltags[TAG_MAX] = { + {"html", HTML_BLOCK}, /* TAG_HTML */ + {"head", HTML_BLOCK}, /* TAG_HEAD */ + {"body", HTML_BLOCK}, /* TAG_BODY */ + {"meta", HTML_BLOCK}, /* TAG_META */ + {"title", HTML_BLOCK}, /* TAG_TITLE */ + {"div", HTML_BLOCK}, /* TAG_DIV */ + {"h1", 0}, /* TAG_H1 */ + {"h2", 0}, /* TAG_H2 */ + {"p", HTML_BLOCK}, /* TAG_P */ + {"span", 0}, /* TAG_SPAN */ + {"link", HTML_BLOCK}, /* TAG_LINK */ +}; +static const char *const htmlattrs[ATTR_MAX] = { + "http-equiv", + "content", + "name", + "rel", + "href", + "type", + "media", + "class" +}; -/* ARGSUSED */ -static int -html_It_headtagname(struct md_mbuf *mbuf, struct htmlq *q, - const int *argc, const char **argv, size_t *res) -{ - struct htmlnode *n; - int i; - struct html_pair attr[2]; +struct htmlpair { + enum htmlattr key; + char *val; +}; - for (n = q->last; n; n = n->parent) - if (n->tok == ROFF_Bl) - break; +struct html { + int flags; +#define HTML_NOSPACE (1 << 0) +}; - assert(n); +#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); +}; - /* LINTED */ - for (i = 0; ROFF_ARGMAX != n->argc[i] && - i < ROFF_MAXLINEARG; i++) { - switch (n->argc[i]) { - case (ROFF_Ohang): - return(html_stput(mbuf, HTML_TAG_DIV, res)); - case (ROFF_Tag): - attr[0].attr = HTML_ATTR_VALIGN; - attr[0].val = "top"; - attr[1].attr = HTML_ATTR_NOWRAP; - attr[1].val = "true"; - return(html_saput(mbuf, HTML_TAG_TD, - res, 2, attr)); - case (ROFF_Column): - attr[0].attr = HTML_ATTR_VALIGN; - attr[0].val = "top"; - return(html_saput(mbuf, HTML_TAG_TD, - res, 1, attr)); - default: - break; - } - } +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_man(MAN_ARGS); +static void print_man_head(MAN_ARGS); +static void print_man_body(MAN_ARGS); +static void print_otag(struct html *, enum htmltag, + int, const struct htmlpair *); +static void print_ctag(struct html *, enum htmltag); +static void print_encode(const char *); +static void print_text(struct html *, const char *); +static int mdoc_root_pre(MDOC_ARGS); +static void mdoc_root_post(MDOC_ARGS); - return(0); -} +static int mdoc_nd_pre(MDOC_ARGS); +static int mdoc_nm_pre(MDOC_ARGS); +static void mdoc_nm_post(MDOC_ARGS); +static int mdoc_pp_pre(MDOC_ARGS); +static int mdoc_sh_pre(MDOC_ARGS); +static void mdoc_sh_post(MDOC_ARGS); +static int mdoc_ss_pre(MDOC_ARGS); +static void mdoc_ss_post(MDOC_ARGS); +static const struct htmlmdoc mdocs[MDOC_MAX] = { + {NULL, NULL}, /* Ap */ + {NULL, NULL}, /* Dd */ + {NULL, NULL}, /* Dt */ + {NULL, NULL}, /* Os */ + {mdoc_sh_pre, mdoc_sh_post }, /* Sh */ + {mdoc_ss_pre, mdoc_ss_post }, /* Ss */ + {mdoc_pp_pre, NULL}, /* Pp */ + {NULL, NULL}, /* D1 */ + {NULL, NULL}, /* Dl */ + {NULL, NULL}, /* Bd */ + {NULL, NULL}, /* Ed */ + {NULL, NULL}, /* Bl */ + {NULL, NULL}, /* El */ + {NULL, NULL}, /* It */ + {NULL, NULL}, /* Ad */ + {NULL, NULL}, /* An */ + {NULL, NULL}, /* Ar */ + {NULL, NULL}, /* Cd */ + {NULL, NULL}, /* Cm */ + {NULL, NULL}, /* Dv */ + {NULL, NULL}, /* Er */ + {NULL, NULL}, /* Ev */ + {NULL, NULL}, /* Ex */ + {NULL, NULL}, /* Fa */ + {NULL, NULL}, /* Fd */ + {NULL, NULL}, /* Fl */ + {NULL, NULL}, /* Fn */ + {NULL, NULL}, /* Ft */ + {NULL, NULL}, /* Ic */ + {NULL, NULL}, /* In */ + {NULL, NULL}, /* Li */ + {mdoc_nd_pre, NULL}, /* Nd */ + {mdoc_nm_pre, mdoc_nm_post}, /* Nm */ + {NULL, NULL}, /* Op */ + {NULL, NULL}, /* Ot */ + {NULL, NULL}, /* Pa */ + {NULL, NULL}, /* Rv */ + {NULL, NULL}, /* St */ + {NULL, NULL}, /* Va */ + {NULL, NULL}, /* Vt */ + {NULL, 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 */ + {NULL, NULL}, /* Ao */ + {NULL, NULL}, /* Aq */ + {NULL, NULL}, /* At */ + {NULL, NULL}, /* Bc */ + {NULL, NULL}, /* Bf */ + {NULL, NULL}, /* Bo */ + {NULL, NULL}, /* Bq */ + {NULL, NULL}, /* Bsx */ + {NULL, NULL}, /* Bx */ + {NULL, NULL}, /* Db */ + {NULL, NULL}, /* Dc */ + {NULL, NULL}, /* Do */ + {NULL, NULL}, /* Dq */ + {NULL, NULL}, /* Ec */ + {NULL, NULL}, /* Ef */ + {NULL, NULL}, /* Em */ + {NULL, NULL}, /* Eo */ + {NULL, NULL}, /* Fx */ + {NULL, NULL}, /* Ms */ + {NULL, NULL}, /* No */ + {NULL, NULL}, /* Ns */ + {NULL, NULL}, /* Nx */ + {NULL, NULL}, /* Ox */ + {NULL, NULL}, /* Pc */ + {NULL, NULL}, /* Pf */ + {NULL, NULL}, /* Po */ + {NULL, NULL}, /* Pq */ + {NULL, NULL}, /* Qc */ + {NULL, NULL}, /* Ql */ + {NULL, NULL}, /* Qo */ + {NULL, NULL}, /* Qq */ + {NULL, NULL}, /* Re */ + {NULL, NULL}, /* Rs */ + {NULL, NULL}, /* Sc */ + {NULL, NULL}, /* So */ + {NULL, NULL}, /* Sq */ + {NULL, NULL}, /* Sm */ + {NULL, NULL}, /* Sx */ + {NULL, NULL}, /* Sy */ + {NULL, NULL}, /* Tn */ + {NULL, 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 */ + {NULL, NULL}, /* Dx */ + {NULL, NULL}, /* %Q */ + {NULL, NULL}, /* br */ + {NULL, NULL}, /* sp */ +}; -/* ARGSUSED */ -static int -html_It_bodytagname(struct md_mbuf *mbuf, struct htmlq *q, - const int *argc, const char **argv, size_t *res) -{ - struct htmlnode *n; - int i; - struct html_pair attr[1]; - for (n = q->last; n; n = n->parent) - if (n->tok == ROFF_Bl) - break; - - assert(n); - - /* LINTED */ - for (i = 0; ROFF_ARGMAX != n->argc[i] && - i < ROFF_MAXLINEARG; i++) { - switch (n->argc[i]) { - case (ROFF_Enum): - /* FALLTHROUGH */ - case (ROFF_Bullet): - /* FALLTHROUGH */ - case (ROFF_Dash): - /* FALLTHROUGH */ - case (ROFF_Hyphen): - /* FALLTHROUGH */ - case (ROFF_Item): - /* FALLTHROUGH */ - case (ROFF_Diag): - /* FALLTHROUGH */ - case (ROFF_Hang): - /* FALLTHROUGH */ - case (ROFF_Ohang): - /* FALLTHROUGH */ - case (ROFF_Inset): - return(html_stput(mbuf, HTML_TAG_DIV, res)); - case (ROFF_Tag): - /* FALLTHROUGH */ - case (ROFF_Column): - attr[0].attr = HTML_ATTR_VALIGN; - attr[0].val = "top"; - return(html_saput(mbuf, HTML_TAG_TD, - res, 1, attr)); - default: - break; - } - } - - assert(i != ROFF_MAXLINEARG); - return(0); -} - - -/* ARGSUSED */ -static int -html_Bl_bodytagname(struct md_mbuf *mbuf, struct htmlq *q, - const int *argc, const char **argv, size_t *res) +int +html_mdoc(void *arg, const struct mdoc *m) { - int i; + struct html *h; - for (i = 0; ROFF_ARGMAX != argc[i] - && i < ROFF_MAXLINEARG; i++) { - switch (argc[i]) { - case (ROFF_Enum): - return(html_stput(mbuf, HTML_TAG_OL, res)); - case (ROFF_Bullet): - /* FALLTHROUGH */ - case (ROFF_Dash): - /* FALLTHROUGH */ - case (ROFF_Hyphen): - /* FALLTHROUGH */ - case (ROFF_Item): - /* FALLTHROUGH */ - case (ROFF_Diag): - /* FALLTHROUGH */ - case (ROFF_Hang): - /* FALLTHROUGH */ - case (ROFF_Ohang): - /* FALLTHROUGH */ - case (ROFF_Inset): - return(html_stput(mbuf, HTML_TAG_UL, res)); - case (ROFF_Tag): - /* FALLTHROUGH */ - case (ROFF_Column): - return(html_stput(mbuf, HTML_TAG_TABLE, res)); - default: - break; - } - } + h = (struct html *)arg; - assert(i != ROFF_MAXLINEARG); - return(0); + print_gen_doctype(h); + print_otag(h, TAG_HTML, 0, NULL); + print_mdoc(mdoc_meta(m), mdoc_node(m), h); + print_ctag(h, TAG_HTML); + printf("\n"); + return(1); } -/* ARGSUSED */ -static int -html_It_blocktagname(struct md_mbuf *mbuf, struct htmlq *q, - const int *argc, const char **argv, size_t *res) +int +html_man(void *arg, const struct man *m) { - struct htmlnode *n; - int i; + struct html *h; - for (n = q->last; n; n = n->parent) - if (n->tok == ROFF_Bl) - break; + h = (struct html *)arg; - assert(n); - - /* LINTED */ - for (i = 0; ROFF_ARGMAX != n->argc[i] && - i < ROFF_MAXLINEARG; i++) { - switch (n->argc[i]) { - case (ROFF_Enum): - /* FALLTHROUGH */ - case (ROFF_Bullet): - /* FALLTHROUGH */ - case (ROFF_Dash): - /* FALLTHROUGH */ - case (ROFF_Hyphen): - /* FALLTHROUGH */ - case (ROFF_Item): - /* FALLTHROUGH */ - case (ROFF_Diag): - /* FALLTHROUGH */ - case (ROFF_Hang): - /* FALLTHROUGH */ - case (ROFF_Ohang): - /* FALLTHROUGH */ - case (ROFF_Inset): - return(html_stput(mbuf, HTML_TAG_LI, res)); - case (ROFF_Tag): - /* FALLTHROUGH */ - case (ROFF_Column): - return(html_stput(mbuf, HTML_TAG_TR, res)); - default: - break; - } - } - - assert(i != ROFF_MAXLINEARG); - return(0); + print_gen_doctype(h); + print_otag(h, TAG_HTML, 0, NULL); + print_man(man_meta(m), man_node(m), h); + print_ctag(h, TAG_HTML); + printf("\n"); + return(1); } -static int -html_loadcss(struct md_mbuf *mbuf, const char *css) +void * +html_alloc(void) { - size_t res, bufsz; - char *buf; - struct stat st; - int fd, c; - ssize_t ssz; - c = 0; - res = 0; - buf = NULL; - - if (-1 == (fd = open(css, O_RDONLY, 0))) { - warn("%s", css); - return(0); - } - - if (-1 == fstat(fd, &st)) { - warn("%s", css); - goto out; - } - - bufsz = MAX(st.st_blksize, BUFSIZ); - if (NULL == (buf = malloc(bufsz))) { - warn("malloc"); - goto out; - } - - for (;;) { - if (-1 == (ssz = read(fd, buf, bufsz))) { - warn("%s", css); - goto out; - } else if (0 == ssz) - break; - if ( ! ml_nputs(mbuf, buf, (size_t)ssz, &res)) - goto out; - } - - c = 1; - -out: - if (-1 == close(fd)) { - warn("%s", css); - c = 0; - } - - if (buf) - free(buf); - - return(c); + return(calloc(1, sizeof(struct html))); } -static int -html_tputln(struct md_mbuf *mbuf, enum ml_scope scope, - int i, enum html_tag tag) +void +html_free(void *p) { - if ( ! ml_putchars(mbuf, ' ', INDENT(i) * INDENT_SZ, NULL)) - return(0); - if ( ! html_tput(mbuf, scope, tag, NULL)) - return(0); - return(ml_nputs(mbuf, "\n", 1, NULL)); + free(p); } -static int -html_aputln(struct md_mbuf *mbuf, enum ml_scope scope, int i, - enum html_tag tag, int sz, const struct html_pair *p) +static void +print_mdoc(MDOC_ARGS) { - if ( ! ml_putchars(mbuf, ' ', INDENT(i) * INDENT_SZ, NULL)) - return(0); - if ( ! html_aput(mbuf, scope, tag, NULL, sz, p)) - return(0); - return(ml_nputs(mbuf, "\n", 1, NULL)); + print_otag(h, TAG_HEAD, 0, NULL); + print_mdoc_head(m, n, h); + print_ctag(h, TAG_HEAD); + print_otag(h, TAG_BODY, 0, NULL); + print_mdoc_node(m, n, h); + print_ctag(h, TAG_BODY); } -/* ARGSUSED */ -static int -html_begin(struct ml_args *p, const struct tm *tm, const char *os, - const char *name, enum roffmsec msec, enum roffvol vol) +static void +print_gen_head(struct html *h) { - enum roffvol bvol; - struct html_pair attr[4]; - char ts[32], title[64]; - int i; + struct htmlpair meta0[2]; + struct htmlpair meta1[2]; + struct htmlpair link[4]; - (void)snprintf(ts, sizeof(ts), "%s(%s)", - name, roff_msecname(msec)); + meta0[0].key = ATTR_HTTPEQUIV; + meta0[0].val = "Content-Type"; + meta0[1].key = ATTR_CONTENT; + meta0[1].val = "text/html; charest-utf-8"; - if (vol >= ROFF_ARCH_START) { - switch (msec) { - case(ROFF_MSEC_1): - /* FALLTHROUGH */ - case(ROFF_MSEC_6): - /* FALLTHROUGH */ - case(ROFF_MSEC_7): - bvol = ROFF_VOL_URM; - break; - case(ROFF_MSEC_2): - /* FALLTHROUGH */ - case(ROFF_MSEC_3): - /* FALLTHROUGH */ - case(ROFF_MSEC_3p): - /* FALLTHROUGH */ - case(ROFF_MSEC_4): - /* FALLTHROUGH */ - case(ROFF_MSEC_5): - bvol = ROFF_VOL_PRM; - break; - case(ROFF_MSEC_8): - bvol = ROFF_VOL_PRM; - break; - case(ROFF_MSEC_9): - bvol = ROFF_VOL_KM; - break; - case(ROFF_MSEC_UNASS): - /* FALLTHROUGH */ - case(ROFF_MSEC_DRAFT): - /* FALLTHROUGH */ - case(ROFF_MSEC_PAPER): - bvol = ROFF_VOL_NONE; - break; - default: - abort(); - /* NOTREACHED */ - } + meta1[0].key = ATTR_NAME; + meta1[0].val = "resource-type"; + meta1[1].key = ATTR_CONTENT; + meta1[1].val = "document"; - (void)snprintf(title, sizeof(title), "%s (%s)", - roff_volname(bvol), roff_volname(vol)); - } else - (void)snprintf(title, sizeof(title), "%s", roff_volname(vol)); + link[0].key = ATTR_REL; + link[0].val = "stylesheet"; + link[1].key = ATTR_HREF; + link[1].val = "style.css"; + link[2].key = ATTR_TYPE; + link[2].val = "text/css"; + link[3].key = ATTR_MEDIA; + link[3].val = "all"; + print_otag(h, TAG_META, 2, meta0); + print_otag(h, TAG_META, 2, meta1); + print_otag(h, TAG_LINK, 4, link); +} - i = 0; - if ( ! html_typeput(p->mbuf, HTML_TYPE_4_01_STRICT, NULL)) - return(0); - if ( ! html_tputln(p->mbuf, ML_OPEN, i, HTML_TAG_HTML)) - return(0); - if ( ! html_tputln(p->mbuf, ML_OPEN, i++, HTML_TAG_HEAD)) - return(0); +static void +print_mdoc_head(MDOC_ARGS) +{ - attr[0].attr = HTML_ATTR_HTTP_EQUIV; - attr[0].val = "content-type"; - attr[1].attr = HTML_ATTR_CONTENT; - attr[1].val = "text/html;charset=utf-8"; - - if ( ! html_aputln(p->mbuf, ML_OPEN, i, HTML_TAG_META, 2, attr)) - return(0); - - attr[0].attr = HTML_ATTR_NAME; - attr[0].val = "resource-type"; - attr[1].attr = HTML_ATTR_CONTENT; - attr[1].val = "document"; - - if ( ! html_aputln(p->mbuf, ML_OPEN, i, HTML_TAG_META, 2, attr)) - return(0); - - if ( ! html_tputln(p->mbuf, ML_OPEN, i, HTML_TAG_TITLE)) - return(0); - if ( ! ml_putstring(p->mbuf, ts, NULL)) - return(0); - if ( ! html_tputln(p->mbuf, ML_CLOSE, i, HTML_TAG_TITLE)) - return(0); - - if (HTML_CSS_EMBED & p->args->params.html.flags) { - attr[0].attr = HTML_ATTR_TYPE; - attr[0].val = "text/css"; - - if ( ! html_aputln(p->mbuf, ML_OPEN, i, - HTML_TAG_STYLE, 1, attr)) - return(0); - if ( ! html_commentput(p->mbuf, ML_OPEN, NULL)) - return(0); - - if ( ! html_loadcss(p->mbuf, p->args->params.html.css)) - return(0); - - if ( ! html_commentput(p->mbuf, ML_CLOSE, NULL)) - return(0); - if ( ! html_tputln(p->mbuf, ML_CLOSE, i, HTML_TAG_STYLE)) - return(0); - } else { - attr[0].attr = HTML_ATTR_REL; - attr[0].val = "stylesheet"; - attr[1].attr = HTML_ATTR_TYPE; - attr[1].val = "text/css"; - attr[2].attr = HTML_ATTR_HREF; - attr[2].val = p->args->params.html.css; - - if ( ! html_aputln(p->mbuf, ML_OPEN, i, - HTML_TAG_LINK, 3, attr)) - return(0); - } - - if ( ! html_tputln(p->mbuf, ML_CLOSE, --i, HTML_TAG_HEAD)) - return(0); - if ( ! html_tputln(p->mbuf, ML_OPEN, i, HTML_TAG_BODY)) - return(0); - - attr[0].attr = HTML_ATTR_CLASS; - attr[0].val = "mdoc"; - - if ( ! html_aputln(p->mbuf, ML_OPEN, i, HTML_TAG_DIV, 1, attr)) - return(0); - - attr[0].attr = HTML_ATTR_WIDTH; - attr[0].val = "100%"; - attr[1].attr = HTML_ATTR_CLASS; - attr[1].val = "header-table"; - - if ( ! html_aputln(p->mbuf, ML_OPEN, i++, HTML_TAG_TABLE, 2, attr)) - return(0); - if ( ! html_tputln(p->mbuf, ML_OPEN, i++, HTML_TAG_TR)) - return(0); - - attr[0].attr = HTML_ATTR_ALIGN; - attr[0].val = "left"; - attr[1].attr = HTML_ATTR_CLASS; - attr[1].val = "header-section"; - - if ( ! html_aputln(p->mbuf, ML_OPEN, i, HTML_TAG_TD, 2, attr)) - return(0); - if ( ! ml_putstring(p->mbuf, ts, NULL)) - return(0); - if ( ! html_tputln(p->mbuf, ML_CLOSE, i, HTML_TAG_TD)) - return(0); - - attr[0].attr = HTML_ATTR_ALIGN; - attr[0].val = "center"; - attr[1].attr = HTML_ATTR_CLASS; - attr[1].val = "header-volume"; - - if ( ! html_aputln(p->mbuf, ML_OPEN, i, HTML_TAG_TD, 2, attr)) - return(0); - if ( ! ml_putstring(p->mbuf, title, NULL)) - return(0); - if ( ! html_tputln(p->mbuf, ML_CLOSE, i, HTML_TAG_TD)) - return(0); - - attr[0].attr = HTML_ATTR_ALIGN; - attr[0].val = "right"; - attr[1].attr = HTML_ATTR_CLASS; - attr[1].val = "header-section"; - - if ( ! html_aputln(p->mbuf, ML_OPEN, i, HTML_TAG_TD, 2, attr)) - return(0); - if ( ! ml_putstring(p->mbuf, ts, NULL)) - return(0); - if ( ! html_tputln(p->mbuf, ML_CLOSE, i, HTML_TAG_TD)) - return(0); - - if ( ! html_tputln(p->mbuf, ML_CLOSE, --i, HTML_TAG_TR)) - return(0); - return(html_tputln(p->mbuf, ML_CLOSE, --i, HTML_TAG_TABLE)); + print_gen_head(h); + print_otag(h, TAG_TITLE, 0, NULL); + print_encode(m->title); + print_ctag(h, TAG_TITLE); } -/* ARGSUSED */ -static int -html_end(struct ml_args *p, const struct tm *tm, const char *os, - const char *name, enum roffmsec msec, enum roffvol vol) +static int +mdoc_root_pre(MDOC_ARGS) { - struct html_pair attr[4]; - int i; - char ts[64]; + struct htmlpair div; - if (0 == strftime(ts, sizeof(ts), "%B %d, %Y", tm)) { - warn("strftime"); - return(0); - } + div.key = ATTR_CLASS; + div.val = "body"; - i = 0; - - attr[0].attr = HTML_ATTR_WIDTH; - attr[0].val = "100%"; - attr[1].attr = HTML_ATTR_CLASS; - attr[1].val = "header-footer"; - - if ( ! html_aputln(p->mbuf, ML_OPEN, i++, HTML_TAG_TABLE, 2, attr)) - return(0); - if ( ! html_tputln(p->mbuf, ML_OPEN, i++, HTML_TAG_TR)) - return(0); - - attr[0].attr = HTML_ATTR_ALIGN; - attr[0].val = "left"; - attr[1].attr = HTML_ATTR_CLASS; - attr[1].val = "footer-os"; - - if ( ! html_aputln(p->mbuf, ML_OPEN, i, HTML_TAG_TD, 2, attr)) - return(0); - if ( ! ml_putstring(p->mbuf, os, NULL)) - return(0); - if ( ! html_tputln(p->mbuf, ML_CLOSE, i, HTML_TAG_TD)) - return(0); - - attr[0].attr = HTML_ATTR_ALIGN; - attr[0].val = "right"; - attr[1].attr = HTML_ATTR_CLASS; - attr[1].val = "footer-date"; - - if ( ! html_aputln(p->mbuf, ML_OPEN, i, HTML_TAG_TD, 2, attr)) - return(0); - if ( ! ml_putstring(p->mbuf, ts, NULL)) - return(0); - if ( ! html_tputln(p->mbuf, ML_CLOSE, i, HTML_TAG_TD)) - return(0); - - if ( ! html_tputln(p->mbuf, ML_CLOSE, --i, HTML_TAG_TR)) - return(0); - if ( ! html_tputln(p->mbuf, ML_CLOSE, --i, HTML_TAG_TABLE)) - return(0); - - if ( ! html_tputln(p->mbuf, ML_CLOSE, 0, HTML_TAG_DIV)) - return(0); - if ( ! html_tputln(p->mbuf, ML_CLOSE, 0, HTML_TAG_BODY)) - return(0); - return(html_tputln(p->mbuf, ML_CLOSE, 0, HTML_TAG_HTML)); + print_otag(h, TAG_DIV, 1, &div); + return(1); } -/* ARGSUSED */ -static int -html_bodytagname(struct md_mbuf *mbuf, - const struct md_args *args, int tok, struct htmlq *q, - const int *argc, const char **argv, size_t *res) +static void +mdoc_root_post(MDOC_ARGS) { - switch (tok) { - case (ROFF_Bl): - return(html_Bl_bodytagname(mbuf, q, argc, argv, res)); - case (ROFF_Fo): - return(html_stput(mbuf, HTML_TAG_SPAN, res)); - case (ROFF_It): - return(html_It_bodytagname(mbuf, q, argc, argv, res)); - case (ROFF_Oo): - return(html_stput(mbuf, HTML_TAG_SPAN, res)); - default: - break; - } - - return(html_stput(mbuf, HTML_TAG_DIV, res)); + print_ctag(h, TAG_DIV); } -/* ARGSUSED */ static int -html_headtagname(struct md_mbuf *mbuf, - const struct md_args *args, int tok, struct htmlq *q, - const int *argc, const char **argv, size_t *res) +mdoc_ss_pre(MDOC_ARGS) { - switch (tok) { - case (ROFF_It): - return(html_It_headtagname(mbuf, q, argc, argv, res)); - case (ROFF_Fo): - /* FALLTHROUGH */ - case (ROFF_Oo): - return(html_stput(mbuf, HTML_TAG_SPAN, res)); - case (ROFF_Sh): - return(html_stput(mbuf, HTML_TAG_H1, res)); - case (ROFF_Ss): - return(html_stput(mbuf, HTML_TAG_H2, res)); - default: - break; - } - - return(html_stput(mbuf, HTML_TAG_DIV, res)); + if (MDOC_BODY == n->type) + print_otag(h, TAG_P, 0, NULL); + if (MDOC_HEAD == n->type) + print_otag(h, TAG_H2, 0, NULL); + return(1); } -/* ARGSUSED */ -static int -html_blocktagname(struct md_mbuf *mbuf, const struct md_args *args, - int tok, struct htmlq *q, const int *argc, - const char **argv, size_t *res) +static void +mdoc_ss_post(MDOC_ARGS) { - switch (tok) { - case (ROFF_Fo): - /* FALLTHROUGH */ - case (ROFF_Oo): - return(html_stput(mbuf, HTML_TAG_SPAN, res)); - case (ROFF_It): - return(html_It_blocktagname(mbuf, q, argc, argv, res)); - default: - break; - } - - return(html_stput(mbuf, HTML_TAG_DIV, res)); + if (MDOC_BODY == n->type) + print_ctag(h, TAG_P); + if (MDOC_HEAD == n->type) + print_ctag(h, TAG_H2); } -/* ARGSUSED */ static int -html_printargs(struct md_mbuf *mbuf, int tok, const char *ns, - const int *argc, const char **argv, size_t *res) +mdoc_pp_pre(MDOC_ARGS) { - /* FIXME: use API in ml.h. */ - - if ( ! ml_puts(mbuf, " class=\"", res)) - return(0); - if ( ! ml_puts(mbuf, ns, res)) - return(0); - if ( ! ml_puts(mbuf, "-", res)) - return(0); - if ( ! ml_puts(mbuf, toknames[tok], res)) - return(0); - return(ml_puts(mbuf, "\"", res)); + print_otag(h, TAG_P, 0, NULL); + return(0); } -/* ARGSUSED */ static int -html_headtagargs(struct md_mbuf *mbuf, - const struct md_args *args, int tok, - const int *argc, const char **argv, size_t *res) +mdoc_nd_pre(MDOC_ARGS) { - return(html_printargs(mbuf, tok, "head", argc, argv, res)); + if (MDOC_BODY == n->type) + print_text(h, "--"); + return(1); } -/* ARGSUSED */ static int -html_bodytagargs(struct md_mbuf *mbuf, - const struct md_args *args, int tok, - const int *argc, const char **argv, size_t *res) +mdoc_nm_pre(MDOC_ARGS) { + struct htmlpair class; - return(html_printargs(mbuf, tok, "body", argc, argv, res)); + class.key = ATTR_CLASS; + class.val = "name"; + + print_otag(h, TAG_SPAN, 1, &class); + if (NULL == n->child) + print_text(h, m->name); + + return(1); } -/* ARGSUSED */ -static int -html_blocktagargs(struct md_mbuf *mbuf, - const struct md_args *args, int tok, - const int *argc, const char **argv, size_t *res) +static void +mdoc_nm_post(MDOC_ARGS) { - return(html_printargs(mbuf, tok, "block", argc, argv, res)); + print_ctag(h, TAG_SPAN); } -/* ARGSUSED */ static int -html_inlinetagargs(struct md_mbuf *mbuf, - const struct md_args *args, int tok, - const int *argc, const char **argv, size_t *res) +mdoc_sh_pre(MDOC_ARGS) { - if ( ! html_printargs(mbuf, tok, "inline", argc, argv, res)) - return(0); - - switch (tok) { - case (ROFF_Sh): - - /* FIXME: use API in ml.h. */ - - assert(*argv); - if ( ! ml_nputs(mbuf, " name=\"", 7, res)) - return(0); - if ( ! ml_putstring(mbuf, *argv++, res)) - return(0); - while (*argv) { - if ( ! ml_putstring(mbuf, "_", res)) - return(0); - if ( ! ml_putstring(mbuf, *argv++, res)) - return(0); - } - if ( ! ml_nputs(mbuf, "\"", 1, res)) - return(0); - break; - - case (ROFF_Sx): - - /* FIXME: use API in ml.h. */ - - assert(*argv); - if ( ! ml_nputs(mbuf, " href=\"#", 8, res)) - return(0); - if ( ! ml_putstring(mbuf, *argv++, res)) - return(0); - while (*argv) { - if ( ! ml_putstring(mbuf, "_", res)) - return(0); - if ( ! ml_putstring(mbuf, *argv++, res)) - return(0); - } - if ( ! ml_nputs(mbuf, "\"", 1, res)) - return(0); - - break; - default: - break; - } - + if (MDOC_BODY == n->type) + print_otag(h, TAG_P, 0, NULL); + if (MDOC_HEAD == n->type) + print_otag(h, TAG_H1, 0, NULL); return(1); } -/* ARGSUSED */ -static int -html_inlinetagname(struct md_mbuf *mbuf, - const struct md_args *args, int tok, size_t *res) +static void +mdoc_sh_post(MDOC_ARGS) { - switch (tok) { - case (ROFF_Dl): - /* FALLTHROUGH */ - case (ROFF_D1): - return(html_stput(mbuf, HTML_TAG_DIV, res)); - case (ROFF_Sh): - return(html_stput(mbuf, HTML_TAG_A, res)); - case (ROFF_Pp): - return(html_stput(mbuf, HTML_TAG_DIV, res)); - case (ROFF_Sx): - return(html_stput(mbuf, HTML_TAG_A, res)); - default: - break; - } - - return(html_stput(mbuf, HTML_TAG_SPAN, res)); + if (MDOC_BODY == n->type) + print_ctag(h, TAG_P); + if (MDOC_HEAD == n->type) + print_ctag(h, TAG_H1); } -static ssize_t -html_begintag(struct ml_args *p, enum md_ns ns, - int tok, const int *argc, const char **argv) +static void +print_mdoc_node(MDOC_ARGS) { - size_t res; - struct htmlq *q; - struct htmlnode *node; - int i; + int child; - assert(ns != MD_NS_DEFAULT); - res = 0; + child = 1; - q = (struct htmlq *)p->data; - - if (NULL == (node = calloc(1, sizeof(struct htmlnode)))) { - warn("calloc"); - return(-1); - } - - node->parent = q->last; - node->tok = tok; - node->ns = ns; - - if (argc) { - /* TODO: argv. */ - - assert(argv); - /* LINTED */ - for (i = 0; ROFF_ARGMAX != argc[i] - && i < ROFF_MAXLINEARG; i++) - node->argc[i] = argc[i]; - assert(i != ROFF_MAXLINEARG); - } - - - q->last = node; - - switch (ns) { - case (MD_NS_BLOCK): - if ( ! html_blocktagname(p->mbuf, p->args, tok, - q, argc, argv, &res)) - return(-1); - if ( ! html_blocktagargs(p->mbuf, p->args, tok, - argc, argv, &res)) - return(-1); + switch (n->type) { + case (MDOC_ROOT): + child = mdoc_root_pre(m, n, h); break; - case (MD_NS_BODY): - if ( ! html_bodytagname(p->mbuf, p->args, tok, - q, argc, argv, &res)) - return(-1); - if ( ! html_bodytagargs(p->mbuf, p->args, tok, - argc, argv, &res)) - return(-1); + case (MDOC_TEXT): + print_text(h, n->string); break; - case (MD_NS_HEAD): - if ( ! html_headtagname(p->mbuf, p->args, tok, q, - argc, argv, &res)) - return(-1); - if ( ! html_headtagargs(p->mbuf, p->args, tok, - argc, argv, &res)) - return(-1); - break; default: - if ( ! html_inlinetagname(p->mbuf, p->args, tok, &res)) - return(-1); - if ( ! html_inlinetagargs(p->mbuf, p->args, tok, - argc, argv, &res)) - return(-1); + if (mdocs[n->tok].pre) + child = (*mdocs[n->tok].pre)(m, n, h); break; } - return((ssize_t)res); -} + if (child && n->child) + print_mdoc_node(m, n->child, h); - -static ssize_t -html_endtag(struct ml_args *p, enum md_ns ns, int tok) -{ - size_t res; - struct htmlq *q; - struct htmlnode *node; - - assert(ns != MD_NS_DEFAULT); - res = 0; - - q = (struct htmlq *)p->data; - node = q->last; - - switch (ns) { - case (MD_NS_BLOCK): - if ( ! html_blocktagname(p->mbuf, p->args, tok, - q, node->argc, - (const char **)node->argv, &res)) - return(-1); + switch (n->type) { + case (MDOC_ROOT): + mdoc_root_post(m, n, h); break; - case (MD_NS_BODY): - if ( ! html_bodytagname(p->mbuf, p->args, tok, - q, node->argc, - (const char **)node->argv, &res)) - return(-1); + case (MDOC_TEXT): break; - case (MD_NS_HEAD): - if ( ! html_headtagname(p->mbuf, p->args, tok, - q, node->argc, - (const char **)node->argv, &res)) - return(-1); - break; default: - if ( ! html_inlinetagname(p->mbuf, p->args, tok, &res)) - return(-1); + if (mdocs[n->tok].post) + (*mdocs[n->tok].post)(m, n, h); break; } - q->last = node->parent; - - free(node); - - return((ssize_t)res); + if (n->next) + print_mdoc_node(m, n->next, h); } -static int -html_alloc(void **p) +static void +print_man(MAN_ARGS) { - if (NULL == (*p = calloc(1, sizeof(struct htmlq)))) { - warn("calloc"); - return(0); - } - return(1); + print_otag(h, TAG_HEAD, 0, NULL); + print_man_head(m, n, h); + print_ctag(h, TAG_HEAD); + print_otag(h, TAG_BODY, 0, NULL); + print_man_body(m, n, h); + print_ctag(h, TAG_BODY); } static void -html_free(void *p) +print_man_head(MAN_ARGS) { - struct htmlq *q; - struct htmlnode *n; - assert(p); - q = (struct htmlq *)p; - - /* LINTED */ - while ((n = q->last)) { - q->last = n->parent; - free(n); - } - - free(q); + print_gen_head(h); + print_otag(h, TAG_TITLE, 0, NULL); + print_encode(m->title); + print_ctag(h, TAG_TITLE); } -/* ARGSUSED */ -static ssize_t -html_beginhttp(struct md_mbuf *mbuf, - const struct md_args *args, - const char *buf, size_t sz) +static void +print_man_body(MAN_ARGS) { - size_t res; - struct html_pair pair; - - res = 0; - pair.attr = HTML_ATTR_HREF; - pair.val = (char *)buf; - - if ( ! html_aput(mbuf, ML_OPEN, HTML_TAG_A, &res, 1, &pair)) - return(-1); - return((ssize_t)res); } -/* ARGSUSED */ -static ssize_t -html_endhttp(struct md_mbuf *mbuf, - const struct md_args *args, - const char *buf, size_t sz) +static void +print_encode(const char *p) { - size_t res; - res = 0; - if ( ! html_tput(mbuf, ML_CLOSE, HTML_TAG_A, &res)) - return(-1); - return((ssize_t)res); + printf("%s", p); /* XXX */ } -/* ARGSUSED */ -static ssize_t -html_beginstring(struct ml_args *p, const char *buf, size_t sz) +static void +print_otag(struct html *h, enum htmltag tag, + int sz, const struct htmlpair *p) { + int i; - if (0 == strncmp(buf, "http://", 7)) - return(html_beginhttp(p->mbuf, p->args, buf, sz)); + if ( ! (HTML_NOSPACE & h->flags)) + if ( ! (HTML_BLOCK & htmltags[tag].flags)) + printf(" "); - return(0); + printf("<%s", htmltags[tag].name); + for (i = 0; i < sz; i++) { + printf(" %s=\"", htmlattrs[p[i].key]); + assert(p->val); + print_encode(p[i].val); + printf("\""); + } + printf(">"); + + h->flags |= HTML_NOSPACE; + } /* ARGSUSED */ -static ssize_t -html_endstring(struct ml_args *p, const char *buf, size_t sz) +static void +print_ctag(struct html *h, enum htmltag tag) { - if (0 == strncmp(buf, "http://", 7)) - return(html_endhttp(p->mbuf, p->args, buf, sz)); - - return(0); + printf("", htmltags[tag].name); + if (HTML_BLOCK & htmltags[tag].flags) + h->flags |= HTML_NOSPACE; } -int -md_line_html(void *data, char *buf) +/* ARGSUSED */ +static void +print_gen_doctype(struct html *h) { - - return(mlg_line((struct md_mlg *)data, buf)); + + printf("\n", DOCTYPE, DTD); } -int -md_exit_html(void *data, int flush) +static void +print_text(struct html *h, const char *p) { - return(mlg_exit((struct md_mlg *)data, flush)); -} + if (*p && 0 == *(p + 1)) + switch (*p) { + case('.'): + /* FALLTHROUGH */ + case(','): + /* FALLTHROUGH */ + case(';'): + /* FALLTHROUGH */ + case(':'): + /* FALLTHROUGH */ + case('?'): + /* FALLTHROUGH */ + case('!'): + /* FALLTHROUGH */ + case(')'): + /* FALLTHROUGH */ + case(']'): + /* FALLTHROUGH */ + case('}'): + h->flags |= HTML_NOSPACE; + default: + break; + } + if ( ! (h->flags & HTML_NOSPACE)) + printf(" "); + h->flags &= ~HTML_NOSPACE; -void * -md_init_html(const struct md_args *args, - struct md_mbuf *mbuf, const struct md_rbuf *rbuf) -{ - struct ml_cbs cbs; + if (p) + print_encode(p); - cbs.ml_alloc = html_alloc; - cbs.ml_free = html_free; - cbs.ml_begintag = html_begintag; - cbs.ml_endtag = html_endtag; - cbs.ml_begin = html_begin; - cbs.ml_end = html_end; - cbs.ml_beginstring = html_beginstring; - cbs.ml_endstring = html_endstring; - - return(mlg_alloc(args, rbuf, mbuf, &cbs)); + if (*p && 0 == *(p + 1)) + switch (*p) { + case('('): + /* FALLTHROUGH */ + case('['): + /* FALLTHROUGH */ + case('{'): + h->flags |= HTML_NOSPACE; + default: + break; + } }