=================================================================== RCS file: /cvs/mandoc/html.c,v retrieving revision 1.27 retrieving revision 1.194 diff -u -p -r1.27 -r1.194 --- mandoc/html.c 2008/12/12 10:11:10 1.27 +++ mandoc/html.c 2017/01/17 01:47:51 1.194 @@ -1,1085 +1,812 @@ -/* $Id: html.c,v 1.27 2008/12/12 10:11:10 kristaps Exp $ */ +/* $Id: html.c,v 1.194 2017/01/17 01:47:51 schwarze Exp $ */ /* - * Copyright (c) 2008 Kristaps Dzonsons + * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons + * Copyright (c) 2011-2015, 2017 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 AUTHORS DISCLAIM ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS 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 "mandoc.h" +#include "mandoc_aux.h" +#include "out.h" #include "html.h" -#include "ml.h" +#include "manconf.h" +#include "main.h" -/* TODO: allow head/tail-less invocations (just "div" start). */ +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. */ +}; -struct htmlnode { - int tok; - enum md_ns ns; - int argc[ROFF_MAXLINEARG]; - char *argv[ROFF_MAXLINEARG]; - struct htmlnode *parent; +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 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 a2width(const char *, struct roffsu *); +static void bufncat(struct html *, const char *, size_t); +static void print_ctag(struct html *, struct tag *); +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 ml_args *, - enum md_ns, int); -static ssize_t html_beginstring(struct ml_args *, - const char *, size_t); -static ssize_t html_endstring(struct ml_args *, - const char *, size_t); -static ssize_t html_begintag(struct ml_args *, - enum md_ns, int, - const int *, const char **); -static int html_begin(struct ml_args *, - const struct tm *, - const char *, const char *, - enum roffmsec, enum roffvol); -static int html_end(struct ml_args *, - const struct tm *, - const char *, const char *, - enum roffmsec, enum roffvol); -static int html_printargs(struct md_mbuf *, int, - const char *, const int *, - const char **, size_t *); -static ssize_t html_beginhttp(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 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 *); -static int html_tputln(struct md_mbuf *, - enum ml_scope, int, enum html_tag); -static int html_aputln(struct md_mbuf *, enum ml_scope, - int, enum html_tag, - int, const struct html_pair *); - -/* ARGSUSED */ -static int -html_It_headtagname(struct md_mbuf *mbuf, struct htmlq *q, - const int *argc, const char **argv, size_t *res) +void * +html_alloc(const struct manoutput *outopts) { - struct htmlnode *n; - int i; - struct html_pair attr[2]; + struct html *h; - for (n = q->last; n; n = n->parent) - if (n->tok == ROFF_Bl) - break; + h = mandoc_calloc(1, sizeof(struct html)); - assert(n); + h->tags.head = NULL; + h->style = outopts->style; + h->base_man = outopts->man; + h->base_includes = outopts->includes; + if (outopts->fragment) + h->oflags |= HTML_FRAGMENT; - /* LINTED */ - for (i = 0; ROFF_ARGMAX != n->argc[i] && - i < ROFF_MAXLINEARG; i++) { - switch (n->argc[i]) { - case (ROFF_Ohang): - return(html_stput(mbuf, HTML_TAG_DIV, res)); - case (ROFF_Tag): - attr[0].attr = HTML_ATTR_VALIGN; - attr[0].val = "top"; - attr[1].attr = HTML_ATTR_NOWRAP; - attr[1].val = "true"; - return(html_saput(mbuf, HTML_TAG_TD, - res, 2, attr)); - case (ROFF_Column): - attr[0].attr = HTML_ATTR_VALIGN; - attr[0].val = "top"; - return(html_saput(mbuf, HTML_TAG_TD, - res, 1, attr)); - default: - break; - } - } - - return(0); + return h; } - -/* ARGSUSED */ -static int -html_It_bodytagname(struct md_mbuf *mbuf, struct htmlq *q, - const int *argc, const char **argv, size_t *res) +void +html_free(void *p) { - struct htmlnode *n; - int i; - struct html_pair attr[1]; + struct tag *tag; + struct html *h; - for (n = q->last; n; n = n->parent) - if (n->tok == ROFF_Bl) - break; + h = (struct html *)p; - assert(n); - - /* LINTED */ - for (i = 0; ROFF_ARGMAX != n->argc[i] && - i < ROFF_MAXLINEARG; i++) { - switch (n->argc[i]) { - case (ROFF_Enum): - /* FALLTHROUGH */ - 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(html_stput(mbuf, HTML_TAG_DIV, res)); - case (ROFF_Tag): - /* FALLTHROUGH */ - case (ROFF_Column): - attr[0].attr = HTML_ATTR_VALIGN; - attr[0].val = "top"; - return(html_saput(mbuf, HTML_TAG_TD, - res, 1, attr)); - default: - break; - } + while ((tag = h->tags.head) != NULL) { + h->tags.head = tag->next; + free(tag); } - assert(i != ROFF_MAXLINEARG); - return(0); + free(h); } +void +print_gen_head(struct html *h) +{ + struct tag *t; -/* ARGSUSED */ -static int -html_Bl_bodytagname(struct md_mbuf *mbuf, struct htmlq *q, - const int *argc, const char **argv, size_t *res) + print_otag(h, TAG_META, "?", "charset", "utf-8"); + + /* + * Print a default style-sheet. + */ + t = print_otag(h, TAG_STYLE, ""); + 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) + print_otag(h, TAG_LINK, "?h??", "rel", "stylesheet", + h->style, "type", "text/css", "media", "all"); +} + +static void +print_metaf(struct html *h, enum mandoc_esc deco) { - int i; + enum htmlfont font; - for (i = 0; ROFF_ARGMAX != argc[i] - && i < ROFF_MAXLINEARG; i++) { - switch (argc[i]) { - case (ROFF_Enum): - return(html_stput(mbuf, HTML_TAG_OL, 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(html_stput(mbuf, HTML_TAG_UL, res)); - case (ROFF_Tag): - /* FALLTHROUGH */ - case (ROFF_Column): - return(html_stput(mbuf, HTML_TAG_TABLE, res)); - default: - break; - } + 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: + case ESCAPE_FONTROMAN: + font = HTMLFONT_NONE; + break; + default: + abort(); } - assert(i != ROFF_MAXLINEARG); - return(0); -} + if (h->metaf) { + print_tagq(h, h->metaf); + h->metaf = NULL; + } + h->metal = h->metac; + h->metac = font; -/* ARGSUSED */ -static int -html_It_blocktagname(struct md_mbuf *mbuf, struct htmlq *q, - const int *argc, const char **argv, size_t *res) + switch (font) { + case HTMLFONT_ITALIC: + h->metaf = print_otag(h, TAG_I, ""); + break; + case HTMLFONT_BOLD: + h->metaf = print_otag(h, TAG_B, ""); + break; + case HTMLFONT_BI: + h->metaf = print_otag(h, TAG_B, ""); + print_otag(h, TAG_I, ""); + 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); - - /* LINTED */ - for (i = 0; ROFF_ARGMAX != n->argc[i] && - i < ROFF_MAXLINEARG; i++) { - switch (n->argc[i]) { - case (ROFF_Enum): - /* FALLTHROUGH */ - 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(html_stput(mbuf, HTML_TAG_LI, res)); - case (ROFF_Tag): - /* FALLTHROUGH */ - case (ROFF_Column): - return(html_stput(mbuf, HTML_TAG_TR, res)); + 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: + case ESCAPE_NUMBERED: + case ESCAPE_SPECIAL: + case ESCAPE_OVERSTRIKE: + if (skip) + skip = 0; + else + sz++; + break; + case ESCAPE_SKIPCHAR: + skip = 1; + break; default: break; } } - - assert(i != ROFF_MAXLINEARG); - return(0); + return sz; } - static int -html_loadcss(struct md_mbuf *mbuf, const char *css) +print_escape(char c) { - 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; + switch (c) { + case '<': + printf("<"); + break; + case '>': + printf(">"); + break; + case '&': + printf("&"); + break; + case '"': + printf("""); + break; + case ASCII_NBRSP: + printf(" "); + break; + case ASCII_HYPH: + putchar('-'); + break; + case ASCII_BREAK: + break; + default: + return 0; } - - 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); + return 1; } - static int -html_tputln(struct md_mbuf *mbuf, enum ml_scope scope, - int i, enum html_tag tag) +print_encode(struct html *h, const char *p, int norecurse) { + 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' }; - if ( ! ml_putchars(mbuf, ' ', INDENT(i) * INDENT_SZ, NULL)) - return(0); - if ( ! html_tput(mbuf, scope, tag, NULL)) - return(0); - return(ml_nputs(mbuf, "\n", 1, NULL)); -} + nospace = 0; + while ('\0' != *p) { + if (HTML_SKIPCHAR & h->flags && '\\' != *p) { + h->flags &= ~HTML_SKIPCHAR; + p++; + continue; + } -static int -html_aputln(struct md_mbuf *mbuf, enum ml_scope scope, int i, - enum html_tag tag, int sz, const struct html_pair *p) -{ + sz = strcspn(p, rejs); - if ( ! ml_putchars(mbuf, ' ', INDENT(i) * INDENT_SZ, NULL)) - return(0); - if ( ! html_aput(mbuf, scope, tag, NULL, sz, p)) - return(0); - return(ml_nputs(mbuf, "\n", 1, NULL)); -} + fwrite(p, 1, sz, stdout); + p += (int)sz; + if ('\0' == *p) + break; -/* ARGSUSED */ -static int -html_begin(struct ml_args *p, const struct tm *tm, const char *os, - const char *name, enum roffmsec msec, enum roffvol vol) -{ - enum roffvol bvol; - struct html_pair attr[4]; - char ts[32], title[64]; - int i; + if (print_escape(*p++)) + continue; - (void)snprintf(ts, sizeof(ts), "%s(%s)", - name, roff_msecname(msec)); + esc = mandoc_escape(&p, &seq, &len); + if (ESCAPE_ERROR == esc) + break; - if (vol >= ROFF_ARCH_START) { - switch (msec) { - case(ROFF_MSEC_1): - /* FALLTHROUGH */ - case(ROFF_MSEC_6): - /* FALLTHROUGH */ - case(ROFF_MSEC_7): - bvol = ROFF_VOL_URM; + switch (esc) { + case ESCAPE_FONT: + case ESCAPE_FONTPREV: + case ESCAPE_FONTBOLD: + case ESCAPE_FONTITALIC: + case ESCAPE_FONTBI: + case ESCAPE_FONTROMAN: + if (0 == norecurse) + print_metaf(h, esc); + continue; + case ESCAPE_SKIPCHAR: + h->flags |= HTML_SKIPCHAR; + continue; + default: break; - case(ROFF_MSEC_2): - /* FALLTHROUGH */ - case(ROFF_MSEC_3): - /* FALLTHROUGH */ - case(ROFF_MSEC_3p): - /* FALLTHROUGH */ - case(ROFF_MSEC_4): - /* FALLTHROUGH */ - case(ROFF_MSEC_5): - bvol = ROFF_VOL_PRM; + } + + 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(ROFF_MSEC_8): - bvol = ROFF_VOL_PRM; + case ESCAPE_NUMBERED: + c = mchars_num2char(seq, len); + if (c < 0) + continue; break; - case(ROFF_MSEC_9): - bvol = ROFF_VOL_KM; + case ESCAPE_SPECIAL: + c = mchars_spec2cp(seq, len); + if (c <= 0) + continue; break; - case(ROFF_MSEC_UNASS): - /* FALLTHROUGH */ - case(ROFF_MSEC_DRAFT): - /* FALLTHROUGH */ - case(ROFF_MSEC_PAPER): - bvol = ROFF_VOL_NONE; + case ESCAPE_NOSPACE: + if ('\0' == *p) + nospace = 1; + continue; + case ESCAPE_OVERSTRIKE: + if (len == 0) + continue; + c = seq[len - 1]; break; default: - abort(); - /* NOTREACHED */ + continue; } + if ((c < 0x20 && c != 0x09) || + (c > 0x7E && c < 0xA0)) + c = 0xFFFD; + if (c > 0x7E) + printf("&#%d;", c); + else if ( ! print_escape(c)) + putchar(c); + } - (void)snprintf(title, sizeof(title), "%s (%s)", - roff_volname(bvol), roff_volname(vol)); - } else - (void)snprintf(title, sizeof(title), "%s", roff_volname(vol)); + 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('\"'); +} - i = 0; +struct tag * +print_otag(struct html *h, enum htmltag tag, const char *fmt, ...) +{ + va_list ap; + struct roffsu mysu, *su; + struct tag *t; + char *s; + int i, have_style; - if ( ! html_typeput(p->mbuf, HTML_TYPE_4_01_STRICT, NULL)) - return(0); - if ( ! html_tputln(p->mbuf, ML_OPEN, i, HTML_TAG_HTML)) - return(0); - if ( ! html_tputln(p->mbuf, ML_OPEN, i++, HTML_TAG_HEAD)) - return(0); + /* Push this tags onto the stack of open scopes. */ - attr[0].attr = HTML_ATTR_HTTP_EQUIV; - attr[0].val = "content-type"; - attr[1].attr = HTML_ATTR_CONTENT; - attr[1].val = "text/html;charset=utf-8"; + 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; - if ( ! html_aputln(p->mbuf, ML_OPEN, i, HTML_TAG_META, 2, attr)) - return(0); + 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(" "); + } - attr[0].attr = HTML_ATTR_NAME; - attr[0].val = "resource-type"; - attr[1].attr = HTML_ATTR_CONTENT; - attr[1].val = "document"; + if ( ! (h->flags & HTML_NONOSPACE)) + h->flags &= ~HTML_NOSPACE; + else + h->flags |= HTML_NOSPACE; - if ( ! html_aputln(p->mbuf, ML_OPEN, i, HTML_TAG_META, 2, attr)) - return(0); + /* Print out the tag name and attributes. */ - if ( ! html_tputln(p->mbuf, ML_OPEN, i, HTML_TAG_TITLE)) - return(0); - if ( ! ml_putstring(p->mbuf, ts, NULL)) - return(0); - if ( ! html_tputln(p->mbuf, ML_CLOSE, i, HTML_TAG_TITLE)) - return(0); + printf("<%s", htmltags[tag].name); - if (HTML_CSS_EMBED & p->args->params.html.flags) { - attr[0].attr = HTML_ATTR_TYPE; - attr[0].val = "text/css"; + va_start(ap, fmt); - if ( ! html_aputln(p->mbuf, ML_OPEN, i, - HTML_TAG_STYLE, 1, attr)) - return(0); - if ( ! html_commentput(p->mbuf, ML_OPEN, NULL)) - return(0); - - if ( ! html_loadcss(p->mbuf, p->args->params.html.css)) - return(0); - - if ( ! html_commentput(p->mbuf, ML_CLOSE, NULL)) - return(0); - if ( ! html_tputln(p->mbuf, ML_CLOSE, i, HTML_TAG_STYLE)) - return(0); - } else { - attr[0].attr = HTML_ATTR_REL; - attr[0].val = "stylesheet"; - attr[1].attr = HTML_ATTR_TYPE; - attr[1].val = "text/css"; - attr[2].attr = HTML_ATTR_HREF; - attr[2].val = p->args->params.html.css; - - if ( ! html_aputln(p->mbuf, ML_OPEN, i, - HTML_TAG_LINK, 3, attr)) - return(0); + have_style = 0; + while (*fmt != '\0') { + if (*fmt == 's') { + printf(" style=\""); + have_style = 1; + fmt++; + break; + } + s = va_arg(ap, char *); + switch (*fmt++) { + case 'c': + print_attr(h, "class", s); + break; + case 'h': + print_attr(h, "href", s); + break; + case 'i': + print_attr(h, "id", s); + break; + case '?': + print_attr(h, s, va_arg(ap, char *)); + break; + default: + abort(); + } } - if ( ! html_tputln(p->mbuf, ML_CLOSE, --i, HTML_TAG_HEAD)) - return(0); - if ( ! html_tputln(p->mbuf, ML_OPEN, i, HTML_TAG_BODY)) - return(0); + /* Print out styles. */ - attr[0].attr = HTML_ATTR_CLASS; - attr[0].val = "mdoc"; + s = NULL; + su = &mysu; + while (*fmt != '\0') { - if ( ! html_aputln(p->mbuf, ML_OPEN, i, HTML_TAG_DIV, 1, attr)) - return(0); + /* First letter: input argument type. */ - attr[0].attr = HTML_ATTR_WIDTH; - attr[0].val = "100%"; - attr[1].attr = HTML_ATTR_CLASS; - attr[1].val = "header-table"; + switch (*fmt++) { + case 'h': + i = va_arg(ap, int); + SCALE_HS_INIT(su, i); + break; + case 's': + s = va_arg(ap, char *); + break; + case 'u': + su = va_arg(ap, struct roffsu *); + break; + case 'v': + i = va_arg(ap, int); + SCALE_VS_INIT(su, i); + break; + case 'w': + s = va_arg(ap, char *); + a2width(s, su); + break; + default: + abort(); + } - if ( ! html_aputln(p->mbuf, ML_OPEN, i++, HTML_TAG_TABLE, 2, attr)) - return(0); - if ( ! html_tputln(p->mbuf, ML_OPEN, i++, HTML_TAG_TR)) - return(0); + /* Second letter: style name. */ - attr[0].attr = HTML_ATTR_ALIGN; - attr[0].val = "left"; - attr[1].attr = HTML_ATTR_CLASS; - attr[1].val = "header-section"; - - if ( ! html_aputln(p->mbuf, ML_OPEN, i, HTML_TAG_TD, 2, attr)) - return(0); - if ( ! ml_putstring(p->mbuf, ts, NULL)) - return(0); - if ( ! html_tputln(p->mbuf, ML_CLOSE, i, HTML_TAG_TD)) - return(0); - - attr[0].attr = HTML_ATTR_ALIGN; - attr[0].val = "center"; - attr[1].attr = HTML_ATTR_CLASS; - attr[1].val = "header-volume"; - - if ( ! html_aputln(p->mbuf, ML_OPEN, i, HTML_TAG_TD, 2, attr)) - return(0); - if ( ! ml_putstring(p->mbuf, title, NULL)) - return(0); - if ( ! html_tputln(p->mbuf, ML_CLOSE, i, HTML_TAG_TD)) - return(0); - - attr[0].attr = HTML_ATTR_ALIGN; - attr[0].val = "right"; - attr[1].attr = HTML_ATTR_CLASS; - attr[1].val = "header-section"; - - if ( ! html_aputln(p->mbuf, ML_OPEN, i, HTML_TAG_TD, 2, attr)) - return(0); - if ( ! ml_putstring(p->mbuf, ts, NULL)) - return(0); - if ( ! html_tputln(p->mbuf, ML_CLOSE, i, HTML_TAG_TD)) - return(0); - - if ( ! html_tputln(p->mbuf, ML_CLOSE, --i, HTML_TAG_TR)) - return(0); - return(html_tputln(p->mbuf, ML_CLOSE, --i, HTML_TAG_TABLE)); -} - - -/* ARGSUSED */ -static int -html_end(struct ml_args *p, const struct tm *tm, const char *os, - const char *name, enum roffmsec msec, enum roffvol vol) -{ - struct html_pair attr[4]; - int i; - char ts[64]; - - if (0 == strftime(ts, sizeof(ts), "%B %d, %Y", tm)) { - warn("strftime"); - return(0); + bufinit(h); + switch (*fmt++) { + case 'b': + bufcat_su(h, "margin-bottom", su); + break; + case 'h': + bufcat_su(h, "height", su); + break; + case 'i': + bufcat_su(h, "text-indent", su); + break; + case 'l': + bufcat_su(h, "margin-left", su); + break; + case 't': + bufcat_su(h, "margin-top", su); + break; + case 'w': + bufcat_su(h, "width", su); + break; + case 'W': + bufcat_su(h, "min-width", su); + break; + case '?': + bufcat_style(h, s, va_arg(ap, char *)); + break; + default: + abort(); + } + printf("%s", h->buf); } + if (have_style) + putchar('"'); - i = 0; + va_end(ap); - attr[0].attr = HTML_ATTR_WIDTH; - attr[0].val = "100%"; - attr[1].attr = HTML_ATTR_CLASS; - attr[1].val = "header-footer"; + /* Accommodate for "well-formed" singleton escaping. */ - if ( ! html_aputln(p->mbuf, ML_OPEN, i++, HTML_TAG_TABLE, 2, attr)) - return(0); - if ( ! html_tputln(p->mbuf, ML_OPEN, i++, HTML_TAG_TR)) - return(0); + if (HTML_AUTOCLOSE & htmltags[tag].flags) + putchar('/'); - attr[0].attr = HTML_ATTR_ALIGN; - attr[0].val = "left"; - attr[1].attr = HTML_ATTR_CLASS; - attr[1].val = "footer-os"; + putchar('>'); - if ( ! html_aputln(p->mbuf, ML_OPEN, i, HTML_TAG_TD, 2, attr)) - return(0); - if ( ! ml_putstring(p->mbuf, os, NULL)) - return(0); - if ( ! html_tputln(p->mbuf, ML_CLOSE, i, HTML_TAG_TD)) - return(0); + h->flags |= HTML_NOSPACE; - attr[0].attr = HTML_ATTR_ALIGN; - attr[0].val = "right"; - attr[1].attr = HTML_ATTR_CLASS; - attr[1].val = "footer-date"; + if ((HTML_AUTOCLOSE | HTML_CLRLINE) & htmltags[tag].flags) + putchar('\n'); - if ( ! html_aputln(p->mbuf, ML_OPEN, i, HTML_TAG_TD, 2, attr)) - return(0); - if ( ! ml_putstring(p->mbuf, ts, NULL)) - return(0); - if ( ! html_tputln(p->mbuf, ML_CLOSE, i, HTML_TAG_TD)) - return(0); - - if ( ! html_tputln(p->mbuf, ML_CLOSE, --i, HTML_TAG_TR)) - return(0); - if ( ! html_tputln(p->mbuf, ML_CLOSE, --i, HTML_TAG_TABLE)) - return(0); - - if ( ! html_tputln(p->mbuf, ML_CLOSE, 0, HTML_TAG_DIV)) - return(0); - if ( ! html_tputln(p->mbuf, ML_CLOSE, 0, HTML_TAG_BODY)) - return(0); - return(html_tputln(p->mbuf, ML_CLOSE, 0, HTML_TAG_HTML)); + return t; } - -/* 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) +static void +print_ctag(struct html *h, struct tag *tag) { - switch (tok) { - case (ROFF_Bl): - return(html_Bl_bodytagname(mbuf, q, argc, argv, res)); - case (ROFF_Fo): - return(html_stput(mbuf, HTML_TAG_SPAN, res)); - case (ROFF_It): - return(html_It_bodytagname(mbuf, q, argc, argv, res)); - case (ROFF_Oo): - return(html_stput(mbuf, HTML_TAG_SPAN, res)); - default: - break; + /* + * 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; + + printf("", htmltags[tag->tag].name); + if (HTML_CLRLINE & htmltags[tag->tag].flags) { + h->flags |= HTML_NOSPACE; + putchar('\n'); } - return(html_stput(mbuf, HTML_TAG_DIV, res)); + h->tags.head = tag->next; + free(tag); } - -/* 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) +void +print_gen_decls(struct html *h) { - switch (tok) { - case (ROFF_It): - return(html_It_headtagname(mbuf, q, argc, argv, res)); - case (ROFF_Fo): - /* FALLTHROUGH */ - case (ROFF_Oo): - return(html_stput(mbuf, HTML_TAG_SPAN, res)); - case (ROFF_Sh): - return(html_stput(mbuf, HTML_TAG_H1, res)); - case (ROFF_Ss): - return(html_stput(mbuf, HTML_TAG_H2, res)); - default: - break; - } - - return(html_stput(mbuf, HTML_TAG_DIV, res)); + puts(""); } - -/* 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_text(struct html *h, const char *word) { - switch (tok) { - case (ROFF_Fo): - /* FALLTHROUGH */ - case (ROFF_Oo): - return(html_stput(mbuf, HTML_TAG_SPAN, res)); - case (ROFF_It): - return(html_It_blocktagname(mbuf, q, argc, argv, 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, ""); + break; + case HTMLFONT_BOLD: + h->metaf = print_otag(h, TAG_B, ""); + break; + case HTMLFONT_BI: + h->metaf = print_otag(h, TAG_B, ""); + print_otag(h, TAG_I, ""); + break; default: break; } - return(html_stput(mbuf, HTML_TAG_DIV, res)); -} + assert(word); + if ( ! print_encode(h, word, 0)) { + if ( ! (h->flags & HTML_NONOSPACE)) + h->flags &= ~HTML_NOSPACE; + h->flags &= ~HTML_NONEWLINE; + } else + h->flags |= HTML_NOSPACE | HTML_NONEWLINE; + if (h->metaf) { + print_tagq(h, h->metaf); + h->metaf = NULL; + } -/* ARGSUSED */ -static int -html_printargs(struct md_mbuf *mbuf, int tok, const char *ns, - const int *argc, const char **argv, size_t *res) -{ - - /* FIXME: use API in ml.h. */ - - 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)); + h->flags &= ~HTML_IGNDELIM; } - -/* 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_tagq(struct html *h, const struct tag *until) { + struct tag *tag; - return(html_printargs(mbuf, tok, "head", argc, argv, res)); + while ((tag = h->tags.head) != NULL) { + print_ctag(h, tag); + if (until && tag == until) + return; + } } - -/* 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 +print_stagq(struct html *h, const struct tag *suntil) { + struct tag *tag; - return(html_printargs(mbuf, tok, "body", argc, argv, res)); + while ((tag = h->tags.head) != NULL) { + if (suntil && tag == suntil) + return; + print_ctag(h, tag); + } } - -/* 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 +print_paragraph(struct html *h) { + struct tag *t; - return(html_printargs(mbuf, tok, "block", argc, argv, res)); + t = print_otag(h, TAG_DIV, "c", "spacer"); + print_tagq(h, t); } -/* 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) +/* + * Calculate the scaling unit passed in a `-width' argument. This uses + * either a native scaling unit (e.g., 1i, 2m) or the string length of + * the value. + */ +static void +a2width(const char *p, struct roffsu *su) { - - if ( ! html_printargs(mbuf, tok, "inline", argc, argv, res)) - return(0); - - switch (tok) { - case (ROFF_Sh): - - /* FIXME: use API in ml.h. */ - - assert(*argv); - if ( ! ml_nputs(mbuf, " name=\"", 7, res)) - return(0); - if ( ! ml_putstring(mbuf, *argv++, res)) - return(0); - while (*argv) { - if ( ! ml_putstring(mbuf, "_", res)) - return(0); - if ( ! ml_putstring(mbuf, *argv++, res)) - return(0); - } - if ( ! ml_nputs(mbuf, "\"", 1, res)) - return(0); - break; - - case (ROFF_Sx): - - /* FIXME: use API in ml.h. */ - - assert(*argv); - if ( ! ml_nputs(mbuf, " href=\"#", 8, res)) - return(0); - if ( ! ml_putstring(mbuf, *argv++, res)) - return(0); - while (*argv) { - if ( ! ml_putstring(mbuf, "_", res)) - return(0); - if ( ! ml_putstring(mbuf, *argv++, res)) - return(0); - } - if ( ! ml_nputs(mbuf, "\"", 1, res)) - return(0); - - break; - default: - break; - } - - return(1); + if (a2roffsu(p, su, SCALE_MAX) < 2) { + su->unit = SCALE_EN; + su->scale = html_strlen(p); + } else if (su->scale < 0.0) + su->scale = 0.0; } - -/* ARGSUSED */ -static int -html_inlinetagname(struct md_mbuf *mbuf, - const struct md_args *args, int tok, size_t *res) +void +bufinit(struct html *h) { - switch (tok) { - case (ROFF_Dl): - /* FALLTHROUGH */ - case (ROFF_D1): - return(html_stput(mbuf, HTML_TAG_DIV, res)); - case (ROFF_Sh): - return(html_stput(mbuf, HTML_TAG_A, res)); - case (ROFF_Pp): - return(html_stput(mbuf, HTML_TAG_DIV, res)); - case (ROFF_Sx): - return(html_stput(mbuf, HTML_TAG_A, res)); - default: - break; - } - - return(html_stput(mbuf, HTML_TAG_SPAN, res)); + h->buf[0] = '\0'; + h->buflen = 0; } - -static ssize_t -html_begintag(struct ml_args *p, enum md_ns ns, - int tok, const int *argc, const char **argv) +void +bufcat_style(struct html *h, const char *key, const char *val) { - size_t res; - struct htmlq *q; - struct htmlnode *node; - int i; - assert(ns != MD_NS_DEFAULT); - res = 0; - - q = (struct htmlq *)p->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); - /* LINTED */ - 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(p->mbuf, p->args, tok, - q, argc, argv, &res)) - return(-1); - if ( ! html_blocktagargs(p->mbuf, p->args, tok, - argc, argv, &res)) - return(-1); - break; - case (MD_NS_BODY): - if ( ! html_bodytagname(p->mbuf, p->args, tok, - q, argc, argv, &res)) - return(-1); - if ( ! html_bodytagargs(p->mbuf, p->args, tok, - argc, argv, &res)) - return(-1); - break; - case (MD_NS_HEAD): - if ( ! html_headtagname(p->mbuf, p->args, tok, q, - argc, argv, &res)) - return(-1); - if ( ! html_headtagargs(p->mbuf, p->args, tok, - argc, argv, &res)) - return(-1); - break; - default: - if ( ! html_inlinetagname(p->mbuf, p->args, tok, &res)) - return(-1); - if ( ! html_inlinetagargs(p->mbuf, p->args, tok, - argc, argv, &res)) - return(-1); - break; - } - - return((ssize_t)res); + bufcat(h, key); + bufcat(h, ":"); + bufcat(h, val); + bufcat(h, ";"); } - -static ssize_t -html_endtag(struct ml_args *p, enum md_ns ns, int tok) +void +bufcat(struct html *h, const char *p) { - size_t res; - struct htmlq *q; - struct htmlnode *node; - assert(ns != MD_NS_DEFAULT); - res = 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. + */ - q = (struct htmlq *)p->data; - node = q->last; - - switch (ns) { - case (MD_NS_BLOCK): - if ( ! html_blocktagname(p->mbuf, p->args, tok, - q, node->argc, - (const char **)node->argv, &res)) - return(-1); - break; - case (MD_NS_BODY): - if ( ! html_bodytagname(p->mbuf, p->args, tok, - q, node->argc, - (const char **)node->argv, &res)) - return(-1); - break; - case (MD_NS_HEAD): - if ( ! html_headtagname(p->mbuf, p->args, tok, - q, node->argc, - (const char **)node->argv, &res)) - return(-1); - break; - default: - if ( ! html_inlinetagname(p->mbuf, p->args, tok, &res)) - return(-1); - break; - } - - q->last = node->parent; - - free(node); - - return((ssize_t)res); + h->buflen = strlcat(h->buf, p, BUFSIZ); + assert(h->buflen < BUFSIZ); } - -static int -html_alloc(void **p) +void +bufcat_fmt(struct html *h, const char *fmt, ...) { + va_list ap; - if (NULL == (*p = calloc(1, sizeof(struct htmlq)))) { - warn("calloc"); - return(0); - } - return(1); + 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 void -html_free(void *p) +bufncat(struct html *h, const char *p, size_t sz) { - struct htmlq *q; - struct htmlnode *n; - assert(p); - q = (struct htmlq *)p; - - /* LINTED */ - while ((n = q->last)) { - q->last = n->parent; - free(n); - } - - free(q); + assert(h->buflen + sz + 1 < BUFSIZ); + strncat(h->buf, p, sz); + h->buflen += sz; } - -/* ARGSUSED */ -static ssize_t -html_beginhttp(struct md_mbuf *mbuf, - const struct md_args *args, - const char *buf, size_t sz) +void +buffmt_includes(struct html *h, const char *name) { - size_t res; - struct html_pair pair; + const char *p, *pp; - res = 0; - pair.attr = HTML_ATTR_HREF; - pair.val = (char *)buf; + pp = h->base_includes; - if ( ! html_aput(mbuf, ML_OPEN, HTML_TAG_A, &res, 1, &pair)) - return(-1); - return((ssize_t)res); + 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; + } + if (pp) + bufcat(h, pp); } - -/* ARGSUSED */ -static ssize_t -html_endhttp(struct md_mbuf *mbuf, - const struct md_args *args, - const char *buf, size_t sz) +void +buffmt_man(struct html *h, const char *name, const char *sec) { - size_t res; + const char *p, *pp; - res = 0; - if ( ! html_tput(mbuf, ML_CLOSE, HTML_TAG_A, &res)) - return(-1); - return((ssize_t)res); -} + pp = h->base_man; - -/* ARGSUSED */ -static ssize_t -html_beginstring(struct ml_args *p, const char *buf, size_t sz) -{ - - if (0 == strncmp(buf, "http://", 7)) - return(html_beginhttp(p->mbuf, p->args, buf, sz)); - - return(0); + 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; + } + if (pp) + bufcat(h, pp); } - -/* ARGSUSED */ -static ssize_t -html_endstring(struct ml_args *p, const char *buf, size_t sz) +void +bufcat_su(struct html *h, const char *p, const struct roffsu *su) { - - if (0 == strncmp(buf, "http://", 7)) - return(html_endhttp(p->mbuf, p->args, buf, sz)); + double v; - return(0); -} + 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_line_html(void *data, char *buf) -{ - - return(mlg_line((struct md_mlg *)data, buf)); + bufcat_fmt(h, "%s: %.2f%s;", p, v, roffscales[su->unit]); } - -int -md_exit_html(void *data, int flush) +void +bufcat_id(struct html *h, const char *src) { - return(mlg_exit((struct md_mlg *)data, flush)); -} + /* Cf. . */ - -void * -md_init_html(const struct md_args *args, - struct md_mbuf *mbuf, const struct md_rbuf *rbuf) -{ - 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; - cbs.ml_beginstring = html_beginstring; - cbs.ml_endstring = html_endstring; - - return(mlg_alloc(args, rbuf, mbuf, &cbs)); + for (; '\0' != *src; src++) + bufncat(h, *src == ' ' ? "_" : src, 1); }