=================================================================== RCS file: /cvs/mandoc/html.c,v retrieving revision 1.71 retrieving revision 1.91 diff -u -p -r1.71 -r1.91 --- mandoc/html.c 2009/10/30 04:57:17 1.71 +++ mandoc/html.c 2009/11/16 08:46:58 1.91 @@ -1,4 +1,4 @@ -/* $Id: html.c,v 1.71 2009/10/30 04:57:17 kristaps Exp $ */ +/* $Id: html.c,v 1.91 2009/11/16 08:46:58 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -18,9 +18,8 @@ #include #include -#include -#include #include +#include #include #include #include @@ -67,7 +66,13 @@ 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 htmlfonts[HTMLFONT_MAX] = { + "roman", + "bold", + "italic" +}; + +static const char *const htmlattrs[ATTR_MAX] = { "http-equiv", "content", "name", @@ -88,6 +93,14 @@ static const char *const htmlattrs[ATTR_MAX] = { 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 *, int); +static void print_metaf(struct html *, enum roffdeco); + + void * html_alloc(char *outopts) { @@ -100,17 +113,16 @@ html_alloc(char *outopts) toks[2] = "includes"; toks[3] = NULL; - if (NULL == (h = calloc(1, sizeof(struct html)))) - 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); - if (NULL == (h->symtab = chars_init(CHARS_HTML))) { - free(h); - return(NULL); - } - while (outopts && *outopts) switch (getsubopt(&outopts, UNCONST(toks), &v)) { case (0): @@ -188,161 +200,140 @@ 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) +struct tag * +print_ofont(struct html *h, enum htmlfont font) { - int j, type; - const char *wp; + struct htmlpair tag; - wp = *p; - type = 1; + h->metal = h->metac; + h->metac = font; - if (0 == *(++wp)) { - *p = wp; - return; - } + /* FIXME: DECO_ROMAN should just close out preexisting. */ - if ('(' == *wp) { - wp++; - if (0 == *wp || 0 == *(wp + 1)) { - *p = 0 == *wp ? wp : wp + 1; - return; - } + if (h->metaf && h->tags.head == h->metaf) + print_tagq(h, h->metaf); - print_spec(h, wp, 2); - *p = ++wp; - return; + PAIR_CLASS_INIT(&tag, htmlfonts[font]); + h->metaf = print_otag(h, TAG_SPAN, 1, &tag); + return(h->metaf); +} - } 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; - } +static void +print_metaf(struct html *h, enum roffdeco deco) +{ + enum htmlfont font; - print_res(h, wp, 2); - *p = ++wp; - return; - case ('['): - type = 0; - 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 */ - break; - case ('I'): - /* TODO */ - break; - case ('P'): - /* FALLTHROUGH */ - case ('R'): - /* TODO */ - break; - default: - break; - } - - *p = wp; - return; - - } else if ('[' != *wp) { - print_spec(h, wp, 1); - *p = wp; - return; + switch (deco) { + case (DECO_PREVIOUS): + font = h->metal; + break; + case (DECO_ITALIC): + font = HTMLFONT_ITALIC; + break; + case (DECO_BOLD): + font = HTMLFONT_BOLD; + break; + case (DECO_ROMAN): + font = HTMLFONT_NONE; + break; + default: + abort(); + /* NOTREACHED */ } - 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; + (void)print_ofont(h, font); } -static void -print_encode(struct html *h, const char *p) +static int +print_encode(struct html *h, const char *p, int norecurse) { + size_t sz; + int len, nospace; + const char *seq; + enum roffdeco deco; + nospace = 0; + for (; *p; p++) { - if ('\\' == *p) { - print_escape(h, &p); - continue; - } - switch (*p) { - case ('<'): + sz = strcspn(p, "\\<>&"); + + fwrite(p, 1, sz, stdout); + p += /* LINTED */ + sz; + + if ('<' == *p) { printf("<"); - break; - case ('>'): + continue; + } else if ('>' == *p) { printf(">"); - break; - case ('&'): + continue; + } else if ('&' == *p) { printf("&"); + continue; + } else if ('\0' == *p) break; + + seq = ++p; + len = a2roffdeco(&deco, &seq, &sz); + + switch (deco) { + case (DECO_RESERVED): + print_res(h, seq, sz); + break; + case (DECO_SPECIAL): + print_spec(h, seq, sz); + break; + case (DECO_PREVIOUS): + /* FALLTHROUGH */ + case (DECO_BOLD): + /* FALLTHROUGH */ + case (DECO_ITALIC): + /* FALLTHROUGH */ + case (DECO_ROMAN): + if (norecurse) + break; + print_metaf(h, deco); + break; default: - putchar(*p); break; } + + p += len - 1; + + if (DECO_NOSPACE == deco && '\0' == *(p + 1)) + nospace = 1; } + + return(nospace); } @@ -354,8 +345,11 @@ 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; t->next = h->tags.head; h->tags.head = t; @@ -364,28 +358,22 @@ print_otag(struct html *h, enum htmltag tag, 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, 1); + putchar('\"'); } - printf(">"); + putchar('>'); h->flags |= HTML_NOSPACE; - if (HTML_CLRLINE & htmltags[tag].flags) - h->flags |= HTML_NEWLINE; - else - h->flags &= ~HTML_NEWLINE; - return(t); } -/* ARGSUSED */ static void print_ctag(struct html *h, enum htmltag tag) { @@ -393,10 +381,8 @@ print_ctag(struct html *h, enum htmltag tag) printf("", htmltags[tag].name); if (HTML_CLRLINE & htmltags[tag].flags) { h->flags |= HTML_NOSPACE; - h->flags |= HTML_NEWLINE; - printf("\n"); - } else - h->flags &= ~HTML_NEWLINE; + putchar('\n'); + } } @@ -440,14 +426,12 @@ print_text(struct html *h, const char *p) } if ( ! (h->flags & HTML_NOSPACE)) - printf(" "); + putchar(' '); - h->flags &= ~HTML_NOSPACE; - h->flags &= ~HTML_NEWLINE; + assert(p); + if ( ! print_encode(h, p, 0)) + h->flags &= ~HTML_NOSPACE; - if (p) - print_encode(h, p); - if (*p && 0 == *(p + 1)) switch (*p) { case('('): @@ -469,6 +453,8 @@ print_tagq(struct html *h, const struct tag *until) struct tag *tag; while ((tag = h->tags.head) != NULL) { + if (tag == h->metaf) + h->metaf = NULL; print_ctag(h, tag->tag); h->tags.head = tag->next; free(tag); @@ -486,6 +472,8 @@ print_stagq(struct html *h, const struct tag *suntil) while ((tag = h->tags.head) != NULL) { if (suntil && tag == suntil) return; + if (tag == h->metaf) + h->metaf = NULL; print_ctag(h, tag->tag); h->tags.head = tag->next; free(tag); @@ -671,7 +659,7 @@ html_idcat(char *dst, const char *src, int sz) sz--; for ( ; *src != '\0' && sz > 1; src++) { - ssz = snprintf(dst, sz, "%.2x", *src); + ssz = snprintf(dst, (size_t)sz, "%.2x", *src); sz -= ssz; dst += ssz; }