=================================================================== RCS file: /cvs/mandoc/html.c,v retrieving revision 1.8 retrieving revision 1.56 diff -u -p -r1.8 -r1.56 --- mandoc/html.c 2008/12/05 17:43:14 1.8 +++ mandoc/html.c 2009/10/03 16:37:23 1.56 @@ -1,494 +1,580 @@ -/* $Id: html.c,v 1.8 2008/12/05 17:43:14 kristaps Exp $ */ +/* $Id: html.c,v 1.56 2009/10/03 16:37:23 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 -#include "libmdocml.h" -#include "private.h" -#include "ml.h" +#include "chars.h" +#include "html.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. */ +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", + "target", }; +#ifdef __linux__ +extern int getsubopt(char **, char * const *, char **); +#endif -static void htmlnode_free(struct htmlnode *); -static void htmlnode_free(struct htmlnode *); +void * +html_alloc(char *outopts) +{ + struct html *h; + char *toks[4], *v; -static int html_loadcss(struct md_mbuf *, const char *); + toks[0] = "style"; + toks[1] = "man"; + toks[2] = "includes"; + toks[3] = NULL; -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 *); + if (NULL == (h = calloc(1, sizeof(struct html)))) + return(NULL); + SLIST_INIT(&h->tags); + SLIST_INIT(&h->ords); -static int -html_loadcss(struct md_mbuf *mbuf, const char *css) -{ - size_t res, bufsz; - char *buf; - struct stat st; - int fd, c; - ssize_t ssz; + if (NULL == (h->symtab = chars_init(CHARS_HTML))) { + free(h); + return(NULL); + } - c = 0; - res = 0; - buf = NULL; + while (outopts && *outopts) + switch (getsubopt(&outopts, toks, &v)) { + case (0): + h->style = v; + break; + case (1): + h->base_man = v; + break; + case (2): + h->base_includes = v; + break; + default: + break; + } - if (-1 == (fd = open(css, O_RDONLY, 0))) { - warn("%s", css); - return(0); - } - - if (-1 == fstat(fd, &st)) { - warn("%s", css); - goto out; - } + return(h); +} - 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; - } +void +html_free(void *p) +{ + struct tag *tag; + struct ord *ord; + struct html *h; - c = 1; + h = (struct html *)p; -out: - if (-1 == close(fd)) { - warn("%s", css); - c = 0; + while ( ! SLIST_EMPTY(&h->ords)) { + ord = SLIST_FIRST(&h->ords); + SLIST_REMOVE_HEAD(&h->ords, entry); + free(ord); } - if (buf) - free(buf); + while ( ! SLIST_EMPTY(&h->tags)) { + tag = SLIST_FIRST(&h->tags); + SLIST_REMOVE_HEAD(&h->tags, entry); + free(tag); + } + + if (h->symtab) + chars_free(h->symtab); - return(c); + free(h); } -/* 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 +print_gen_head(struct html *h) { - const char *preamble, *css, *trail; - char buf[512]; - size_t res; + struct htmlpair tag[4]; - preamble = - "\n" - "\n" - "\n" - " \n" - " \n" - " Manual Page for %s(%s)\n"; + 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); - css = - " \n"; - trail = - "\n" - "\n" - "
\n"; + 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); - res = 0; + 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); + } +} - (void)snprintf(buf, sizeof(buf) - 1, - preamble, title, section); - if ( ! ml_puts(mbuf, buf, &res)) - return(0); +static void +print_spec(struct html *h, const char *p, int len) +{ + const char *rhs; + int i; + size_t sz; - 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); - } + rhs = chars_a2ascii(h->symtab, p, (size_t)len, &sz); - if ( ! ml_puts(mbuf, trail, &res)) - 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) { - size_t res; + const char *rhs; + int i; + size_t sz; - res = 0; - if ( ! ml_puts(mbuf, "
\n", &res)) - return(0); + rhs = chars_a2res(h->symtab, p, (size_t)len, &sz); - return(1); + if (NULL == rhs) + return; + for (i = 0; i < (int)sz; i++) + putchar(rhs[i]); } -/* ARGSUSED */ -static int -html_blockbodytagname(struct md_mbuf *mbuf, - const struct md_args *args, int tok, size_t *res) +static void +print_escape(struct html *h, const char **p) { + int j, type; + const char *wp; - return(ml_puts(mbuf, "div", res)); -} + wp = *p; + type = 1; + 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; -/* ARGSUSED */ -static int -html_blockheadtagname(struct md_mbuf *mbuf, - const struct md_args *args, int tok, size_t *res) -{ + } else if ('*' == *wp) { + if (0 == *(++wp)) { + *p = wp; + return; + } - return(ml_puts(mbuf, "div", res)); + 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; + 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 */ + break; + case ('I'): + /* TODO */ + break; + case ('P'): + /* FALLTHROUGH */ + case ('R'): + /* TODO */ + break; + default: + break; + } + + *p = wp; + return; + + } else if ('[' != *wp) { + print_spec(h, wp, 1); + *p = wp; + return; + } + + 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; } -/* ARGSUSED */ -static int -html_blocktagname(struct md_mbuf *mbuf, - const struct md_args *args, int tok, size_t *res) +static void +print_encode(struct html *h, const char *p) { - return(ml_puts(mbuf, "div", res)); + 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; + } + } } -static int -html_printargs(struct md_mbuf *mbuf, int tok, const char *ns, - const int *argc, const char **argv, size_t *res) +struct tag * +print_otag(struct html *h, enum htmltag tag, + int sz, const struct htmlpair *p) { - int i, c; + int i; + struct tag *t; - 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 ( ! (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 (NULL == argv || NULL == argc) - return(1); - assert(argv && argc); - - /* FIXME: ignores values. */ + if ( ! (HTML_NOSPACE & h->flags)) + if ( ! (HTML_CLRLINE & htmltags[tag].flags)) + printf(" "); - 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); + 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(">"); - return(1); + h->flags |= HTML_NOSPACE; + if (HTML_CLRLINE & htmltags[tag].flags) + h->flags |= HTML_NEWLINE; + else + h->flags &= ~HTML_NEWLINE; + + return(t); } /* 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) +static void +print_ctag(struct html *h, enum htmltag tag) { - - return(html_printargs(mbuf, tok, "head", argc, argv, 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 int -html_blockbodytagargs(struct md_mbuf *mbuf, - const struct md_args *args, int tok, - const int *argc, const char **argv, size_t *res) +void +print_gen_doctype(struct html *h) { - - return(html_printargs(mbuf, tok, "body", argc, argv, res)); + + printf("", DOCTYPE, DTD); } -/* 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) +void +print_text(struct html *h, const char *p) { - return(html_printargs(mbuf, tok, "block", argc, argv, res)); -} + 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(" "); -/* 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) -{ + h->flags &= ~HTML_NOSPACE; + h->flags &= ~HTML_NEWLINE; - return(html_printargs(mbuf, tok, "inline", argc, argv, res)); + 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; + } } -/* ARGSUSED */ -static int -html_inlinetagname(struct md_mbuf *mbuf, - const struct md_args *args, int tok, size_t *res) +void +print_tagq(struct html *h, const struct tag *until) { + struct tag *tag; - switch (tok) { - case (ROFF_Pp): - return(ml_puts(mbuf, "div", res)); - default: - return(ml_puts(mbuf, "span", res)); + 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; } - 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) +void +print_stagq(struct html *h, const struct tag *suntil) { - size_t res; - struct htmlq *q; - struct htmlnode *node; + struct tag *tag; - 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); + 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); } +} - node->parent = q->last; - node->tok = tok; - node->ns = ns; - q->last = node; +void +bufinit(struct html *h) +{ - 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; - } - - return((ssize_t)res); + h->buf[0] = '\0'; + h->buflen = 0; } -static ssize_t -html_endtag(struct md_mbuf *mbuf, void *data, - const struct md_args *args, enum md_ns ns, int tok) +void +bufcat(struct html *h, const char *p) { - size_t res; - struct htmlq *q; - struct htmlnode *node; - assert(ns != MD_NS_DEFAULT); - res = 0; + bufncat(h, p, strlen(p)); +} - 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; - } +void +buffmt(struct html *h, const char *fmt, ...) +{ + va_list ap; - node = q->last; - q->last = node->parent; - - htmlnode_free(node); - - return((ssize_t)res); + 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); } -int -md_line_html(void *data, char *buf) +void +bufncat(struct html *h, const char *p, size_t sz) { - return(mlg_line((struct md_mlg *)data, buf)); + if (h->buflen + sz > BUFSIZ - 1) + sz = BUFSIZ - 1 - h->buflen; + + (void)strncat(h->buf, p, sz); + h->buflen += sz; } -int -md_exit_html(void *data, int flush) +void +buffmt_includes(struct html *h, const char *name) { + const char *p, *pp; - return(mlg_exit((struct md_mlg *)data, flush)); + pp = h->base_includes; + while ((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; + } + pp = p + 2; + } + if (pp) + bufcat(h, pp); } -void * -md_init_html(const struct md_args *args, - struct md_mbuf *mbuf, const struct md_rbuf *rbuf) +void +buffmt_man(struct html *h, + const char *name, const char *sec) { - struct htmlq *q; + const char *p, *pp; - if (NULL == (q = calloc(1, sizeof(struct htmlq)))) { - warn("calloc"); - return(NULL); + pp = h->base_man; + while ((p = strchr(pp, '%'))) { + bufncat(h, pp, (size_t)(p - pp)); + switch (*(p + 1)) { + case('S'): + bufcat(h, sec); + break; + case('N'): + buffmt(h, name ? name : "1"); + break; + default: + bufncat(h, p, 2); + break; + } + pp = p + 2; } - - return(mlg_alloc(args, q, rbuf, mbuf, html_begintag, - html_endtag, html_begin, html_end)); + if (pp) + bufcat(h, pp); } -