=================================================================== RCS file: /cvs/mandoc/html.c,v retrieving revision 1.8 retrieving revision 1.26 diff -u -p -r1.8 -r1.26 --- mandoc/html.c 2008/12/05 17:43:14 1.8 +++ mandoc/html.c 2008/12/10 17:40:56 1.26 @@ -1,4 +1,4 @@ -/* $Id: html.c,v 1.8 2008/12/05 17:43:14 kristaps Exp $ */ +/* $Id: html.c,v 1.26 2008/12/10 17:40:56 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -27,63 +27,73 @@ #include #include -#include "libmdocml.h" -#include "private.h" +#include "html.h" #include "ml.h" - /* TODO: allow head/tail-less invocations (just "div" start). */ -/* FIXME: free htmlq. */ struct htmlnode { int tok; enum md_ns ns; - int *argc[ROFF_MAXLINEARG]; + int argc[ROFF_MAXLINEARG]; char *argv[ROFF_MAXLINEARG]; struct htmlnode *parent; }; - struct htmlq { struct htmlnode *last; }; -static void htmlnode_free(struct htmlnode *); -static void htmlnode_free(struct htmlnode *); - -static int html_loadcss(struct md_mbuf *, const char *); - -static ssize_t html_endtag(struct md_mbuf *, void *, - const struct md_args *, +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 ml_args *, enum md_ns, int); -static ssize_t html_begintag(struct md_mbuf *, void *, - const struct md_args *, - enum md_ns, int, +static ssize_t html_beginstring(struct ml_args *, + const char *, size_t); +static ssize_t html_endstring(struct ml_args *, + const char *, size_t); +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 *, - const char *, 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, size_t *); + 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_blockheadtagname(struct md_mbuf *, - const struct md_args *, int, size_t *); -static int html_blockheadtagargs(struct md_mbuf *, +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_blockbodytagname(struct md_mbuf *, - const struct md_args *, int, size_t *); -static int html_blockbodytagargs(struct md_mbuf *, +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 *, @@ -91,9 +101,214 @@ static int html_inlinetagname(struct md_mbuf *, 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 *); +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 */ 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; + struct html_pair attr[2]; + + 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(html_stput(mbuf, HTML_TAG_DIV, res)); + case (ROFF_Tag): + 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): + attr[0].attr = HTML_ATTR_VALIGN; + attr[0].val = "top"; + return(html_saput(mbuf, HTML_TAG_TD, + res, 1, attr)); + 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; + struct html_pair attr[1]; + + 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(html_stput(mbuf, HTML_TAG_DIV, res)); + case (ROFF_Tag): + /* FALLTHROUGH */ + case (ROFF_Column): + attr[0].attr = HTML_ATTR_VALIGN; + attr[0].val = "top"; + return(html_saput(mbuf, HTML_TAG_TD, + res, 1, attr)); + 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(html_stput(mbuf, HTML_TAG_OL, 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(html_stput(mbuf, HTML_TAG_UL, res)); + case (ROFF_Tag): + /* FALLTHROUGH */ + case (ROFF_Column): + return(html_stput(mbuf, HTML_TAG_TABLE, 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(html_stput(mbuf, HTML_TAG_LI, res)); + case (ROFF_Tag): + /* FALLTHROUGH */ + case (ROFF_Column): + return(html_stput(mbuf, HTML_TAG_TR, res)); + default: + break; + } + } + + assert(i != ROFF_MAXLINEARG); + return(0); +} + + +static int html_loadcss(struct md_mbuf *mbuf, const char *css) { size_t res, bufsz; @@ -147,117 +362,357 @@ 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) +html_begin(struct ml_args *p, const struct tm *tm, const char *os, + const char *name, enum roffmsec msec, enum roffvol vol) { - const char *preamble, *css, *trail; - char buf[512]; - size_t res; + enum roffvol bvol; + struct html_pair attr[4]; + char ts[32], title[64]; + 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" - "
\n"; + 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 */ + } - res = 0; + (void)snprintf(title, sizeof(title), "%s (%s)", + roff_volname(bvol), roff_volname(vol)); + } else + (void)snprintf(title, sizeof(title), "%s", roff_volname(vol)); - (void)snprintf(buf, sizeof(buf) - 1, - preamble, title, section); - if ( ! ml_puts(mbuf, buf, &res)) + i = 0; + + if ( ! html_typeput(p->mbuf, HTML_TYPE_4_01_STRICT, NULL)) return(0); + if ( ! html_tputln(p->mbuf, ML_OPEN, i, HTML_TAG_HTML)) + return(0); + if ( ! html_tputln(p->mbuf, ML_OPEN, i++, HTML_TAG_HEAD)) + return(0); - assert(args->params.html.css); - if (HTML_CSS_EMBED & args->params.html.flags) { - if ( ! ml_puts(mbuf, " \n", &res)) + + if ( ! html_loadcss(p->mbuf, p->args->params.html.css)) return(0); + + if ( ! html_commentput(p->mbuf, ML_CLOSE, NULL)) + return(0); + if ( ! html_tputln(p->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 = p->args->params.html.css; + + if ( ! html_aputln(p->mbuf, ML_OPEN, i, + HTML_TAG_LINK, 3, attr)) return(0); } - if ( ! ml_puts(mbuf, trail, &res)) + if ( ! html_tputln(p->mbuf, ML_CLOSE, --i, HTML_TAG_HEAD)) return(0); + if ( ! html_tputln(p->mbuf, ML_OPEN, i, HTML_TAG_BODY)) + return(0); - return(1); + 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); + + 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_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 = "header-section"; + + 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); + + 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(p->mbuf, title, 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 = "header-section"; + + 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); + 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) { - size_t res; + struct html_pair attr[4]; + int i; + char ts[64]; - res = 0; - if ( ! ml_puts(mbuf, "
\n", &res)) + if (0 == strftime(ts, sizeof(ts), "%B %d, %Y", tm)) { + warn("strftime"); return(0); + } - return(1); + 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); + 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)); } /* ARGSUSED */ static int -html_blockbodytagname(struct md_mbuf *mbuf, - const struct md_args *args, int tok, size_t *res) +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) { - return(ml_puts(mbuf, "div", res)); + switch (tok) { + case (ROFF_Bl): + return(html_Bl_bodytagname(mbuf, q, argc, argv, res)); + case (ROFF_Fo): + return(html_stput(mbuf, HTML_TAG_SPAN, res)); + case (ROFF_It): + return(html_It_bodytagname(mbuf, q, argc, argv, res)); + case (ROFF_Oo): + return(html_stput(mbuf, HTML_TAG_SPAN, res)); + default: + break; + } + + return(html_stput(mbuf, HTML_TAG_DIV, res)); } - - /* ARGSUSED */ static int -html_blockheadtagname(struct md_mbuf *mbuf, - const struct md_args *args, int tok, size_t *res) +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) { - return(ml_puts(mbuf, "div", res)); + switch (tok) { + case (ROFF_It): + return(html_It_headtagname(mbuf, q, argc, argv, res)); + case (ROFF_Fo): + /* FALLTHROUGH */ + case (ROFF_Oo): + return(html_stput(mbuf, HTML_TAG_SPAN, res)); + case (ROFF_Sh): + return(html_stput(mbuf, HTML_TAG_H1, res)); + case (ROFF_Ss): + return(html_stput(mbuf, HTML_TAG_H2, res)); + default: + break; + } + + return(html_stput(mbuf, HTML_TAG_DIV, res)); } /* ARGSUSED */ static int -html_blocktagname(struct md_mbuf *mbuf, - const struct md_args *args, int tok, size_t *res) +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) { - return(ml_puts(mbuf, "div", res)); + switch (tok) { + case (ROFF_Fo): + /* FALLTHROUGH */ + case (ROFF_Oo): + return(html_stput(mbuf, HTML_TAG_SPAN, res)); + case (ROFF_It): + return(html_It_blocktagname(mbuf, q, argc, argv, res)); + default: + break; + } + + return(html_stput(mbuf, HTML_TAG_DIV, res)); } +/* ARGSUSED */ static int html_printargs(struct md_mbuf *mbuf, int tok, const char *ns, const int *argc, const char **argv, size_t *res) { - int i, c; + /* FIXME: use API in ml.h. */ + if ( ! ml_puts(mbuf, " class=\"", res)) return(0); if ( ! ml_puts(mbuf, ns, res)) @@ -266,41 +721,13 @@ html_printargs(struct md_mbuf *mbuf, int tok, const ch return(0); if ( ! ml_puts(mbuf, toknames[tok], res)) return(0); - if ( ! ml_puts(mbuf, "\"", res)) - return(0); - - if (NULL == argv || NULL == argc) - return(1); - assert(argv && argc); - - /* FIXME: ignores values. */ - - 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); - } - - return(1); + return(ml_puts(mbuf, "\"", res)); } /* ARGSUSED */ static int -html_blockheadtagargs(struct md_mbuf *mbuf, +html_headtagargs(struct md_mbuf *mbuf, const struct md_args *args, int tok, const int *argc, const char **argv, size_t *res) { @@ -311,7 +738,7 @@ html_blockheadtagargs(struct md_mbuf *mbuf, /* ARGSUSED */ static int -html_blockbodytagargs(struct md_mbuf *mbuf, +html_bodytagargs(struct md_mbuf *mbuf, const struct md_args *args, int tok, const int *argc, const char **argv, size_t *res) { @@ -338,7 +765,53 @@ html_inlinetagargs(struct md_mbuf *mbuf, const int *argc, const char **argv, size_t *res) { - return(html_printargs(mbuf, tok, "inline", argc, argv, res)); + if ( ! html_printargs(mbuf, tok, "inline", argc, argv, res)) + 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)) + 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; + } + + return(1); } @@ -349,29 +822,33 @@ html_inlinetagname(struct md_mbuf *mbuf, { switch (tok) { + case (ROFF_Sh): + return(html_stput(mbuf, HTML_TAG_A, res)); case (ROFF_Pp): - return(ml_puts(mbuf, "div", res)); + return(html_stput(mbuf, HTML_TAG_DIV, res)); + case (ROFF_Sx): + return(html_stput(mbuf, HTML_TAG_A, res)); default: - return(ml_puts(mbuf, "span", res)); + break; } - return(1); + + 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; struct htmlq *q; struct htmlnode *node; + int i; 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"); @@ -382,34 +859,49 @@ html_begintag(struct md_mbuf *mbuf, void *data, 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, &res)) + 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_blockbodytagname(mbuf, args, tok, &res)) + if ( ! html_bodytagname(p->mbuf, p->args, tok, + q, argc, argv, &res)) return(-1); - if ( ! html_blockbodytagargs(mbuf, args, tok, + if ( ! html_bodytagargs(p->mbuf, p->args, tok, argc, argv, &res)) return(-1); break; case (MD_NS_HEAD): - if ( ! html_blockheadtagname(mbuf, args, tok, &res)) + if ( ! html_headtagname(p->mbuf, p->args, tok, q, + argc, argv, &res)) return(-1); - if ( ! html_blockheadtagargs(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; @@ -420,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; @@ -430,37 +921,131 @@ 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, &res)) + 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_blockbodytagname(mbuf, args, tok, &res)) + 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_blockheadtagname(mbuf, args, tok, &res)) + 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; } - node = q->last; q->last = node->parent; - htmlnode_free(node); + 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(1); +} + + +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); + } + + free(q); +} + + +/* 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 ( ! html_aput(mbuf, ML_OPEN, HTML_TAG_A, &res, 1, &pair)) + return(-1); + return((ssize_t)res); +} + + +/* ARGSUSED */ +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 ml_args *p, const char *buf, size_t sz) +{ + + if (0 == strncmp(buf, "http://", 7)) + return(html_beginhttp(p->mbuf, p->args, buf, sz)); + + return(0); +} + + +/* ARGSUSED */ +static ssize_t +html_endstring(struct ml_args *p, const char *buf, size_t sz) +{ + + if (0 == strncmp(buf, "http://", 7)) + return(html_endhttp(p->mbuf, p->args, buf, sz)); + + return(0); +} + + int md_line_html(void *data, char *buf) { @@ -481,14 +1066,16 @@ void * md_init_html(const struct md_args *args, struct md_mbuf *mbuf, const struct md_rbuf *rbuf) { - struct htmlq *q; + struct ml_cbs cbs; - if (NULL == (q = calloc(1, sizeof(struct htmlq)))) { - warn("calloc"); - return(NULL); - } + 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, q, rbuf, mbuf, html_begintag, - html_endtag, html_begin, html_end)); + return(mlg_alloc(args, rbuf, mbuf, &cbs)); } -