" -#define TAG_TITLE

=================================================================== RCS file: /cvs/mandoc/html.c,v retrieving revision 1.18 retrieving revision 1.26 diff -u -p -r1.18 -r1.26 --- mandoc/html.c 2008/12/09 19:57:26 1.18 +++ mandoc/html.c 2008/12/10 17:40:56 1.26 @@ -1,4 +1,4 @@ -/* $Id: html.c,v 1.18 2008/12/09 19:57:26 kristaps Exp $ */ +/* $Id: html.c,v 1.26 2008/12/10 17:40:56 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -27,31 +27,9 @@ #include #include -#include "private.h" +#include "html.h" #include "ml.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 "" - /* TODO: allow head/tail-less invocations (just "div" start). */ struct htmlnode { @@ -62,45 +40,41 @@ 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 *, +static ssize_t html_endtag(struct ml_args *, enum md_ns, int); -static ssize_t html_beginstring(struct md_mbuf *, - const struct md_args *, +static ssize_t html_beginstring(struct ml_args *, const char *, size_t); -static ssize_t html_beginhttp(struct md_mbuf *, - const struct md_args *, +static ssize_t html_endstring(struct ml_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, +static ssize_t html_begintag(struct ml_args *, + enum md_ns, int, const int *, const char **); -static int html_begin(struct md_mbuf *, - const struct md_args *, +static int html_begin(struct ml_args *, const struct tm *, const char *, const char *, - enum roffmsec, const char *); + enum roffmsec, enum roffvol); +static int html_end(struct ml_args *, + const struct tm *, + const char *, const char *, + enum roffmsec, enum roffvol); 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_beginhttp(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 int html_blocktagname(struct md_mbuf *, const struct md_args *, int, struct htmlq *, const int *, @@ -139,6 +113,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 */ @@ -148,6 +127,7 @@ html_It_headtagname(struct md_mbuf *mbuf, struct htmlq { struct htmlnode *n; int i; + struct html_pair attr[2]; for (n = q->last; n; n = n->parent) if (n->tok == ROFF_Bl) @@ -160,11 +140,19 @@ html_It_headtagname(struct md_mbuf *mbuf, struct htmlq i < ROFF_MAXLINEARG; i++) { switch (n->argc[i]) { case (ROFF_Ohang): - return(ml_nputs(mbuf, "div", 3, res)); + return(html_stput(mbuf, HTML_TAG_DIV, res)); case (ROFF_Tag): - /* FALLTHROUGH */ + attr[0].attr = HTML_ATTR_VALIGN; + attr[0].val = "top"; + attr[1].attr = HTML_ATTR_NOWRAP; + attr[1].val = "true"; + return(html_saput(mbuf, HTML_TAG_TD, + res, 2, attr)); case (ROFF_Column): - return(ml_nputs(mbuf, "td", 2, res)); + attr[0].attr = HTML_ATTR_VALIGN; + attr[0].val = "top"; + return(html_saput(mbuf, HTML_TAG_TD, + res, 1, attr)); default: break; } @@ -181,6 +169,7 @@ html_It_bodytagname(struct md_mbuf *mbuf, struct htmlq { struct htmlnode *n; int i; + struct html_pair attr[1]; for (n = q->last; n; n = n->parent) if (n->tok == ROFF_Bl) @@ -209,11 +198,14 @@ 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)); + attr[0].attr = HTML_ATTR_VALIGN; + attr[0].val = "top"; + return(html_saput(mbuf, HTML_TAG_TD, + res, 1, attr)); default: break; } @@ -235,7 +227,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): @@ -251,11 +243,11 @@ 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; } @@ -301,11 +293,11 @@ 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; } @@ -371,121 +363,273 @@ out: static int -html_putline(struct md_mbuf *mbuf, size_t indent, - const char *p, size_t *res) +html_tputln(struct md_mbuf *mbuf, enum ml_scope scope, + int i, enum html_tag tag) { - /* FIXME: use INDENT macro for this. */ - if ( ! ml_putchars(mbuf, ' ', indent * 4, res)) + if ( ! ml_putchars(mbuf, ' ', INDENT(i) * INDENT_SZ, NULL)) return(0); - if ( ! ml_puts(mbuf, p, res)) + if ( ! html_tput(mbuf, scope, tag, NULL)) return(0); - return(ml_nputs(mbuf, "\n", 1, res)); + return(ml_nputs(mbuf, "\n", 1, NULL)); } static int -html_putlinestart(struct md_mbuf *mbuf, size_t indent, - const char *p, size_t *res) +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 * 4, res)) + if ( ! ml_putchars(mbuf, ' ', INDENT(i) * INDENT_SZ, NULL)) return(0); - return(ml_puts(mbuf, p, res)); + 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, enum roffmsec section, - const char *vol) +html_begin(struct ml_args *p, const struct tm *tm, const char *os, + const char *name, enum roffmsec msec, enum roffvol vol) { - char mtitle[128], css[128]; - size_t i; + enum roffvol bvol; + struct html_pair attr[4]; + char ts[32], title[64]; + int i; - (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); + (void)snprintf(ts, sizeof(ts), "%s(%s)", + name, roff_msecname(msec)); + if (vol >= ROFF_ARCH_START) { + switch (msec) { + case(ROFF_MSEC_1): + /* FALLTHROUGH */ + case(ROFF_MSEC_6): + /* FALLTHROUGH */ + case(ROFF_MSEC_7): + bvol = ROFF_VOL_URM; + break; + case(ROFF_MSEC_2): + /* FALLTHROUGH */ + case(ROFF_MSEC_3): + /* FALLTHROUGH */ + case(ROFF_MSEC_3p): + /* FALLTHROUGH */ + case(ROFF_MSEC_4): + /* FALLTHROUGH */ + case(ROFF_MSEC_5): + bvol = ROFF_VOL_PRM; + break; + case(ROFF_MSEC_8): + bvol = ROFF_VOL_PRM; + break; + case(ROFF_MSEC_9): + bvol = ROFF_VOL_KM; + break; + case(ROFF_MSEC_UNASS): + /* FALLTHROUGH */ + case(ROFF_MSEC_DRAFT): + /* FALLTHROUGH */ + case(ROFF_MSEC_PAPER): + bvol = ROFF_VOL_NONE; + break; + default: + abort(); + /* NOTREACHED */ + } + + (void)snprintf(title, sizeof(title), "%s (%s)", + roff_volname(bvol), roff_volname(vol)); + } else + (void)snprintf(title, sizeof(title), "%s", roff_volname(vol)); + + i = 0; - if ( ! html_putline(mbuf, i, TAG_DOCTYPE, NULL)) + if ( ! html_typeput(p->mbuf, HTML_TYPE_4_01_STRICT, NULL)) return(0); - if ( ! html_putline(mbuf, i, TAG_HTML, NULL)) + if ( ! html_tputln(p->mbuf, ML_OPEN, i, HTML_TAG_HTML)) return(0); - if ( ! html_putline(mbuf, i++, TAG_HEAD, NULL)) + if ( ! html_tputln(p->mbuf, ML_OPEN, i++, HTML_TAG_HEAD)) return(0); - if ( ! html_putline(mbuf, i, TAG_CONTTYPE, NULL)) + + 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 ( ! html_aputln(p->mbuf, ML_OPEN, i, HTML_TAG_META, 2, attr)) return(0); - if ( ! html_putline(mbuf, i, TAG_RESTYPE, NULL)) + + attr[0].attr = HTML_ATTR_NAME; + attr[0].val = "resource-type"; + attr[1].attr = HTML_ATTR_CONTENT; + attr[1].val = "document"; + + if ( ! html_aputln(p->mbuf, ML_OPEN, i, HTML_TAG_META, 2, attr)) return(0); - if ( ! html_putlinestart(mbuf, i, TAG_TITLE, NULL)) + + if ( ! html_tputln(p->mbuf, ML_OPEN, i, HTML_TAG_TITLE)) return(0); - if ( ! ml_putstring(mbuf, mtitle, NULL)) + if ( ! ml_putstring(p->mbuf, ts, NULL)) return(0); - if ( ! html_putline(mbuf, i, TAG_TITLE_END, NULL)) + if ( ! html_tputln(p->mbuf, ML_CLOSE, i, HTML_TAG_TITLE)) return(0); - if (HTML_CSS_EMBED & args->params.html.flags) { - if ( ! html_putline(mbuf, i, TAG_STYLE_CSS, NULL)) + if (HTML_CSS_EMBED & p->args->params.html.flags) { + attr[0].attr = HTML_ATTR_TYPE; + attr[0].val = "text/css"; + + if ( ! html_aputln(p->mbuf, ML_OPEN, i, + HTML_TAG_STYLE, 1, attr)) return(0); - if ( ! html_loadcss(mbuf, args->params.html.css)) + if ( ! html_commentput(p->mbuf, ML_OPEN, NULL)) return(0); - if ( ! html_putline(mbuf, i, TAG_STYLE_END, NULL)) + + if ( ! html_loadcss(p->mbuf, p->args->params.html.css)) return(0); - } else if ( ! html_putline(mbuf, i, css, NULL)) - return(0); - if ( ! html_putline(mbuf, --i, TAG_HEAD_END, NULL)) + if ( ! html_commentput(p->mbuf, ML_CLOSE, NULL)) + return(0); + if ( ! html_tputln(p->mbuf, ML_CLOSE, i, HTML_TAG_STYLE)) + return(0); + } else { + 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 = p->args->params.html.css; + + if ( ! html_aputln(p->mbuf, ML_OPEN, i, + HTML_TAG_LINK, 3, attr)) + return(0); + } + + if ( ! html_tputln(p->mbuf, ML_CLOSE, --i, HTML_TAG_HEAD)) return(0); - if ( ! html_putline(mbuf, i, TAG_BODY, NULL)) + if ( ! html_tputln(p->mbuf, ML_OPEN, i, HTML_TAG_BODY)) return(0); - if ( ! html_putline(mbuf, i, TAG_DIV_MDOC, NULL)) + + attr[0].attr = HTML_ATTR_CLASS; + attr[0].val = "mdoc"; + + if ( ! html_aputln(p->mbuf, ML_OPEN, i, HTML_TAG_DIV, 1, attr)) return(0); - if ( ! html_putline(mbuf, i++, "", NULL)) + + attr[0].attr = HTML_ATTR_WIDTH; + attr[0].val = "100%"; + attr[1].attr = HTML_ATTR_CLASS; + attr[1].val = "header-table"; + + if ( ! html_aputln(p->mbuf, ML_OPEN, i++, HTML_TAG_TABLE, 2, attr)) return(0); - if ( ! html_putline(mbuf, i++, "", NULL)) + if ( ! html_tputln(p->mbuf, ML_OPEN, i++, HTML_TAG_TR)) return(0); - if ( ! html_putline(mbuf, i++, "", NULL)) + if ( ! html_tputln(p->mbuf, ML_CLOSE, i, HTML_TAG_TD)) return(0); - if ( ! html_putline(mbuf, i++, "", NULL)) + if ( ! html_tputln(p->mbuf, ML_CLOSE, i, HTML_TAG_TD)) return(0); - if ( ! html_putline(mbuf, i++, "", NULL)) + if ( ! html_tputln(p->mbuf, ML_CLOSE, i, HTML_TAG_TD)) return(0); - if ( ! html_putline(mbuf, --i, "", NULL)) + + if ( ! html_tputln(p->mbuf, ML_CLOSE, --i, HTML_TAG_TR)) return(0); - if ( ! html_putline(mbuf, --i, "

", NULL)) + + attr[0].attr = HTML_ATTR_ALIGN; + attr[0].val = "left"; + attr[1].attr = HTML_ATTR_CLASS; + attr[1].val = "header-section"; + + if ( ! html_aputln(p->mbuf, ML_OPEN, i, HTML_TAG_TD, 2, attr)) return(0); - if ( ! ml_putstring(mbuf, title, NULL)) + if ( ! ml_putstring(p->mbuf, ts, NULL)) return(0); - if ( ! html_putline(mbuf, --i, "

", NULL)) + + attr[0].attr = HTML_ATTR_ALIGN; + attr[0].val = "center"; + attr[1].attr = HTML_ATTR_CLASS; + attr[1].val = "header-volume"; + + if ( ! html_aputln(p->mbuf, ML_OPEN, i, HTML_TAG_TD, 2, attr)) return(0); - if ( ! ml_putstring(mbuf, "Hello, world.", NULL)) + if ( ! ml_putstring(p->mbuf, title, NULL)) return(0); - if ( ! html_putline(mbuf, --i, "

", NULL)) + + attr[0].attr = HTML_ATTR_ALIGN; + attr[0].val = "right"; + attr[1].attr = HTML_ATTR_CLASS; + attr[1].val = "header-section"; + + if ( ! html_aputln(p->mbuf, ML_OPEN, i, HTML_TAG_TD, 2, attr)) return(0); - if ( ! ml_putstring(mbuf, title, NULL)) + if ( ! ml_putstring(p->mbuf, ts, NULL)) return(0); - if ( ! html_putline(mbuf, --i, "

", NULL)) - return(0); - return(1); + return(html_tputln(p->mbuf, ML_CLOSE, --i, HTML_TAG_TABLE)); } /* ARGSUSED */ static int -html_end(struct md_mbuf *mbuf, const struct md_args *args) +html_end(struct ml_args *p, const struct tm *tm, const char *os, + const char *name, enum roffmsec msec, enum roffvol vol) { + struct html_pair attr[4]; + int i; + char ts[64]; - if ( ! html_putline(mbuf, 0, TAG_DIV_END, NULL)) + if (0 == strftime(ts, sizeof(ts), "%B %d, %Y", tm)) { + warn("strftime"); return(0); - if ( ! html_putline(mbuf, 0, TAG_BODY_END, NULL)) + } + + i = 0; + + attr[0].attr = HTML_ATTR_WIDTH; + attr[0].val = "100%"; + attr[1].attr = HTML_ATTR_CLASS; + attr[1].val = "header-footer"; + + if ( ! html_aputln(p->mbuf, ML_OPEN, i++, HTML_TAG_TABLE, 2, attr)) return(0); - return(html_putline(mbuf, 0, TAG_HTML_END, NULL)); + if ( ! html_tputln(p->mbuf, ML_OPEN, i++, HTML_TAG_TR)) + return(0); + + attr[0].attr = HTML_ATTR_ALIGN; + attr[0].val = "left"; + attr[1].attr = HTML_ATTR_CLASS; + attr[1].val = "footer-os"; + + if ( ! html_aputln(p->mbuf, ML_OPEN, i, HTML_TAG_TD, 2, attr)) + return(0); + if ( ! ml_putstring(p->mbuf, os, NULL)) + return(0); + if ( ! html_tputln(p->mbuf, ML_CLOSE, i, HTML_TAG_TD)) + return(0); + + attr[0].attr = HTML_ATTR_ALIGN; + attr[0].val = "right"; + attr[1].attr = HTML_ATTR_CLASS; + attr[1].val = "footer-date"; + + if ( ! html_aputln(p->mbuf, ML_OPEN, i, HTML_TAG_TD, 2, attr)) + return(0); + if ( ! ml_putstring(p->mbuf, ts, NULL)) + return(0); + if ( ! html_tputln(p->mbuf, ML_CLOSE, i, HTML_TAG_TD)) + return(0); + + if ( ! html_tputln(p->mbuf, ML_CLOSE, --i, HTML_TAG_TR)) + return(0); + if ( ! html_tputln(p->mbuf, ML_CLOSE, --i, HTML_TAG_TABLE)) + return(0); + + if ( ! html_tputln(p->mbuf, ML_CLOSE, 0, HTML_TAG_DIV)) + return(0); + if ( ! html_tputln(p->mbuf, ML_CLOSE, 0, HTML_TAG_BODY)) + return(0); + return(html_tputln(p->mbuf, ML_CLOSE, 0, HTML_TAG_HTML)); } @@ -500,16 +644,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)); } @@ -524,18 +668,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)); } @@ -548,16 +692,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)); } @@ -567,6 +711,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)) @@ -623,14 +769,43 @@ html_inlinetagargs(struct md_mbuf *mbuf, return(0); switch (tok) { + case (ROFF_Sh): + + /* FIXME: use API in ml.h. */ + + assert(*argv); + if ( ! ml_nputs(mbuf, " name=\"", 7, res)) + return(0); + if ( ! ml_putstring(mbuf, *argv++, res)) + return(0); + while (*argv) { + if ( ! ml_putstring(mbuf, "_", res)) + return(0); + if ( ! ml_putstring(mbuf, *argv++, res)) + return(0); + } + if ( ! ml_nputs(mbuf, "\"", 1, res)) + return(0); + break; + case (ROFF_Sx): + + /* FIXME: use API in ml.h. */ + assert(*argv); if ( ! ml_nputs(mbuf, " href=\"#", 8, res)) return(0); - if ( ! ml_putstring(mbuf, *argv, res)) + if ( ! ml_putstring(mbuf, *argv++, res)) return(0); + while (*argv) { + if ( ! ml_putstring(mbuf, "_", res)) + return(0); + if ( ! ml_putstring(mbuf, *argv++, res)) + return(0); + } if ( ! ml_nputs(mbuf, "\"", 1, res)) return(0); + break; default: break; @@ -647,21 +822,22 @@ html_inlinetagname(struct md_mbuf *mbuf, { switch (tok) { + case (ROFF_Sh): + return(html_stput(mbuf, HTML_TAG_A, res)); 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)); } static ssize_t -html_begintag(struct md_mbuf *mbuf, void *data, - const struct md_args *args, enum md_ns ns, +html_begintag(struct ml_args *p, enum md_ns ns, int tok, const int *argc, const char **argv) { size_t res; @@ -672,8 +848,7 @@ html_begintag(struct md_mbuf *mbuf, void *data, assert(ns != MD_NS_DEFAULT); res = 0; - assert(data); - q = (struct htmlq *)data; + q = (struct htmlq *)p->data; if (NULL == (node = calloc(1, sizeof(struct htmlnode)))) { warn("calloc"); @@ -700,33 +875,33 @@ html_begintag(struct md_mbuf *mbuf, void *data, switch (ns) { case (MD_NS_BLOCK): - if ( ! html_blocktagname(mbuf, args, tok, + if ( ! html_blocktagname(p->mbuf, p->args, tok, q, argc, argv, &res)) return(-1); - if ( ! html_blocktagargs(mbuf, args, tok, + if ( ! html_blocktagargs(p->mbuf, p->args, tok, argc, argv, &res)) return(-1); break; case (MD_NS_BODY): - if ( ! html_bodytagname(mbuf, args, tok, + if ( ! html_bodytagname(p->mbuf, p->args, tok, q, argc, argv, &res)) return(-1); - if ( ! html_bodytagargs(mbuf, args, tok, + if ( ! html_bodytagargs(p->mbuf, p->args, tok, argc, argv, &res)) return(-1); break; case (MD_NS_HEAD): - if ( ! html_headtagname(mbuf, args, tok, q, + if ( ! html_headtagname(p->mbuf, p->args, tok, q, argc, argv, &res)) return(-1); - if ( ! html_headtagargs(mbuf, args, tok, + if ( ! html_headtagargs(p->mbuf, p->args, tok, argc, argv, &res)) return(-1); break; default: - if ( ! html_inlinetagname(mbuf, args, tok, &res)) + if ( ! html_inlinetagname(p->mbuf, p->args, tok, &res)) return(-1); - if ( ! html_inlinetagargs(mbuf, args, tok, + if ( ! html_inlinetagargs(p->mbuf, p->args, tok, argc, argv, &res)) return(-1); break; @@ -737,8 +912,7 @@ html_begintag(struct md_mbuf *mbuf, void *data, static ssize_t -html_endtag(struct md_mbuf *mbuf, void *data, - const struct md_args *args, enum md_ns ns, int tok) +html_endtag(struct ml_args *p, enum md_ns ns, int tok) { size_t res; struct htmlq *q; @@ -747,31 +921,30 @@ html_endtag(struct md_mbuf *mbuf, void *data, assert(ns != MD_NS_DEFAULT); res = 0; - assert(data); - q = (struct htmlq *)data; + q = (struct htmlq *)p->data; node = q->last; switch (ns) { case (MD_NS_BLOCK): - if ( ! html_blocktagname(mbuf, args, tok, + if ( ! html_blocktagname(p->mbuf, p->args, tok, q, node->argc, (const char **)node->argv, &res)) return(-1); break; case (MD_NS_BODY): - if ( ! html_bodytagname(mbuf, args, tok, + if ( ! html_bodytagname(p->mbuf, p->args, tok, q, node->argc, (const char **)node->argv, &res)) return(-1); break; case (MD_NS_HEAD): - if ( ! html_headtagname(mbuf, args, tok, + if ( ! html_headtagname(p->mbuf, p->args, tok, q, node->argc, (const char **)node->argv, &res)) return(-1); break; default: - if ( ! html_inlinetagname(mbuf, args, tok, &res)) + if ( ! html_inlinetagname(p->mbuf, p->args, tok, &res)) return(-1); break; } @@ -815,26 +988,26 @@ html_free(void *p) } +/* ARGSUSED */ 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 ( ! ml_puts(mbuf, "", &res)) - return(-1); - return((ssize_t)res); } +/* ARGSUSED */ static ssize_t html_endhttp(struct md_mbuf *mbuf, const struct md_args *args, @@ -843,23 +1016,19 @@ html_endhttp(struct md_mbuf *mbuf, size_t res; res = 0; - - if ( ! ml_puts(mbuf, "", &res)) + 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) +html_beginstring(struct ml_args *p, const char *buf, size_t sz) { if (0 == strncmp(buf, "http://", 7)) - return(html_beginhttp(mbuf, args, buf, sz)); + return(html_beginhttp(p->mbuf, p->args, buf, sz)); return(0); } @@ -867,13 +1036,11 @@ html_beginstring(struct md_mbuf *mbuf, /* ARGSUSED */ static ssize_t -html_endstring(struct md_mbuf *mbuf, - const struct md_args *args, - const char *buf, size_t sz) +html_endstring(struct ml_args *p, const char *buf, size_t sz) { if (0 == strncmp(buf, "http://", 7)) - return(html_endhttp(mbuf, args, buf, sz)); + return(html_endhttp(p->mbuf, p->args, buf, sz)); return(0); }