=================================================================== RCS file: /cvs/mandoc/html.c,v retrieving revision 1.82 retrieving revision 1.84 diff -u -p -r1.82 -r1.84 --- mandoc/html.c 2009/11/09 05:11:46 1.82 +++ mandoc/html.c 2009/11/12 08:21:05 1.84 @@ -1,4 +1,4 @@ -/* $Id: html.c,v 1.82 2009/11/09 05:11:46 kristaps Exp $ */ +/* $Id: html.c,v 1.84 2009/11/12 08:21:05 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -88,8 +88,8 @@ extern int getsubopt(char **, char * const *, char #endif -static void print_spec(struct html *, const char *, int); -static void print_res(struct html *, const char *, int); +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 void print_encode(struct html *, const char *); @@ -193,12 +193,12 @@ 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; 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; @@ -207,12 +207,12 @@ print_spec(struct html *h, const char *p, int len) 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; 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; @@ -262,6 +262,9 @@ print_encode(struct html *h, const char *p) } p += len - 1; + + if (DECO_NOSPACE == deco && '\0' == *(p + 1)) + h->flags |= HTML_NOSPACE; } }