5 files changed, 22 insertions, 10 deletions

diff --git a/html.c b/html.c
index 13b9f516..6c0668d1 100644
--- a/html.c
+++ b/html.c
@@ -88,7 +88,8 @@ static	const char	*const htmlattrs[ATTR_MAX] = {
 	"summary",
 };
 
-static	void		  print_spec(struct html *, const char *, size_t);
+static	void		  print_spec(struct html *, enum roffdeco,
+				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_doctype(struct html *);
@@ -215,7 +216,7 @@ print_gen_head(struct html *h)
 
 
 static void
-print_spec(struct html *h, const char *p, size_t len)
+print_spec(struct html *h, enum roffdeco d, const char *p, size_t len)
 {
 	int		 cp;
 	const char	*rhs;
@@ -224,6 +225,9 @@ print_spec(struct html *h, const char *p, size_t len)
 	if ((cp = chars_spec2cp(h->symtab, p, len)) > 0) {
 		printf("&#%d;", cp);
 		return;
+	} else if (-1 == cp && DECO_SSPECIAL == d) {
+		fwrite(p, 1, len, stdout);
+		return;
 	} else if (-1 == cp)
 		return;
 
@@ -342,8 +346,10 @@ print_encode(struct html *h, const char *p, int norecurse)
 		case (DECO_RESERVED):
 			print_res(h, seq, sz);
 			break;
+		case (DECO_SSPECIAL):
+			/* FALLTHROUGH */
 		case (DECO_SPECIAL):
-			print_spec(h, seq, sz);
+			print_spec(h, deco, seq, sz);
 			break;
 		case (DECO_PREVIOUS):
 			/* FALLTHROUGH */
diff --git a/mandoc.c b/mandoc.c
index 83dafb33..fd1423b7 100644
--- a/mandoc.c
+++ b/mandoc.c
@@ -314,7 +314,7 @@ mandoc_eos(const char *p, size_t sz, int enclosed)
 	 */
 
 	found = 0;
-	for (q = p + sz - 1; q >= p; q--) {
+	for (q = p + (int)sz - 1; q >= p; q--) {
 		switch (*q) {
 		case ('\"'):
 			/* FALLTHROUGH */
diff --git a/out.c b/out.c
index 6886f428..ace17bb2 100644
--- a/out.c
+++ b/out.c
@@ -278,7 +278,7 @@ a2roffdeco(enum roffdeco *d, const char **word, size_t *sz)
 		*d = DECO_NOSPACE;
 		return(i);
 	default:
-		*d = DECO_SPECIAL;
+		*d = DECO_SSPECIAL;
 		i--;
 		lim = 1;
 		break;
diff --git a/out.h b/out.h
index c787f0c6..ee91b3d4 100644
--- a/out.h
+++ b/out.h
@@ -37,8 +37,9 @@ enum	roffscale {
 
 enum	roffdeco {
 	DECO_NONE,
-	DECO_SPECIAL,
-	DECO_RESERVED,
+	DECO_SPECIAL, /* special character */
+	DECO_SSPECIAL, /* single-char special */
+	DECO_RESERVED, /* reserved word */
 	DECO_BOLD,
 	DECO_ITALIC,
 	DECO_ROMAN,
diff --git a/term.c b/term.c
index 9894ac07..4338559b 100644
--- a/term.c
+++ b/term.c
@@ -34,7 +34,8 @@
 #include "term.h"
 #include "main.h"
 
-static	void		  spec(struct termp *, const char *, size_t);
+static	void		  spec(struct termp *, enum roffdeco,
+				const char *, size_t);
 static	void		  res(struct termp *, const char *, size_t);
 static	void		  buffera(struct termp *, const char *, size_t);
 static	void		  bufferc(struct termp *, char);
@@ -360,7 +361,7 @@ term_vspace(struct termp *p)
 
 
 static void
-spec(struct termp *p, const char *word, size_t len)
+spec(struct termp *p, enum roffdeco d, const char *word, size_t len)
 {
 	const char	*rhs;
 	size_t		 sz;
@@ -368,6 +369,8 @@ spec(struct termp *p, const char *word, size_t len)
 	rhs = chars_spec2str(p->symtab, word, len, &sz);
 	if (rhs) 
 		encode(p, rhs, sz);
+	else if (DECO_SSPECIAL == d)
+		encode(p, word, len);
 }
 
 
@@ -519,7 +522,9 @@ term_word(struct termp *p, const char *word)
 			res(p, seq, ssz);
 			break;
 		case (DECO_SPECIAL):
-			spec(p, seq, ssz);
+			/* FALLTHROUGH */
+		case (DECO_SSPECIAL):
+			spec(p, deco, seq, ssz);
 			break;
 		case (DECO_BOLD):
 			term_fontrepl(p, TERMFONT_BOLD);