=================================================================== RCS file: /cvs/mandoc/html.c,v retrieving revision 1.77 retrieving revision 1.81 diff -u -p -r1.77 -r1.81 --- mandoc/html.c 2009/11/01 08:15:20 1.77 +++ mandoc/html.c 2009/11/05 10:16:01 1.81 @@ -1,4 +1,4 @@ -/* $Id: html.c,v 1.77 2009/11/01 08:15:20 kristaps Exp $ */ +/* $Id: html.c,v 1.81 2009/11/05 10:16:01 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -270,21 +270,19 @@ print_escape(struct html *h, const char **p) return; } - switch (*wp) { - case ('B'): - /* TODO */ - break; - case ('I'): - /* TODO */ - break; - case ('P'): - /* FALLTHROUGH */ - case ('R'): - /* TODO */ - break; - default: - break; - } + /* + * These aren't supported, as they're symmetry-breaking + * constructs that don't play well with hierarchical + * mark-up. Consider: + * + * \fBHello. + * .PP + * World. + * + * The style started before "Hello" wouldn't be able to + * propogate into the next `PP' because we'd exit the + * current paragraph's scope. + */ *p = wp; return; @@ -322,7 +320,8 @@ print_encode(struct html *h, const char *p) sz = strcspn(p, "\\<>&"); fwrite(p, 1, sz, stdout); - p += sz; + p += /* LINTED */ + sz; if ('\\' == *p) { print_escape(h, &p); @@ -361,16 +360,16 @@ 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("\""); + putchar('\"'); } - printf(">"); + putchar('>'); h->flags |= HTML_NOSPACE; if (HTML_CLRLINE & htmltags[tag].flags) @@ -391,7 +390,7 @@ print_ctag(struct html *h, enum htmltag tag) if (HTML_CLRLINE & htmltags[tag].flags) { h->flags |= HTML_NOSPACE; h->flags |= HTML_NEWLINE; - printf("\n"); + putchar('\n'); } else h->flags &= ~HTML_NEWLINE; } @@ -437,7 +436,7 @@ print_text(struct html *h, const char *p) } if ( ! (h->flags & HTML_NOSPACE)) - printf(" "); + putchar(' '); h->flags &= ~HTML_NOSPACE; h->flags &= ~HTML_NEWLINE;