From 2176678845e3bde85db6f82732ecbedba450f755 Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Tue, 24 May 2011 21:40:14 +0000 Subject: Use the correct Unicode value for the zero-width space, which means that spec2cp never needs to fall through to spec2str. Then clean out html.c of its unnecessary print_res() function. --- html.c | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) (limited to 'html.c') diff --git a/html.c b/html.c index e74da382..170e5361 100644 --- a/html.c +++ b/html.c @@ -108,7 +108,6 @@ static const char *const roffscales[SCALE_MAX] = { }; static void bufncat(struct html *, const char *, size_t); -static void print_spec(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 mandoc_esc); @@ -217,26 +216,6 @@ print_gen_head(struct html *h) } } -static void -print_spec(struct html *h, const char *p, size_t len) -{ - int cp; - const char *rhs; - size_t sz; - - if ((cp = mchars_spec2cp(h->symtab, p, len)) > 0) { - printf("&#%d;", cp); - return; - } else if (-1 == cp && 1 == len) { - fwrite(p, 1, len, stdout); - return; - } else if (-1 == cp) - return; - - if (NULL != (rhs = mchars_spec2str(h->symtab, p, len, &sz))) - fwrite(rhs, 1, sz, stdout); -} - static void print_metaf(struct html *h, enum mandoc_esc deco) { @@ -367,7 +346,11 @@ print_encode(struct html *h, const char *p, int norecurse) putchar(c); break; case (ESCAPE_SPECIAL): - print_spec(h, seq, len); + c = mchars_spec2cp(h->symtab, seq, len); + if (c > 0) + printf("&#%d;", c); + else if (-1 == c && 1 == len) + putchar((int)*seq); break; case (ESCAPE_FONT): /* FALLTHROUGH */ -- cgit