===================================================================
RCS file: /cvs/mandoc/term.c,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -p -r1.191 -r1.192
--- mandoc/term.c	2011/05/15 22:29:50	1.191
+++ mandoc/term.c	2011/05/17 11:55:08	1.192
@@ -1,4 +1,4 @@
-/*	$Id: term.c,v 1.191 2011/05/15 22:29:50 kristaps Exp $ */
+/*	$Id: term.c,v 1.192 2011/05/17 11:55:08 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -451,6 +451,9 @@ term_word(struct termp *p, const char *word)
 			break;
 
 		switch (esc) {
+		case (ESCAPE_UNICODE):
+			encode(p, "?", 1);
+			break;
 		case (ESCAPE_NUMBERED):
 			if ('\0' != (c = mchars_num2char(seq, sz)))
 				encode(p, &c, 1);
@@ -584,6 +587,7 @@ term_strlen(const struct termp *p, const char *cp)
 		for (i = 0; i < rsz; i++)
 			sz += (*p->width)(p, *cp++);
 
+		c = 0;
 		switch (*cp) {
 		case ('\\'):
 			cp++;
@@ -591,8 +595,12 @@ term_strlen(const struct termp *p, const char *cp)
 			switch (mandoc_escape(&cp, &seq, &ssz)) {
 			case (ESCAPE_ERROR):
 				return(sz);
+			case (ESCAPE_UNICODE):
+				c = '?';
+				/* FALLTHROUGH */
 			case (ESCAPE_NUMBERED):
-				c = mchars_num2char(seq, ssz);
+				if ('\0' != c)
+					c = mchars_num2char(seq, ssz);
 				if ('\0' != c)
 					sz += (*p->width)(p, c);
 				break;