=================================================================== RCS file: /cvs/mandoc/html.c,v retrieving revision 1.14 retrieving revision 1.17 diff -u -p -r1.14 -r1.17 --- mandoc/html.c 2008/12/07 21:30:49 1.14 +++ mandoc/html.c 2008/12/09 17:09:12 1.17 @@ -1,4 +1,4 @@ -/* $Id: html.c,v 1.14 2008/12/07 21:30:49 kristaps Exp $ */ +/* $Id: html.c,v 1.17 2008/12/09 17:09:12 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -27,10 +27,27 @@ #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). */ @@ -75,7 +92,7 @@ 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 *); @@ -141,7 +158,6 @@ html_It_headtagname(struct md_mbuf *mbuf, struct htmlq switch (n->argc[i]) { case (ROFF_Ohang): return(ml_nputs(mbuf, "div", 3, res)); - case (ROFF_Tag): /* FALLTHROUGH */ case (ROFF_Column): @@ -151,8 +167,7 @@ html_It_headtagname(struct md_mbuf *mbuf, struct htmlq } } - abort(); - /* NOTREACHED */ + return(0); } @@ -202,10 +217,7 @@ html_It_bodytagname(struct md_mbuf *mbuf, struct htmlq } assert(i != ROFF_MAXLINEARG); - abort(); - /* NOTREACHED */ - - return(1); + return(0); } @@ -247,8 +259,7 @@ html_Bl_bodytagname(struct md_mbuf *mbuf, struct htmlq } assert(i != ROFF_MAXLINEARG); - abort(); - /* NOTREACHED */ + return(0); } @@ -298,8 +309,7 @@ html_It_blocktagname(struct md_mbuf *mbuf, struct html } assert(i != ROFF_MAXLINEARG); - abort(); - /* NOTREACHED */ + return(0); } @@ -361,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" - "
"; - 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)); }