=================================================================== RCS file: /cvs/mandoc/html.c,v retrieving revision 1.58 retrieving revision 1.86 diff -u -p -r1.58 -r1.86 --- mandoc/html.c 2009/10/07 12:35:23 1.58 +++ mandoc/html.c 2009/11/14 12:00:24 1.86 @@ -1,4 +1,4 @@ -/* $Id: html.c,v 1.58 2009/10/07 12:35:23 kristaps Exp $ */ +/* $Id: html.c,v 1.86 2009/11/14 12:00:24 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -15,12 +15,12 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #include -#include #include -#include -#include +#include #include +#include +#include #include #include #include @@ -28,12 +28,15 @@ #include "out.h" #include "chars.h" #include "html.h" +#include "main.h" +#define UNCONST(a) ((void *)(uintptr_t)(const void *)(a)) + #define DOCTYPE "-//W3C//DTD HTML 4.01//EN" #define DTD "http://www.w3.org/TR/html4/strict.dtd" struct htmldata { - char *name; + const char *name; int flags; #define HTML_CLRLINE (1 << 0) #define HTML_NOSTACK (1 << 1) @@ -63,7 +66,7 @@ static const struct htmldata htmltags[TAG_MAX] = { {"base", HTML_CLRLINE | HTML_NOSTACK}, /* TAG_BASE */ }; -static const char *const htmlattrs[ATTR_MAX] = { +static const char *const htmlattrs[ATTR_MAX] = { "http-equiv", "content", "name", @@ -77,36 +80,44 @@ static const char *const htmlattrs[ATTR_MAX] = { "valign", "target", "id", + "summary", }; #ifdef __linux__ extern int getsubopt(char **, char * const *, char **); #endif + +static void print_spec(struct html *, const char *, size_t); +static void print_res(struct html *, const char *, size_t); +static void print_ctag(struct html *, enum htmltag); +static int print_encode(struct html *, const char *); + + void * html_alloc(char *outopts) { struct html *h; - char *toks[4], *v; + const char *toks[4]; + char *v; toks[0] = "style"; toks[1] = "man"; toks[2] = "includes"; toks[3] = NULL; - if (NULL == (h = calloc(1, sizeof(struct html)))) - return(NULL); - - SLIST_INIT(&h->tags); - SLIST_INIT(&h->ords); - - if (NULL == (h->symtab = chars_init(CHARS_HTML))) { - free(h); - return(NULL); + h = calloc(1, sizeof(struct html)); + if (NULL == h) { + perror(NULL); + exit(EXIT_FAILURE); } + h->tags.head = NULL; + h->ords.head = NULL; + h->symtab = chars_init(CHARS_HTML); + while (outopts && *outopts) - switch (getsubopt(&outopts, toks, &v)) { + switch (getsubopt(&outopts, UNCONST(toks), &v)) { case (0): h->style = v; break; @@ -133,15 +144,13 @@ html_free(void *p) h = (struct html *)p; - while ( ! SLIST_EMPTY(&h->ords)) { - ord = SLIST_FIRST(&h->ords); - SLIST_REMOVE_HEAD(&h->ords, entry); + while ((ord = h->ords.head) != NULL) { + h->ords.head = ord->next; free(ord); } - while ( ! SLIST_EMPTY(&h->tags)) { - tag = SLIST_FIRST(&h->tags); - SLIST_REMOVE_HEAD(&h->tags, entry); + while ((tag = h->tags.head) != NULL) { + h->tags.head = tag->next; free(tag); } @@ -184,164 +193,86 @@ print_gen_head(struct html *h) static void -print_spec(struct html *h, const char *p, int len) +print_spec(struct html *h, const char *p, size_t len) { const char *rhs; - int i; size_t sz; - rhs = chars_a2ascii(h->symtab, p, (size_t)len, &sz); + rhs = chars_a2ascii(h->symtab, p, len, &sz); if (NULL == rhs) return; - for (i = 0; i < (int)sz; i++) - putchar(rhs[i]); + fwrite(rhs, 1, sz, stdout); } static void -print_res(struct html *h, const char *p, int len) +print_res(struct html *h, const char *p, size_t len) { const char *rhs; - int i; size_t sz; - rhs = chars_a2res(h->symtab, p, (size_t)len, &sz); + rhs = chars_a2res(h->symtab, p, len, &sz); if (NULL == rhs) return; - for (i = 0; i < (int)sz; i++) - putchar(rhs[i]); + fwrite(rhs, 1, sz, stdout); } -static void -print_escape(struct html *h, const char **p) +static int +print_encode(struct html *h, const char *p) { - int j, type; - const char *wp; + size_t sz; + int len, nospace; + const char *seq; + enum roffdeco deco; - wp = *p; - type = 1; + nospace = 0; - if (0 == *(++wp)) { - *p = wp; - return; - } + for (; *p; p++) { + sz = strcspn(p, "\\<>&"); - if ('(' == *wp) { - wp++; - if (0 == *wp || 0 == *(wp + 1)) { - *p = 0 == *wp ? wp : wp + 1; - return; - } + fwrite(p, 1, sz, stdout); + p += /* LINTED */ + sz; - print_spec(h, wp, 2); - *p = ++wp; - return; + if ('<' == *p) { + printf("<"); + continue; + } else if ('>' == *p) { + printf(">"); + continue; + } else if ('&' == *p) { + printf("&"); + continue; + } else if ('\0' == *p) + break; - } else if ('*' == *wp) { - if (0 == *(++wp)) { - *p = wp; - return; - } + seq = ++p; + len = a2roffdeco(&deco, &seq, &sz); - 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_RESERVED): + print_res(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_SPECIAL): + print_spec(h, seq, sz); break; - case ('I'): - /* TODO */ - break; - case ('P'): - /* FALLTHROUGH */ - case ('R'): - /* TODO */ - 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) -{ - - 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; - } - } -} - - struct tag * print_otag(struct html *h, enum htmltag tag, int sz, const struct htmlpair *p) @@ -350,25 +281,29 @@ print_otag(struct html *h, enum htmltag tag, struct tag *t; 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(EXIT_FAILURE); + } t->tag = tag; - SLIST_INSERT_HEAD(&h->tags, 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(" "); + putchar(' '); 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("\""); + (void)print_encode(h, p[i].val); + putchar('\"'); } - printf(">"); + putchar('>'); h->flags |= HTML_NOSPACE; if (HTML_CLRLINE & htmltags[tag].flags) @@ -386,11 +321,11 @@ 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 + putchar('\n'); + } else h->flags &= ~HTML_NEWLINE; } @@ -435,13 +370,13 @@ print_text(struct html *h, const char *p) } if ( ! (h->flags & HTML_NOSPACE)) - printf(" "); + putchar(' '); - h->flags &= ~HTML_NOSPACE; h->flags &= ~HTML_NEWLINE; - if (p) - print_encode(h, p); + assert(p); + if ( ! print_encode(h, p)) + h->flags &= ~HTML_NOSPACE; if (*p && 0 == *(p + 1)) switch (*p) { @@ -463,10 +398,9 @@ print_tagq(struct html *h, const struct tag *until) { struct tag *tag; - while ( ! SLIST_EMPTY(&h->tags)) { - tag = SLIST_FIRST(&h->tags); + while ((tag = h->tags.head) != NULL) { print_ctag(h, tag->tag); - SLIST_REMOVE_HEAD(&h->tags, entry); + h->tags.head = tag->next; free(tag); if (until && tag == until) return; @@ -479,12 +413,11 @@ print_stagq(struct html *h, const struct tag *suntil) { struct tag *tag; - while ( ! SLIST_EMPTY(&h->tags)) { - tag = SLIST_FIRST(&h->tags); + while ((tag = h->tags.head) != NULL) { if (suntil && tag == suntil) return; print_ctag(h, tag->tag); - SLIST_REMOVE_HEAD(&h->tags, entry); + h->tags.head = tag->next; free(tag); } } @@ -549,7 +482,8 @@ buffmt_includes(struct html *h, const char *name) const char *p, *pp; pp = h->base_includes; - while ((p = strchr(pp, '%'))) { + + while (NULL != (p = strchr(pp, '%'))) { bufncat(h, pp, (size_t)(p - pp)); switch (*(p + 1)) { case('I'): @@ -573,7 +507,9 @@ buffmt_man(struct html *h, const char *p, *pp; pp = h->base_man; - while ((p = strchr(pp, '%'))) { + + /* LINTED */ + while (NULL != (p = strchr(pp, '%'))) { bufncat(h, pp, (size_t)(p - pp)); switch (*(p + 1)) { case('S'): @@ -596,8 +532,8 @@ buffmt_man(struct html *h, void bufcat_su(struct html *h, const char *p, const struct roffsu *su) { - int v; - char *u; + double v; + const char *u; v = su->scale; @@ -614,14 +550,21 @@ bufcat_su(struct html *h, const char *p, const struct case (SCALE_PT): u = "pt"; break; + case (SCALE_EM): + u = "em"; + break; case (SCALE_MM): if (0 == (v /= 100)) v = 1; u = "em"; break; + case (SCALE_EN): + u = "ex"; + break; + case (SCALE_BU): + u = "ex"; + break; case (SCALE_VS): - /* FALLTHROUGH */ - case (SCALE_EM): u = "em"; break; default: @@ -629,5 +572,37 @@ bufcat_su(struct html *h, const char *p, const struct break; } - buffmt(h, "%s: %d%s;", p, v, u); + if (su->pt) + buffmt(h, "%s: %f%s;", p, v, u); + else + /* LINTED */ + buffmt(h, "%s: %d%s;", p, (int)v, u); +} + + +void +html_idcat(char *dst, const char *src, int sz) +{ + int ssz; + + assert(sz); + + /* Cf. . */ + + for ( ; *dst != '\0' && sz; dst++, sz--) + /* Jump to end. */ ; + + assert(sz > 2); + + /* We can't start with a number (bah). */ + + *dst++ = 'x'; + *dst = '\0'; + sz--; + + for ( ; *src != '\0' && sz > 1; src++) { + ssz = snprintf(dst, (size_t)sz, "%.2x", *src); + sz -= ssz; + dst += ssz; + } }