=================================================================== RCS file: /cvs/mandoc/html.c,v retrieving revision 1.12 retrieving revision 1.20 diff -u -p -r1.12 -r1.20 --- mandoc/html.c 2008/12/06 19:41:41 1.12 +++ mandoc/html.c 2008/12/10 00:58:15 1.20 @@ -1,4 +1,4 @@ -/* $Id: html.c,v 1.12 2008/12/06 19:41:41 kristaps Exp $ */ +/* $Id: html.c,v 1.20 2008/12/10 00:58:15 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -27,11 +27,9 @@ #include #include -#include "libmdocml.h" -#include "private.h" +#include "html.h" #include "ml.h" - /* TODO: allow head/tail-less invocations (just "div" start). */ struct htmlnode { @@ -42,19 +40,30 @@ struct htmlnode { struct htmlnode *parent; }; - struct htmlq { struct htmlnode *last; }; -static int html_loadcss(struct md_mbuf *, const char *); - +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, @@ -63,7 +72,7 @@ static int html_begin(struct md_mbuf *, const struct md_args *, const struct tm *, const char *, const char *, - const char *, const char *); + enum roffmsec, const char *); static int html_printargs(struct md_mbuf *, int, const char *, const int *, const char **, size_t *); @@ -107,6 +116,11 @@ static int html_It_headtagname(struct md_mbuf *, 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 *); /* ARGSUSED */ @@ -122,23 +136,23 @@ html_It_headtagname(struct md_mbuf *mbuf, struct htmlq break; assert(n); + + /* 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): /* FALLTHROUGH */ case (ROFF_Column): - return(ml_nputs(mbuf, "td", 2, res)); + return(html_stput(mbuf, HTML_TAG_TD, res)); default: break; } } - assert(i != ROFF_MAXLINEARG); - abort(); - /* NOTREACHED */ - - return(1); + return(0); } @@ -155,6 +169,8 @@ html_It_bodytagname(struct md_mbuf *mbuf, struct htmlq break; assert(n); + + /* LINTED */ for (i = 0; ROFF_ARGMAX != n->argc[i] && i < ROFF_MAXLINEARG; i++) { switch (n->argc[i]) { @@ -175,21 +191,18 @@ html_It_bodytagname(struct md_mbuf *mbuf, struct htmlq case (ROFF_Ohang): /* FALLTHROUGH */ case (ROFF_Inset): - return(ml_nputs(mbuf, "div", 3, res)); + return(html_stput(mbuf, HTML_TAG_DIV, res)); case (ROFF_Tag): /* FALLTHROUGH */ case (ROFF_Column): - return(ml_nputs(mbuf, "td", 2, res)); + return(html_stput(mbuf, HTML_TAG_TD, res)); default: break; } } assert(i != ROFF_MAXLINEARG); - abort(); - /* NOTREACHED */ - - return(1); + return(0); } @@ -204,7 +217,7 @@ html_Bl_bodytagname(struct md_mbuf *mbuf, struct htmlq && i < ROFF_MAXLINEARG; i++) { switch (argc[i]) { case (ROFF_Enum): - return(ml_nputs(mbuf, "ol", 2, res)); + return(html_stput(mbuf, HTML_TAG_OL, res)); case (ROFF_Bullet): /* FALLTHROUGH */ case (ROFF_Dash): @@ -220,19 +233,18 @@ html_Bl_bodytagname(struct md_mbuf *mbuf, struct htmlq case (ROFF_Ohang): /* FALLTHROUGH */ case (ROFF_Inset): - return(ml_nputs(mbuf, "ul", 2, res)); + return(html_stput(mbuf, HTML_TAG_UL, res)); case (ROFF_Tag): /* FALLTHROUGH */ case (ROFF_Column): - return(ml_nputs(mbuf, "table", 5, res)); + return(html_stput(mbuf, HTML_TAG_TABLE, res)); default: break; } } assert(i != ROFF_MAXLINEARG); - abort(); - /* NOTREACHED */ + return(0); } @@ -249,6 +261,8 @@ html_It_blocktagname(struct md_mbuf *mbuf, struct html break; assert(n); + + /* LINTED */ for (i = 0; ROFF_ARGMAX != n->argc[i] && i < ROFF_MAXLINEARG; i++) { switch (n->argc[i]) { @@ -269,19 +283,18 @@ html_It_blocktagname(struct md_mbuf *mbuf, struct html case (ROFF_Ohang): /* FALLTHROUGH */ case (ROFF_Inset): - return(ml_nputs(mbuf, "li", 2, res)); + return(html_stput(mbuf, HTML_TAG_LI, res)); case (ROFF_Tag): /* FALLTHROUGH */ case (ROFF_Column): - return(ml_nputs(mbuf, "tr", 2, res)); + return(html_stput(mbuf, HTML_TAG_TR, res)); default: break; } } assert(i != ROFF_MAXLINEARG); - abort(); - /* NOTREACHED */ + return(0); } @@ -339,62 +352,152 @@ out: } +static int +html_tputln(struct md_mbuf *mbuf, enum ml_scope scope, + int i, enum html_tag tag) +{ + + 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)); +} + + +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) +{ + + 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)); +} + + /* 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) + const char *name, enum roffmsec msec, const char *vol) { - const char *preamble, *css, *trail; - char buf[512]; - size_t res; + struct html_pair attr[4]; + char ts[32]; + int i; - preamble = - "\n" - "\n" - "\n" - " \n" - " \n" - " Manual Page for %s(%s)\n"; + (void)snprintf(ts, sizeof(ts), "%s(%s)", + name, roff_msecname(msec)); - css = - " \n"; - trail = - "\n" - "\n" - "
"; + i = 0; - res = 0; + if ( ! html_typeput(mbuf, HTML_TYPE_4_01_STRICT, NULL)) + return(0); + if ( ! html_tputln(mbuf, ML_OPEN, i, HTML_TAG_HTML)) + return(0); + if ( ! html_tputln(mbuf, ML_OPEN, i++, HTML_TAG_HEAD)) + return(0); - (void)snprintf(buf, sizeof(buf) - 1, - preamble, title, section); + 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 ( ! ml_puts(mbuf, buf, &res)) + if ( ! html_aputln(mbuf, ML_OPEN, i, HTML_TAG_META, 2, attr)) return(0); - assert(args->params.html.css); + attr[0].attr = HTML_ATTR_NAME; + attr[0].val = "resource-type"; + attr[1].attr = HTML_ATTR_CONTENT; + attr[1].val = "document"; + + if ( ! html_aputln(mbuf, ML_OPEN, i, HTML_TAG_META, 2, attr)) + return(0); + + if ( ! html_tputln(mbuf, ML_OPEN, i, HTML_TAG_TITLE)) + return(0); + if ( ! ml_putstring(mbuf, ts, NULL)) + return(0); + if ( ! html_tputln(mbuf, ML_CLOSE, i, HTML_TAG_TITLE)) + return(0); + if (HTML_CSS_EMBED & args->params.html.flags) { - if ( ! ml_puts(mbuf, " \n", &res)) + + if ( ! html_commentput(mbuf, ML_CLOSE, NULL)) + return(NULL); + if ( ! html_tputln(mbuf, ML_CLOSE, i, HTML_TAG_STYLE)) return(0); } else { - (void)snprintf(buf, sizeof(buf) - 1, css, - args->params.html.css); - if ( ! ml_puts(mbuf, buf, &res)) + 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 = args->params.html.css; + + if ( ! html_aputln(mbuf, ML_OPEN, i, + HTML_TAG_LINK, 3, attr)) return(0); } - if ( ! ml_puts(mbuf, trail, &res)) + if ( ! html_tputln(mbuf, ML_CLOSE, --i, HTML_TAG_HEAD)) return(0); + if ( ! html_tputln(mbuf, ML_OPEN, i, HTML_TAG_BODY)) + return(0); - return(1); + attr[0].attr = HTML_ATTR_CLASS; + attr[0].val = "mdoc"; + + if ( ! html_aputln(mbuf, ML_OPEN, i, HTML_TAG_DIV, 1, attr)) + return(0); + + attr[0].attr = HTML_ATTR_WIDTH; + attr[0].val = "100%"; + + if ( ! html_aputln(mbuf, ML_OPEN, i++, HTML_TAG_TABLE, 1, attr)) + return(0); + if ( ! html_tputln(mbuf, ML_OPEN, i++, HTML_TAG_TR)) + return(0); + + if ( ! html_tputln(mbuf, ML_OPEN, i, HTML_TAG_TD)) + return(0); + if ( ! ml_putstring(mbuf, ts, NULL)) + return(0); + if ( ! html_tputln(mbuf, ML_CLOSE, i, HTML_TAG_TD)) + return(0); + + if ( ! html_tputln(mbuf, ML_OPEN, i, HTML_TAG_TD)) + return(0); + /* TODO: middle. */ + if ( ! html_tputln(mbuf, ML_CLOSE, i, HTML_TAG_TD)) + return(0); + + attr[0].attr = HTML_ATTR_ALIGN; + attr[0].val = "right"; + + if ( ! html_aputln(mbuf, ML_OPEN, i, HTML_TAG_TD, 1, attr)) + return(0); + if ( ! ml_putstring(mbuf, ts, NULL)) + return(0); + if ( ! html_tputln(mbuf, ML_CLOSE, i, HTML_TAG_TD)) + return(0); + + if ( ! html_tputln(mbuf, ML_CLOSE, --i, HTML_TAG_TR)) + return(0); + return(html_tputln(mbuf, ML_CLOSE, --i, HTML_TAG_TABLE)); } @@ -403,7 +506,11 @@ static int html_end(struct md_mbuf *mbuf, const struct md_args *args) { - return(ml_puts(mbuf, "
\n", NULL)); + if ( ! html_tputln(mbuf, ML_CLOSE, 0, HTML_TAG_DIV)) + return(0); + if ( ! html_tputln(mbuf, ML_CLOSE, 0, HTML_TAG_BODY)) + return(0); + return(html_tputln(mbuf, ML_CLOSE, 0, HTML_TAG_HTML)); } @@ -418,16 +525,16 @@ html_bodytagname(struct md_mbuf *mbuf, case (ROFF_Bl): return(html_Bl_bodytagname(mbuf, q, argc, argv, res)); case (ROFF_Fo): - return(ml_nputs(mbuf, "span", 4, res)); + return(html_stput(mbuf, HTML_TAG_SPAN, res)); case (ROFF_It): return(html_It_bodytagname(mbuf, q, argc, argv, res)); case (ROFF_Oo): - return(ml_nputs(mbuf, "span", 4, res)); + return(html_stput(mbuf, HTML_TAG_SPAN, res)); default: break; } - return(ml_puts(mbuf, "div", res)); + return(html_stput(mbuf, HTML_TAG_DIV, res)); } @@ -442,18 +549,18 @@ html_headtagname(struct md_mbuf *mbuf, case (ROFF_It): return(html_It_headtagname(mbuf, q, argc, argv, res)); case (ROFF_Fo): - return(ml_nputs(mbuf, "span", 4, res)); + /* FALLTHROUGH */ case (ROFF_Oo): - return(ml_nputs(mbuf, "span", 4, res)); + return(html_stput(mbuf, HTML_TAG_SPAN, res)); case (ROFF_Sh): - return(ml_nputs(mbuf, "h1", 2, res)); + return(html_stput(mbuf, HTML_TAG_H1, res)); case (ROFF_Ss): - return(ml_nputs(mbuf, "h2", 2, res)); + return(html_stput(mbuf, HTML_TAG_H2, res)); default: break; } - return(ml_nputs(mbuf, "div", 3, res)); + return(html_stput(mbuf, HTML_TAG_DIV, res)); } @@ -466,16 +573,16 @@ html_blocktagname(struct md_mbuf *mbuf, const struct m switch (tok) { case (ROFF_Fo): - return(ml_nputs(mbuf, "span", 4, res)); + /* FALLTHROUGH */ case (ROFF_Oo): - return(ml_nputs(mbuf, "span", 4, res)); + return(html_stput(mbuf, HTML_TAG_SPAN, res)); case (ROFF_It): return(html_It_blocktagname(mbuf, q, argc, argv, res)); default: break; } - return(ml_puts(mbuf, "div", res)); + return(html_stput(mbuf, HTML_TAG_DIV, res)); } @@ -485,6 +592,8 @@ html_printargs(struct md_mbuf *mbuf, int tok, const ch const int *argc, const char **argv, size_t *res) { + /* FIXME: use API in ml.h. */ + if ( ! ml_puts(mbuf, " class=\"", res)) return(0); if ( ! ml_puts(mbuf, ns, res)) @@ -542,6 +651,9 @@ html_inlinetagargs(struct md_mbuf *mbuf, switch (tok) { case (ROFF_Sx): + + /* FIXME: use API in ml.h. */ + assert(*argv); if ( ! ml_nputs(mbuf, " href=\"#", 8, res)) return(0); @@ -549,6 +661,7 @@ html_inlinetagargs(struct md_mbuf *mbuf, return(0); if ( ! ml_nputs(mbuf, "\"", 1, res)) return(0); + break; default: break; } @@ -565,14 +678,14 @@ html_inlinetagname(struct md_mbuf *mbuf, switch (tok) { case (ROFF_Pp): - return(ml_nputs(mbuf, "div", 3, res)); + return(html_stput(mbuf, HTML_TAG_DIV, res)); case (ROFF_Sx): - return(ml_nputs(mbuf, "a", 1, res)); + return(html_stput(mbuf, HTML_TAG_A, res)); default: break; } - return(ml_puts(mbuf, "span", res)); + return(html_stput(mbuf, HTML_TAG_SPAN, res)); } @@ -605,6 +718,7 @@ html_begintag(struct md_mbuf *mbuf, void *data, /* TODO: argv. */ assert(argv); + /* LINTED */ for (i = 0; ROFF_ARGMAX != argc[i] && i < ROFF_MAXLINEARG; i++) node->argc[i] = argc[i]; @@ -721,6 +835,7 @@ html_free(void *p) assert(p); q = (struct htmlq *)p; + /* LINTED */ while ((n = q->last)) { q->last = n->parent; free(n); @@ -730,6 +845,66 @@ html_free(void *p) } +static ssize_t +html_beginhttp(struct md_mbuf *mbuf, + const struct md_args *args, + const char *buf, size_t sz) +{ + 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); +} + + +static ssize_t +html_endhttp(struct md_mbuf *mbuf, + const struct md_args *args, + const char *buf, size_t sz) +{ + size_t res; + + res = 0; + if ( ! html_tput(mbuf, ML_CLOSE, HTML_TAG_A, &res)) + return(-1); + return((ssize_t)res); +} + + +/* ARGSUSED */ +static ssize_t +html_beginstring(struct md_mbuf *mbuf, + const struct md_args *args, + const char *buf, size_t sz) +{ + + if (0 == strncmp(buf, "http://", 7)) + return(html_beginhttp(mbuf, args, buf, sz)); + + return(0); +} + + +/* ARGSUSED */ +static ssize_t +html_endstring(struct md_mbuf *mbuf, + const struct md_args *args, + const char *buf, size_t sz) +{ + + if (0 == strncmp(buf, "http://", 7)) + return(html_endhttp(mbuf, args, buf, sz)); + + return(0); +} + + int md_line_html(void *data, char *buf) { @@ -758,7 +933,8 @@ md_init_html(const struct md_args *args, 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)); } -