=================================================================== RCS file: /cvs/mandoc/html.c,v retrieving revision 1.12 retrieving revision 1.180 diff -u -p -r1.12 -r1.180 --- mandoc/html.c 2008/12/06 19:41:41 1.12 +++ mandoc/html.c 2014/10/28 17:36:19 1.180 @@ -1,764 +1,756 @@ -/* $Id: html.c,v 1.12 2008/12/06 19:41:41 kristaps Exp $ */ +/* $Id: html.c,v 1.180 2014/10/28 17:36:19 schwarze Exp $ */ /* - * Copyright (c) 2008 Kristaps Dzonsons + * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons + * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include -#include +#include "config.h" +#include + #include -#include -#include -#include +#include +#include #include +#include +#include #include #include -#include "libmdocml.h" -#include "private.h" -#include "ml.h" +#include "mandoc.h" +#include "mandoc_aux.h" +#include "libmandoc.h" +#include "out.h" +#include "html.h" +#include "main.h" +struct htmldata { + const char *name; + int flags; +#define HTML_CLRLINE (1 << 0) +#define HTML_NOSTACK (1 << 1) +#define HTML_AUTOCLOSE (1 << 2) /* Tag has auto-closure. */ +}; -/* TODO: allow head/tail-less invocations (just "div" start). */ +static const struct htmldata htmltags[TAG_MAX] = { + {"html", HTML_CLRLINE}, /* TAG_HTML */ + {"head", HTML_CLRLINE}, /* TAG_HEAD */ + {"body", HTML_CLRLINE}, /* TAG_BODY */ + {"meta", HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_META */ + {"title", HTML_CLRLINE}, /* TAG_TITLE */ + {"div", HTML_CLRLINE}, /* TAG_DIV */ + {"h1", 0}, /* TAG_H1 */ + {"h2", 0}, /* TAG_H2 */ + {"span", 0}, /* TAG_SPAN */ + {"link", HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_LINK */ + {"br", HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_BR */ + {"a", 0}, /* TAG_A */ + {"table", HTML_CLRLINE}, /* TAG_TABLE */ + {"tbody", HTML_CLRLINE}, /* TAG_TBODY */ + {"col", HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_COL */ + {"tr", HTML_CLRLINE}, /* TAG_TR */ + {"td", HTML_CLRLINE}, /* TAG_TD */ + {"li", HTML_CLRLINE}, /* TAG_LI */ + {"ul", HTML_CLRLINE}, /* TAG_UL */ + {"ol", HTML_CLRLINE}, /* TAG_OL */ + {"dl", HTML_CLRLINE}, /* TAG_DL */ + {"dt", HTML_CLRLINE}, /* TAG_DT */ + {"dd", HTML_CLRLINE}, /* TAG_DD */ + {"blockquote", HTML_CLRLINE}, /* TAG_BLOCKQUOTE */ + {"pre", HTML_CLRLINE }, /* TAG_PRE */ + {"b", 0 }, /* TAG_B */ + {"i", 0 }, /* TAG_I */ + {"code", 0 }, /* TAG_CODE */ + {"small", 0 }, /* TAG_SMALL */ + {"style", HTML_CLRLINE}, /* TAG_STYLE */ + {"math", HTML_CLRLINE}, /* TAG_MATH */ + {"mrow", 0}, /* TAG_MROW */ + {"mi", 0}, /* TAG_MI */ + {"mo", 0}, /* TAG_MO */ + {"msup", 0}, /* TAG_MSUP */ + {"msub", 0}, /* TAG_MSUB */ + {"msubsup", 0}, /* TAG_MSUBSUP */ + {"mfrac", 0}, /* TAG_MFRAC */ + {"msqrt", 0}, /* TAG_MSQRT */ + {"mfenced", 0}, /* TAG_MFENCED */ + {"mtable", 0}, /* TAG_MTABLE */ + {"mtr", 0}, /* TAG_MTR */ + {"mtd", 0}, /* TAG_MTD */ + {"munderover", 0}, /* TAG_MUNDEROVER */ + {"munder", 0}, /* TAG_MUNDER*/ + {"mover", 0}, /* TAG_MOVER*/ +}; -struct htmlnode { - int tok; - enum md_ns ns; - int argc[ROFF_MAXLINEARG]; - char *argv[ROFF_MAXLINEARG]; - struct htmlnode *parent; +static const char *const htmlattrs[ATTR_MAX] = { + "name", /* ATTR_NAME */ + "rel", /* ATTR_REL */ + "href", /* ATTR_HREF */ + "type", /* ATTR_TYPE */ + "media", /* ATTR_MEDIA */ + "class", /* ATTR_CLASS */ + "style", /* ATTR_STYLE */ + "id", /* ATTR_ID */ + "colspan", /* ATTR_COLSPAN */ + "charset", /* ATTR_CHARSET */ + "open", /* ATTR_OPEN */ + "close", /* ATTR_CLOSE */ + "mathvariant", /* ATTR_MATHVARIANT */ }; - -struct htmlq { - struct htmlnode *last; +static const char *const roffscales[SCALE_MAX] = { + "cm", /* SCALE_CM */ + "in", /* SCALE_IN */ + "pc", /* SCALE_PC */ + "pt", /* SCALE_PT */ + "em", /* SCALE_EM */ + "em", /* SCALE_MM */ + "ex", /* SCALE_EN */ + "ex", /* SCALE_BU */ + "em", /* SCALE_VS */ + "ex", /* SCALE_FS */ }; +static void bufncat(struct html *, const char *, size_t); +static void print_ctag(struct html *, enum htmltag); +static int print_escape(char); +static int print_encode(struct html *, const char *, int); +static void print_metaf(struct html *, enum mandoc_esc); +static void print_attr(struct html *, const char *, const char *); -static int html_loadcss(struct md_mbuf *, const char *); -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 *, void *, - const struct md_args *, - enum md_ns, int, - const int *, const char **); -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_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 int html_blocktagname(struct md_mbuf *, - const struct md_args *, int, - struct htmlq *, const int *, - const char **, size_t *); -static int html_blocktagargs(struct md_mbuf *, - const struct md_args *, int, - const int *, const char **, size_t *); -static int html_headtagname(struct md_mbuf *, - const struct md_args *, int, - struct htmlq *, const int *, - const char **, size_t *); -static int html_headtagargs(struct md_mbuf *, - const struct md_args *, int, - const int *, const char **, size_t *); -static int html_bodytagname(struct md_mbuf *, - const struct md_args *, - int, struct htmlq *, const int *, - const char **, size_t *); -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 *, - const struct md_args *, int, size_t *); -static int html_inlinetagargs(struct md_mbuf *, - const struct md_args *, int, - const int *, const char **, size_t *); -static int html_Bl_bodytagname(struct md_mbuf *, - struct htmlq *, const int *, - const char **, size_t *); -static int html_It_blocktagname(struct md_mbuf *, - struct htmlq *, const int *, - const char **, size_t *); -static int html_It_headtagname(struct md_mbuf *, - struct htmlq *, const int *, - const char **, size_t *); -static int html_It_bodytagname(struct md_mbuf *, - struct htmlq *, const int *, - const char **, size_t *); +void * +html_alloc(const struct mchars *mchars, char *outopts) +{ + struct html *h; + const char *toks[5]; + char *v; + toks[0] = "style"; + toks[1] = "man"; + toks[2] = "includes"; + toks[3] = "fragment"; + toks[4] = NULL; -/* ARGSUSED */ -static int -html_It_headtagname(struct md_mbuf *mbuf, struct htmlq *q, - const int *argc, const char **argv, size_t *res) -{ - struct htmlnode *n; - int i; + h = mandoc_calloc(1, sizeof(struct html)); - for (n = q->last; n; n = n->parent) - if (n->tok == ROFF_Bl) - break; + h->tags.head = NULL; + h->symtab = mchars; - assert(n); - for (i = 0; ROFF_ARGMAX != n->argc[i] && - i < ROFF_MAXLINEARG; i++) { - switch (n->argc[i]) { - case (ROFF_Tag): - /* FALLTHROUGH */ - case (ROFF_Column): - return(ml_nputs(mbuf, "td", 2, res)); + while (outopts && *outopts) + switch (getsubopt(&outopts, UNCONST(toks), &v)) { + case 0: + h->style = v; + break; + case 1: + h->base_man = v; + break; + case 2: + h->base_includes = v; + break; + case 3: + h->oflags |= HTML_FRAGMENT; + break; default: break; } + + return(h); +} + +void +html_free(void *p) +{ + struct tag *tag; + struct html *h; + + h = (struct html *)p; + + while ((tag = h->tags.head) != NULL) { + h->tags.head = tag->next; + free(tag); } - assert(i != ROFF_MAXLINEARG); - abort(); - /* NOTREACHED */ + free(h); +} - return(1); +void +print_gen_head(struct html *h) +{ + struct htmlpair tag[4]; + struct tag *t; + + tag[0].key = ATTR_CHARSET; + tag[0].val = "utf-8"; + print_otag(h, TAG_META, 1, tag); + + /* + * Print a default style-sheet. + */ + t = print_otag(h, TAG_STYLE, 0, NULL); + print_text(h, "table.head, table.foot { width: 100%; }\n" + "td.head-rtitle, td.foot-os { text-align: right; }\n" + "td.head-vol { text-align: center; }\n" + "table.foot td { width: 50%; }\n" + "table.head td { width: 33%; }\n" + "div.spacer { margin: 1em 0; }\n"); + print_tagq(h, t); + + if (h->style) { + tag[0].key = ATTR_REL; + tag[0].val = "stylesheet"; + tag[1].key = ATTR_HREF; + tag[1].val = h->style; + tag[2].key = ATTR_TYPE; + tag[2].val = "text/css"; + tag[3].key = ATTR_MEDIA; + tag[3].val = "all"; + print_otag(h, TAG_LINK, 4, tag); + } } +static void +print_metaf(struct html *h, enum mandoc_esc deco) +{ + enum htmlfont font; -/* ARGSUSED */ -static int -html_It_bodytagname(struct md_mbuf *mbuf, struct htmlq *q, - const int *argc, const char **argv, size_t *res) + switch (deco) { + case ESCAPE_FONTPREV: + font = h->metal; + break; + case ESCAPE_FONTITALIC: + font = HTMLFONT_ITALIC; + break; + case ESCAPE_FONTBOLD: + font = HTMLFONT_BOLD; + break; + case ESCAPE_FONTBI: + font = HTMLFONT_BI; + break; + case ESCAPE_FONT: + /* FALLTHROUGH */ + case ESCAPE_FONTROMAN: + font = HTMLFONT_NONE; + break; + default: + abort(); + /* NOTREACHED */ + } + + if (h->metaf) { + print_tagq(h, h->metaf); + h->metaf = NULL; + } + + h->metal = h->metac; + h->metac = font; + + switch (font) { + case HTMLFONT_ITALIC: + h->metaf = print_otag(h, TAG_I, 0, NULL); + break; + case HTMLFONT_BOLD: + h->metaf = print_otag(h, TAG_B, 0, NULL); + break; + case HTMLFONT_BI: + h->metaf = print_otag(h, TAG_B, 0, NULL); + print_otag(h, TAG_I, 0, NULL); + break; + default: + break; + } +} + +int +html_strlen(const char *cp) { - struct htmlnode *n; - int i; + size_t rsz; + int skip, sz; - for (n = q->last; n; n = n->parent) - if (n->tok == ROFF_Bl) - break; + /* + * Account for escaped sequences within string length + * calculations. This follows the logic in term_strlen() as we + * must calculate the width of produced strings. + * Assume that characters are always width of "1". This is + * hacky, but it gets the job done for approximation of widths. + */ - assert(n); - for (i = 0; ROFF_ARGMAX != n->argc[i] && - i < ROFF_MAXLINEARG; i++) { - switch (n->argc[i]) { - case (ROFF_Enum): + sz = 0; + skip = 0; + while (1) { + rsz = strcspn(cp, "\\"); + if (rsz) { + cp += rsz; + if (skip) { + skip = 0; + rsz--; + } + sz += rsz; + } + if ('\0' == *cp) + break; + cp++; + switch (mandoc_escape(&cp, NULL, NULL)) { + case ESCAPE_ERROR: + return(sz); + case ESCAPE_UNICODE: /* FALLTHROUGH */ - case (ROFF_Bullet): + case ESCAPE_NUMBERED: /* FALLTHROUGH */ - case (ROFF_Dash): - /* FALLTHROUGH */ - case (ROFF_Hyphen): - /* FALLTHROUGH */ - case (ROFF_Item): - /* FALLTHROUGH */ - case (ROFF_Diag): - /* FALLTHROUGH */ - case (ROFF_Hang): - /* FALLTHROUGH */ - case (ROFF_Ohang): - /* FALLTHROUGH */ - case (ROFF_Inset): - return(ml_nputs(mbuf, "div", 3, res)); - case (ROFF_Tag): - /* FALLTHROUGH */ - case (ROFF_Column): - return(ml_nputs(mbuf, "td", 2, res)); + case ESCAPE_SPECIAL: + if (skip) + skip = 0; + else + sz++; + break; + case ESCAPE_SKIPCHAR: + skip = 1; + break; default: break; } } + return(sz); +} - assert(i != ROFF_MAXLINEARG); - abort(); - /* NOTREACHED */ +static int +print_escape(char c) +{ + switch (c) { + case '<': + printf("<"); + break; + case '>': + printf(">"); + break; + case '&': + printf("&"); + break; + case '"': + printf("""); + break; + case ASCII_NBRSP: + putchar('-'); + break; + case ASCII_HYPH: + putchar('-'); + /* FALLTHROUGH */ + case ASCII_BREAK: + break; + default: + return(0); + } return(1); } - -/* ARGSUSED */ static int -html_Bl_bodytagname(struct md_mbuf *mbuf, struct htmlq *q, - const int *argc, const char **argv, size_t *res) +print_encode(struct html *h, const char *p, int norecurse) { - int i; + size_t sz; + int c, len, nospace; + const char *seq; + enum mandoc_esc esc; + static const char rejs[9] = { '\\', '<', '>', '&', '"', + ASCII_NBRSP, ASCII_HYPH, ASCII_BREAK, '\0' }; - for (i = 0; ROFF_ARGMAX != argc[i] - && i < ROFF_MAXLINEARG; i++) { - switch (argc[i]) { - case (ROFF_Enum): - return(ml_nputs(mbuf, "ol", 2, res)); - case (ROFF_Bullet): - /* FALLTHROUGH */ - case (ROFF_Dash): - /* FALLTHROUGH */ - case (ROFF_Hyphen): - /* FALLTHROUGH */ - case (ROFF_Item): - /* FALLTHROUGH */ - case (ROFF_Diag): - /* FALLTHROUGH */ - case (ROFF_Hang): - /* FALLTHROUGH */ - case (ROFF_Ohang): - /* FALLTHROUGH */ - case (ROFF_Inset): - return(ml_nputs(mbuf, "ul", 2, res)); - case (ROFF_Tag): - /* FALLTHROUGH */ - case (ROFF_Column): - return(ml_nputs(mbuf, "table", 5, res)); - default: - break; + nospace = 0; + + while ('\0' != *p) { + if (HTML_SKIPCHAR & h->flags && '\\' != *p) { + h->flags &= ~HTML_SKIPCHAR; + p++; + continue; } - } - assert(i != ROFF_MAXLINEARG); - abort(); - /* NOTREACHED */ -} + sz = strcspn(p, rejs); + fwrite(p, 1, sz, stdout); + p += (int)sz; -/* ARGSUSED */ -static int -html_It_blocktagname(struct md_mbuf *mbuf, struct htmlq *q, - const int *argc, const char **argv, size_t *res) -{ - struct htmlnode *n; - int i; + if ('\0' == *p) + break; - for (n = q->last; n; n = n->parent) - if (n->tok == ROFF_Bl) + if (print_escape(*p++)) + continue; + + esc = mandoc_escape(&p, &seq, &len); + if (ESCAPE_ERROR == esc) break; - assert(n); - for (i = 0; ROFF_ARGMAX != n->argc[i] && - i < ROFF_MAXLINEARG; i++) { - switch (n->argc[i]) { - case (ROFF_Enum): + switch (esc) { + case ESCAPE_FONT: /* FALLTHROUGH */ - case (ROFF_Bullet): + case ESCAPE_FONTPREV: /* FALLTHROUGH */ - case (ROFF_Dash): + case ESCAPE_FONTBOLD: /* FALLTHROUGH */ - case (ROFF_Hyphen): + case ESCAPE_FONTITALIC: /* FALLTHROUGH */ - case (ROFF_Item): + case ESCAPE_FONTBI: /* FALLTHROUGH */ - case (ROFF_Diag): - /* FALLTHROUGH */ - case (ROFF_Hang): - /* FALLTHROUGH */ - case (ROFF_Ohang): - /* FALLTHROUGH */ - case (ROFF_Inset): - return(ml_nputs(mbuf, "li", 2, res)); - case (ROFF_Tag): - /* FALLTHROUGH */ - case (ROFF_Column): - return(ml_nputs(mbuf, "tr", 2, res)); + case ESCAPE_FONTROMAN: + if (0 == norecurse) + print_metaf(h, esc); + continue; + case ESCAPE_SKIPCHAR: + h->flags |= HTML_SKIPCHAR; + continue; default: break; } + + if (h->flags & HTML_SKIPCHAR) { + h->flags &= ~HTML_SKIPCHAR; + continue; + } + + switch (esc) { + case ESCAPE_UNICODE: + /* Skip past "u" header. */ + c = mchars_num2uc(seq + 1, len - 1); + break; + case ESCAPE_NUMBERED: + c = mchars_num2char(seq, len); + break; + case ESCAPE_SPECIAL: + c = mchars_spec2cp(h->symtab, seq, len); + break; + case ESCAPE_NOSPACE: + if ('\0' == *p) + nospace = 1; + continue; + default: + continue; + } + if (c <= 0) + continue; + if (c < 0x20 || (c > 0x7E && c < 0xA0)) + c = 0xFFFD; + if (c > 0x7E) + printf("&#%d;", c); + else if ( ! print_escape(c)) + putchar(c); } - assert(i != ROFF_MAXLINEARG); - abort(); - /* NOTREACHED */ + return(nospace); } +static void +print_attr(struct html *h, const char *key, const char *val) +{ + printf(" %s=\"", key); + (void)print_encode(h, val, 1); + putchar('\"'); +} -static int -html_loadcss(struct md_mbuf *mbuf, const char *css) +struct tag * +print_otag(struct html *h, enum htmltag tag, + int sz, const struct htmlpair *p) { - size_t res, bufsz; - char *buf; - struct stat st; - int fd, c; - ssize_t ssz; + int i; + struct tag *t; - c = 0; - res = 0; - buf = NULL; + /* Push this tags onto the stack of open scopes. */ - if (-1 == (fd = open(css, O_RDONLY, 0))) { - warn("%s", css); - return(0); - } - - if (-1 == fstat(fd, &st)) { - warn("%s", css); - goto out; - } + if ( ! (HTML_NOSTACK & htmltags[tag].flags)) { + t = mandoc_malloc(sizeof(struct tag)); + t->tag = tag; + t->next = h->tags.head; + h->tags.head = t; + } else + t = NULL; - bufsz = MAX(st.st_blksize, BUFSIZ); - if (NULL == (buf = malloc(bufsz))) { - warn("malloc"); - goto out; - } + if ( ! (HTML_NOSPACE & h->flags)) + if ( ! (HTML_CLRLINE & htmltags[tag].flags)) { + /* Manage keeps! */ + if ( ! (HTML_KEEP & h->flags)) { + if (HTML_PREKEEP & h->flags) + h->flags |= HTML_KEEP; + putchar(' '); + } else + printf(" "); + } - 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; - } + if ( ! (h->flags & HTML_NONOSPACE)) + h->flags &= ~HTML_NOSPACE; + else + h->flags |= HTML_NOSPACE; - c = 1; + /* Print out the tag name and attributes. */ -out: - if (-1 == close(fd)) { - warn("%s", css); - c = 0; - } + printf("<%s", htmltags[tag].name); + for (i = 0; i < sz; i++) + print_attr(h, htmlattrs[p[i].key], p[i].val); - if (buf) - free(buf); + /* Accommodate for "well-formed" singleton escaping. */ - return(c); -} + if (HTML_AUTOCLOSE & htmltags[tag].flags) + putchar('/'); + putchar('>'); -/* ARGSUSED */ -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 *vol) -{ - const char *preamble, *css, *trail; - char buf[512]; - size_t res; + h->flags |= HTML_NOSPACE; - preamble = - "\n" - "\n" - "\n" - " \n" - " \n" - " Manual Page for %s(%s)\n"; + if ((HTML_AUTOCLOSE | HTML_CLRLINE) & htmltags[tag].flags) + putchar('\n'); - css = - " \n"; - trail = - "\n" - "\n" - "
"; + return(t); +} - res = 0; +static void +print_ctag(struct html *h, enum htmltag tag) +{ - (void)snprintf(buf, sizeof(buf) - 1, - preamble, title, section); - - if ( ! ml_puts(mbuf, buf, &res)) - return(0); - - 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); + printf("", htmltags[tag].name); + if (HTML_CLRLINE & htmltags[tag].flags) { + h->flags |= HTML_NOSPACE; + putchar('\n'); } - - if ( ! ml_puts(mbuf, trail, &res)) - return(0); - - return(1); } - -/* ARGSUSED */ -static int -html_end(struct md_mbuf *mbuf, const struct md_args *args) +void +print_gen_decls(struct html *h) { - return(ml_puts(mbuf, "
\n", NULL)); + puts(""); } - -/* ARGSUSED */ -static int -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) +void +print_text(struct html *h, const char *word) { - 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)); + if ( ! (HTML_NOSPACE & h->flags)) { + /* Manage keeps! */ + if ( ! (HTML_KEEP & h->flags)) { + if (HTML_PREKEEP & h->flags) + h->flags |= HTML_KEEP; + putchar(' '); + } else + printf(" "); + } + + assert(NULL == h->metaf); + switch (h->metac) { + case HTMLFONT_ITALIC: + h->metaf = print_otag(h, TAG_I, 0, NULL); + break; + case HTMLFONT_BOLD: + h->metaf = print_otag(h, TAG_B, 0, NULL); + break; + case HTMLFONT_BI: + h->metaf = print_otag(h, TAG_B, 0, NULL); + print_otag(h, TAG_I, 0, NULL); + break; default: break; } - return(ml_puts(mbuf, "div", res)); -} + assert(word); + if ( ! print_encode(h, word, 0)) { + if ( ! (h->flags & HTML_NONOSPACE)) + h->flags &= ~HTML_NOSPACE; + } else + h->flags |= HTML_NOSPACE; - -/* ARGSUSED */ -static int -html_headtagname(struct md_mbuf *mbuf, - const struct md_args *args, int tok, struct htmlq *q, - const int *argc, const char **argv, size_t *res) -{ - - 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_nputs(mbuf, "h1", 2, res)); - case (ROFF_Ss): - return(ml_nputs(mbuf, "h2", 2, res)); - default: - break; + if (h->metaf) { + print_tagq(h, h->metaf); + h->metaf = NULL; } - return(ml_nputs(mbuf, "div", 3, res)); + h->flags &= ~HTML_IGNDELIM; } - -/* ARGSUSED */ -static int -html_blocktagname(struct md_mbuf *mbuf, const struct md_args *args, - int tok, struct htmlq *q, const int *argc, - const char **argv, size_t *res) +void +print_tagq(struct html *h, const struct tag *until) { + struct tag *tag; - 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: - break; + while ((tag = h->tags.head) != NULL) { + /* + * Remember to close out and nullify the current + * meta-font and table, if applicable. + */ + if (tag == h->metaf) + h->metaf = NULL; + if (tag == h->tblt) + h->tblt = NULL; + print_ctag(h, tag->tag); + h->tags.head = tag->next; + free(tag); + if (until && tag == until) + return; } - - return(ml_puts(mbuf, "div", res)); } - -/* ARGSUSED */ -static int -html_printargs(struct md_mbuf *mbuf, int tok, const char *ns, - const int *argc, const char **argv, size_t *res) +void +print_stagq(struct html *h, const struct tag *suntil) { + struct tag *tag; - if ( ! ml_puts(mbuf, " class=\"", res)) - return(0); - if ( ! ml_puts(mbuf, ns, res)) - return(0); - if ( ! ml_puts(mbuf, "-", res)) - return(0); - if ( ! ml_puts(mbuf, toknames[tok], res)) - return(0); - return(ml_puts(mbuf, "\"", res)); + while ((tag = h->tags.head) != NULL) { + if (suntil && tag == suntil) + return; + /* + * Remember to close out and nullify the current + * meta-font and table, if applicable. + */ + if (tag == h->metaf) + h->metaf = NULL; + if (tag == h->tblt) + h->tblt = NULL; + print_ctag(h, tag->tag); + h->tags.head = tag->next; + free(tag); + } } - -/* ARGSUSED */ -static int -html_headtagargs(struct md_mbuf *mbuf, - const struct md_args *args, int tok, - const int *argc, const char **argv, size_t *res) +void +print_paragraph(struct html *h) { + struct tag *t; + struct htmlpair tag; - return(html_printargs(mbuf, tok, "head", argc, argv, res)); + PAIR_CLASS_INIT(&tag, "spacer"); + t = print_otag(h, TAG_DIV, 1, &tag); + print_tagq(h, t); } -/* ARGSUSED */ -static int -html_bodytagargs(struct md_mbuf *mbuf, - const struct md_args *args, int tok, - const int *argc, const char **argv, size_t *res) +void +bufinit(struct html *h) { - return(html_printargs(mbuf, tok, "body", argc, argv, res)); + h->buf[0] = '\0'; + h->buflen = 0; } - -/* 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) +void +bufcat_style(struct html *h, const char *key, const char *val) { - return(html_printargs(mbuf, tok, "block", argc, argv, res)); + bufcat(h, key); + bufcat(h, ":"); + bufcat(h, val); + bufcat(h, ";"); } - -/* ARGSUSED */ -static int -html_inlinetagargs(struct md_mbuf *mbuf, - const struct md_args *args, int tok, - const int *argc, const char **argv, size_t *res) +void +bufcat(struct html *h, const char *p) { - if ( ! html_printargs(mbuf, tok, "inline", argc, argv, res)) - return(0); + /* + * XXX This is broken and not easy to fix. + * When using the -Oincludes option, buffmt_includes() + * may pass in strings overrunning BUFSIZ, causing a crash. + */ - 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); - default: - break; - } - - return(1); + h->buflen = strlcat(h->buf, p, BUFSIZ); + assert(h->buflen < BUFSIZ); } - -/* ARGSUSED */ -static int -html_inlinetagname(struct md_mbuf *mbuf, - const struct md_args *args, int tok, size_t *res) +void +bufcat_fmt(struct html *h, const char *fmt, ...) { + va_list ap; - switch (tok) { - case (ROFF_Pp): - return(ml_nputs(mbuf, "div", 3, res)); - case (ROFF_Sx): - return(ml_nputs(mbuf, "a", 1, res)); - default: - break; - } - - return(ml_puts(mbuf, "span", res)); + va_start(ap, fmt); + (void)vsnprintf(h->buf + (int)h->buflen, + BUFSIZ - h->buflen - 1, fmt, ap); + va_end(ap); + h->buflen = strlen(h->buf); } - -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) +static void +bufncat(struct html *h, const char *p, size_t sz) { - size_t res; - struct htmlq *q; - struct htmlnode *node; - int i; - assert(ns != MD_NS_DEFAULT); - res = 0; - - assert(data); - q = (struct htmlq *)data; - - if (NULL == (node = calloc(1, sizeof(struct htmlnode)))) { - warn("calloc"); - return(-1); - } - - node->parent = q->last; - node->tok = tok; - node->ns = ns; - - if (argc) { - /* TODO: argv. */ - - assert(argv); - for (i = 0; ROFF_ARGMAX != argc[i] - && i < ROFF_MAXLINEARG; i++) - node->argc[i] = argc[i]; - assert(i != ROFF_MAXLINEARG); - } - - - q->last = node; - - switch (ns) { - case (MD_NS_BLOCK): - if ( ! html_blocktagname(mbuf, args, tok, - q, argc, argv, &res)) - return(-1); - if ( ! html_blocktagargs(mbuf, args, tok, - argc, argv, &res)) - return(-1); - break; - case (MD_NS_BODY): - if ( ! html_bodytagname(mbuf, args, tok, - q, argc, argv, &res)) - return(-1); - if ( ! html_bodytagargs(mbuf, args, tok, - argc, argv, &res)) - return(-1); - break; - case (MD_NS_HEAD): - if ( ! html_headtagname(mbuf, args, tok, q, - argc, argv, &res)) - return(-1); - if ( ! html_headtagargs(mbuf, args, tok, - argc, argv, &res)) - return(-1); - break; - default: - if ( ! html_inlinetagname(mbuf, args, tok, &res)) - return(-1); - if ( ! html_inlinetagargs(mbuf, args, tok, - argc, argv, &res)) - return(-1); - break; - } - - return((ssize_t)res); + assert(h->buflen + sz + 1 < BUFSIZ); + strncat(h->buf, p, sz); + h->buflen += sz; } - -static ssize_t -html_endtag(struct md_mbuf *mbuf, void *data, - const struct md_args *args, enum md_ns ns, int tok) +void +buffmt_includes(struct html *h, const char *name) { - size_t res; - struct htmlq *q; - struct htmlnode *node; + const char *p, *pp; - assert(ns != MD_NS_DEFAULT); - res = 0; + pp = h->base_includes; - assert(data); - q = (struct htmlq *)data; - node = q->last; - - switch (ns) { - case (MD_NS_BLOCK): - if ( ! html_blocktagname(mbuf, args, tok, - q, node->argc, - (const char **)node->argv, &res)) - return(-1); - break; - case (MD_NS_BODY): - if ( ! html_bodytagname(mbuf, args, tok, - q, node->argc, - (const char **)node->argv, &res)) - return(-1); - break; - case (MD_NS_HEAD): - if ( ! html_headtagname(mbuf, args, tok, - q, node->argc, - (const char **)node->argv, &res)) - return(-1); - break; - default: - if ( ! html_inlinetagname(mbuf, args, tok, &res)) - return(-1); - break; + bufinit(h); + while (NULL != (p = strchr(pp, '%'))) { + bufncat(h, pp, (size_t)(p - pp)); + switch (*(p + 1)) { + case'I': + bufcat(h, name); + break; + default: + bufncat(h, p, 2); + break; + } + pp = p + 2; } - - q->last = node->parent; - - free(node); - - return((ssize_t)res); + if (pp) + bufcat(h, pp); } - -static int -html_alloc(void **p) +void +buffmt_man(struct html *h, const char *name, const char *sec) { + const char *p, *pp; - if (NULL == (*p = calloc(1, sizeof(struct htmlq)))) { - warn("calloc"); - return(0); - } - return(1); -} + pp = h->base_man; - -static void -html_free(void *p) -{ - struct htmlq *q; - struct htmlnode *n; - - assert(p); - q = (struct htmlq *)p; - - while ((n = q->last)) { - q->last = n->parent; - free(n); + bufinit(h); + while (NULL != (p = strchr(pp, '%'))) { + bufncat(h, pp, (size_t)(p - pp)); + switch (*(p + 1)) { + case 'S': + bufcat(h, sec ? sec : "1"); + break; + case 'N': + bufcat_fmt(h, "%s", name); + break; + default: + bufncat(h, p, 2); + break; + } + pp = p + 2; } - - free(q); + if (pp) + bufcat(h, pp); } - -int -md_line_html(void *data, char *buf) +void +bufcat_su(struct html *h, const char *p, const struct roffsu *su) { + double v; - return(mlg_line((struct md_mlg *)data, buf)); -} + v = su->scale; + if (SCALE_MM == su->unit && 0.0 == (v /= 100.0)) + v = 1.0; + else if (SCALE_BU == su->unit) + v /= 24.0; - -int -md_exit_html(void *data, int flush) -{ - - return(mlg_exit((struct md_mlg *)data, flush)); + bufcat_fmt(h, "%s: %.2f%s;", p, v, roffscales[su->unit]); } - -void * -md_init_html(const struct md_args *args, - struct md_mbuf *mbuf, const struct md_rbuf *rbuf) +void +bufcat_id(struct html *h, const char *src) { - struct ml_cbs cbs; - 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; + /* Cf. . */ - return(mlg_alloc(args, rbuf, mbuf, &cbs)); + while ('\0' != *src) + bufcat_fmt(h, "%.2x", *src++); } -