=================================================================== RCS file: /cvs/mandoc/html.c,v retrieving revision 1.8 retrieving revision 1.31 diff -u -p -r1.8 -r1.31 --- mandoc/html.c 2008/12/05 17:43:14 1.8 +++ mandoc/html.c 2009/09/17 07:41:28 1.31 @@ -1,494 +1,813 @@ -/* $Id: html.c,v 1.8 2008/12/05 17:43:14 kristaps Exp $ */ +/* $Id: html.c,v 1.31 2009/09/17 07:41:28 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 -#include "libmdocml.h" -#include "private.h" -#include "ml.h" +#include "mdoc.h" +#include "man.h" +#define DOCTYPE "-//W3C//DTD HTML 4.01//EN" +#define DTD "http://www.w3.org/TR/html4/strict.dtd" -/* TODO: allow head/tail-less invocations (just "div" start). */ -/* FIXME: free htmlq. */ +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_MAX +}; -struct htmlnode { - int tok; - enum md_ns ns; - int *argc[ROFF_MAXLINEARG]; - char *argv[ROFF_MAXLINEARG]; - struct htmlnode *parent; +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_CLRLINE (1 << 0) +#define HTML_NOSTACK (1 << 1) +}; -struct htmlq { - struct htmlnode *last; +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 */ + {"title", HTML_CLRLINE | HTML_NOSTACK}, /* 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 */ + {"a", 0}, /* TAG_A */ }; +static const char *const htmlattrs[ATTR_MAX] = { + "http-equiv", + "content", + "name", + "rel", + "href", + "type", + "media", + "class" +}; -static void htmlnode_free(struct htmlnode *); -static void htmlnode_free(struct htmlnode *); +struct htmlpair { + enum htmlattr key; + char *val; +}; -static int html_loadcss(struct md_mbuf *, const char *); +struct tag { + enum htmltag tag; + SLIST_ENTRY(tag) entry; +}; -static ssize_t html_endtag(struct md_mbuf *, void *, - const struct md_args *, - enum md_ns, int); -static ssize_t html_begintag(struct md_mbuf *, void *, - const struct md_args *, - enum md_ns, int, - const int *, const char **); -static int html_begin(struct md_mbuf *, - const struct md_args *, - const struct tm *, - const char *, const char *, - const char *, const char *); -static int html_printargs(struct md_mbuf *, int, - const char *, const int *, - const char **, size_t *); -static int html_end(struct md_mbuf *, - const struct md_args *); -static int html_blocktagname(struct md_mbuf *, - const struct md_args *, int, size_t *); -static int html_blocktagargs(struct md_mbuf *, - const struct md_args *, int, - const int *, const char **, size_t *); -static int html_blockheadtagname(struct md_mbuf *, - const struct md_args *, int, size_t *); -static int html_blockheadtagargs(struct md_mbuf *, - const struct md_args *, int, - const int *, const char **, size_t *); -static int html_blockbodytagname(struct md_mbuf *, - const struct md_args *, int, size_t *); -static int html_blockbodytagargs(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 *); +SLIST_HEAD(tagq, tag); +struct html { + int flags; +#define HTML_NOSPACE (1 << 0) +#define HTML_NEWLINE (1 << 1) + struct tagq stack; +}; -static int -html_loadcss(struct md_mbuf *mbuf, const char *css) +#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_title(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 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_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 int mdoc_ar_pre(MDOC_ARGS); +static int mdoc_fl_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 int mdoc_op_pre(MDOC_ARGS); +static void mdoc_op_post(MDOC_ARGS); +static int mdoc_pp_pre(MDOC_ARGS); +static int mdoc_sh_pre(MDOC_ARGS); +static int mdoc_ss_pre(MDOC_ARGS); +static int mdoc_xr_pre(MDOC_ARGS); + +static const struct htmlmdoc mdocs[MDOC_MAX] = { + {NULL, 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 */ + {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 */ + {mdoc_ar_pre, 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 */ + {mdoc_fl_pre, 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, NULL}, /* Nm */ + {mdoc_op_pre, mdoc_op_post}, /* Op */ + {NULL, NULL}, /* Ot */ + {NULL, NULL}, /* Pa */ + {NULL, NULL}, /* Rv */ + {NULL, NULL}, /* St */ + {NULL, NULL}, /* Va */ + {NULL, 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 */ + {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 */ + {mdoc_ns_pre, 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 */ +}; + + +void +html_mdoc(void *arg, const struct mdoc *m) { - size_t res, bufsz; - char *buf; - struct stat st; - int fd, c; - ssize_t ssz; + struct html *h; + struct tag *t; - c = 0; - res = 0; - buf = NULL; + h = (struct html *)arg; - if (-1 == (fd = open(css, O_RDONLY, 0))) { - warn("%s", css); - return(0); - } - - if (-1 == fstat(fd, &st)) { - warn("%s", css); - goto out; - } + 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); - bufsz = MAX(st.st_blksize, BUFSIZ); - if (NULL == (buf = malloc(bufsz))) { - warn("malloc"); - goto out; - } + printf("\n"); +} - 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; +void +html_man(void *arg, const struct man *m) +{ + struct html *h; + struct tag *t; -out: - if (-1 == close(fd)) { - warn("%s", css); - c = 0; - } + h = (struct html *)arg; - if (buf) - free(buf); + 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); - return(c); + printf("\n"); } -/* ARGSUSED */ -static int -html_begin(struct md_mbuf *mbuf, const struct md_args *args, - const struct tm *tm, const char *os, - const char *title, const char *section, - const char *vol) +void * +html_alloc(void) { - const char *preamble, *css, *trail; - char buf[512]; - size_t res; + struct html *h; - preamble = - "\n" - "\n" - "\n" - " \n" - " \n" - " Manual Page for %s(%s)\n"; + if (NULL == (h = calloc(1, sizeof(struct html)))) + return(NULL); - css = - " \n"; - trail = - "\n" - "\n" - "
\n"; + SLIST_INIT(&h->stack); + return(h); +} - res = 0; - (void)snprintf(buf, sizeof(buf) - 1, - preamble, title, section); +void +html_free(void *p) +{ + struct tag *tag; + struct html *h; - if ( ! ml_puts(mbuf, buf, &res)) - return(0); + h = (struct html *)p; - assert(args->params.html.css); - if (HTML_CSS_EMBED & args->params.html.flags) { - if ( ! ml_puts(mbuf, " \n", &res)) - return(0); - } else { - (void)snprintf(buf, sizeof(buf) - 1, css, - args->params.html.css); - if ( ! ml_puts(mbuf, buf, &res)) - return(0); + while ( ! SLIST_EMPTY(&h->stack)) { + tag = SLIST_FIRST(&h->stack); + SLIST_REMOVE_HEAD(&h->stack, entry); + free(tag); } + free(h); +} - if ( ! ml_puts(mbuf, trail, &res)) - return(0); - return(1); +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_title(m, n, h); + print_mdoc_node(m, n, h); + print_tagq(h, t); } -/* ARGSUSED */ -static int -html_end(struct md_mbuf *mbuf, const struct md_args *args) +static void +print_gen_head(struct html *h) { - size_t res; + struct htmlpair meta0[2]; + struct htmlpair meta1[2]; + struct htmlpair link[4]; - res = 0; - if ( ! ml_puts(mbuf, "
\n", &res)) - return(0); + meta0[0].key = ATTR_HTTPEQUIV; + meta0[0].val = "Content-Type"; + meta0[1].key = ATTR_CONTENT; + meta0[1].val = "text/html; charest-utf-8"; - return(1); + meta1[0].key = ATTR_NAME; + meta1[0].val = "resource-type"; + meta1[1].key = ATTR_CONTENT; + meta1[1].val = "document"; + + link[0].key = ATTR_REL; + link[0].val = "stylesheet"; + link[1].key = ATTR_HREF; + link[1].val = "style.css"; /* XXX */ + 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); } /* ARGSUSED */ -static int -html_blockbodytagname(struct md_mbuf *mbuf, - const struct md_args *args, int tok, size_t *res) +static void +print_mdoc_head(MDOC_ARGS) { - return(ml_puts(mbuf, "div", res)); + print_gen_head(h); + print_otag(h, TAG_TITLE, 0, NULL); + print_encode(m->title); } +/* ARGSUSED */ +static void +print_mdoc_title(MDOC_ARGS) +{ + /* TODO */ +} + +static void +print_mdoc_node(MDOC_ARGS) +{ + int child; + struct tag *t; + + child = 1; + t = SLIST_FIRST(&h->stack); + + 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_node(m, n->child, h); + + print_stagq(h, t); + + switch (n->type) { + case (MDOC_ROOT): + break; + case (MDOC_TEXT): + break; + default: + if (mdocs[n->tok].post) + (*mdocs[n->tok].post)(m, n, h); + break; + } + + if (n->next) + print_mdoc_node(m, n->next, h); +} + + +static void +print_man(MAN_ARGS) +{ + struct tag *t; + + t = print_otag(h, TAG_HEAD, 0, NULL); + print_man_head(m, n, h); + print_tagq(h, t); + + t = print_otag(h, TAG_BODY, 0, NULL); + print_man_body(m, n, h); + print_tagq(h, t); +} + + /* ARGSUSED */ -static int -html_blockheadtagname(struct md_mbuf *mbuf, - const struct md_args *args, int tok, size_t *res) +static void +print_man_head(MAN_ARGS) { - return(ml_puts(mbuf, "div", res)); + print_gen_head(h); + print_otag(h, TAG_TITLE, 0, NULL); + print_encode(m->title); } /* ARGSUSED */ -static int -html_blocktagname(struct md_mbuf *mbuf, - const struct md_args *args, int tok, size_t *res) +static void +print_man_body(MAN_ARGS) { - return(ml_puts(mbuf, "div", res)); + /* TODO */ } -static int -html_printargs(struct md_mbuf *mbuf, int tok, const char *ns, - const int *argc, const char **argv, size_t *res) +static void +print_encode(const char *p) { - int i, c; - 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); - if ( ! ml_puts(mbuf, "\"", res)) - return(0); + printf("%s", p); /* XXX */ +} - if (NULL == argv || NULL == argc) - return(1); - assert(argv && argc); + +static struct tag * +print_otag(struct html *h, enum htmltag tag, + int sz, const struct htmlpair *p) +{ + int i; + struct tag *t; + + if ( ! (HTML_NOSTACK & htmltags[tag].flags)) { + if (NULL == (t = malloc(sizeof(struct tag)))) + err(EXIT_FAILURE, "malloc"); + t->tag = tag; + SLIST_INSERT_HEAD(&h->stack, t, entry); + } else + t = NULL; + + if ( ! (HTML_NOSPACE & h->flags)) + if ( ! (HTML_CLRLINE & htmltags[tag].flags)) + printf(" "); + + 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; + if (HTML_CLRLINE & htmltags[tag].flags) + h->flags |= HTML_NEWLINE; + else + h->flags &= ~HTML_NEWLINE; + + return(t); +} + + +/* ARGSUSED */ +static void +print_ctag(struct html *h, enum htmltag tag) +{ - /* FIXME: ignores values. */ + printf("", htmltags[tag].name); + 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; +} - for (i = 0; ROFF_ARGMAX != (c = argc[i]); i++) { - if (argv[i]) - continue; - 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); - if ( ! ml_puts(mbuf, "-", res)) - return(0); - if ( ! ml_puts(mbuf, tokargnames[c], res)) - return(0); - if ( ! ml_puts(mbuf, "\"", res)) - return(0); + +/* ARGSUSED */ +static void +print_gen_doctype(struct html *h) +{ + + printf("\n", DOCTYPE, DTD); +} + + +static void +print_text(struct html *h, const char *p) +{ + + 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; + break; + default: + break; + } + + if ( ! (h->flags & HTML_NOSPACE)) + printf(" "); + + h->flags &= ~HTML_NOSPACE; + h->flags &= ~HTML_NEWLINE; + + if (p) + print_encode(p); + + if (*p && 0 == *(p + 1)) + switch (*p) { + case('('): + /* FALLTHROUGH */ + case('['): + /* FALLTHROUGH */ + case('{'): + h->flags |= HTML_NOSPACE; + break; + default: + break; + } +} + + +static void +print_tagq(struct html *h, const struct tag *until) +{ + struct tag *tag; + + while ( ! SLIST_EMPTY(&h->stack)) { + tag = SLIST_FIRST(&h->stack); + print_ctag(h, tag->tag); + SLIST_REMOVE_HEAD(&h->stack, entry); + free(tag); + if (until && tag == until) + return; } +} + +static void +print_stagq(struct html *h, const struct tag *suntil) +{ + struct tag *tag; + + while ( ! SLIST_EMPTY(&h->stack)) { + tag = SLIST_FIRST(&h->stack); + if (suntil && tag == suntil) + return; + print_ctag(h, tag->tag); + SLIST_REMOVE_HEAD(&h->stack, entry); + free(tag); + } +} + + +/* ARGSUSED */ +static int +mdoc_root_pre(MDOC_ARGS) +{ + struct htmlpair tag; + + tag.key = ATTR_CLASS; + tag.val = "body"; + + print_otag(h, TAG_DIV, 1, &tag); return(1); } /* ARGSUSED */ static int -html_blockheadtagargs(struct md_mbuf *mbuf, - const struct md_args *args, int tok, - const int *argc, const char **argv, size_t *res) +mdoc_ss_pre(MDOC_ARGS) { - return(html_printargs(mbuf, tok, "head", argc, argv, 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_blockbodytagargs(struct md_mbuf *mbuf, - const struct md_args *args, int tok, - const int *argc, const char **argv, size_t *res) +mdoc_fl_pre(MDOC_ARGS) { + struct htmlpair tag; - return(html_printargs(mbuf, tok, "body", argc, argv, res)); + tag.key = ATTR_CLASS; + tag.val = "flag"; + + print_otag(h, TAG_SPAN, 1, &tag); + print_text(h, "\\-"); + h->flags |= HTML_NOSPACE; + 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) +mdoc_pp_pre(MDOC_ARGS) { - return(html_printargs(mbuf, tok, "block", argc, argv, res)); + print_otag(h, TAG_BR, 0, NULL); + print_otag(h, TAG_BR, 0, NULL); + return(0); } /* 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_nd_pre(MDOC_ARGS) { - return(html_printargs(mbuf, tok, "inline", argc, argv, res)); + if (MDOC_BODY == n->type) + print_text(h, "\\(en"); + return(1); } /* ARGSUSED */ static int -html_inlinetagname(struct md_mbuf *mbuf, - const struct md_args *args, int tok, size_t *res) +mdoc_op_pre(MDOC_ARGS) { - switch (tok) { - case (ROFF_Pp): - return(ml_puts(mbuf, "div", res)); - default: - return(ml_puts(mbuf, "span", res)); + if (MDOC_BODY == n->type) { + print_text(h, "\\(lB"); + h->flags |= HTML_NOSPACE; } return(1); } -static ssize_t -html_begintag(struct md_mbuf *mbuf, void *data, - const struct md_args *args, enum md_ns ns, - int tok, const int *argc, const char **argv) +/* ARGSUSED */ +static void +mdoc_op_post(MDOC_ARGS) { - size_t res; - struct htmlq *q; - struct htmlnode *node; - assert(ns != MD_NS_DEFAULT); - res = 0; + if (MDOC_BODY != n->type) + return; + h->flags |= HTML_NOSPACE; + print_text(h, "\\(rB"); +} - assert(data); - q = (struct htmlq *)data; - if (NULL == (node = calloc(1, sizeof(struct htmlnode)))) { - warn("calloc"); - return(-1); - } +static int +mdoc_nm_pre(MDOC_ARGS) +{ + struct htmlpair class; - node->parent = q->last; - node->tok = tok; - node->ns = ns; + if ( ! (HTML_NEWLINE & h->flags)) + if (SEC_SYNOPSIS == n->sec) + print_otag(h, TAG_BR, 0, NULL); - q->last = node; + class.key = ATTR_CLASS; + class.val = "name"; - switch (ns) { - case (MD_NS_BLOCK): - if ( ! html_blocktagname(mbuf, args, tok, &res)) - return(-1); - if ( ! html_blocktagargs(mbuf, args, tok, - argc, argv, &res)) - return(-1); - break; - case (MD_NS_BODY): - if ( ! html_blockbodytagname(mbuf, args, tok, &res)) - return(-1); - if ( ! html_blockbodytagargs(mbuf, args, tok, - argc, argv, &res)) - return(-1); - break; - case (MD_NS_HEAD): - if ( ! html_blockheadtagname(mbuf, args, tok, &res)) - return(-1); - if ( ! html_blockheadtagargs(mbuf, args, tok, - argc, argv, &res)) - return(-1); - break; - default: - if ( ! html_inlinetagname(mbuf, args, tok, &res)) - return(-1); - if ( ! html_inlinetagargs(mbuf, args, tok, - argc, argv, &res)) - return(-1); - break; - } + print_otag(h, TAG_SPAN, 1, &class); + if (NULL == n->child) + print_text(h, m->name); - return((ssize_t)res); + return(1); } -static ssize_t -html_endtag(struct md_mbuf *mbuf, void *data, - const struct md_args *args, enum md_ns ns, int tok) +/* ARGSUSED */ +static int +mdoc_sh_pre(MDOC_ARGS) { - size_t res; - struct htmlq *q; - struct htmlnode *node; - assert(ns != MD_NS_DEFAULT); - res = 0; + 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); +} - assert(data); - q = (struct htmlq *)data; - switch (ns) { - case (MD_NS_BLOCK): - if ( ! html_blocktagname(mbuf, args, tok, &res)) - return(-1); - break; - case (MD_NS_BODY): - if ( ! html_blockbodytagname(mbuf, args, tok, &res)) - return(-1); - break; - case (MD_NS_HEAD): - if ( ! html_blockheadtagname(mbuf, args, tok, &res)) - return(-1); - break; - default: - if ( ! html_inlinetagname(mbuf, args, tok, &res)) - return(-1); - break; - } +/* ARGSUSED */ +static int +mdoc_xr_pre(MDOC_ARGS) +{ + struct htmlpair tag; - node = q->last; - q->last = node->parent; + tag.key = ATTR_HREF; + tag.val = "#"; /* TODO */ - htmlnode_free(node); + print_otag(h, TAG_A, 1, &tag); - return((ssize_t)res); -} + n = n->child; + print_text(h, n->string); + if (NULL == (n = n->next)) + return(0); + h->flags |= HTML_NOSPACE; + print_text(h, "("); + h->flags |= HTML_NOSPACE; + print_text(h, n->string); + h->flags |= HTML_NOSPACE; + print_text(h, ")"); -int -md_line_html(void *data, char *buf) -{ - - return(mlg_line((struct md_mlg *)data, buf)); + return(0); } -int -md_exit_html(void *data, int flush) +/* ARGSUSED */ +static int +mdoc_ns_pre(MDOC_ARGS) { - return(mlg_exit((struct md_mlg *)data, flush)); + h->flags |= HTML_NOSPACE; + return(1); } -void * -md_init_html(const struct md_args *args, - struct md_mbuf *mbuf, const struct md_rbuf *rbuf) +/* ARGSUSED */ +static int +mdoc_ar_pre(MDOC_ARGS) { - struct htmlq *q; + struct htmlpair tag; - if (NULL == (q = calloc(1, sizeof(struct htmlq)))) { - warn("calloc"); - return(NULL); - } + tag.key = ATTR_CLASS; + tag.val = "arg"; - return(mlg_alloc(args, q, rbuf, mbuf, html_begintag, - html_endtag, html_begin, html_end)); + print_otag(h, TAG_SPAN, 1, &tag); + return(1); } -