===================================================================
RCS file: /cvs/mandoc/term.c,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -p -r1.193 -r1.194
--- mandoc/term.c	2011/05/17 14:38:34	1.193
+++ mandoc/term.c	2011/05/17 22:32:45	1.194
@@ -1,4 +1,4 @@
-/*	$Id: term.c,v 1.193 2011/05/17 14:38:34 kristaps Exp $ */
+/*	$Id: term.c,v 1.194 2011/05/17 22:32:45 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -36,6 +36,7 @@
 static	void		 adjbuf(struct termp *p, int);
 static	void		 bufferc(struct termp *, char);
 static	void		 encode(struct termp *, const char *, size_t);
+static	void		 encode1(struct termp *, int);
 
 void
 term_free(struct termp *p)
@@ -403,7 +404,7 @@ term_word(struct termp *p, const char *word)
 {
 	const char	*seq, *cp;
 	char		 c;
-	int		 sz;
+	int		 sz, uc;
 	size_t		 ssz;
 	enum mandoc_esc	 esc;
 
@@ -440,7 +441,13 @@ term_word(struct termp *p, const char *word)
 
 		switch (esc) {
 		case (ESCAPE_UNICODE):
-			encode(p, "?", 1);
+			if (TERMENC_ASCII == p->enc) {
+				encode1(p, '?');
+				break;
+			}
+			uc = mchars_num2uc(seq + 1, sz - 1);
+			if ('\0' != uc)
+				encode1(p, uc);
 			break;
 		case (ESCAPE_NUMBERED):
 			if ('\0' != (c = mchars_num2char(seq, sz)))
@@ -503,7 +510,34 @@ bufferc(struct termp *p, char c)
 	p->buf[p->col++] = c;
 }
 
+/*
+ * See encode().
+ * Do this for a single (probably unicode) value.
+ * Does not check for non-decorated glyphs.
+ */
 static void
+encode1(struct termp *p, int c)
+{
+	enum termfont	  f;
+
+	if (p->col + 4 >= p->maxcols)
+		adjbuf(p, p->col + 4);
+
+	f = term_fonttop(p);
+
+	if (TERMFONT_NONE == f) {
+		p->buf[p->col++] = c;
+		return;
+	} else if (TERMFONT_UNDER == f) {
+		p->buf[p->col++] = '_';
+	} else
+		p->buf[p->col++] = c;
+
+	p->buf[p->col++] = 8;
+	p->buf[p->col++] = c;
+}
+
+static void
 encode(struct termp *p, const char *word, size_t sz)
 {
 	enum termfont	  f;
@@ -584,11 +618,16 @@ term_strlen(const struct termp *p, const char *cp)
 			case (ESCAPE_ERROR):
 				return(sz);
 			case (ESCAPE_UNICODE):
-				c = '?';
-				/* FALLTHROUGH */
-			case (ESCAPE_NUMBERED):
+				if (TERMENC_ASCII != p->enc) {
+					sz += (*p->width)(p, '?');
+					break;
+				}
+				c = mchars_num2uc(seq + 1, ssz - 1);
 				if ('\0' != c)
-					c = mchars_num2char(seq, ssz);
+					sz += (*p->width)(p, c);
+				break;
+			case (ESCAPE_NUMBERED):
+				c = mchars_num2char(seq, ssz);
 				if ('\0' != c)
 					sz += (*p->width)(p, c);
 				break;