=================================================================== RCS file: /cvs/mandoc/html.c,v retrieving revision 1.35 retrieving revision 1.127 diff -u -p -r1.35 -r1.127 --- mandoc/html.c 2009/09/20 11:05:22 1.35 +++ mandoc/html.c 2011/03/15 16:23:51 1.127 @@ -1,6 +1,7 @@ -/* $Id: html.c,v 1.35 2009/09/20 11:05:22 kristaps Exp $ */ +/* $Id: html.c,v 1.127 2011/03/15 16:23:51 kristaps Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons + * Copyright (c) 2011 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 @@ -14,378 +15,152 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif +#include + #include #include -#include +#include #include +#include #include #include +#include +#include "mandoc.h" +#include "out.h" #include "chars.h" -#include "mdoc.h" -#include "man.h" +#include "html.h" +#include "main.h" -#define DOCTYPE "-//W3C//DTD HTML 4.01//EN" -#define DTD "http://www.w3.org/TR/html4/strict.dtd" - -#define INDENT 5 -#define HALFINDENT 3 -#define PX_MULT 8 - -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_TABLE, - TAG_COL, - TAG_TR, - TAG_TD, - TAG_LI, - TAG_UL, - TAG_OL, - TAG_MAX -}; - -enum htmlattr { - ATTR_HTTPEQUIV, - ATTR_CONTENT, - ATTR_NAME, - ATTR_REL, - ATTR_HREF, - ATTR_TYPE, - ATTR_MEDIA, - ATTR_CLASS, - ATTR_STYLE, - ATTR_WIDTH, - ATTR_VALIGN, - 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 */ + {"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 */ - {"col", HTML_CLRLINE | HTML_NOSTACK}, /* TAG_COL */ + {"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 */ + {"p", HTML_CLRLINE | HTML_NOSTACK | HTML_AUTOCLOSE}, /* TAG_P */ + {"pre", HTML_CLRLINE }, /* TAG_PRE */ + {"b", 0 }, /* TAG_B */ + {"i", 0 }, /* TAG_I */ + {"code", 0 }, /* TAG_CODE */ + {"small", 0 }, /* TAG_SMALL */ }; -static const char *const htmlattrs[ATTR_MAX] = { - "http-equiv", - "content", - "name", - "rel", - "href", - "type", - "media", - "class", - "style", - "width", - "valign", +static const char *const htmlattrs[ATTR_MAX] = { + "http-equiv", /* ATTR_HTTPEQUIV */ + "content", /* ATTR_CONTENT */ + "name", /* ATTR_NAME */ + "rel", /* ATTR_REL */ + "href", /* ATTR_HREF */ + "type", /* ATTR_TYPE */ + "media", /* ATTR_MEDIA */ + "class", /* ATTR_CLASS */ + "style", /* ATTR_STYLE */ + "width", /* ATTR_WIDTH */ + "id", /* ATTR_ID */ + "summary", /* ATTR_SUMMARY */ + "align", /* ATTR_ALIGN */ + "colspan", /* ATTR_COLSPAN */ }; -struct htmlpair { - enum htmlattr key; - char *val; -}; - -struct tag { - enum htmltag tag; - SLIST_ENTRY(tag) entry; -}; - -SLIST_HEAD(tagq, tag); - -struct html { - int flags; -#define HTML_NOSPACE (1 << 0) -#define HTML_NEWLINE (1 << 1) - struct tagq stack; - void *symtab; -}; - -#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_num(struct html *, const char *, size_t); +static void print_spec(struct html *, enum roffdeco, + const char *, size_t); +static void print_res(struct html *, const char *, size_t); static void print_ctag(struct html *, enum htmltag); -static void print_encode(struct html *, const char *); -static void print_escape(struct html *, const char **); -static void print_text(struct html *, const char *); -static void print_res(struct html *, const char *, int); -static void print_spec(struct html *, const char *, int); +static void print_doctype(struct html *); +static void print_xmltype(struct html *); +static int print_encode(struct html *, const char *, int); +static void print_metaf(struct html *, enum roffdeco); +static void print_attr(struct html *, + const char *, const char *); +static void *ml_alloc(char *, enum htmltype); -static int a2width(const char *); -static int a2offs(const char *); -static int mdoc_list_pre(MDOC_ARGS, int); -static int mdoc_listitem_pre(MDOC_ARGS); -static int mdoc_root_pre(MDOC_ARGS); -static int mdoc_tbl_pre(MDOC_ARGS, int); -static int mdoc_tbl_block_pre(MDOC_ARGS, int, int, int); -static int mdoc_tbl_body_pre(MDOC_ARGS, int, int); -static int mdoc_tbl_head_pre(MDOC_ARGS, int, int); +static void * +ml_alloc(char *outopts, enum htmltype type) +{ + struct html *h; + const char *toks[4]; + char *v; -static int mdoc_ar_pre(MDOC_ARGS); -static int mdoc_bl_pre(MDOC_ARGS); -static int mdoc_d1_pre(MDOC_ARGS); -static void mdoc_dq_post(MDOC_ARGS); -static int mdoc_dq_pre(MDOC_ARGS); -static int mdoc_fl_pre(MDOC_ARGS); -static int mdoc_em_pre(MDOC_ARGS); -static int mdoc_ex_pre(MDOC_ARGS); -static int mdoc_it_pre(MDOC_ARGS); -static int mdoc_nd_pre(MDOC_ARGS); -static int mdoc_nm_pre(MDOC_ARGS); -static int mdoc_ns_pre(MDOC_ARGS); -static void mdoc_op_post(MDOC_ARGS); -static int mdoc_op_pre(MDOC_ARGS); -static int mdoc_pp_pre(MDOC_ARGS); -static void mdoc_pq_post(MDOC_ARGS); -static int mdoc_pq_pre(MDOC_ARGS); -static int mdoc_sh_pre(MDOC_ARGS); -static void mdoc_sq_post(MDOC_ARGS); -static int mdoc_sq_pre(MDOC_ARGS); -static int mdoc_ss_pre(MDOC_ARGS); -static int mdoc_sx_pre(MDOC_ARGS); -static int mdoc_xr_pre(MDOC_ARGS); -static int mdoc_xx_pre(MDOC_ARGS); + toks[0] = "style"; + toks[1] = "man"; + toks[2] = "includes"; + toks[3] = NULL; -#ifdef __linux__ -extern size_t strlcpy(char *, const char *, size_t); -extern size_t strlcat(char *, const char *, size_t); -#endif + h = calloc(1, sizeof(struct html)); + if (NULL == h) { + perror(NULL); + exit((int)MANDOCLEVEL_SYSERR); + } -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 */ - {mdoc_d1_pre, NULL}, /* D1 */ - {mdoc_d1_pre, NULL}, /* Dl */ - {NULL, NULL}, /* Bd */ - {NULL, NULL}, /* Ed */ - {mdoc_bl_pre, NULL}, /* Bl */ - {NULL, NULL}, /* El */ - {mdoc_it_pre, NULL}, /* It */ - {NULL, NULL}, /* Ad */ - {NULL, NULL}, /* An */ - {mdoc_ar_pre, NULL}, /* Ar */ - {NULL, NULL}, /* Cd */ - {NULL, NULL}, /* Cm */ - {NULL, NULL}, /* Dv */ - {NULL, NULL}, /* Er */ - {NULL, NULL}, /* Ev */ - {mdoc_ex_pre, 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 */ - {mdoc_xx_pre, NULL}, /* Bsx */ - {NULL, NULL}, /* Bx */ - {NULL, NULL}, /* Db */ - {NULL, NULL}, /* Dc */ - {NULL, NULL}, /* Do */ - {mdoc_dq_pre, mdoc_dq_post}, /* Dq */ - {NULL, NULL}, /* Ec */ - {NULL, NULL}, /* Ef */ - {mdoc_em_pre, NULL}, /* Em */ - {NULL, NULL}, /* Eo */ - {mdoc_xx_pre, NULL}, /* Fx */ - {NULL, NULL}, /* Ms */ - {NULL, NULL}, /* No */ - {mdoc_ns_pre, NULL}, /* Ns */ - {mdoc_xx_pre, NULL}, /* Nx */ - {mdoc_xx_pre, NULL}, /* Ox */ - {NULL, NULL}, /* Pc */ - {NULL, NULL}, /* Pf */ - {mdoc_pq_pre, mdoc_pq_post}, /* Po */ - {mdoc_pq_pre, mdoc_pq_post}, /* Pq */ - {NULL, NULL}, /* Qc */ - {NULL, NULL}, /* Ql */ - {NULL, NULL}, /* Qo */ - {NULL, NULL}, /* Qq */ - {NULL, NULL}, /* Re */ - {NULL, NULL}, /* Rs */ - {NULL, NULL}, /* Sc */ - {mdoc_sq_pre, mdoc_sq_post}, /* So */ - {mdoc_sq_pre, mdoc_sq_post}, /* Sq */ - {NULL, NULL}, /* Sm */ - {mdoc_sx_pre, NULL}, /* Sx */ - {NULL, NULL}, /* Sy */ - {NULL, NULL}, /* Tn */ - {mdoc_xx_pre, 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 */ - {mdoc_xx_pre, NULL}, /* Dx */ - {NULL, NULL}, /* %Q */ - {NULL, NULL}, /* br */ - {NULL, NULL}, /* sp */ -}; + h->type = type; + h->tags.head = NULL; + h->symtab = chars_init(CHARS_HTML); -static char buf[BUFSIZ]; /* XXX */ + 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; + default: + break; + } -#define bufcat(x) (void)strlcat(buf, (x), BUFSIZ) -#define bufinit() buf[0] = 0 -#define buffmt(...) (void)snprintf(buf, BUFSIZ - 1, __VA_ARGS__) - -void -html_mdoc(void *arg, const struct mdoc *m) -{ - 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"); + return(h); } - -void -html_man(void *arg, const struct man *m) +void * +html_alloc(char *outopts) { - struct html *h; - struct tag *t; - h = (struct html *)arg; - - 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); - - printf("\n"); + return(ml_alloc(outopts, HTML_HTML_4_01_STRICT)); } void * -html_alloc(void) +xhtml_alloc(char *outopts) { - struct html *h; - if (NULL == (h = calloc(1, sizeof(struct html)))) - return(NULL); - - SLIST_INIT(&h->stack); - if (NULL == (h->symtab = chars_init(CHARS_HTML))) { - free(h); - return(NULL); - } - return(h); + return(ml_alloc(outopts, HTML_XHTML_1_0_STRICT)); } @@ -397,392 +172,358 @@ 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); } + + if (h->symtab) + chars_free(h->symtab); + free(h); } -static void -print_mdoc(MDOC_ARGS) +void +print_gen_head(struct html *h) { - struct tag *t; + struct htmlpair tag[4]; - t = print_otag(h, TAG_HEAD, 0, NULL); - print_mdoc_head(m, n, h); - print_tagq(h, t); + tag[0].key = ATTR_HTTPEQUIV; + tag[0].val = "Content-Type"; + tag[1].key = ATTR_CONTENT; + tag[1].val = "text/html; charset=utf-8"; + print_otag(h, TAG_META, 2, tag); - t = print_otag(h, TAG_BODY, 0, NULL); - print_mdoc_title(m, n, h); - print_mdoc_node(m, n, h); - print_tagq(h, t); + tag[0].key = ATTR_NAME; + tag[0].val = "resource-type"; + tag[1].key = ATTR_CONTENT; + tag[1].val = "document"; + print_otag(h, TAG_META, 2, tag); + + 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); + } } - +/* ARGSUSED */ static void -print_gen_head(struct html *h) +print_num(struct html *h, const char *p, size_t len) { - struct htmlpair meta0[2]; - struct htmlpair meta1[2]; - struct htmlpair link[4]; + const char *rhs; - meta0[0].key = ATTR_HTTPEQUIV; - meta0[0].val = "Content-Type"; - meta0[1].key = ATTR_CONTENT; - meta0[1].val = "text/html; charset=utf-8"; - - meta1[0].key = ATTR_NAME; - meta1[0].val = "resource-type"; - meta1[1].key = ATTR_CONTENT; - meta1[1].val = "document"; - - 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"; - - print_otag(h, TAG_META, 2, meta0); - print_otag(h, TAG_META, 2, meta1); - print_otag(h, TAG_LINK, 4, link); + rhs = chars_num2char(p, len); + if (rhs) + putchar((int)*rhs); } - -/* ARGSUSED */ static void -print_mdoc_head(MDOC_ARGS) +print_spec(struct html *h, enum roffdeco d, const char *p, size_t len) { + int cp; + const char *rhs; + size_t sz; - print_gen_head(h); - print_otag(h, TAG_TITLE, 0, NULL); - print_encode(h, m->title); + if ((cp = chars_spec2cp(h->symtab, p, len)) > 0) { + printf("&#%d;", cp); + return; + } else if (-1 == cp && DECO_SSPECIAL == d) { + fwrite(p, 1, len, stdout); + return; + } else if (-1 == cp) + return; + + if (NULL != (rhs = chars_spec2str(h->symtab, p, len, &sz))) + fwrite(rhs, 1, sz, stdout); } -/* ARGSUSED */ static void -print_mdoc_title(MDOC_ARGS) +print_res(struct html *h, const char *p, size_t len) { + int cp; + const char *rhs; + size_t sz; - /* TODO */ + if ((cp = chars_res2cp(h->symtab, p, len)) > 0) { + printf("&#%d;", cp); + return; + } else if (-1 == cp) + return; + + if (NULL != (rhs = chars_res2str(h->symtab, p, len, &sz))) + fwrite(rhs, 1, sz, stdout); } static void -print_mdoc_node(MDOC_ARGS) +print_metaf(struct html *h, enum roffdeco deco) { - int child; - struct tag *t; + enum htmlfont font; - child = 1; - t = SLIST_FIRST(&h->stack); - - bufinit(); - - switch (n->type) { - case (MDOC_ROOT): - child = mdoc_root_pre(m, n, h); + switch (deco) { + case (DECO_PREVIOUS): + font = h->metal; break; - case (MDOC_TEXT): - print_text(h, n->string); + case (DECO_ITALIC): + font = HTMLFONT_ITALIC; break; - default: - if (mdocs[n->tok].pre) - child = (*mdocs[n->tok].pre)(m, n, h); + case (DECO_BOLD): + font = HTMLFONT_BOLD; break; - } - - if (child && n->child) - print_mdoc_node(m, n->child, h); - - print_stagq(h, t); - - bufinit(); - - switch (n->type) { - case (MDOC_ROOT): + case (DECO_ROMAN): + font = HTMLFONT_NONE; break; - case (MDOC_TEXT): - break; default: - if (mdocs[n->tok].post) - (*mdocs[n->tok].post)(m, n, h); - break; + abort(); + /* NOTREACHED */ } - if (n->next) - print_mdoc_node(m, n->next, h); -} + if (h->metaf) { + print_tagq(h, h->metaf); + h->metaf = NULL; + } + h->metal = h->metac; + h->metac = font; -static void -print_man(MAN_ARGS) -{ - struct tag *t; - - t = print_otag(h, TAG_HEAD, 0, NULL); - print_man_head(m, n, h); - print_tagq(h, t); - - t = print_otag(h, TAG_BODY, 0, NULL); - print_man_body(m, n, h); - print_tagq(h, t); + if (HTMLFONT_NONE != font) + h->metaf = HTMLFONT_BOLD == font ? + print_otag(h, TAG_B, 0, NULL) : + print_otag(h, TAG_I, 0, NULL); } -/* ARGSUSED */ -static void -print_man_head(MAN_ARGS) +static int +print_encode(struct html *h, const char *p, int norecurse) { - - print_gen_head(h); - print_otag(h, TAG_TITLE, 0, NULL); - print_encode(h, m->title); -} - - -/* ARGSUSED */ -static void -print_man_body(MAN_ARGS) -{ - - /* TODO */ -} - - -static void -print_spec(struct html *h, const char *p, int len) -{ - const char *rhs; - int i; size_t sz; + int len, nospace; + const char *seq; + enum roffdeco deco; + static const char rejs[6] = { '\\', '<', '>', '&', ASCII_HYPH, '\0' }; - rhs = chars_a2ascii(h->symtab, p, (size_t)len, &sz); + nospace = 0; - if (NULL == rhs) - return; - for (i = 0; i < (int)sz; i++) - putchar(rhs[i]); -} + for (; *p; p++) { + sz = strcspn(p, rejs); + fwrite(p, 1, sz, stdout); + p += /* LINTED */ + sz; -static void -print_res(struct html *h, const char *p, int len) -{ - const char *rhs; - int i; - size_t sz; + if ('<' == *p) { + printf("<"); + continue; + } else if ('>' == *p) { + printf(">"); + continue; + } else if ('&' == *p) { + printf("&"); + continue; + } else if (ASCII_HYPH == *p) { + /* + * Note: "soft hyphens" aren't graphically + * displayed when not breaking the text; we want + * them to be displayed. + */ + /*printf("­");*/ + putchar('-'); + continue; + } else if ('\0' == *p) + break; - rhs = chars_a2res(h->symtab, p, (size_t)len, &sz); + seq = ++p; + len = a2roffdeco(&deco, &seq, &sz); - if (NULL == rhs) - return; - for (i = 0; i < (int)sz; i++) - putchar(rhs[i]); -} - - -static void -print_escape(struct html *h, const char **p) -{ - int j, type; - const char *wp; - - wp = *p; - type = 1; - - if (0 == *(++wp)) { - *p = wp; - return; - } - - if ('(' == *wp) { - wp++; - if (0 == *wp || 0 == *(wp + 1)) { - *p = 0 == *wp ? wp : wp + 1; - return; - } - - print_spec(h, wp, 2); - *p = ++wp; - return; - - } else if ('*' == *wp) { - if (0 == *(++wp)) { - *p = wp; - return; - } - - switch (*wp) { - case ('('): - wp++; - if (0 == *wp || 0 == *(wp + 1)) { - *p = 0 == *wp ? wp : wp + 1; - return; - } - - print_res(h, wp, 2); - *p = ++wp; - return; - case ('['): - type = 0; + switch (deco) { + case (DECO_NUMBERED): + print_num(h, seq, sz); break; - default: - print_res(h, wp, 1); - *p = wp; - return; - } - - } else if ('f' == *wp) { - if (0 == *(++wp)) { - *p = wp; - return; - } - - switch (*wp) { - case ('B'): - /* TODO */ + case (DECO_RESERVED): + print_res(h, seq, sz); break; - case ('I'): - /* TODO */ + case (DECO_SSPECIAL): + /* FALLTHROUGH */ + case (DECO_SPECIAL): + print_spec(h, deco, seq, sz); break; - case ('P'): + case (DECO_PREVIOUS): /* FALLTHROUGH */ - case ('R'): - /* TODO */ + case (DECO_BOLD): + /* FALLTHROUGH */ + case (DECO_ITALIC): + /* FALLTHROUGH */ + case (DECO_ROMAN): + if (norecurse) + break; + print_metaf(h, deco); break; default: break; } - *p = wp; - return; + p += len - 1; - } else if ('[' != *wp) { - print_spec(h, wp, 1); - *p = wp; - return; + if (DECO_NOSPACE == deco && '\0' == *(p + 1)) + nospace = 1; } - wp++; - for (j = 0; *wp && ']' != *wp; wp++, j++) - /* Loop... */ ; - - if (0 == *wp) { - *p = wp; - return; - } - - if (type) - print_spec(h, wp - j, j); - else - print_res(h, wp - j, j); - - *p = wp; + return(nospace); } static void -print_encode(struct html *h, const char *p) +print_attr(struct html *h, const char *key, const char *val) { - - for (; *p; p++) { - if ('\\' == *p) { - print_escape(h, &p); - continue; - } - switch (*p) { - case ('<'): - printf("<"); - break; - case ('>'): - printf(">"); - break; - case ('&'): - printf("&"); - break; - default: - putchar(*p); - break; - } - } + printf(" %s=\"", key); + (void)print_encode(h, val, 1); + putchar('\"'); } -static struct 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 = malloc(sizeof(struct tag)); + if (NULL == t) { + perror(NULL); + exit((int)MANDOCLEVEL_SYSERR); + } 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(h, p[i].val); - printf("\""); + for (i = 0; i < sz; i++) + print_attr(h, htmlattrs[p[i].key], p[i].val); + + /* Add non-overridable attributes. */ + + if (TAG_HTML == tag && HTML_XHTML_1_0_STRICT == h->type) { + print_attr(h, "xmlns", "http://www.w3.org/1999/xhtml"); + print_attr(h, "xml:lang", "en"); + print_attr(h, "lang", "en"); } - printf(">"); + /* Accomodate for XML "well-formed" singleton escaping. */ + + if (HTML_AUTOCLOSE & htmltags[tag].flags) + switch (h->type) { + case (HTML_XHTML_1_0_STRICT): + putchar('/'); + break; + default: + break; + } + + 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) { printf("", htmltags[tag].name); - if (HTML_CLRLINE & htmltags[tag].flags) + if (HTML_CLRLINE & htmltags[tag].flags) { h->flags |= HTML_NOSPACE; - if (HTML_CLRLINE & htmltags[tag].flags) - h->flags |= HTML_NEWLINE; - else - h->flags &= ~HTML_NEWLINE; + putchar('\n'); + } } -/* ARGSUSED */ +void +print_gen_decls(struct html *h) +{ + + print_xmltype(h); + print_doctype(h); +} + + static void -print_gen_doctype(struct html *h) +print_xmltype(struct html *h) { - - printf("\n", DOCTYPE, DTD); + + if (HTML_XHTML_1_0_STRICT == h->type) + puts(""); } static void -print_text(struct html *h, const char *p) +print_doctype(struct html *h) { + const char *doctype; + const char *dtd; + const char *name; - if (*p && 0 == *(p + 1)) - switch (*p) { + switch (h->type) { + case (HTML_HTML_4_01_STRICT): + name = "HTML"; + doctype = "-//W3C//DTD HTML 4.01//EN"; + dtd = "http://www.w3.org/TR/html4/strict.dtd"; + break; + default: + name = "html"; + doctype = "-//W3C//DTD XHTML 1.0 Strict//EN"; + dtd = "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"; + break; + } + + printf("\n", + name, doctype, dtd); +} + + +void +print_text(struct html *h, const char *word) +{ + + if (word[0] && '\0' == word[1]) + switch (word[0]) { case('.'): /* FALLTHROUGH */ case(','): @@ -798,30 +539,50 @@ print_text(struct html *h, const char *p) case(')'): /* FALLTHROUGH */ case(']'): - /* FALLTHROUGH */ - case('}'): - h->flags |= HTML_NOSPACE; + if ( ! (HTML_IGNDELIM & h->flags)) + h->flags |= HTML_NOSPACE; break; default: break; } - if ( ! (h->flags & HTML_NOSPACE)) - printf(" "); + if ( ! (HTML_NOSPACE & h->flags)) { + /* Manage keeps! */ + if ( ! (HTML_KEEP & h->flags)) { + if (HTML_PREKEEP & h->flags) + h->flags |= HTML_KEEP; + putchar(' '); + } else + printf(" "); + } - h->flags &= ~HTML_NOSPACE; - h->flags &= ~HTML_NEWLINE; + assert(NULL == h->metaf); + if (HTMLFONT_NONE != h->metac) + h->metaf = HTMLFONT_BOLD == h->metac ? + print_otag(h, TAG_B, 0, NULL) : + print_otag(h, TAG_I, 0, NULL); - if (p) - print_encode(h, p); + assert(word); + if ( ! print_encode(h, word, 0)) + if ( ! (h->flags & HTML_NONOSPACE)) + h->flags &= ~HTML_NOSPACE; - if (*p && 0 == *(p + 1)) - switch (*p) { + if (h->metaf) { + print_tagq(h, h->metaf); + h->metaf = NULL; + } + + h->flags &= ~HTML_IGNDELIM; + + /* + * Note that we don't process the pipe: the parser sees it as + * punctuation, but we don't in terms of typography. + */ + if (word[0] && '\0' == word[1]) + switch (word[0]) { case('('): /* FALLTHROUGH */ case('['): - /* FALLTHROUGH */ - case('{'): h->flags |= HTML_NOSPACE; break; default: @@ -830,15 +591,22 @@ print_text(struct html *h, const char *p) } -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); + 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); - SLIST_REMOVE_HEAD(&h->stack, entry); + h->tags.head = tag->next; free(tag); if (until && tag == until) return; @@ -846,794 +614,213 @@ print_tagq(struct html *h, const struct tag *until) } -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; + /* + * 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); - SLIST_REMOVE_HEAD(&h->stack, entry); + h->tags.head = tag->next; free(tag); } } -/* FIXME: put in utility file for front-ends. */ -static int -a2offs(const char *p) +void +bufinit(struct html *h) { - int len, i; - if (0 == strcmp(p, "left")) - return(0); - if (0 == strcmp(p, "indent")) - return(INDENT + 1); - if (0 == strcmp(p, "indent-two")) - return((INDENT + 1) * 2); + h->buf[0] = '\0'; + h->buflen = 0; +} - if (0 == (len = (int)strlen(p))) - return(0); - for (i = 0; i < len - 1; i++) - if ( ! isdigit((u_char)p[i])) - break; +void +bufcat_style(struct html *h, const char *key, const char *val) +{ - if (i == len - 1) - if ('n' == p[len - 1] || 'm' == p[len - 1]) - return(atoi(p)); - - return(len); + bufcat(h, key); + bufncat(h, ":", 1); + bufcat(h, val); + bufncat(h, ";", 1); } -/* FIXME: put in utility file for front-ends. */ -static int -a2width(const char *p) +void +bufcat(struct html *h, const char *p) { - int i, len; - if (0 == (len = (int)strlen(p))) - return(0); - for (i = 0; i < len - 1; i++) - if ( ! isdigit((u_char)p[i])) - break; - - if (i == len - 1) - if ('n' == p[len - 1] || 'm' == p[len - 1]) - return(atoi(p) + 2); - - return(len + 2); + bufncat(h, p, strlen(p)); } - - -/* ARGSUSED */ -static int -mdoc_root_pre(MDOC_ARGS) +void +buffmt(struct html *h, const char *fmt, ...) { - struct htmlpair tag; + va_list ap; - tag.key = ATTR_CLASS; - tag.val = "body"; - - print_otag(h, TAG_DIV, 1, &tag); - 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 int -mdoc_sh_pre(MDOC_ARGS) +void +bufncat(struct html *h, const char *p, size_t sz) { - struct htmlpair tag[2]; - if (MDOC_HEAD == n->type) { - tag[0].key = ATTR_CLASS; - tag[0].val = "sec-head"; - print_otag(h, TAG_DIV, 1, tag); - print_otag(h, TAG_SPAN, 1, tag); - return(1); - } else if (MDOC_BLOCK == n->type) { - tag[0].key = ATTR_CLASS; - tag[0].val = "sec-block"; - print_otag(h, TAG_DIV, 1, tag); - return(1); - } + if (h->buflen + sz > BUFSIZ - 1) + sz = BUFSIZ - 1 - h->buflen; - buffmt("margin-left: %dem;", INDENT); - - if (n->parent->next && n->child) - bufcat("margin-bottom: 1em;"); - - tag[0].key = ATTR_CLASS; - tag[0].val = "sec-body"; - tag[1].key = ATTR_STYLE; - tag[1].val = buf; - - print_otag(h, TAG_DIV, 2, tag); - return(1); + (void)strncat(h->buf, p, sz); + h->buflen += sz; } -/* ARGSUSED */ -static int -mdoc_ss_pre(MDOC_ARGS) +void +buffmt_includes(struct html *h, const char *name) { - struct htmlpair tag[2]; - int i; + const char *p, *pp; - i = 0; - - if (MDOC_BODY == n->type) { - tag[i].key = ATTR_CLASS; - tag[i++].val = "ssec-body"; - if (n->parent->next && n->child) { - bufcat("margin-bottom: 1em;"); - tag[i].key = ATTR_STYLE; - tag[i++].val = buf; + pp = h->base_includes; + + 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; } - print_otag(h, TAG_DIV, i, tag); - return(1); - } else if (MDOC_BLOCK == n->type) { - tag[i].key = ATTR_CLASS; - tag[i++].val = "ssec-block"; - if (n->prev) { - bufcat("margin-top: 1em;"); - tag[i].key = ATTR_STYLE; - tag[i++].val = buf; - } - print_otag(h, TAG_DIV, i, tag); - return(1); + pp = p + 2; } - - buffmt("margin-left: -%dem;", INDENT - HALFINDENT); - - tag[0].key = ATTR_CLASS; - tag[0].val = "ssec-head"; - tag[1].key = ATTR_STYLE; - tag[1].val = buf; - - print_otag(h, TAG_DIV, 2, tag); - print_otag(h, TAG_SPAN, 1, tag); - return(1); + if (pp) + bufcat(h, pp); } -/* ARGSUSED */ -static int -mdoc_fl_pre(MDOC_ARGS) +void +buffmt_man(struct html *h, + const char *name, const char *sec) { - struct htmlpair tag; + const char *p, *pp; - tag.key = ATTR_CLASS; - tag.val = "flag"; - - print_otag(h, TAG_SPAN, 1, &tag); - print_text(h, "\\-"); - h->flags |= HTML_NOSPACE; - return(1); -} - - -/* ARGSUSED */ -static int -mdoc_pp_pre(MDOC_ARGS) -{ - struct htmlpair tag; - - bufcat("clear: both;"); - bufcat("height: 1em;"); - - tag.key = ATTR_STYLE; - tag.val = buf; - - print_otag(h, TAG_DIV, 1, &tag); - return(0); -} - - -/* ARGSUSED */ -static int -mdoc_nd_pre(MDOC_ARGS) -{ - struct htmlpair tag; - - if (MDOC_BODY != n->type) - return(1); - - /* XXX - this can contain block elements! */ - print_text(h, "\\(em"); - tag.key = ATTR_CLASS; - tag.val = "desc-body"; - print_otag(h, TAG_SPAN, 1, &tag); - return(1); -} - - -/* ARGSUSED */ -static int -mdoc_op_pre(MDOC_ARGS) -{ - struct htmlpair tag; - - if (MDOC_BODY != n->type) - return(1); - - /* XXX - this can contain block elements! */ - print_text(h, "\\(lB"); - tag.key = ATTR_CLASS; - tag.val = "opt"; - print_otag(h, TAG_SPAN, 1, &tag); - return(1); -} - - -/* ARGSUSED */ -static void -mdoc_op_post(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return; - h->flags |= HTML_NOSPACE; - print_text(h, "\\(rB"); -} - - -static int -mdoc_nm_pre(MDOC_ARGS) -{ - struct htmlpair tag; - - if ( ! (HTML_NEWLINE & h->flags)) - if (SEC_SYNOPSIS == n->sec) { - tag.key = ATTR_STYLE; - tag.val = "clear: both;"; - print_otag(h, TAG_BR, 1, &tag); + pp = h->base_man; + + /* LINTED */ + 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'): + buffmt(h, name); + break; + default: + bufncat(h, p, 2); + break; } - - tag.key = ATTR_CLASS; - tag.val = "name"; - - print_otag(h, TAG_SPAN, 1, &tag); - if (NULL == n->child) - print_text(h, m->name); - - return(1); + 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[2]; + double v; + const char *u; - tag[0].key = ATTR_CLASS; - tag[0].val = "link-man"; - tag[1].key = ATTR_HREF; - tag[1].val = "#"; /* TODO */ + v = su->scale; - print_otag(h, TAG_A, 2, tag); - - n = n->child; - print_text(h, n->string); - if (NULL == (n = n->next)) - return(0); - - h->flags |= HTML_NOSPACE; - print_text(h, "("); - h->flags |= HTML_NOSPACE; - print_text(h, n->string); - h->flags |= HTML_NOSPACE; - print_text(h, ")"); - - return(0); -} - - -/* ARGSUSED */ -static int -mdoc_ns_pre(MDOC_ARGS) -{ - - h->flags |= HTML_NOSPACE; - return(1); -} - - -/* ARGSUSED */ -static int -mdoc_ar_pre(MDOC_ARGS) -{ - struct htmlpair tag; - - tag.key = ATTR_CLASS; - tag.val = "arg"; - - print_otag(h, TAG_SPAN, 1, &tag); - return(1); -} - - -/* ARGSUSED */ -static int -mdoc_xx_pre(MDOC_ARGS) -{ - const char *pp; - struct htmlpair tag; - - switch (n->tok) { - case (MDOC_Bsx): - pp = "BSDI BSD/OS"; + switch (su->unit) { + case (SCALE_CM): + u = "cm"; break; - case (MDOC_Dx): - pp = "DragonFlyBSD"; + case (SCALE_IN): + u = "in"; break; - case (MDOC_Fx): - pp = "FreeBSD"; + case (SCALE_PC): + u = "pc"; break; - case (MDOC_Nx): - pp = "NetBSD"; + case (SCALE_PT): + u = "pt"; break; - case (MDOC_Ox): - pp = "OpenBSD"; + case (SCALE_EM): + u = "em"; break; - case (MDOC_Ux): - pp = "UNIX"; + case (SCALE_MM): + if (0 == (v /= 100)) + v = 1; + u = "em"; break; - default: - return(1); - } - - tag.key = ATTR_CLASS; - tag.val = "unix"; - - print_otag(h, TAG_SPAN, 1, &tag); - print_text(h, pp); - return(1); -} - - -/* ARGSUSED */ -static int -mdoc_tbl_block_pre(MDOC_ARGS, int w, int o, int c) -{ - struct htmlpair tag; - - buffmt("margin-left: %dem; clear: both;", w + o); - - if ( ! c) - bufcat("padding-top: 1em;"); - - tag.key = ATTR_STYLE; - tag.val = buf; - print_otag(h, TAG_DIV, 1, &tag); - return(1); -} - - -/* ARGSUSED */ -static int -mdoc_tbl_body_pre(MDOC_ARGS, int t, int w) -{ - struct htmlpair tag; - int i; - - switch (t) { - case (MDOC_Tag): - i = 1; - tag.key = ATTR_STYLE; - tag.val = buf; - bufcat("clear: right;"); - bufcat("float: left;"); - bufcat("width: 100%%;"); + case (SCALE_EN): + u = "ex"; break; - default: - i = 0; + case (SCALE_BU): + u = "ex"; break; - } - - print_otag(h, TAG_DIV, i, &tag); - return(1); -} - - -/* ARGSUSED */ -static int -mdoc_tbl_head_pre(MDOC_ARGS, int t, int w) -{ - struct htmlpair tag; - int i; - - switch (t) { - case (MDOC_Hang): - /* FALLTHROUGH */ - case (MDOC_Tag): - i = 1; - tag.key = ATTR_STYLE; - tag.val = buf; - buffmt("margin-left: -%dem;", w); - bufcat("clear: left;"); - bufcat("float: left;"); - bufcat("padding-right: 1em;"); + case (SCALE_VS): + u = "em"; break; default: - i = 0; + u = "ex"; break; } - print_otag(h, TAG_DIV, i, &tag); - return(1); + /* + * XXX: the CSS spec isn't clear as to which types accept + * integer or real numbers, so we just make them all decimals. + */ + buffmt(h, "%s: %.2f%s;", p, v, u); } -static int -mdoc_tbl_pre(MDOC_ARGS, int type) +void +html_idcat(char *dst, const char *src, int sz) { - int i, w, o, c; - const struct mdoc_node *bl; + int ssz; - bl = n->parent->parent; - if (MDOC_BLOCK != n->type) - bl = bl->parent; + assert(sz > 2); - /* FIXME: fmt_vspace() equivalent. */ + /* Cf. . */ - assert(bl->args); + /* We can't start with a number (bah). */ - w = o = c = 0; - - for (i = 0; i < (int)bl->args->argc; i++) - if (MDOC_Width == bl->args->argv[i].arg) { - assert(bl->args->argv[i].sz); - w = a2width(bl->args->argv[i].value[0]); - } else if (MDOC_Offset == bl->args->argv[i].arg) { - assert(bl->args->argv[i].sz); - o = a2offs(bl->args->argv[i].value[0]); - } else if (MDOC_Compact == bl->args->argv[i].arg) - c = 1; - - if (0 == w) - w = 10; - - switch (n->type) { - case (MDOC_BLOCK): - break; - case (MDOC_HEAD): - return(mdoc_tbl_head_pre(m, n, h, type, w)); - case (MDOC_BODY): - return(mdoc_tbl_body_pre(m, n, h, type, w)); - default: - abort(); - /* NOTREACHED */ + if ('#' == *dst) { + dst++; + sz--; } - - return(mdoc_tbl_block_pre(m, n, h, w, o, c)); -} - - -/* ARGSUSED */ -static int -mdoc_listitem_pre(MDOC_ARGS) -{ - int i, w, o, c; - const struct mdoc_node *bl; - struct htmlpair tag; - - /* FIXME: fmt_vspace() equivalent. */ - - if (MDOC_BLOCK != n->type) - return(1); - - bl = n->parent->parent; - assert(bl); - - w = o = c = 0; - - for (i = 0; i < (int)bl->args->argc; i++) - if (MDOC_Width == bl->args->argv[i].arg) { - assert(bl->args->argv[i].sz); - w = a2width(bl->args->argv[i].value[0]); - } else if (MDOC_Offset == bl->args->argv[i].arg) { - assert(bl->args->argv[i].sz); - o = a2offs(bl->args->argv[i].value[0]); - } else if (MDOC_Compact == bl->args->argv[i].arg) - c = 1; - - if (o && w) - buffmt("margin-left: %dem; padding-left: %dem;", o, w); - else if (w) - buffmt("padding-left: %dem;", w > 4 ? w - 4 : w); - else if (o) - buffmt("margin-left: %dem;", o); - - if ( ! c) - bufcat("padding-top: 1em;"); - - tag.key = ATTR_STYLE; - tag.val = buf; - - print_otag(h, TAG_LI, 1, &tag); - return(1); -} - - -/* ARGSUSED */ -static int -mdoc_list_pre(MDOC_ARGS, int type) -{ - - switch (type) { - case (MDOC_Enum): - print_otag(h, TAG_OL, 0, NULL); - break; - case (MDOC_Bullet): - print_otag(h, TAG_UL, 0, NULL); - break; - default: - break; + if ('\0' == *dst) { + *dst++ = 'x'; + *dst = '\0'; + sz--; } - return(1); -} + for ( ; *dst != '\0' && sz; dst++, sz--) + /* Jump to end. */ ; - -static int -mdoc_bl_pre(MDOC_ARGS) -{ - int i, len, type; - - if (MDOC_BLOCK != n->type) - return(1); - - assert(n->args); - len = (int)n->args->argc; - - for (i = 0; i < len; i++) - switch ((type = n->args->argv[i].arg)) { - case (MDOC_Enum): - /* FALLTHROUGH */ - case (MDOC_Bullet): - return(mdoc_list_pre(m, n, h, type)); - case (MDOC_Tag): - /* FALLTHROUGH */ - case (MDOC_Hang): - /* FALLTHROUGH */ - case (MDOC_Dash): - /* FALLTHROUGH */ - case (MDOC_Hyphen): - /* FALLTHROUGH */ - case (MDOC_Inset): - /* FALLTHROUGH */ - case (MDOC_Diag): - /* FALLTHROUGH */ - case (MDOC_Item): - /* FALLTHROUGH */ - case (MDOC_Column): - /* FALLTHROUGH */ - case (MDOC_Ohang): - return(1); - default: - break; - } - - abort(); - /* NOTREACHED */ -} - - -static int -mdoc_it_pre(MDOC_ARGS) -{ - int i, len, type; - const struct mdoc_node *bl; - - if (MDOC_BLOCK == n->type) - bl = n->parent->parent; - else - bl = n->parent->parent->parent; - - assert(bl->args); - len = (int)bl->args->argc; - - for (i = 0; i < len; i++) - switch ((type = bl->args->argv[i].arg)) { - case (MDOC_Tag): - /* FALLTHROUGH */ - case (MDOC_Hang): - return(mdoc_tbl_pre(m, n, h, type)); - case (MDOC_Enum): - /* FALLTHROUGH */ - case (MDOC_Bullet): - return(mdoc_listitem_pre(m, n, h)); - case (MDOC_Dash): - /* FALLTHROUGH */ - case (MDOC_Hyphen): - /* FALLTHROUGH */ - case (MDOC_Inset): - /* FALLTHROUGH */ - case (MDOC_Diag): - /* FALLTHROUGH */ - case (MDOC_Item): - /* FALLTHROUGH */ - case (MDOC_Column): - /* FALLTHROUGH */ - case (MDOC_Ohang): - return(0); - default: - break; - } - - abort(); - /* NOTREACHED */ -} - - -/* ARGSUSED */ -static int -mdoc_ex_pre(MDOC_ARGS) -{ - const struct mdoc_node *nn; - struct tag *t; - struct htmlpair tag; - - print_text(h, "The"); - - tag.key = ATTR_CLASS; - tag.val = "utility"; - - for (nn = n->child; nn; nn = nn->next) { - t = print_otag(h, TAG_SPAN, 1, &tag); - print_text(h, nn->string); - print_tagq(h, t); - - h->flags |= HTML_NOSPACE; - - if (nn->next && NULL == nn->next->next) - print_text(h, ", and"); - else if (nn->next) - print_text(h, ","); - else - h->flags &= ~HTML_NOSPACE; + for ( ; *src != '\0' && sz > 1; src++) { + ssz = snprintf(dst, (size_t)sz, "%.2x", *src); + sz -= ssz; + dst += ssz; } - - if (n->child->next) - print_text(h, "utilities exit"); - else - print_text(h, "utility exits"); - - print_text(h, "0 on success, and >0 if an error occurs."); - return(0); -} - - -/* ARGSUSED */ -static int -mdoc_dq_pre(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return(1); - print_text(h, "\\(lq"); - h->flags |= HTML_NOSPACE; - return(1); -} - - -/* ARGSUSED */ -static void -mdoc_dq_post(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return; - h->flags |= HTML_NOSPACE; - print_text(h, "\\(rq"); -} - - -/* ARGSUSED */ -static int -mdoc_pq_pre(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return(1); - print_text(h, "\\&("); - h->flags |= HTML_NOSPACE; - return(1); -} - - -/* ARGSUSED */ -static void -mdoc_pq_post(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return; - print_text(h, ")"); -} - - -/* ARGSUSED */ -static int -mdoc_sq_pre(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return(1); - print_text(h, "\\(oq"); - h->flags |= HTML_NOSPACE; - return(1); -} - - -/* ARGSUSED */ -static void -mdoc_sq_post(MDOC_ARGS) -{ - - if (MDOC_BODY != n->type) - return; - h->flags |= HTML_NOSPACE; - print_text(h, "\\(aq"); -} - - -/* ARGSUSED */ -static int -mdoc_em_pre(MDOC_ARGS) -{ - struct htmlpair tag; - - tag.key = ATTR_CLASS; - tag.val = "emph"; - - print_otag(h, TAG_SPAN, 1, &tag); - return(1); -} - - -/* ARGSUSED */ -static int -mdoc_d1_pre(MDOC_ARGS) -{ - struct htmlpair tag[2]; - - if (MDOC_BLOCK != n->type) - return(1); - - buffmt("margin-left: %dem;", INDENT); - bufcat("margin-bottom: 0px;"); - - tag[0].key = ATTR_CLASS; - tag[0].val = "lit-block"; - tag[1].key = ATTR_STYLE; - tag[1].val = buf; - - print_otag(h, TAG_DIV, 2, tag); - return(1); -} - - -/* ARGSUSED */ -static int -mdoc_sx_pre(MDOC_ARGS) -{ - struct htmlpair tag[2]; - - tag[0].key = ATTR_HREF; - tag[0].val = "#"; /* XXX */ - tag[1].key = ATTR_CLASS; - tag[1].val = "link-sec"; - - print_otag(h, TAG_A, 2, tag); - return(1); }