=================================================================== RCS file: /cvs/mandoc/mdoc_html.c,v retrieving revision 1.16 retrieving revision 1.21 diff -u -p -r1.16 -r1.21 --- mandoc/mdoc_html.c 2009/10/03 15:08:09 1.16 +++ mandoc/mdoc_html.c 2009/10/04 09:00:40 1.21 @@ -1,4 +1,4 @@ -/* $Id: mdoc_html.c,v 1.16 2009/10/03 15:08:09 kristaps Exp $ */ +/* $Id: mdoc_html.c,v 1.21 2009/10/04 09:00:40 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -36,9 +35,6 @@ #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); @@ -54,13 +50,6 @@ static int a2width(const char *); static int a2offs(const char *); static int a2list(const struct mdoc_node *); -static void buffmt_man(struct html *, - const char *, const char *); -static void buffmt(struct html *, const char *, ...); -static void bufcat(struct html *, const char *); -static void bufncat(struct html *, const char *, size_t); - - static void mdoc_root_post(MDOC_ARGS); static int mdoc_root_pre(MDOC_ARGS); static int mdoc_tbl_pre(MDOC_ARGS, int); @@ -281,80 +270,6 @@ html_mdoc(void *arg, const struct mdoc *m) } -static void -bufinit(struct html *h) -{ - - h->buf[0] = '\0'; - h->buflen = 0; -} - - -static void -bufcat(struct html *h, const char *p) -{ - - bufncat(h, p, strlen(p)); -} - - -static void -buffmt(struct html *h, const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - (void)vsnprintf(h->buf + h->buflen, - BUFSIZ - h->buflen - 1, fmt, ap); - va_end(ap); - h->buflen = strlen(h->buf); - assert('\0' == h->buf[h->buflen]); -} - - -static void -bufncat(struct html *h, const char *p, size_t sz) -{ - - if (h->buflen + sz > BUFSIZ - 1) - sz = BUFSIZ - 1 - h->buflen; - - (void)strncat(h->buf, p, sz); - h->buflen += sz; - assert('\0' == h->buf[h->buflen]); -} - - -static void -buffmt_man(struct html *h, - const char *name, const char *sec) -{ - const char *p, *pp; - - pp = h->base_man; - - /* FIXME: URL-encode contents. */ - - while ((p = strchr(pp, '%'))) { - bufncat(h, pp, p - pp); - switch (*(p + 1)) { - case('S'): - bufcat(h, sec); - break; - case('N'): - buffmt(h, name ? name : "1"); - break; - default: - bufncat(h, p, 2); - break; - } - pp = p + 2; - } - if (pp) - bufcat(h, pp); -} - - static int a2list(const struct mdoc_node *n) { @@ -467,21 +382,19 @@ print_mdoc(MDOC_ARGS) static void print_mdoc_head(MDOC_ARGS) { - char b[BUFSIZ]; print_gen_head(h); + bufinit(h); + buffmt(h, "%s(%d)", m->title, m->msec); - (void)snprintf(b, BUFSIZ - 1, - "%s(%d)", m->title, m->msec); - if (m->arch) { - (void)strlcat(b, " (", BUFSIZ); - (void)strlcat(b, m->arch, BUFSIZ); - (void)strlcat(b, ")", BUFSIZ); + bufcat(h, " ("); + bufcat(h, m->arch); + bufcat(h, ")"); } print_otag(h, TAG_TITLE, 0, NULL); - print_text(h, b); + print_text(h, h->buf); } @@ -629,21 +542,17 @@ mdoc_sh_pre(MDOC_ARGS) { struct htmlpair tag[2]; const struct mdoc_node *nn; + char link[BUFSIZ]; - if (MDOC_HEAD == n->type) { + if (MDOC_BODY == n->type) { + buffmt(h, "margin-left: %dem;", INDENT); + tag[0].key = ATTR_CLASS; - tag[0].val = "sec-head"; - print_otag(h, TAG_DIV, 1, tag); - print_otag(h, TAG_SPAN, 1, tag); + tag[0].val = "sec-body"; + tag[1].key = ATTR_STYLE; + tag[1].val = h->buf; - for (nn = n->child; nn; nn = nn->next) { - bufcat(h, nn->string); - if (nn->next) - bufncat(h, " ", 1); - } - tag[0].key = ATTR_NAME; - tag[0].val = h->buf; - print_otag(h, TAG_A, 1, tag); + print_otag(h, TAG_DIV, 2, tag); return(1); } else if (MDOC_BLOCK == n->type) { tag[0].key = ATTR_CLASS; @@ -660,17 +569,21 @@ mdoc_sh_pre(MDOC_ARGS) tag[1].key = ATTR_STYLE; tag[1].val = h->buf; - print_otag(h, TAG_DIV, 2, tag); return(1); } - buffmt(h, "margin-left: %dem;", INDENT); - + link[0] = 0; + for (nn = n->child; nn; nn = nn->next) { + (void)strlcat(link, nn->string, BUFSIZ); + if (nn->next) + (void)strlcat(link, "_", BUFSIZ); + } + tag[0].key = ATTR_CLASS; - tag[0].val = "sec-body"; - tag[1].key = ATTR_STYLE; - tag[1].val = h->buf; + tag[0].val = "sec-head"; + tag[1].key = ATTR_ID; + tag[1].val = link; print_otag(h, TAG_DIV, 2, tag); return(1); @@ -681,54 +594,56 @@ mdoc_sh_pre(MDOC_ARGS) static int mdoc_ss_pre(MDOC_ARGS) { - struct htmlpair tag[2]; + struct htmlpair tag[3]; int i; const struct mdoc_node *nn; + char link[BUFSIZ]; i = 0; if (MDOC_BODY == n->type) { tag[i].key = ATTR_CLASS; tag[i++].val = "ssec-body"; + if (n->parent->next && n->child) { bufcat(h, "margin-bottom: 1em;"); tag[i].key = ATTR_STYLE; tag[i++].val = h->buf; } + 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(h, "margin-top: 1em;"); tag[i].key = ATTR_STYLE; tag[i++].val = h->buf; } + print_otag(h, TAG_DIV, i, tag); return(1); } + link[0] = 0; + for (nn = n->child; nn; nn = nn->next) { + (void)strlcat(link, nn->string, BUFSIZ); + if (nn->next) + (void)strlcat(link, "_", BUFSIZ); + } + buffmt(h, "margin-left: -%dem;", INDENT - HALFINDENT); tag[0].key = ATTR_CLASS; tag[0].val = "ssec-head"; tag[1].key = ATTR_STYLE; tag[1].val = h->buf; + tag[2].key = ATTR_ID; + tag[2].val = link; - print_otag(h, TAG_DIV, 2, tag); - print_otag(h, TAG_SPAN, 1, tag); - - bufinit(h); - for (nn = n->child; nn; nn = nn->next) { - bufcat(h, nn->string); - if (nn->next) - bufcat(h, " "); - } - tag[0].key = ATTR_NAME; - tag[0].val = h->buf; - print_otag(h, TAG_A, 1, tag); - + print_otag(h, TAG_DIV, 3, tag); return(1); } @@ -829,17 +744,21 @@ mdoc_xr_pre(MDOC_ARGS) { struct htmlpair tag[2]; const struct mdoc_node *nn; + int i; - buffmt_man(h, n->child->string, - n->child->next ? - n->child->next->string : NULL); + i = 0; + tag[i].key = ATTR_CLASS; + tag[i++].val = "link-man"; - tag[0].key = ATTR_CLASS; - tag[0].val = "link-man"; - tag[1].key = ATTR_HREF; - tag[1].val = h->buf; - print_otag(h, TAG_A, 2, tag); + if (h->base_man) { + buffmt_man(h, n->child->string, n->child->next ? + n->child->next->string : NULL); + tag[i].key = ATTR_HREF; + tag[i++].val = h->buf; + } + print_otag(h, TAG_A, i, tag); + nn = n->child; print_text(h, nn->string); @@ -1352,18 +1271,19 @@ mdoc_sx_pre(MDOC_ARGS) { struct htmlpair tag[2]; const struct mdoc_node *nn; + char link[BUFSIZ]; - bufcat(h, "#"); + (void)strlcpy(link, "#", BUFSIZ); for (nn = n->child; nn; nn = nn->next) { - bufcat(h, nn->string); + (void)strlcat(link, nn->string, BUFSIZ); if (nn->next) - bufcat(h, " "); + (void)strlcat(link, "_", BUFSIZ); } - tag[0].key = ATTR_HREF; - tag[0].val = h->buf; - tag[1].key = ATTR_CLASS; - tag[1].val = "link-sec"; + tag[0].key = ATTR_CLASS; + tag[0].val = "link-sec"; + tag[1].key = ATTR_HREF; + tag[1].val = link; print_otag(h, TAG_A, 2, tag); return(1); @@ -1516,6 +1436,8 @@ mdoc_an_pre(MDOC_ARGS) { struct htmlpair tag; + /* TODO: -split and -nosplit (see termp_an_pre()). */ + tag.key = ATTR_CLASS; tag.val = "author"; print_otag(h, TAG_SPAN, 1, &tag); @@ -1694,23 +1616,26 @@ mdoc_fn_pre(MDOC_ARGS) } /* Split apart into type and name. */ - - tag[0].key = ATTR_CLASS; - tag[0].val = "ftype"; - t = print_otag(h, TAG_SPAN, 1, tag); - assert(n->child->string); sp = n->child->string; - while (NULL != (ep = strchr(sp, ' '))) { - sz = MIN((int)(ep - sp), BUFSIZ - 1); - (void)memcpy(nbuf, sp, (size_t)sz); - nbuf[sz] = '\0'; - print_text(h, nbuf); - sp = ++ep; + + if ((ep = strchr(sp, ' '))) { + tag[0].key = ATTR_CLASS; + tag[0].val = "ftype"; + + t = print_otag(h, TAG_SPAN, 1, tag); + + while (ep) { + sz = MIN((int)(ep - sp), BUFSIZ - 1); + (void)memcpy(nbuf, sp, (size_t)sz); + nbuf[sz] = '\0'; + print_text(h, nbuf); + sp = ++ep; + ep = strchr(sp, ' '); + } + print_tagq(h, t); } - print_tagq(h, t); - tag[0].key = ATTR_CLASS; tag[0].val = "fname"; t = print_otag(h, TAG_SPAN, 1, tag); @@ -1769,7 +1694,7 @@ mdoc_sp_pre(MDOC_ARGS) break; } - buffmt(h, "height: %dem", len); + buffmt(h, "height: %dem;", len); tag.key = ATTR_STYLE; tag.val = h->buf; print_otag(h, TAG_DIV, 1, &tag); @@ -1896,21 +1821,23 @@ static int mdoc_in_pre(MDOC_ARGS) { const struct mdoc_node *nn; - struct htmlpair tag; + struct htmlpair tag[2]; + struct tag *t; + int i; if (SEC_SYNOPSIS == n->sec) { if (n->next && MDOC_In != n->next->tok) { - tag.key = ATTR_STYLE; - tag.val = "margin-bottom: 1em;"; - print_otag(h, TAG_DIV, 1, &tag); + tag[0].key = ATTR_STYLE; + tag[0].val = "margin-bottom: 1em;"; + print_otag(h, TAG_DIV, 1, tag); } else print_otag(h, TAG_DIV, 0, NULL); } - tag.key = ATTR_CLASS; - tag.val = "includes"; + tag[0].key = ATTR_CLASS; + tag[0].val = "includes"; - print_otag(h, TAG_SPAN, 1, &tag); + print_otag(h, TAG_SPAN, 1, tag); if (SEC_SYNOPSIS == n->sec) print_text(h, "#include"); @@ -1920,8 +1847,20 @@ mdoc_in_pre(MDOC_ARGS) /* XXX -- see warning in termp_in_post(). */ - for (nn = n->child; nn; nn = nn->next) + for (nn = n->child; nn; nn = nn->next) { + assert(MDOC_TEXT == nn->type); + i = 0; + tag[i].key = ATTR_CLASS; + tag[i++].val = "link-includes"; + if (h->base_includes) { + buffmt_includes(h, nn->string); + tag[i].key = ATTR_HREF; + tag[i++].val = h->buf; + } + t = print_otag(h, TAG_A, i, tag); print_mdoc_node(m, nn, h); + print_tagq(h, t); + } h->flags |= HTML_NOSPACE; print_text(h, ">");