In -Tascii mode, print "<?>" only for Unicode escapes of unknown

representation, not for character escapes with unknown names.
According to groff, the latter produce no output, and we now warn
about them.

2 files changed, 7 insertions, 13 deletions

diff --git a/term.c b/term.c
index b1e50255..6cac5ab5 100644
--- a/term.c
+++ b/term.c
@@ -1,4 +1,4 @@
-/*	$Id: term.c,v 1.231 2014/10/28 17:36:19 schwarze Exp $ */
+/*	$Id: term.c,v 1.232 2014/10/28 18:49:33 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -458,9 +458,7 @@ term_word(struct termp *p, const char *word)
 			if (p->enc == TERMENC_ASCII) {
 				cp = mchars_spec2str(p->symtab,
 				    seq, sz, &ssz);
-				if (cp == NULL)
-					encode(p, "<?>", 3);
-				else
+				if (cp != NULL)
 					encode(p, cp, ssz);
 			} else {
 				uc = mchars_spec2cp(p->symtab, seq, sz);
@@ -690,14 +688,10 @@ term_strlen(const struct termp *p, const char *cp)
 					sz += cond_width(p, c, &skip);
 				break;
 			case ESCAPE_SPECIAL:
-				if (p->enc == TERMENC_ASCII) {
+				if (p->enc == TERMENC_ASCII)
 					rhs = mchars_spec2str(p->symtab,
 					    seq, ssz, &rsz);
-					if (rhs == NULL) {
-						rhs = "<?>";
-						rsz = 3;
-					}
-				} else {
+				else {
 					c = mchars_spec2cp(p->symtab,
 					    seq, ssz);
 					if (c > 0)
diff --git a/term_ascii.c b/term_ascii.c
index 6ec27be0..6c290453 100644
--- a/term_ascii.c
+++ b/term_ascii.c
@@ -1,4 +1,4 @@
-/*	$Id: term_ascii.c,v 1.38 2014/10/28 17:36:19 schwarze Exp $ */
+/*	$Id: term_ascii.c,v 1.39 2014/10/28 18:49:33 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -19,6 +19,7 @@
 
 #include <sys/types.h>
 
+#include <assert.h>
 #if HAVE_WCHAR
 #include <locale.h>
 #endif
@@ -337,8 +338,7 @@ ascii_uc2str(int uc)
 	"j",	"DZ",	"Dz",	"dz",	"'\bG",	"'\bg",	"HV",	"W",
 	"`\bN",	"`\bn",	"A",	"a",	"'\bAE","'\bae","O",	"o"};
 
-	if (uc < 0)
-		return("<?>");
+	assert(uc >= 0);
 	if ((size_t)uc < sizeof(tab)/sizeof(tab[0]))
 		return(tab[uc]);
 	return(mchars_uc2str(uc));