=================================================================== RCS file: /cvs/mandoc/html.c,v retrieving revision 1.10 retrieving revision 1.16 diff -u -p -r1.10 -r1.16 --- mandoc/html.c 2008/12/05 22:34:30 1.10 +++ mandoc/html.c 2008/12/08 16:29:57 1.16 @@ -1,4 +1,4 @@ -/* $Id: html.c,v 1.10 2008/12/05 22:34:30 kristaps Exp $ */ +/* $Id: html.c,v 1.16 2008/12/08 16:29:57 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -55,6 +55,18 @@ 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_beginstring(struct md_mbuf *, + const struct md_args *, + const char *, size_t); +static ssize_t html_beginhttp(struct md_mbuf *, + const struct md_args *, + const char *, size_t); +static ssize_t html_endstring(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 ssize_t html_begintag(struct md_mbuf *, void *, const struct md_args *, enum md_ns, int, @@ -63,7 +75,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 *); @@ -83,11 +95,11 @@ static int html_headtagname(struct md_mbuf *, 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 *, +static int html_bodytagname(struct md_mbuf *, const struct md_args *, int, struct htmlq *, const int *, const char **, size_t *); -static int html_blockbodytagargs(struct md_mbuf *, +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 *, @@ -115,16 +127,20 @@ html_It_headtagname(struct md_mbuf *mbuf, struct htmlq const int *argc, const char **argv, size_t *res) { struct htmlnode *n; - int i, c; + int i; for (n = q->last; n; n = n->parent) if (n->tok == ROFF_Bl) break; assert(n); - for (i = 0; ROFF_ARGMAX != (c = n->argc[i]) && + + /* LINTED */ + for (i = 0; ROFF_ARGMAX != n->argc[i] && i < ROFF_MAXLINEARG; i++) { switch (n->argc[i]) { + case (ROFF_Ohang): + return(ml_nputs(mbuf, "div", 3, res)); case (ROFF_Tag): /* FALLTHROUGH */ case (ROFF_Column): @@ -134,11 +150,7 @@ html_It_headtagname(struct md_mbuf *mbuf, struct htmlq } } - assert(i != ROFF_MAXLINEARG); - abort(); - /* NOTREACHED */ - - return(1); + return(0); } @@ -148,14 +160,16 @@ html_It_bodytagname(struct md_mbuf *mbuf, struct htmlq const int *argc, const char **argv, size_t *res) { struct htmlnode *n; - int i, c; + int i; for (n = q->last; n; n = n->parent) if (n->tok == ROFF_Bl) break; assert(n); - for (i = 0; ROFF_ARGMAX != (c = n->argc[i]) && + + /* LINTED */ + for (i = 0; ROFF_ARGMAX != n->argc[i] && i < ROFF_MAXLINEARG; i++) { switch (n->argc[i]) { case (ROFF_Enum): @@ -186,10 +200,7 @@ html_It_bodytagname(struct md_mbuf *mbuf, struct htmlq } assert(i != ROFF_MAXLINEARG); - abort(); - /* NOTREACHED */ - - return(1); + return(0); } @@ -198,9 +209,9 @@ static int html_Bl_bodytagname(struct md_mbuf *mbuf, struct htmlq *q, const int *argc, const char **argv, size_t *res) { - int c, i; + int i; - for (i = 0; ROFF_ARGMAX != (c = argc[i]) + for (i = 0; ROFF_ARGMAX != argc[i] && i < ROFF_MAXLINEARG; i++) { switch (argc[i]) { case (ROFF_Enum): @@ -231,8 +242,7 @@ html_Bl_bodytagname(struct md_mbuf *mbuf, struct htmlq } assert(i != ROFF_MAXLINEARG); - abort(); - /* NOTREACHED */ + return(0); } @@ -242,14 +252,16 @@ html_It_blocktagname(struct md_mbuf *mbuf, struct html const int *argc, const char **argv, size_t *res) { struct htmlnode *n; - int i, c; + int i; for (n = q->last; n; n = n->parent) if (n->tok == ROFF_Bl) break; assert(n); - for (i = 0; ROFF_ARGMAX != (c = n->argc[i]) && + + /* LINTED */ + for (i = 0; ROFF_ARGMAX != n->argc[i] && i < ROFF_MAXLINEARG; i++) { switch (n->argc[i]) { case (ROFF_Enum): @@ -280,8 +292,7 @@ html_It_blocktagname(struct md_mbuf *mbuf, struct html } assert(i != ROFF_MAXLINEARG); - abort(); - /* NOTREACHED */ + return(0); } @@ -343,7 +354,7 @@ 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; @@ -371,7 +382,7 @@ html_begin(struct md_mbuf *mbuf, const struct md_args res = 0; (void)snprintf(buf, sizeof(buf) - 1, - preamble, title, section); + preamble, title, ml_section(section)); if ( ! ml_puts(mbuf, buf, &res)) return(0); @@ -409,7 +420,7 @@ html_end(struct md_mbuf *mbuf, const struct md_args *a /* ARGSUSED */ static int -html_blockbodytagname(struct md_mbuf *mbuf, +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) { @@ -417,8 +428,12 @@ html_blockbodytagname(struct md_mbuf *mbuf, switch (tok) { case (ROFF_Bl): return(html_Bl_bodytagname(mbuf, q, argc, argv, res)); + case (ROFF_Fo): + return(ml_nputs(mbuf, "span", 4, res)); case (ROFF_It): return(html_It_bodytagname(mbuf, q, argc, argv, res)); + case (ROFF_Oo): + return(ml_nputs(mbuf, "span", 4, res)); default: break; } @@ -437,15 +452,19 @@ html_headtagname(struct md_mbuf *mbuf, switch (tok) { case (ROFF_It): return(html_It_headtagname(mbuf, q, argc, argv, res)); + case (ROFF_Fo): + return(ml_nputs(mbuf, "span", 4, res)); + case (ROFF_Oo): + return(ml_nputs(mbuf, "span", 4, res)); case (ROFF_Sh): - return(ml_puts(mbuf, "h1", res)); + return(ml_nputs(mbuf, "h1", 2, res)); case (ROFF_Ss): - return(ml_puts(mbuf, "h2", res)); + return(ml_nputs(mbuf, "h2", 2, res)); default: break; } - return(ml_puts(mbuf, "div", res)); + return(ml_nputs(mbuf, "div", 3, res)); } @@ -457,6 +476,10 @@ html_blocktagname(struct md_mbuf *mbuf, const struct m { switch (tok) { + case (ROFF_Fo): + return(ml_nputs(mbuf, "span", 4, res)); + case (ROFF_Oo): + return(ml_nputs(mbuf, "span", 4, res)); case (ROFF_It): return(html_It_blocktagname(mbuf, q, argc, argv, res)); default: @@ -498,7 +521,7 @@ html_headtagargs(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) { @@ -525,7 +548,24 @@ 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_Sx): + assert(*argv); + if ( ! ml_nputs(mbuf, " href=\"#", 8, res)) + return(0); + if ( ! ml_putstring(mbuf, *argv, res)) + return(0); + if ( ! ml_nputs(mbuf, "\"", 1, res)) + return(0); + break; + default: + break; + } + + return(1); } @@ -537,7 +577,9 @@ html_inlinetagname(struct md_mbuf *mbuf, switch (tok) { case (ROFF_Pp): - return(ml_puts(mbuf, "div", res)); + return(ml_nputs(mbuf, "div", 3, res)); + case (ROFF_Sx): + return(ml_nputs(mbuf, "a", 1, res)); default: break; } @@ -554,7 +596,7 @@ html_begintag(struct md_mbuf *mbuf, void *data, size_t res; struct htmlq *q; struct htmlnode *node; - int i, c; + int i; assert(ns != MD_NS_DEFAULT); res = 0; @@ -575,12 +617,12 @@ html_begintag(struct md_mbuf *mbuf, void *data, /* TODO: argv. */ assert(argv); - for (i = 0; ROFF_ARGMAX != (c = argc[i]) + /* LINTED */ + for (i = 0; ROFF_ARGMAX != argc[i] && i < ROFF_MAXLINEARG; i++) node->argc[i] = argc[i]; assert(i != ROFF_MAXLINEARG); - } else - assert(NULL == argv); + } q->last = node; @@ -595,10 +637,10 @@ html_begintag(struct md_mbuf *mbuf, void *data, return(-1); break; case (MD_NS_BODY): - if ( ! html_blockbodytagname(mbuf, args, tok, + if ( ! html_bodytagname(mbuf, args, tok, q, argc, argv, &res)) return(-1); - if ( ! html_blockbodytagargs(mbuf, args, tok, + if ( ! html_bodytagargs(mbuf, args, tok, argc, argv, &res)) return(-1); break; @@ -646,7 +688,7 @@ html_endtag(struct md_mbuf *mbuf, void *data, return(-1); break; case (MD_NS_BODY): - if ( ! html_blockbodytagname(mbuf, args, tok, + if ( ! html_bodytagname(mbuf, args, tok, q, node->argc, (const char **)node->argv, &res)) return(-1); @@ -692,6 +734,7 @@ html_free(void *p) assert(p); q = (struct htmlq *)p; + /* LINTED */ while ((n = q->last)) { q->last = n->parent; free(n); @@ -701,6 +744,70 @@ html_free(void *p) } +static ssize_t +html_beginhttp(struct md_mbuf *mbuf, + const struct md_args *args, + const char *buf, size_t sz) +{ + size_t res; + + res = 0; + + if ( ! ml_puts(mbuf, "", &res)) + return(-1); + + return((ssize_t)res); +} + + +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 ( ! ml_puts(mbuf, "", &res)) + return(-1); + + return((ssize_t)res); +} + + +/* ARGSUSED */ +static ssize_t +html_beginstring(struct md_mbuf *mbuf, + const struct md_args *args, + const char *buf, size_t sz) +{ + + if (0 == strncmp(buf, "http://", 7)) + return(html_beginhttp(mbuf, args, buf, sz)); + + return(0); +} + + +/* ARGSUSED */ +static ssize_t +html_endstring(struct md_mbuf *mbuf, + const struct md_args *args, + const char *buf, size_t sz) +{ + + if (0 == strncmp(buf, "http://", 7)) + return(html_endhttp(mbuf, args, buf, sz)); + + return(0); +} + + int md_line_html(void *data, char *buf) { @@ -729,7 +836,8 @@ md_init_html(const struct md_args *args, 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, rbuf, mbuf, &cbs)); } -