===================================================================
RCS file: /cvs/mandoc/mandoc.c,v
retrieving revision 1.51
retrieving revision 1.53
diff -u -p -r1.51 -r1.53
--- mandoc/mandoc.c	2011/05/14 17:54:42	1.51
+++ mandoc/mandoc.c	2011/05/24 21:31:23	1.53
@@ -1,4 +1,4 @@
-/*	$Id: mandoc.c,v 1.51 2011/05/14 17:54:42 kristaps Exp $ */
+/*	$Id: mandoc.c,v 1.53 2011/05/24 21:31:23 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -125,6 +125,14 @@ mandoc_escape(const char **end, const char **start, in
 		break;
 	case ('['):
 		gly = ESCAPE_SPECIAL;
+		/*
+		 * Unicode escapes are defined in groff as \[uXXXX] to
+		 * \[u10FFFF], where the contained value must be a valid
+		 * Unicode codepoint.  Here, however, only check whether
+		 * it's not a zero-width escape.
+		 */
+		if ('u' == cp[i] && ']' != cp[i + 1])
+			gly = ESCAPE_UNICODE;
 		term = ']';
 		break;
 	case ('C'):
@@ -155,10 +163,6 @@ mandoc_escape(const char **end, const char **start, in
 	case ('Y'):
 		if (ESCAPE_ERROR == gly)
 			gly = ESCAPE_IGNORE;
-		/* FALLTHROUGH */
-	case ('*'):
-		if (ESCAPE_ERROR == gly)
-			gly = ESCAPE_PREDEF;
 		/* FALLTHROUGH */
 	case ('f'):
 		if (ESCAPE_ERROR == gly)