=================================================================== RCS file: /cvs/mandoc/html.c,v retrieving revision 1.30 retrieving revision 1.187 diff -u -p -r1.30 -r1.187 --- mandoc/html.c 2009/09/16 22:17:27 1.30 +++ mandoc/html.c 2015/09/26 00:54:03 1.187 @@ -1,324 +1,153 @@ -/* $Id: html.c,v 1.30 2009/09/16 22:17:27 kristaps Exp $ */ +/* $Id: html.c,v 1.187 2015/09/26 00:54:03 schwarze Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons + * Copyright (c) 2011-2015 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. * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * 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 AUTHOR BE LIABLE FOR + * 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 "config.h" +#include + #include -#include +#include +#include #include +#include #include +#include +#include -#include "mdoc.h" -#include "man.h" +#include "mandoc.h" +#include "mandoc_aux.h" +#include "out.h" +#include "html.h" +#include "manconf.h" +#include "main.h" -#define DOCTYPE "-//W3C//DTD HTML 4.01//EN" -#define DTD "http://www.w3.org/TR/html4/strict.dtd" - -enum htmltag { - TAG_HTML, - TAG_HEAD, - TAG_BODY, - TAG_META, - TAG_TITLE, - TAG_DIV, - TAG_H1, - TAG_H2, - TAG_P, - TAG_SPAN, - TAG_LINK, - TAG_BR, - TAG_A, - TAG_MAX -}; - -enum htmlattr { - ATTR_HTTPEQUIV, - ATTR_CONTENT, - ATTR_NAME, - ATTR_REL, - ATTR_HREF, - ATTR_TYPE, - ATTR_MEDIA, - ATTR_CLASS, - ATTR_MAX -}; - struct htmldata { - char *name; + const char *name; int flags; #define HTML_CLRLINE (1 << 0) #define HTML_NOSTACK (1 << 1) +#define HTML_AUTOCLOSE (1 << 2) /* Tag has auto-closure. */ }; 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}, /* TAG_META */ - {"title", HTML_CLRLINE | HTML_NOSTACK}, /* TAG_TITLE */ + {"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 */ - {"p", HTML_CLRLINE}, /* TAG_P */ {"span", 0}, /* TAG_SPAN */ - {"link", HTML_CLRLINE | HTML_NOSTACK}, /* TAG_LINK */ - {"br", HTML_CLRLINE | HTML_NOSTACK}, /* TAG_LINK */ + {"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*/ }; -static const char *const htmlattrs[ATTR_MAX] = { - "http-equiv", - "content", - "name", - "rel", - "href", - "type", - "media", - "class" +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 htmlpair { - enum htmlattr key; - char *val; +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 */ }; -struct tag { - enum htmltag tag; - SLIST_ENTRY(tag) entry; -}; +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 *); -SLIST_HEAD(tagq, tag); -struct html { - int flags; -#define HTML_NOSPACE (1 << 0) -#define HTML_NEWLINE (1 << 1) - struct tagq stack; -}; - -#define MDOC_ARGS const struct mdoc_meta *m, \ - const struct mdoc_node *n, \ - struct html *h -#define MAN_ARGS const struct man_meta *m, \ - const struct man_node *n, \ - struct html *h -struct htmlmdoc { - int (*pre)(MDOC_ARGS); - void (*post)(MDOC_ARGS); -}; - -static void print_gen_doctype(struct html *); -static void print_gen_head(struct html *); -static void print_mdoc(MDOC_ARGS); -static void print_mdoc_head(MDOC_ARGS); -static void print_mdoc_title(MDOC_ARGS); -static void print_mdoc_node(MDOC_ARGS); -static void print_man(MAN_ARGS); -static void print_man_head(MAN_ARGS); -static void print_man_body(MAN_ARGS); -static struct tag *print_otag(struct html *, enum htmltag, - int, const struct htmlpair *); -static void print_tagq(struct html *, const struct tag *); -static void print_stagq(struct html *, const struct tag *); -static void print_ctag(struct html *, enum htmltag); -static void print_encode(const char *); -static void print_text(struct html *, const char *); -static int mdoc_root_pre(MDOC_ARGS); - -static int mdoc_fl_pre(MDOC_ARGS); -static int mdoc_nd_pre(MDOC_ARGS); -static int mdoc_nm_pre(MDOC_ARGS); -static int mdoc_op_pre(MDOC_ARGS); -static void mdoc_op_post(MDOC_ARGS); -static int mdoc_pp_pre(MDOC_ARGS); -static int mdoc_sh_pre(MDOC_ARGS); -static int mdoc_ss_pre(MDOC_ARGS); -static int mdoc_xr_pre(MDOC_ARGS); - -static const struct htmlmdoc mdocs[MDOC_MAX] = { - {NULL, NULL}, /* Ap */ - {NULL, NULL}, /* Dd */ - {NULL, NULL}, /* Dt */ - {NULL, NULL}, /* Os */ - {mdoc_sh_pre, NULL }, /* Sh */ - {mdoc_ss_pre, NULL }, /* Ss */ - {mdoc_pp_pre, NULL}, /* Pp */ - {NULL, NULL}, /* D1 */ - {NULL, NULL}, /* Dl */ - {NULL, NULL}, /* Bd */ - {NULL, NULL}, /* Ed */ - {NULL, NULL}, /* Bl */ - {NULL, NULL}, /* El */ - {NULL, NULL}, /* It */ - {NULL, NULL}, /* Ad */ - {NULL, NULL}, /* An */ - {NULL, NULL}, /* Ar */ - {NULL, NULL}, /* Cd */ - {NULL, NULL}, /* Cm */ - {NULL, NULL}, /* Dv */ - {NULL, NULL}, /* Er */ - {NULL, NULL}, /* Ev */ - {NULL, NULL}, /* Ex */ - {NULL, NULL}, /* Fa */ - {NULL, NULL}, /* Fd */ - {mdoc_fl_pre, NULL}, /* Fl */ - {NULL, NULL}, /* Fn */ - {NULL, NULL}, /* Ft */ - {NULL, NULL}, /* Ic */ - {NULL, NULL}, /* In */ - {NULL, NULL}, /* Li */ - {mdoc_nd_pre, NULL}, /* Nd */ - {mdoc_nm_pre, NULL}, /* Nm */ - {mdoc_op_pre, mdoc_op_post}, /* Op */ - {NULL, NULL}, /* Ot */ - {NULL, NULL}, /* Pa */ - {NULL, NULL}, /* Rv */ - {NULL, NULL}, /* St */ - {NULL, NULL}, /* Va */ - {NULL, NULL}, /* Vt */ - {mdoc_xr_pre, NULL}, /* Xr */ - {NULL, NULL}, /* %A */ - {NULL, NULL}, /* %B */ - {NULL, NULL}, /* %D */ - {NULL, NULL}, /* %I */ - {NULL, NULL}, /* %J */ - {NULL, NULL}, /* %N */ - {NULL, NULL}, /* %O */ - {NULL, NULL}, /* %P */ - {NULL, NULL}, /* %R */ - {NULL, NULL}, /* %T */ - {NULL, NULL}, /* %V */ - {NULL, NULL}, /* Ac */ - {NULL, NULL}, /* Ao */ - {NULL, NULL}, /* Aq */ - {NULL, NULL}, /* At */ - {NULL, NULL}, /* Bc */ - {NULL, NULL}, /* Bf */ - {NULL, NULL}, /* Bo */ - {NULL, NULL}, /* Bq */ - {NULL, NULL}, /* Bsx */ - {NULL, NULL}, /* Bx */ - {NULL, NULL}, /* Db */ - {NULL, NULL}, /* Dc */ - {NULL, NULL}, /* Do */ - {NULL, NULL}, /* Dq */ - {NULL, NULL}, /* Ec */ - {NULL, NULL}, /* Ef */ - {NULL, NULL}, /* Em */ - {NULL, NULL}, /* Eo */ - {NULL, NULL}, /* Fx */ - {NULL, NULL}, /* Ms */ - {NULL, NULL}, /* No */ - {NULL, NULL}, /* Ns */ - {NULL, NULL}, /* Nx */ - {NULL, NULL}, /* Ox */ - {NULL, NULL}, /* Pc */ - {NULL, NULL}, /* Pf */ - {NULL, NULL}, /* Po */ - {NULL, NULL}, /* Pq */ - {NULL, NULL}, /* Qc */ - {NULL, NULL}, /* Ql */ - {NULL, NULL}, /* Qo */ - {NULL, NULL}, /* Qq */ - {NULL, NULL}, /* Re */ - {NULL, NULL}, /* Rs */ - {NULL, NULL}, /* Sc */ - {NULL, NULL}, /* So */ - {NULL, NULL}, /* Sq */ - {NULL, NULL}, /* Sm */ - {NULL, NULL}, /* Sx */ - {NULL, NULL}, /* Sy */ - {NULL, NULL}, /* Tn */ - {NULL, NULL}, /* Ux */ - {NULL, NULL}, /* Xc */ - {NULL, NULL}, /* Xo */ - {NULL, NULL}, /* Fo */ - {NULL, NULL}, /* Fc */ - {NULL, NULL}, /* Oo */ - {NULL, NULL}, /* Oc */ - {NULL, NULL}, /* Bk */ - {NULL, NULL}, /* Ek */ - {NULL, NULL}, /* Bt */ - {NULL, NULL}, /* Hf */ - {NULL, NULL}, /* Fr */ - {NULL, NULL}, /* Ud */ - {NULL, NULL}, /* Lb */ - {NULL, NULL}, /* Lp */ - {NULL, NULL}, /* Lk */ - {NULL, NULL}, /* Mt */ - {NULL, NULL}, /* Brq */ - {NULL, NULL}, /* Bro */ - {NULL, NULL}, /* Brc */ - {NULL, NULL}, /* %C */ - {NULL, NULL}, /* Es */ - {NULL, NULL}, /* En */ - {NULL, NULL}, /* Dx */ - {NULL, NULL}, /* %Q */ - {NULL, NULL}, /* br */ - {NULL, NULL}, /* sp */ -}; - - -void -html_mdoc(void *arg, const struct mdoc *m) +void * +html_alloc(const struct mchars *mchars, const struct manoutput *outopts) { - struct html *h; - struct tag *t; - - h = (struct html *)arg; - - print_gen_doctype(h); - t = print_otag(h, TAG_HTML, 0, NULL); - print_mdoc(mdoc_meta(m), mdoc_node(m), h); - print_tagq(h, t); - - printf("\n"); -} - - -void -html_man(void *arg, const struct man *m) -{ struct html *h; - struct tag *t; - h = (struct html *)arg; + h = mandoc_calloc(1, sizeof(struct html)); - print_gen_doctype(h); - t = print_otag(h, TAG_HTML, 0, NULL); - print_man(man_meta(m), man_node(m), h); - print_tagq(h, t); + h->tags.head = NULL; + h->symtab = mchars; - printf("\n"); -} + h->style = outopts->style; + h->base_man = outopts->man; + h->base_includes = outopts->includes; + if (outopts->fragment) + h->oflags |= HTML_FRAGMENT; - -void * -html_alloc(void) -{ - struct html *h; - - if (NULL == (h = calloc(1, sizeof(struct html)))) - return(NULL); - - SLIST_INIT(&h->stack); return(h); } - void html_free(void *p) { @@ -327,461 +156,583 @@ html_free(void *p) h = (struct html *)p; - while ( ! SLIST_EMPTY(&h->stack)) { - tag = SLIST_FIRST(&h->stack); - SLIST_REMOVE_HEAD(&h->stack, entry); + while ((tag = h->tags.head) != NULL) { + h->tags.head = tag->next; free(tag); } + free(h); } - -static void -print_mdoc(MDOC_ARGS) +void +print_gen_head(struct html *h) { + struct htmlpair tag[4]; struct tag *t; - t = print_otag(h, TAG_HEAD, 0, NULL); - print_mdoc_head(m, n, h); - print_tagq(h, t); + tag[0].key = ATTR_CHARSET; + tag[0].val = "utf-8"; + print_otag(h, TAG_META, 1, tag); - t = print_otag(h, TAG_BODY, 0, NULL); - print_mdoc_title(m, n, h); - print_mdoc_node(m, n, h); + /* + * 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_gen_head(struct html *h) +print_metaf(struct html *h, enum mandoc_esc deco) { - struct htmlpair meta0[2]; - struct htmlpair meta1[2]; - struct htmlpair link[4]; + enum htmlfont font; - meta0[0].key = ATTR_HTTPEQUIV; - meta0[0].val = "Content-Type"; - meta0[1].key = ATTR_CONTENT; - meta0[1].val = "text/html; charest-utf-8"; + 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(); + } - meta1[0].key = ATTR_NAME; - meta1[0].val = "resource-type"; - meta1[1].key = ATTR_CONTENT; - meta1[1].val = "document"; + if (h->metaf) { + print_tagq(h, h->metaf); + h->metaf = NULL; + } - link[0].key = ATTR_REL; - link[0].val = "stylesheet"; - link[1].key = ATTR_HREF; - link[1].val = "style.css"; /* XXX */ - link[2].key = ATTR_TYPE; - link[2].val = "text/css"; - link[3].key = ATTR_MEDIA; - link[3].val = "all"; + h->metal = h->metac; + h->metac = font; - print_otag(h, TAG_META, 2, meta0); - print_otag(h, TAG_META, 2, meta1); - print_otag(h, TAG_LINK, 4, link); + 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; + } } - -/* ARGSUSED */ -static void -print_mdoc_head(MDOC_ARGS) +int +html_strlen(const char *cp) { + size_t rsz; + int skip, sz; - print_gen_head(h); - print_otag(h, TAG_TITLE, 0, NULL); - print_encode(m->title); -} + /* + * 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. + */ - -/* ARGSUSED */ -static void -print_mdoc_title(MDOC_ARGS) -{ - - /* TODO */ + 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 ESCAPE_NUMBERED: + /* FALLTHROUGH */ + case ESCAPE_SPECIAL: + /* FALLTHROUGH */ + case ESCAPE_OVERSTRIKE: + if (skip) + skip = 0; + else + sz++; + break; + case ESCAPE_SKIPCHAR: + skip = 1; + break; + default: + break; + } + } + return(sz); } - -static void -print_mdoc_node(MDOC_ARGS) +static int +print_escape(char c) { - int child; - struct tag *t; - child = 1; - t = SLIST_FIRST(&h->stack); - - switch (n->type) { - case (MDOC_ROOT): - child = mdoc_root_pre(m, n, h); + switch (c) { + case '<': + printf("<"); break; - case (MDOC_TEXT): - print_text(h, n->string); + case '>': + printf(">"); break; - default: - if (mdocs[n->tok].pre) - child = (*mdocs[n->tok].pre)(m, n, h); + case '&': + printf("&"); break; - } - - if (child && n->child) - print_mdoc_node(m, n->child, h); - - print_stagq(h, t); - - switch (n->type) { - case (MDOC_ROOT): + case '"': + printf("""); break; - case (MDOC_TEXT): + case ASCII_NBRSP: + putchar('-'); break; - default: - if (mdocs[n->tok].post) - (*mdocs[n->tok].post)(m, n, h); + case ASCII_HYPH: + putchar('-'); + /* FALLTHROUGH */ + case ASCII_BREAK: break; + default: + return(0); } - - if (n->next) - print_mdoc_node(m, n->next, h); + return(1); } - -static void -print_man(MAN_ARGS) +static int +print_encode(struct html *h, const char *p, int norecurse) { - struct tag *t; + 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' }; - t = print_otag(h, TAG_HEAD, 0, NULL); - print_man_head(m, n, h); - print_tagq(h, t); + nospace = 0; - t = print_otag(h, TAG_BODY, 0, NULL); - print_man_body(m, n, h); - print_tagq(h, t); -} + while ('\0' != *p) { + if (HTML_SKIPCHAR & h->flags && '\\' != *p) { + h->flags &= ~HTML_SKIPCHAR; + p++; + continue; + } + sz = strcspn(p, rejs); -/* ARGSUSED */ -static void -print_man_head(MAN_ARGS) -{ + fwrite(p, 1, sz, stdout); + p += (int)sz; - print_gen_head(h); - print_otag(h, TAG_TITLE, 0, NULL); - print_encode(m->title); -} + if ('\0' == *p) + break; + if (print_escape(*p++)) + continue; -/* ARGSUSED */ -static void -print_man_body(MAN_ARGS) -{ + esc = mandoc_escape(&p, &seq, &len); + if (ESCAPE_ERROR == esc) + break; - /* TODO */ -} + switch (esc) { + case ESCAPE_FONT: + /* FALLTHROUGH */ + case ESCAPE_FONTPREV: + /* FALLTHROUGH */ + case ESCAPE_FONTBOLD: + /* FALLTHROUGH */ + case ESCAPE_FONTITALIC: + /* FALLTHROUGH */ + case ESCAPE_FONTBI: + /* FALLTHROUGH */ + 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); + if (c < 0) + continue; + break; + case ESCAPE_SPECIAL: + c = mchars_spec2cp(h->symtab, seq, len); + if (c <= 0) + continue; + break; + case ESCAPE_NOSPACE: + if ('\0' == *p) + nospace = 1; + continue; + case ESCAPE_OVERSTRIKE: + if (len == 0) + continue; + c = seq[len - 1]; + break; + default: + 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); + } + + return(nospace); +} + static void -print_encode(const char *p) +print_attr(struct html *h, const char *key, const char *val) { - - printf("%s", p); /* XXX */ + printf(" %s=\"", key); + (void)print_encode(h, val, 1); + putchar('\"'); } - -static struct tag * -print_otag(struct html *h, enum htmltag tag, +struct tag * +print_otag(struct html *h, enum htmltag tag, int sz, const struct htmlpair *p) { int i; struct tag *t; + /* Push this tags onto the stack of open scopes. */ + if ( ! (HTML_NOSTACK & htmltags[tag].flags)) { - if (NULL == (t = malloc(sizeof(struct tag)))) - err(EXIT_FAILURE, "malloc"); + t = mandoc_malloc(sizeof(struct tag)); t->tag = tag; - SLIST_INSERT_HEAD(&h->stack, t, entry); + t->next = h->tags.head; + h->tags.head = t; } else t = NULL; if ( ! (HTML_NOSPACE & h->flags)) - if ( ! (HTML_CLRLINE & htmltags[tag].flags)) - printf(" "); + 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(" "); + } + if ( ! (h->flags & HTML_NONOSPACE)) + h->flags &= ~HTML_NOSPACE; + else + h->flags |= HTML_NOSPACE; + + /* Print out the tag name and attributes. */ + printf("<%s", htmltags[tag].name); - for (i = 0; i < sz; i++) { - printf(" %s=\"", htmlattrs[p[i].key]); - assert(p->val); - print_encode(p[i].val); - printf("\""); - } - printf(">"); + for (i = 0; i < sz; i++) + print_attr(h, htmlattrs[p[i].key], p[i].val); + /* Accommodate for "well-formed" singleton escaping. */ + + if (HTML_AUTOCLOSE & htmltags[tag].flags) + putchar('/'); + + putchar('>'); + h->flags |= HTML_NOSPACE; - if (HTML_CLRLINE & htmltags[tag].flags) - h->flags |= HTML_NEWLINE; - else - h->flags &= ~HTML_NEWLINE; + if ((HTML_AUTOCLOSE | HTML_CLRLINE) & htmltags[tag].flags) + putchar('\n'); + return(t); } - -/* ARGSUSED */ static void -print_ctag(struct html *h, enum htmltag tag) +print_ctag(struct html *h, struct tag *tag) { - - printf("", htmltags[tag].name); - if (HTML_CLRLINE & htmltags[tag].flags) + + /* + * 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; - if (HTML_CLRLINE & htmltags[tag].flags) - h->flags |= HTML_NEWLINE; - else - h->flags &= ~HTML_NEWLINE; + putchar('\n'); + } + + h->tags.head = tag->next; + free(tag); } - -/* ARGSUSED */ -static void -print_gen_doctype(struct html *h) +void +print_gen_decls(struct html *h) { - - printf("\n", DOCTYPE, DTD); + + puts(""); } - -static void -print_text(struct html *h, const char *p) +void +print_text(struct html *h, const char *word) { - if (*p && 0 == *(p + 1)) - switch (*p) { - case('.'): - /* FALLTHROUGH */ - case(','): - /* FALLTHROUGH */ - case(';'): - /* FALLTHROUGH */ - case(':'): - /* FALLTHROUGH */ - case('?'): - /* FALLTHROUGH */ - case('!'): - /* FALLTHROUGH */ - case(')'): - /* FALLTHROUGH */ - case(']'): - /* FALLTHROUGH */ - case('}'): - h->flags |= HTML_NOSPACE; - break; - default: - break; - } + if ( ! (HTML_NOSPACE & h->flags)) { + /* Manage keeps! */ + if ( ! (HTML_KEEP & h->flags)) { + if (HTML_PREKEEP & h->flags) + h->flags |= HTML_KEEP; + putchar(' '); + } else + printf(" "); + } - if ( ! (h->flags & HTML_NOSPACE)) - 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; + } - h->flags &= ~HTML_NOSPACE; - h->flags &= ~HTML_NEWLINE; + 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 (p) - print_encode(p); + if (h->metaf) { + print_tagq(h, h->metaf); + h->metaf = NULL; + } - if (*p && 0 == *(p + 1)) - switch (*p) { - case('('): - /* FALLTHROUGH */ - case('['): - /* FALLTHROUGH */ - case('{'): - h->flags |= HTML_NOSPACE; - break; - default: - break; - } + h->flags &= ~HTML_IGNDELIM; } - -static void +void print_tagq(struct html *h, const struct tag *until) { struct tag *tag; - while ( ! SLIST_EMPTY(&h->stack)) { - tag = SLIST_FIRST(&h->stack); - print_ctag(h, tag->tag); - SLIST_REMOVE_HEAD(&h->stack, entry); - free(tag); + while ((tag = h->tags.head) != NULL) { + print_ctag(h, tag); if (until && tag == until) return; } } - -static void +void print_stagq(struct html *h, const struct tag *suntil) { struct tag *tag; - while ( ! SLIST_EMPTY(&h->stack)) { - tag = SLIST_FIRST(&h->stack); + while ((tag = h->tags.head) != NULL) { if (suntil && tag == suntil) return; - print_ctag(h, tag->tag); - SLIST_REMOVE_HEAD(&h->stack, entry); - free(tag); + print_ctag(h, tag); } } - -/* ARGSUSED */ -static int -mdoc_root_pre(MDOC_ARGS) +void +print_paragraph(struct html *h) { + struct tag *t; struct htmlpair tag; - tag.key = ATTR_CLASS; - tag.val = "body"; - - print_otag(h, TAG_DIV, 1, &tag); - return(1); + PAIR_CLASS_INIT(&tag, "spacer"); + t = print_otag(h, TAG_DIV, 1, &tag); + print_tagq(h, t); } -/* ARGSUSED */ -static int -mdoc_ss_pre(MDOC_ARGS) +void +bufinit(struct html *h) { - if (MDOC_BODY == n->type) - print_otag(h, TAG_P, 0, NULL); - if (MDOC_HEAD == n->type) - print_otag(h, TAG_H2, 0, NULL); - return(1); + h->buf[0] = '\0'; + h->buflen = 0; } - -/* ARGSUSED */ -static int -mdoc_fl_pre(MDOC_ARGS) +void +bufcat_style(struct html *h, const char *key, const char *val) { - struct htmlpair tag; - tag.key = ATTR_CLASS; - tag.val = "flag"; - - print_otag(h, TAG_SPAN, 1, &tag); - print_text(h, "\\-"); - h->flags |= HTML_NOSPACE; - return(1); + bufcat(h, key); + bufcat(h, ":"); + bufcat(h, val); + bufcat(h, ";"); } - -/* ARGSUSED */ -static int -mdoc_pp_pre(MDOC_ARGS) +void +bufcat(struct html *h, const char *p) { - print_otag(h, TAG_BR, 0, NULL); - print_otag(h, TAG_BR, 0, NULL); - 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. + */ - -/* ARGSUSED */ -static int -mdoc_nd_pre(MDOC_ARGS) -{ - - if (MDOC_BODY == n->type) - print_text(h, "--"); - return(1); + h->buflen = strlcat(h->buf, p, BUFSIZ); + assert(h->buflen < BUFSIZ); } - -/* ARGSUSED */ -static int -mdoc_op_pre(MDOC_ARGS) +void +bufcat_fmt(struct html *h, const char *fmt, ...) { + va_list ap; - if (MDOC_BODY == n->type) { - print_text(h, "\\(lB"); - h->flags |= HTML_NOSPACE; - } - 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); } - -/* ARGSUSED */ static void -mdoc_op_post(MDOC_ARGS) +bufncat(struct html *h, const char *p, size_t sz) { - if (MDOC_BODY != n->type) - return; - h->flags |= HTML_NOSPACE; - print_text(h, "\\(rB"); + assert(h->buflen + sz + 1 < BUFSIZ); + strncat(h->buf, p, sz); + h->buflen += sz; } - -static int -mdoc_nm_pre(MDOC_ARGS) +void +buffmt_includes(struct html *h, const char *name) { - struct htmlpair class; + const char *p, *pp; - if ( ! (HTML_NEWLINE & h->flags)) - if (SEC_SYNOPSIS == n->sec) - print_otag(h, TAG_BR, 0, NULL); + pp = h->base_includes; - class.key = ATTR_CLASS; - class.val = "name"; - - print_otag(h, TAG_SPAN, 1, &class); - if (NULL == n->child) - print_text(h, m->name); - - return(1); + 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 int -mdoc_sh_pre(MDOC_ARGS) +void +buffmt_man(struct html *h, const char *name, const char *sec) { + const char *p, *pp; - if (MDOC_BODY == n->type) - print_otag(h, TAG_P, 0, NULL); - if (MDOC_HEAD == n->type) - print_otag(h, TAG_H1, 0, NULL); - return(1); + pp = h->base_man; + + 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 int -mdoc_xr_pre(MDOC_ARGS) +void +bufcat_su(struct html *h, const char *p, const struct roffsu *su) { - struct htmlpair tag; + double v; - tag.key = ATTR_HREF; - tag.val = "#"; /* TODO */ + 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; - print_otag(h, TAG_A, 1, &tag); + bufcat_fmt(h, "%s: %.2f%s;", p, v, roffscales[su->unit]); +} - n = n->child; - print_text(h, n->string); - if (NULL == (n = n->next)) - return(0); +void +bufcat_id(struct html *h, const char *src) +{ - h->flags |= HTML_NOSPACE; - print_text(h, "("); - h->flags |= HTML_NOSPACE; - print_text(h, n->string); - h->flags |= HTML_NOSPACE; - print_text(h, ")"); + /* Cf. . */ - return(0); + while ('\0' != *src) + bufcat_fmt(h, "%.2x", *src++); }