=================================================================== RCS file: /cvs/mandoc/html.c,v retrieving revision 1.15 retrieving revision 1.18 diff -u -p -r1.15 -r1.18 --- mandoc/html.c 2008/12/08 12:46:28 1.15 +++ mandoc/html.c 2008/12/09 19:57:26 1.18 @@ -1,4 +1,4 @@ -/* $Id: html.c,v 1.15 2008/12/08 12:46:28 kristaps Exp $ */ +/* $Id: html.c,v 1.18 2008/12/09 19:57:26 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -27,10 +27,30 @@ #include #include -#include "libmdocml.h" #include "private.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). */ @@ -141,7 +161,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 +170,7 @@ html_It_headtagname(struct md_mbuf *mbuf, struct htmlq } } - abort(); - /* NOTREACHED */ + return(0); } @@ -202,10 +220,7 @@ html_It_bodytagname(struct md_mbuf *mbuf, struct htmlq } assert(i != ROFF_MAXLINEARG); - abort(); - /* NOTREACHED */ - - return(1); + return(0); } @@ -247,8 +262,7 @@ html_Bl_bodytagname(struct md_mbuf *mbuf, struct htmlq } assert(i != ROFF_MAXLINEARG); - abort(); - /* NOTREACHED */ + return(0); } @@ -298,8 +312,7 @@ html_It_blocktagname(struct md_mbuf *mbuf, struct html } assert(i != ROFF_MAXLINEARG); - abort(); - /* NOTREACHED */ + return(0); } @@ -357,6 +370,31 @@ out: } +static int +html_putline(struct md_mbuf *mbuf, size_t indent, + const char *p, size_t *res) +{ + + /* FIXME: use INDENT macro for this. */ + if ( ! ml_putchars(mbuf, ' ', indent * 4, res)) + return(0); + if ( ! ml_puts(mbuf, p, res)) + return(0); + return(ml_nputs(mbuf, "\n", 1, res)); +} + + +static int +html_putlinestart(struct md_mbuf *mbuf, size_t indent, + const char *p, size_t *res) +{ + + if ( ! ml_putchars(mbuf, ' ', indent * 4, res)) + return(0); + return(ml_puts(mbuf, p, res)); +} + + /* ARGSUSED */ static int html_begin(struct md_mbuf *mbuf, const struct md_args *args, @@ -364,54 +402,76 @@ html_begin(struct md_mbuf *mbuf, const struct md_args const char *title, enum roffmsec section, const char *vol) { - const char *preamble, *css, *trail; - char buf[512]; - size_t res; + char mtitle[128], css[128]; + size_t i; - 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" - "
"; + i = 0; - res = 0; - - (void)snprintf(buf, sizeof(buf) - 1, - preamble, title, ml_section(section)); - - if ( ! ml_puts(mbuf, buf, &res)) + if ( ! html_putline(mbuf, i, TAG_DOCTYPE, NULL)) return(0); + if ( ! html_putline(mbuf, i, TAG_HTML, NULL)) + return(0); + if ( ! html_putline(mbuf, i++, TAG_HEAD, NULL)) + return(0); + if ( ! html_putline(mbuf, i, TAG_CONTTYPE, NULL)) + return(0); + if ( ! html_putline(mbuf, i, TAG_RESTYPE, NULL)) + return(0); + if ( ! html_putlinestart(mbuf, i, TAG_TITLE, NULL)) + return(0); + if ( ! ml_putstring(mbuf, mtitle, NULL)) + return(0); + if ( ! html_putline(mbuf, i, TAG_TITLE_END, NULL)) + return(0); - assert(args->params.html.css); if (HTML_CSS_EMBED & args->params.html.flags) { - if ( ! ml_puts(mbuf, " \n", &res)) + if ( ! html_putline(mbuf, i, TAG_STYLE_END, NULL)) 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)) + } else if ( ! html_putline(mbuf, i, css, NULL)) return(0); + if ( ! html_putline(mbuf, --i, TAG_HEAD_END, NULL)) + return(0); + if ( ! html_putline(mbuf, i, TAG_BODY, NULL)) + return(0); + if ( ! html_putline(mbuf, i, TAG_DIV_MDOC, NULL)) + return(0); + if ( ! html_putline(mbuf, i++, "", NULL)) + return(0); + if ( ! html_putline(mbuf, i++, "", NULL)) + return(0); + if ( ! html_putline(mbuf, i++, "", NULL)) + return(0); + if ( ! html_putline(mbuf, i++, "", NULL)) + return(0); + if ( ! html_putline(mbuf, i++, "", NULL)) + return(0); + if ( ! html_putline(mbuf, --i, "", NULL)) + return(0); + if ( ! html_putline(mbuf, --i, "
", NULL)) + return(0); + if ( ! ml_putstring(mbuf, title, NULL)) + return(0); + if ( ! html_putline(mbuf, --i, "", NULL)) + return(0); + if ( ! ml_putstring(mbuf, "Hello, world.", NULL)) + return(0); + if ( ! html_putline(mbuf, --i, "", NULL)) + return(0); + if ( ! ml_putstring(mbuf, title, NULL)) + return(0); + if ( ! html_putline(mbuf, --i, "
", NULL)) + return(0); return(1); } @@ -421,7 +481,11 @@ static int html_end(struct md_mbuf *mbuf, const struct md_args *args) { - return(ml_puts(mbuf, "
\n", NULL)); + if ( ! html_putline(mbuf, 0, TAG_DIV_END, NULL)) + return(0); + if ( ! html_putline(mbuf, 0, TAG_BODY_END, NULL)) + return(0); + return(html_putline(mbuf, 0, TAG_HTML_END, NULL)); }