diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2014-10-27 13:31:04 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2014-10-27 13:31:04 +0000 |
| commit | e31a1492391aa4d678a400d3a7024f93b4dec47e (patch) | |
| tree | 86cb49f97633b229d0c63e41499265979b96c95b /html.c | |
| parent | 0816fa828919460b77df2858465b6e1d25cce74d (diff) | |
| download | mandoc-e31a1492391aa4d678a400d3a7024f93b4dec47e.tar.gz mandoc-e31a1492391aa4d678a400d3a7024f93b4dec47e.tar.zst mandoc-e31a1492391aa4d678a400d3a7024f93b4dec47e.zip | |
Fix a regression in term.c rev. 1.229 reported by bentley@:
In UTF-8 output, do not print anything if mchars_spec2cp() returns 0.
In particular, this repairs handling of zero-width spaces (\&).
While here, let mchars_spec2cp() return 0xFFFD instead of -1
if the character is not found, simplifying the using code.
In HTML output, do not print obfuscated ASCII characters and
do not test for one-char escapes, mchars_spec2cp() already does that.
Diffstat (limited to 'html.c')
| -rw-r--r-- | html.c | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -1,4 +1,4 @@ -/* $Id: html.c,v 1.177 2014/10/26 17:12:03 schwarze Exp $ */ +/* $Id: html.c,v 1.178 2014/10/27 13:31:04 schwarze Exp $ */ /* * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -457,11 +457,12 @@ print_encode(struct html *h, const char *p, int norecurse) break; case ESCAPE_SPECIAL: c = mchars_spec2cp(h->symtab, seq, len); - if (c > 0) + if (c <= 0) + break; + if (c < 0x20 || c > 0x7e) printf("&#%d;", c); - else if (-1 == c && 1 == len && - !print_escape(*seq)) - putchar((int)*seq); + else if ( ! print_escape(c)) + putchar(c); break; case ESCAPE_NOSPACE: if ('\0' == *p) |