=================================================================== RCS file: /cvs/mandoc/html.c,v retrieving revision 1.5 retrieving revision 1.17 diff -u -p -r1.5 -r1.17 --- mandoc/html.c 2008/12/04 16:19:52 1.5 +++ mandoc/html.c 2008/12/09 17:09:12 1.17 @@ -1,4 +1,4 @@ -/* $Id: html.c,v 1.5 2008/12/04 16:19:52 kristaps Exp $ */ +/* $Id: html.c,v 1.17 2008/12/09 17:09:12 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -27,50 +27,293 @@ #include #include -#include "libmdocml.h" #include "private.h" #include "ml.h" +#define TAG_HTML "" +#define TAG_BODY "" +#define TAG_DIV_MDOC "
" +#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 "" +/* TODO: allow head/tail-less invocations (just "div" start). */ + +struct htmlnode { + int tok; + enum md_ns ns; + int argc[ROFF_MAXLINEARG]; + char *argv[ROFF_MAXLINEARG]; + struct htmlnode *parent; +}; + + +struct htmlq { + struct htmlnode *last; +}; + + static int html_loadcss(struct md_mbuf *, const char *); -static ssize_t html_endtag(struct md_mbuf *, +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_begintag(struct md_mbuf *, +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 *, - 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 ssize_t html_blocktagname(struct md_mbuf *, - const struct md_args *, int); -static ssize_t html_blocktagargs(struct md_mbuf *, +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 **); -static ssize_t html_blockheadtagname(struct md_mbuf *, - const struct md_args *, int); -static ssize_t html_blockheadtagargs(struct md_mbuf *, + 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 **); -static ssize_t html_blockbodytagname(struct md_mbuf *, - const struct md_args *, int); -static ssize_t html_blockbodytagargs(struct md_mbuf *, + 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 **); -static ssize_t html_inlinetagname(struct md_mbuf *, - const struct md_args *, int); -static ssize_t html_inlinetagargs(struct md_mbuf *, + 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 **); + 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) +{ + 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_Ohang): + return(ml_nputs(mbuf, "div", 3, res)); + case (ROFF_Tag): + /* FALLTHROUGH */ + case (ROFF_Column): + return(ml_nputs(mbuf, "td", 2, res)); + default: + break; + } + } + + 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; + } + } + + 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 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: + 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) + 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); +} + + +static int html_loadcss(struct md_mbuf *mbuf, const char *css) { size_t res, bufsz; @@ -128,58 +371,75 @@ out: 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 *title, enum roffmsec section, const char *vol) { - const char *preamble, *css, *trail; - char buf[512]; + char mtitle[128], css[128]; size_t res; - preamble = - "\n" - "\n" - "\n" - " \n" - " \n" - " Manual Page for %s(%s)\n"; + (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); - css = - " \n"; - trail = - "\n" - "\n" - "
\n"; - res = 0; - (void)snprintf(buf, sizeof(buf) - 1, - preamble, title, section); - - if ( ! ml_puts(mbuf, buf, &res)) + if ( ! ml_puts(mbuf, TAG_DOCTYPE, &res)) return(0); + if ( ! ml_nputs(mbuf, "\n", 1, &res)) + return(0); + if ( ! ml_puts(mbuf, TAG_HTML, &res)) + return(0); + if ( ! ml_nputs(mbuf, "\n", 1, &res)) + return(0); + if ( ! ml_puts(mbuf, TAG_BODY, &res)) + return(0); + if ( ! ml_nputs(mbuf, "\n", 1, &res)) + return(0); + if ( ! ml_puts(mbuf, TAG_CONTTYPE, &res)) + return(0); + if ( ! ml_nputs(mbuf, "\n", 1, &res)) + return(0); + if ( ! ml_puts(mbuf, TAG_RESTYPE, &res)) + return(0); + if ( ! ml_nputs(mbuf, "\n", 1, &res)) + return(0); + if ( ! ml_puts(mbuf, TAG_TITLE, &res)) + return(0); + if ( ! ml_putstring(mbuf, mtitle, &res)) + return(0); + if ( ! ml_puts(mbuf, TAG_TITLE_END, &res)) + return(0); + if ( ! ml_nputs(mbuf, "\n", 1, &res)) + return(0); - assert(args->params.html.css); if (HTML_CSS_EMBED & args->params.html.flags) { - if ( ! ml_puts(mbuf, " \n", &res)) + if ( ! ml_puts(mbuf, TAG_STYLE_END, &res)) return(0); - } else { - (void)snprintf(buf, sizeof(buf) - 1, css, - args->params.html.css); - if ( ! ml_puts(mbuf, buf, &res)) - return(0); - } + } else if ( ! ml_puts(mbuf, css, &res)) + return(0); - if ( ! ml_puts(mbuf, trail, &res)) + if ( ! ml_puts(mbuf, "\n", &res)) return(0); - return(1); + if ( ! ml_puts(mbuf, TAG_HEAD_END, &res)) + return(0); + if ( ! ml_nputs(mbuf, "\n", 1, &res)) + return(0); + if ( ! ml_puts(mbuf, TAG_BODY, &res)) + return(0); + if ( ! ml_nputs(mbuf, "\n", 1, &res)) + return(0); + if ( ! ml_puts(mbuf, TAG_DIV_MDOC, &res)) + return(0); + return(ml_nputs(mbuf, "\n", 1, &res)); } @@ -187,181 +447,251 @@ html_begin(struct md_mbuf *mbuf, const struct md_args static int html_end(struct md_mbuf *mbuf, const struct md_args *args) { - size_t res; - res = 0; - if ( ! ml_puts(mbuf, "
\n", &res)) - return(0); - - return(1); + return(ml_puts(mbuf, "
\n", NULL)); } /* ARGSUSED */ -static ssize_t -html_blockbodytagname(struct md_mbuf *mbuf, - const struct md_args *args, int tok) +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) { - size_t res; - res = 0; - if ( ! ml_puts(mbuf, "div", &res)) - return(-1); + 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((ssize_t)res); + return(ml_puts(mbuf, "div", res)); } - - /* ARGSUSED */ -static ssize_t -html_blockheadtagname(struct md_mbuf *mbuf, - const struct md_args *args, int tok) +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) { - size_t res; - res = 0; - if ( ! ml_puts(mbuf, "div", &res)) - return(-1); + 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; + } - return((ssize_t)res); + return(ml_nputs(mbuf, "div", 3, res)); } /* ARGSUSED */ -static ssize_t -html_blocktagname(struct md_mbuf *mbuf, - const struct md_args *args, int tok) +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) { - size_t res; - res = 0; - if ( ! ml_puts(mbuf, "div", &res)) - return(-1); + 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; + } - return((ssize_t)res); + return(ml_puts(mbuf, "div", res)); } /* ARGSUSED */ -static ssize_t -html_blockheadtagargs(struct md_mbuf *mbuf, const struct md_args *args, - int tok, const int *argc, const char **argv) +static int +html_printargs(struct md_mbuf *mbuf, int tok, const char *ns, + const int *argc, const char **argv, size_t *res) { - size_t res; - res = 0; - - if ( ! ml_puts(mbuf, " class=\"head-", &res)) + if ( ! ml_puts(mbuf, " class=\"", res)) return(0); - if ( ! ml_puts(mbuf, toknames[tok], &res)) + if ( ! ml_puts(mbuf, ns, res)) return(0); - if ( ! ml_puts(mbuf, "\"", &res)) + if ( ! ml_puts(mbuf, "-", res)) return(0); + if ( ! ml_puts(mbuf, toknames[tok], res)) + return(0); + return(ml_puts(mbuf, "\"", res)); +} - switch (tok) { - default: - break; - } - 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) +{ + + return(html_printargs(mbuf, tok, "head", argc, argv, res)); } /* ARGSUSED */ -static ssize_t -html_blockbodytagargs(struct md_mbuf *mbuf, const struct md_args *args, - int tok, const int *argc, const char **argv) +static int +html_bodytagargs(struct md_mbuf *mbuf, + const struct md_args *args, int tok, + const int *argc, const char **argv, size_t *res) { - size_t res; - res = 0; + return(html_printargs(mbuf, tok, "body", argc, argv, res)); +} - if ( ! ml_puts(mbuf, " class=\"body-", &res)) - return(0); - if ( ! ml_puts(mbuf, toknames[tok], &res)) - return(0); - if ( ! ml_puts(mbuf, "\"", &res)) - return(0); - switch (tok) { - default: - break; - } +/* 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(res); + return(html_printargs(mbuf, tok, "block", argc, argv, res)); } /* ARGSUSED */ -static ssize_t -html_blocktagargs(struct md_mbuf *mbuf, const struct md_args *args, - int tok, const int *argc, const char **argv) +static int +html_inlinetagargs(struct md_mbuf *mbuf, + const struct md_args *args, int tok, + const int *argc, const char **argv, size_t *res) { - size_t res; - res = 0; - - if ( ! ml_puts(mbuf, " class=\"block-", &res)) + if ( ! html_printargs(mbuf, tok, "inline", argc, argv, res)) return(0); - if ( ! ml_puts(mbuf, toknames[tok], &res)) - return(0); - if ( ! ml_puts(mbuf, "\"", &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; } - - return(0); + + return(1); } /* ARGSUSED */ -static ssize_t -html_inlinetagargs(struct md_mbuf *mbuf, const struct md_args *args, - int tok, const int *argc, const char **argv) +static int +html_inlinetagname(struct md_mbuf *mbuf, + const struct md_args *args, int tok, size_t *res) { - size_t res; - res = 0; - - if ( ! ml_puts(mbuf, " class=\"inline-", &res)) - return(0); - if ( ! ml_puts(mbuf, toknames[tok], &res)) - return(0); - if ( ! ml_puts(mbuf, "\"", &res)) - return(0); - - switch (tok) { + case (ROFF_Pp): + return(ml_nputs(mbuf, "div", 3, res)); + case (ROFF_Sx): + return(ml_nputs(mbuf, "a", 1, res)); default: break; } - return(0); + return(ml_puts(mbuf, "span", res)); } -/* ARGSUSED */ -static ssize_t -html_inlinetagname(struct md_mbuf *mbuf, - const struct md_args *args, int tok) +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; - switch (tok) { - case (ROFF_Pp): - if ( ! ml_puts(mbuf, "div", &res)) + assert(data); + q = (struct htmlq *)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(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 ( ! ml_puts(mbuf, "span", &res)) + if ( ! html_inlinetagname(mbuf, args, tok, &res)) return(-1); + if ( ! html_inlinetagargs(mbuf, args, tok, + argc, argv, &res)) + return(-1); break; } @@ -370,59 +700,148 @@ html_inlinetagname(struct md_mbuf *mbuf, static ssize_t -html_begintag(struct md_mbuf *mbuf, const struct md_args *args, - enum md_ns ns, int tok, - const int *argc, const char **argv) +html_endtag(struct md_mbuf *mbuf, void *data, + const struct md_args *args, enum md_ns ns, int tok) { + 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)) - return(0); - return(html_blocktagargs(mbuf, args, - tok, argc, argv)); + if ( ! html_blocktagname(mbuf, args, tok, + q, node->argc, + (const char **)node->argv, &res)) + return(-1); + break; case (MD_NS_BODY): - if ( ! html_blockbodytagname(mbuf, args, tok)) - return(0); - return(html_blockbodytagargs(mbuf, args, - tok, argc, argv)); + if ( ! html_bodytagname(mbuf, args, tok, + q, node->argc, + (const char **)node->argv, &res)) + return(-1); + break; case (MD_NS_HEAD): - if ( ! html_blockheadtagname(mbuf, args, tok)) - return(0); - return(html_blockheadtagargs(mbuf, args, - tok, argc, argv)); + 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; } - if ( ! html_inlinetagname(mbuf, args, tok)) + q->last = node->parent; + + free(node); + + return((ssize_t)res); +} + + +static int +html_alloc(void **p) +{ + + if (NULL == (*p = calloc(1, sizeof(struct htmlq)))) { + warn("calloc"); return(0); - return(html_inlinetagargs(mbuf, args, tok, argc, argv)); + } + return(1); } -static ssize_t -html_endtag(struct md_mbuf *mbuf, const struct md_args *args, - enum md_ns ns, int tok) +static void +html_free(void *p) { + struct htmlq *q; + struct htmlnode *n; - assert(ns != MD_NS_DEFAULT); - switch (ns) { - case (MD_NS_BLOCK): - return(html_blocktagname(mbuf, args, tok)); - case (MD_NS_BODY): - return(html_blockbodytagname(mbuf, args, tok)); - case (MD_NS_HEAD): - return(html_blockheadtagname(mbuf, args, tok)); - default: - break; + assert(p); + q = (struct htmlq *)p; + + /* LINTED */ + while ((n = q->last)) { + q->last = n->parent; + free(n); } - return(html_inlinetagname(mbuf, args, tok)); + free(q); } +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); +} + + +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 ( ! ml_puts(mbuf, "", &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) { @@ -443,8 +862,16 @@ void * md_init_html(const struct md_args *args, struct md_mbuf *mbuf, const struct md_rbuf *rbuf) { + struct ml_cbs cbs; - return(mlg_alloc(args, rbuf, mbuf, html_begintag, - html_endtag, html_begin, html_end)); -} + 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)); +}