=================================================================== RCS file: /cvs/mandoc/html.c,v retrieving revision 1.2 retrieving revision 1.6 diff -u -p -r1.2 -r1.6 --- mandoc/html.c 2008/12/03 19:21:58 1.2 +++ mandoc/html.c 2008/12/04 23:10:51 1.6 @@ -1,4 +1,4 @@ -/* $Id: html.c,v 1.2 2008/12/03 19:21:58 kristaps Exp $ */ +/* $Id: html.c,v 1.6 2008/12/04 23:10:51 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -16,15 +16,24 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ +#include +#include + #include +#include +#include #include +#include #include +#include #include "libmdocml.h" #include "private.h" #include "ml.h" +static int html_loadcss(struct md_mbuf *, const char *); + static ssize_t html_endtag(struct md_mbuf *, const struct md_args *, enum md_ns, int); @@ -32,8 +41,11 @@ static ssize_t html_begintag(struct md_mbuf *, const struct md_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 md_mbuf *, + const struct md_args *, + const struct tm *, + const char *, const char *, + const char *, const char *); static int html_end(struct md_mbuf *, const struct md_args *); static ssize_t html_blocktagname(struct md_mbuf *, @@ -41,6 +53,16 @@ static ssize_t html_blocktagname(struct md_mbuf *, static ssize_t 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 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 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 *, @@ -48,83 +70,227 @@ static ssize_t html_inlinetagargs(struct md_mbuf *, const int *, const char **); +static int +html_loadcss(struct md_mbuf *mbuf, const char *css) +{ + size_t res, bufsz; + char *buf; + struct stat st; + int fd, c; + ssize_t ssz; + + c = 0; + res = 0; + buf = NULL; + + if (-1 == (fd = open(css, O_RDONLY, 0))) { + warn("%s", css); + return(0); + } + + if (-1 == fstat(fd, &st)) { + warn("%s", css); + goto out; + } + + bufsz = MAX(st.st_blksize, BUFSIZ); + if (NULL == (buf = malloc(bufsz))) { + warn("malloc"); + goto out; + } + + for (;;) { + if (-1 == (ssz = read(fd, buf, bufsz))) { + warn("%s", css); + goto out; + } else if (0 == ssz) + break; + if ( ! ml_nputs(mbuf, buf, (size_t)ssz, &res)) + goto out; + } + + c = 1; + +out: + if (-1 == close(fd)) { + warn("%s", css); + c = 0; + } + + if (buf) + free(buf); + + return(c); +} + + +/* ARGSUSED */ static int -html_begin(struct md_mbuf *mbuf, const struct md_args *args) +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 *preamble, *css, *trail; + char buf[512]; size_t res; + preamble = + "\n" + "\n" + "\n" + " \n" + " \n" + " Manual Page for %s(%s)\n"; + + css = + " \n"; + trail = + "\n" + "\n" + "
\n"; + res = 0; - if ( ! ml_puts(mbuf, "\n", &res)) + + (void)snprintf(buf, sizeof(buf) - 1, + preamble, title, section); + + if ( ! ml_puts(mbuf, buf, &res)) return(0); - if ( ! ml_puts(mbuf, "\n", &res)) + + assert(args->params.html.css); + if (HTML_CSS_EMBED & args->params.html.flags) { + if ( ! ml_puts(mbuf, " \n", &res)) + return(0); + } else { + (void)snprintf(buf, sizeof(buf) - 1, css, + args->params.html.css); + if ( ! ml_puts(mbuf, buf, &res)) + return(0); + } + + if ( ! ml_puts(mbuf, trail, &res)) return(0); - if ( ! ml_puts(mbuf, "\n", &res)) - return(0); - if ( ! ml_puts(mbuf, " Manual page\n", &res)) - return(0); - if ( ! ml_puts(mbuf, " \n", &res)) - return(0); - if ( ! ml_puts(mbuf, " \n", &res)) - return(0); - if ( ! ml_puts(mbuf, "\n", &res)) - return(0); - if ( ! ml_puts(mbuf, "", &res)) - return(0); return(1); } +/* ARGSUSED */ static int html_end(struct md_mbuf *mbuf, const struct md_args *args) { size_t res; res = 0; - if ( ! ml_puts(mbuf, "\n", &res)) + if ( ! ml_puts(mbuf, "
\n", &res)) return(0); return(1); } +/* ARGSUSED */ static ssize_t +html_blockbodytagname(struct md_mbuf *mbuf, + const struct md_args *args, int tok) +{ + size_t res; + + res = 0; + if ( ! ml_puts(mbuf, "div", &res)) + return(-1); + + return((ssize_t)res); +} + + + + +/* ARGSUSED */ +static ssize_t +html_blockheadtagname(struct md_mbuf *mbuf, + const struct md_args *args, int tok) +{ + size_t res; + + res = 0; + if ( ! ml_puts(mbuf, "div", &res)) + return(-1); + + return((ssize_t)res); +} + + +/* ARGSUSED */ +static ssize_t html_blocktagname(struct md_mbuf *mbuf, const struct md_args *args, int tok) { size_t res; res = 0; + if ( ! ml_puts(mbuf, "div", &res)) + return(-1); + return((ssize_t)res); +} + + +/* ARGSUSED */ +static ssize_t +html_blockheadtagargs(struct md_mbuf *mbuf, const struct md_args *args, + int tok, const int *argc, const char **argv) +{ + size_t res; + + res = 0; + + if ( ! ml_puts(mbuf, " class=\"head-", &res)) + return(0); + if ( ! ml_puts(mbuf, toknames[tok], &res)) + return(0); + if ( ! ml_puts(mbuf, "\"", &res)) + return(0); + switch (tok) { - case (ROFF_Sh): - if ( ! ml_puts(mbuf, "blockquote", &res)) - return(-1); + default: break; - case (ROFF_Bd): - if ( ! ml_puts(mbuf, "pre", &res)) - return(-1); - break; - case (ROFF_Bl): - if ( ! ml_puts(mbuf, "ul", &res)) - return(-1); - break; - case (ROFF_It): - if ( ! ml_puts(mbuf, "li", &res)) - return(-1); - break; + } + + return(0); +} + + +/* ARGSUSED */ +static ssize_t +html_blockbodytagargs(struct md_mbuf *mbuf, const struct md_args *args, + int tok, const int *argc, const char **argv) +{ + size_t res; + + res = 0; + + 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: - if ( ! ml_puts(mbuf, "div", &res)) - return(-1); break; } - return((size_t)res); + return(res); } @@ -133,13 +299,23 @@ static ssize_t html_blocktagargs(struct md_mbuf *mbuf, const struct md_args *args, int tok, const int *argc, const char **argv) { + size_t res; + res = 0; + + 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); + switch (tok) { default: - return(0); + break; } - return(-1); + return(0); } @@ -148,16 +324,28 @@ static ssize_t html_inlinetagargs(struct md_mbuf *mbuf, const struct md_args *args, int tok, const int *argc, const char **argv) { + 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) { default: - return(0); + break; } - return(-1); + return(0); } +/* ARGSUSED */ static ssize_t html_inlinetagname(struct md_mbuf *mbuf, const struct md_args *args, int tok) @@ -167,14 +355,10 @@ html_inlinetagname(struct md_mbuf *mbuf, res = 0; switch (tok) { - case (ROFF_Sh): - if ( ! ml_puts(mbuf, "h1", &res)) + case (ROFF_Pp): + if ( ! ml_puts(mbuf, "div", &res)) return(-1); break; - case (ROFF_Ss): - if ( ! ml_puts(mbuf, "h2", &res)) - return(-1); - break; default: if ( ! ml_puts(mbuf, "span", &res)) return(-1); @@ -192,15 +376,40 @@ html_begintag(struct md_mbuf *mbuf, const struct md_ar { assert(ns != MD_NS_DEFAULT); - if (MD_NS_BLOCK == ns) { + switch (ns) { + case (MD_NS_BLOCK): if ( ! html_blocktagname(mbuf, args, tok)) return(0); + if (NULL == argc || NULL == argv) + return(1); + assert(argc && argv); return(html_blocktagargs(mbuf, args, tok, argc, argv)); + case (MD_NS_BODY): + if ( ! html_blockbodytagname(mbuf, args, tok)) + return(0); + if (NULL == argc || NULL == argv) + return(1); + assert(argc && argv); + return(html_blockbodytagargs(mbuf, args, + tok, argc, argv)); + case (MD_NS_HEAD): + if ( ! html_blockheadtagname(mbuf, args, tok)) + return(0); + if (NULL == argc || NULL == argv) + return(1); + assert(argc && argv); + return(html_blockheadtagargs(mbuf, args, + tok, argc, argv)); + default: + break; } if ( ! html_inlinetagname(mbuf, args, tok)) return(0); + if (NULL == argc || NULL == argv) + return(1); + assert(argc && argv); return(html_inlinetagargs(mbuf, args, tok, argc, argv)); } @@ -211,8 +420,16 @@ html_endtag(struct md_mbuf *mbuf, const struct md_args { assert(ns != MD_NS_DEFAULT); - if (MD_NS_BLOCK == ns) + 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; + } return(html_inlinetagname(mbuf, args, tok)); }