=================================================================== RCS file: /cvs/mandoc/html.c,v retrieving revision 1.18 retrieving revision 1.53 diff -u -p -r1.18 -r1.53 --- mandoc/html.c 2008/12/09 19:57:26 1.18 +++ mandoc/html.c 2009/10/03 15:08:09 1.53 @@ -1,914 +1,486 @@ -/* $Id: html.c,v 1.18 2008/12/09 19:57:26 kristaps Exp $ */ +/* $Id: html.c,v 1.53 2009/10/03 15:08:09 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 -#include "private.h" -#include "ml.h" +#include "chars.h" +#include "html.h" -#define TAG_HTML "" -#define TAG_HTML_END "" -#define TAG_BODY "" -#define TAG_BODY_END "" -#define TAG_DIV_MDOC "
" -#define TAG_DIV_END "
" -#define TAG_STYLE_CSS "" -#define TAG_HEAD "" -#define TAG_HEAD_END "" -#define TAG_TITLE "" -#define TAG_TITLE_END "" -#define TAG_LINK_CSS "" -#define TAG_DOCTYPE "" -#define TAG_RESTYPE "" -#define TAG_CONTTYPE "" +#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). */ +struct htmldata { + char *name; + int flags; +#define HTML_CLRLINE (1 << 0) +#define HTML_NOSTACK (1 << 1) +}; -struct htmlnode { - int tok; - enum md_ns ns; - int argc[ROFF_MAXLINEARG]; - char *argv[ROFF_MAXLINEARG]; - struct htmlnode *parent; +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}, /* 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 */ + {"table", HTML_CLRLINE}, /* TAG_TABLE */ + {"col", HTML_CLRLINE | HTML_NOSTACK}, /* 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 */ }; - -struct htmlq { - struct htmlnode *last; +static const char *const htmlattrs[ATTR_MAX] = { + "http-equiv", + "content", + "name", + "rel", + "href", + "type", + "media", + "class", + "style", + "width", + "valign", }; +#ifdef __linux__ +extern int getsubopt(char **, char * const *, char **); +#endif -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 md_mbuf *, void *, - const struct md_args *, - enum md_ns, int); -static ssize_t html_beginstring(struct md_mbuf *, - const struct md_args *, - const char *, size_t); -static ssize_t html_beginhttp(struct md_mbuf *, - const struct md_args *, - const char *, size_t); -static ssize_t html_endstring(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 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 *, - enum roffmsec, 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, - 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 *); - - -/* ARGSUSED */ -static int -html_It_headtagname(struct md_mbuf *mbuf, struct htmlq *q, - const int *argc, const char **argv, size_t *res) +void * +html_alloc(char *outopts) { - struct htmlnode *n; - int i; + struct html *h; + char *toks[4], *v; - for (n = q->last; n; n = n->parent) - if (n->tok == ROFF_Bl) - break; + toks[0] = "style"; + toks[1] = "man"; + toks[2] = NULL; - assert(n); + if (NULL == (h = calloc(1, sizeof(struct html)))) + return(NULL); - /* LINTED */ - for (i = 0; ROFF_ARGMAX != n->argc[i] && - i < ROFF_MAXLINEARG; i++) { - switch (n->argc[i]) { - case (ROFF_Ohang): - return(ml_nputs(mbuf, "div", 3, res)); - case (ROFF_Tag): - /* FALLTHROUGH */ - case (ROFF_Column): - return(ml_nputs(mbuf, "td", 2, res)); - default: - break; - } - } + SLIST_INIT(&h->tags); + SLIST_INIT(&h->ords); - return(0); -} - - -/* 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; - - 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(ml_nputs(mbuf, "div", 3, res)); - case (ROFF_Tag): - /* FALLTHROUGH */ - case (ROFF_Column): - return(ml_nputs(mbuf, "td", 2, res)); - default: - break; - } + if (NULL == (h->symtab = chars_init(CHARS_HTML))) { + free(h); + return(NULL); } - assert(i != ROFF_MAXLINEARG); - return(0); -} + h->base_man = "%N.%S.html"; - -/* ARGSUSED */ -static int -html_Bl_bodytagname(struct md_mbuf *mbuf, struct htmlq *q, - const int *argc, const char **argv, size_t *res) -{ - int i; - - for (i = 0; ROFF_ARGMAX != argc[i] - && i < ROFF_MAXLINEARG; i++) { - switch (argc[i]) { - case (ROFF_Enum): - return(ml_nputs(mbuf, "ol", 2, 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(ml_nputs(mbuf, "ul", 2, res)); - case (ROFF_Tag): - /* FALLTHROUGH */ - case (ROFF_Column): - return(ml_nputs(mbuf, "table", 5, res)); - default: + while (outopts && *outopts) + switch (getsubopt(&outopts, toks, &v)) { + case (0): + h->style = v; break; - } - } - - assert(i != ROFF_MAXLINEARG); - return(0); -} - - -/* ARGSUSED */ -static int -html_It_blocktagname(struct md_mbuf *mbuf, struct htmlq *q, - const int *argc, const char **argv, size_t *res) -{ - struct htmlnode *n; - int i; - - for (n = q->last; n; n = n->parent) - if (n->tok == ROFF_Bl) + case (1): + h->base_man = v; 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(ml_nputs(mbuf, "li", 2, res)); - case (ROFF_Tag): - /* FALLTHROUGH */ - case (ROFF_Column): - return(ml_nputs(mbuf, "tr", 2, res)); default: break; } - } - assert(i != ROFF_MAXLINEARG); - return(0); + return(h); } -static int -html_loadcss(struct md_mbuf *mbuf, const char *css) +void +html_free(void *p) { - size_t res, bufsz; - char *buf; - struct stat st; - int fd, c; - ssize_t ssz; + struct tag *tag; + struct ord *ord; + struct html *h; - c = 0; - res = 0; - buf = NULL; + h = (struct html *)p; - if (-1 == (fd = open(css, O_RDONLY, 0))) { - warn("%s", css); - return(0); - } - - if (-1 == fstat(fd, &st)) { - warn("%s", css); - goto out; + while ( ! SLIST_EMPTY(&h->ords)) { + ord = SLIST_FIRST(&h->ords); + SLIST_REMOVE_HEAD(&h->ords, entry); + free(ord); } - bufsz = MAX(st.st_blksize, BUFSIZ); - if (NULL == (buf = malloc(bufsz))) { - warn("malloc"); - goto out; + while ( ! SLIST_EMPTY(&h->tags)) { + tag = SLIST_FIRST(&h->tags); + SLIST_REMOVE_HEAD(&h->tags, entry); + free(tag); } + + if (h->buf) + free(h->buf); + if (h->symtab) + chars_free(h->symtab); - 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); + free(h); } -static int -html_putline(struct md_mbuf *mbuf, size_t indent, - const char *p, size_t *res) +void +print_gen_head(struct html *h) { + struct htmlpair tag[4]; - /* FIXME: use INDENT macro for this. */ - if ( ! ml_putchars(mbuf, ' ', indent * 4, res)) - return(0); - if ( ! ml_puts(mbuf, p, res)) - return(0); - return(ml_nputs(mbuf, "\n", 1, res)); -} + tag[0].key = ATTR_HTTPEQUIV; + tag[0].val = "Content-Type"; + tag[1].key = ATTR_CONTENT; + tag[1].val = "text/html; charset=utf-8"; + print_otag(h, TAG_META, 2, tag); + tag[0].key = ATTR_NAME; + tag[0].val = "resource-type"; + tag[1].key = ATTR_CONTENT; + tag[1].val = "document"; + print_otag(h, TAG_META, 2, tag); -static int -html_putlinestart(struct md_mbuf *mbuf, size_t indent, - const char *p, size_t *res) -{ - - if ( ! ml_putchars(mbuf, ' ', indent * 4, res)) - return(0); - return(ml_puts(mbuf, p, res)); + if (h->style) { + tag[0].key = ATTR_REL; + tag[0].val = "stylesheet"; + tag[1].key = ATTR_HREF; + tag[1].val = h->style; + tag[2].key = ATTR_TYPE; + tag[2].val = "text/css"; + tag[3].key = ATTR_MEDIA; + tag[3].val = "all"; + print_otag(h, TAG_LINK, 4, tag); + } } -/* ARGSUSED */ -static int -html_begin(struct md_mbuf *mbuf, const struct md_args *args, - const struct tm *tm, const char *os, - const char *title, enum roffmsec section, - const char *vol) +static void +print_spec(struct html *h, const char *p, int len) { - char mtitle[128], css[128]; - size_t i; + const char *rhs; + int i; + size_t sz; - (void)snprintf(mtitle, sizeof(mtitle), - "Manual Page for %s(%s)", - title, roff_msecname(section)); - (void)snprintf(css, sizeof(css), - TAG_LINK_CSS, args->params.html.css); + rhs = chars_a2ascii(h->symtab, p, (size_t)len, &sz); - i = 0; - - if ( ! html_putline(mbuf, i, TAG_DOCTYPE, NULL)) - return(0); - if ( ! html_putline(mbuf, i, TAG_HTML, NULL)) - return(0); - if ( ! html_putline(mbuf, i++, TAG_HEAD, NULL)) - return(0); - if ( ! html_putline(mbuf, i, TAG_CONTTYPE, NULL)) - return(0); - if ( ! html_putline(mbuf, i, TAG_RESTYPE, NULL)) - return(0); - if ( ! html_putlinestart(mbuf, i, TAG_TITLE, NULL)) - return(0); - if ( ! ml_putstring(mbuf, mtitle, NULL)) - return(0); - if ( ! html_putline(mbuf, i, TAG_TITLE_END, NULL)) - return(0); - - if (HTML_CSS_EMBED & args->params.html.flags) { - if ( ! html_putline(mbuf, i, TAG_STYLE_CSS, NULL)) - return(0); - if ( ! html_loadcss(mbuf, args->params.html.css)) - return(0); - if ( ! html_putline(mbuf, i, TAG_STYLE_END, NULL)) - return(0); - } else if ( ! html_putline(mbuf, i, css, NULL)) - return(0); - - if ( ! html_putline(mbuf, --i, TAG_HEAD_END, NULL)) - return(0); - if ( ! html_putline(mbuf, i, TAG_BODY, NULL)) - return(0); - if ( ! html_putline(mbuf, i, TAG_DIV_MDOC, NULL)) - return(0); - if ( ! html_putline(mbuf, i++, "", NULL)) - return(0); - if ( ! html_putline(mbuf, i++, "", NULL)) - return(0); - if ( ! html_putline(mbuf, i++, "", NULL)) - return(0); - if ( ! html_putline(mbuf, i++, "", NULL)) - return(0); - if ( ! html_putline(mbuf, i++, "", NULL)) - return(0); - if ( ! html_putline(mbuf, --i, "", NULL)) - return(0); - if ( ! html_putline(mbuf, --i, "
", NULL)) - return(0); - if ( ! ml_putstring(mbuf, title, NULL)) - return(0); - if ( ! html_putline(mbuf, --i, "", NULL)) - return(0); - if ( ! ml_putstring(mbuf, "Hello, world.", NULL)) - return(0); - if ( ! html_putline(mbuf, --i, "", NULL)) - return(0); - if ( ! ml_putstring(mbuf, title, NULL)) - return(0); - if ( ! html_putline(mbuf, --i, "
", NULL)) - return(0); - return(1); + if (NULL == rhs) + return; + for (i = 0; i < (int)sz; i++) + putchar(rhs[i]); } -/* ARGSUSED */ -static int -html_end(struct md_mbuf *mbuf, const struct md_args *args) +static void +print_res(struct html *h, const char *p, int len) { + const char *rhs; + int i; + size_t sz; - if ( ! html_putline(mbuf, 0, TAG_DIV_END, NULL)) - return(0); - if ( ! html_putline(mbuf, 0, TAG_BODY_END, NULL)) - return(0); - return(html_putline(mbuf, 0, TAG_HTML_END, NULL)); -} + rhs = chars_a2res(h->symtab, p, (size_t)len, &sz); - -/* 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) -{ - - switch (tok) { - case (ROFF_Bl): - return(html_Bl_bodytagname(mbuf, q, argc, argv, res)); - case (ROFF_Fo): - return(ml_nputs(mbuf, "span", 4, res)); - case (ROFF_It): - return(html_It_bodytagname(mbuf, q, argc, argv, res)); - case (ROFF_Oo): - return(ml_nputs(mbuf, "span", 4, res)); - default: - break; - } - - return(ml_puts(mbuf, "div", res)); + if (NULL == rhs) + return; + for (i = 0; i < (int)sz; i++) + putchar(rhs[i]); } -/* 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) +static void +print_escape(struct html *h, const char **p) { + int j, type; + const char *wp; - switch (tok) { - case (ROFF_It): - return(html_It_headtagname(mbuf, q, argc, argv, res)); - case (ROFF_Fo): - return(ml_nputs(mbuf, "span", 4, res)); - case (ROFF_Oo): - return(ml_nputs(mbuf, "span", 4, res)); - case (ROFF_Sh): - return(ml_nputs(mbuf, "h1", 2, res)); - case (ROFF_Ss): - return(ml_nputs(mbuf, "h2", 2, res)); - default: - break; - } + wp = *p; + type = 1; - return(ml_nputs(mbuf, "div", 3, res)); -} - - -/* 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) -{ - - switch (tok) { - case (ROFF_Fo): - return(ml_nputs(mbuf, "span", 4, res)); - case (ROFF_Oo): - return(ml_nputs(mbuf, "span", 4, res)); - case (ROFF_It): - return(html_It_blocktagname(mbuf, q, argc, argv, res)); - default: - break; + if (0 == *(++wp)) { + *p = wp; + return; } - return(ml_puts(mbuf, "div", res)); -} + if ('(' == *wp) { + wp++; + if (0 == *wp || 0 == *(wp + 1)) { + *p = 0 == *wp ? wp : wp + 1; + return; + } + print_spec(h, wp, 2); + *p = ++wp; + return; -/* ARGSUSED */ -static int -html_printargs(struct md_mbuf *mbuf, int tok, const char *ns, - const int *argc, const char **argv, size_t *res) -{ + } else if ('*' == *wp) { + if (0 == *(++wp)) { + *p = wp; + return; + } - 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)); -} + switch (*wp) { + case ('('): + wp++; + if (0 == *wp || 0 == *(wp + 1)) { + *p = 0 == *wp ? wp : wp + 1; + return; + } - -/* 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) -{ - - return(html_printargs(mbuf, tok, "head", argc, argv, res)); -} - - -/* 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) -{ - - return(html_printargs(mbuf, tok, "body", argc, argv, res)); -} - - -/* 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) -{ - - return(html_printargs(mbuf, tok, "block", argc, argv, res)); -} - - -/* 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) -{ - - if ( ! html_printargs(mbuf, tok, "inline", argc, argv, res)) - return(0); - - switch (tok) { - case (ROFF_Sx): - assert(*argv); - if ( ! ml_nputs(mbuf, " href=\"#", 8, res)) - return(0); - if ( ! ml_putstring(mbuf, *argv, res)) - return(0); - if ( ! ml_nputs(mbuf, "\"", 1, res)) - return(0); - break; - default: - break; - } + print_res(h, wp, 2); + *p = ++wp; + return; + case ('['): + type = 0; + break; + default: + print_res(h, wp, 1); + *p = wp; + return; + } - return(1); -} + } else if ('f' == *wp) { + if (0 == *(++wp)) { + *p = wp; + return; + } + switch (*wp) { + case ('B'): + /* TODO */ + break; + case ('I'): + /* TODO */ + break; + case ('P'): + /* FALLTHROUGH */ + case ('R'): + /* TODO */ + break; + default: + break; + } -/* ARGSUSED */ -static int -html_inlinetagname(struct md_mbuf *mbuf, - const struct md_args *args, int tok, size_t *res) -{ + *p = wp; + return; - switch (tok) { - case (ROFF_Pp): - return(ml_nputs(mbuf, "div", 3, res)); - case (ROFF_Sx): - return(ml_nputs(mbuf, "a", 1, res)); - default: - break; + } else if ('[' != *wp) { + print_spec(h, wp, 1); + *p = wp; + return; } - return(ml_puts(mbuf, "span", res)); -} + wp++; + for (j = 0; *wp && ']' != *wp; wp++, j++) + /* Loop... */ ; - -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) -{ - size_t res; - struct htmlq *q; - struct htmlnode *node; - int i; - - assert(ns != MD_NS_DEFAULT); - res = 0; - - assert(data); - q = (struct htmlq *)data; - - if (NULL == (node = calloc(1, sizeof(struct htmlnode)))) { - warn("calloc"); - return(-1); + if (0 == *wp) { + *p = wp; + return; } - node->parent = q->last; - node->tok = tok; - node->ns = ns; + if (type) + print_spec(h, wp - j, j); + else + print_res(h, wp - j, j); - 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(mbuf, args, tok, - q, argc, argv, &res)) - return(-1); - if ( ! html_blocktagargs(mbuf, args, tok, - argc, argv, &res)) - return(-1); - break; - case (MD_NS_BODY): - if ( ! html_bodytagname(mbuf, args, tok, - q, argc, argv, &res)) - return(-1); - if ( ! html_bodytagargs(mbuf, args, tok, - argc, argv, &res)) - return(-1); - break; - case (MD_NS_HEAD): - if ( ! html_headtagname(mbuf, args, tok, q, - argc, argv, &res)) - return(-1); - if ( ! html_headtagargs(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; - } - - return((ssize_t)res); + *p = wp; } -static ssize_t -html_endtag(struct md_mbuf *mbuf, void *data, - const struct md_args *args, enum md_ns ns, int tok) +static void +print_encode(struct html *h, const char *p) { - size_t res; - struct htmlq *q; - struct htmlnode *node; - assert(ns != MD_NS_DEFAULT); - res = 0; - - assert(data); - q = (struct htmlq *)data; - node = q->last; - - switch (ns) { - case (MD_NS_BLOCK): - if ( ! html_blocktagname(mbuf, args, tok, - q, node->argc, - (const char **)node->argv, &res)) - return(-1); - break; - case (MD_NS_BODY): - if ( ! html_bodytagname(mbuf, args, tok, - q, node->argc, - (const char **)node->argv, &res)) - return(-1); - break; - case (MD_NS_HEAD): - if ( ! html_headtagname(mbuf, args, tok, - q, node->argc, - (const char **)node->argv, &res)) - return(-1); - break; - default: - if ( ! html_inlinetagname(mbuf, args, tok, &res)) - return(-1); - break; + 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; + } } - - q->last = node->parent; - - free(node); - - return((ssize_t)res); } -static int -html_alloc(void **p) +struct tag * +print_otag(struct html *h, enum htmltag tag, + int sz, const struct htmlpair *p) { + int i; + struct tag *t; - if (NULL == (*p = calloc(1, sizeof(struct htmlq)))) { - warn("calloc"); - return(0); - } - return(1); -} + if ( ! (HTML_NOSTACK & htmltags[tag].flags)) { + if (NULL == (t = malloc(sizeof(struct tag)))) + err(EXIT_FAILURE, "malloc"); + t->tag = tag; + SLIST_INSERT_HEAD(&h->tags, t, entry); + } else + t = NULL; + if ( ! (HTML_NOSPACE & h->flags)) + if ( ! (HTML_CLRLINE & htmltags[tag].flags)) + printf(" "); -static void -html_free(void *p) -{ - struct htmlq *q; - struct htmlnode *n; - - assert(p); - q = (struct htmlq *)p; - - /* LINTED */ - while ((n = q->last)) { - q->last = n->parent; - free(n); + 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("\""); } + printf(">"); - free(q); -} + h->flags |= HTML_NOSPACE; + if (HTML_CLRLINE & htmltags[tag].flags) + h->flags |= HTML_NEWLINE; + else + h->flags &= ~HTML_NEWLINE; - -static ssize_t -html_beginhttp(struct md_mbuf *mbuf, - const struct md_args *args, - const char *buf, size_t sz) -{ - size_t res; - - res = 0; - - if ( ! ml_puts(mbuf, "", &res)) - return(-1); - - return((ssize_t)res); + return(t); } -static ssize_t -html_endhttp(struct md_mbuf *mbuf, - const struct md_args *args, - const char *buf, size_t sz) +/* ARGSUSED */ +static void +print_ctag(struct html *h, enum htmltag tag) { - size_t res; - - res = 0; - - if ( ! ml_puts(mbuf, "", &res)) - return(-1); - - return((ssize_t)res); + + 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; } /* ARGSUSED */ -static ssize_t -html_beginstring(struct md_mbuf *mbuf, - const struct md_args *args, - const char *buf, size_t sz) +void +print_gen_doctype(struct html *h) { - - if (0 == strncmp(buf, "http://", 7)) - return(html_beginhttp(mbuf, args, buf, sz)); - - return(0); + + printf("", DOCTYPE, DTD); } -/* ARGSUSED */ -static ssize_t -html_endstring(struct md_mbuf *mbuf, - const struct md_args *args, - const char *buf, size_t sz) +void +print_text(struct html *h, const char *p) { - - if (0 == strncmp(buf, "http://", 7)) - return(html_endhttp(mbuf, args, buf, sz)); - return(0); -} + if (*p && 0 == *(p + 1)) + switch (*p) { + case('.'): + /* FALLTHROUGH */ + case(','): + /* FALLTHROUGH */ + case(';'): + /* FALLTHROUGH */ + case(':'): + /* FALLTHROUGH */ + case('?'): + /* FALLTHROUGH */ + case('!'): + /* FALLTHROUGH */ + case(')'): + /* FALLTHROUGH */ + case(']'): + /* FALLTHROUGH */ + case('}'): + if ( ! (HTML_IGNDELIM & h->flags)) + h->flags |= HTML_NOSPACE; + break; + default: + break; + } + if ( ! (h->flags & HTML_NOSPACE)) + printf(" "); -int -md_line_html(void *data, char *buf) -{ + h->flags &= ~HTML_NOSPACE; + h->flags &= ~HTML_NEWLINE; - return(mlg_line((struct md_mlg *)data, buf)); + if (p) + print_encode(h, p); + + if (*p && 0 == *(p + 1)) + switch (*p) { + case('('): + /* FALLTHROUGH */ + case('['): + /* FALLTHROUGH */ + case('{'): + h->flags |= HTML_NOSPACE; + break; + default: + break; + } } -int -md_exit_html(void *data, int flush) +void +print_tagq(struct html *h, const struct tag *until) { + struct tag *tag; - return(mlg_exit((struct md_mlg *)data, flush)); + while ( ! SLIST_EMPTY(&h->tags)) { + tag = SLIST_FIRST(&h->tags); + print_ctag(h, tag->tag); + SLIST_REMOVE_HEAD(&h->tags, entry); + free(tag); + if (until && tag == until) + return; + } } -void * -md_init_html(const struct md_args *args, - struct md_mbuf *mbuf, const struct md_rbuf *rbuf) +void +print_stagq(struct html *h, const struct tag *suntil) { - struct ml_cbs cbs; + struct tag *tag; - 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)); + while ( ! SLIST_EMPTY(&h->tags)) { + tag = SLIST_FIRST(&h->tags); + if (suntil && tag == suntil) + return; + print_ctag(h, tag->tag); + SLIST_REMOVE_HEAD(&h->tags, entry); + free(tag); + } }