=================================================================== RCS file: /cvs/mandoc/html.c,v retrieving revision 1.5 retrieving revision 1.9 diff -u -p -r1.5 -r1.9 --- mandoc/html.c 2008/12/04 16:19:52 1.5 +++ mandoc/html.c 2008/12/05 19:45:15 1.9 @@ -1,4 +1,4 @@ -/* $Id: html.c,v 1.5 2008/12/04 16:19:52 kristaps Exp $ */ +/* $Id: html.c,v 1.9 2008/12/05 19:45:15 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -32,12 +32,30 @@ #include "ml.h" +/* 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_begintag(struct md_mbuf *, void *, const struct md_args *, enum md_ns, int, const int *, const char **); @@ -46,28 +64,31 @@ static int html_begin(struct md_mbuf *, 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 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, 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_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 **); -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_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 **); -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 @@ -187,181 +208,174 @@ 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 +static int html_blockbodytagname(struct md_mbuf *mbuf, - const struct md_args *args, int tok) + const struct md_args *args, int tok, size_t *res) { - size_t res; - res = 0; - if ( ! ml_puts(mbuf, "div", &res)) - return(-1); - - return((ssize_t)res); + return(ml_puts(mbuf, "div", res)); } - - /* ARGSUSED */ -static ssize_t +static int html_blockheadtagname(struct md_mbuf *mbuf, - const struct md_args *args, int tok) + const struct md_args *args, int tok, size_t *res) { - size_t res; - res = 0; - if ( ! ml_puts(mbuf, "div", &res)) - return(-1); - - return((ssize_t)res); + return(ml_puts(mbuf, "div", res)); } /* ARGSUSED */ -static ssize_t +static int html_blocktagname(struct md_mbuf *mbuf, - const struct md_args *args, int tok) + const struct md_args *args, int tok, size_t *res) { - size_t res; - res = 0; - if ( ! ml_puts(mbuf, "div", &res)) - return(-1); - - 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_blockheadtagargs(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_blockbodytagargs(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; + return(html_printargs(mbuf, tok, "inline", argc, argv, res)); +} - if ( ! ml_puts(mbuf, " class=\"block-", &res)) - return(0); - if ( ! ml_puts(mbuf, toknames[tok], &res)) - return(0); - if ( ! ml_puts(mbuf, "\"", &res)) - return(0); +/* ARGSUSED */ +static int +html_inlinetagname(struct md_mbuf *mbuf, + const struct md_args *args, int tok, size_t *res) +{ + switch (tok) { + case (ROFF_Pp): + return(ml_puts(mbuf, "div", res)); default: break; } - return(0); + return(ml_puts(mbuf, "span", res)); } -/* ARGSUSED */ -static ssize_t -html_inlinetagargs(struct md_mbuf *mbuf, const struct md_args *args, +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; + assert(ns != MD_NS_DEFAULT); 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); + assert(data); + q = (struct htmlq *)data; - - switch (tok) { - default: - break; + if (NULL == (node = calloc(1, sizeof(struct htmlnode)))) { + warn("calloc"); + return(-1); } - return(0); -} + node->parent = q->last; + node->tok = tok; + node->ns = ns; + q->last = node; -/* ARGSUSED */ -static ssize_t -html_inlinetagname(struct md_mbuf *mbuf, - const struct md_args *args, int tok) -{ - size_t res; - - res = 0; - - switch (tok) { - case (ROFF_Pp): - if ( ! ml_puts(mbuf, "div", &res)) + 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 ( ! 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,56 +384,74 @@ 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; + 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, &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_blockbodytagname(mbuf, args, tok, &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_blockheadtagname(mbuf, args, tok, &res)) + return(-1); + break; default: + if ( ! html_inlinetagname(mbuf, args, tok, &res)) + return(-1); break; } - if ( ! html_inlinetagname(mbuf, args, tok)) + node = q->last; + 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; + + while ((n = q->last)) { + q->last = n->parent; + free(n); } - return(html_inlinetagname(mbuf, args, tok)); + free(q); } @@ -443,8 +475,15 @@ 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; + + return(mlg_alloc(args, rbuf, mbuf, &cbs)); }