===================================================================
RCS file: /cvs/mandoc/man.c,v
retrieving revision 1.37
retrieving revision 1.39
diff -u -p -r1.37 -r1.39
--- mandoc/man.c	2009/08/21 13:45:33	1.37
+++ mandoc/man.c	2009/08/22 09:10:38	1.39
@@ -1,4 +1,4 @@
-/*	$Id: man.c,v 1.37 2009/08/21 13:45:33 kristaps Exp $ */
+/*	$Id: man.c,v 1.39 2009/08/22 09:10:38 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -54,7 +54,7 @@ const	char *const __man_macronames[MAN_MAX] = {		 
 	"R",		"B",		"I",		"IR",
 	"RI",		"na",		"i",		"sp",
 	"nf",		"fi",		"r",		"RE",
-	"RS",		"DT"
+	"RS",		"DT",		"UC"
 	};
 
 const	char * const *man_macronames = __man_macronames;
@@ -493,6 +493,12 @@ man_pmacro(struct man *m, int ln, char *buf)
 			break;
 		else if (' ' == buf[i])
 			break;
+
+		/* Check for invalid characters. */
+
+		if (isgraph((u_char)buf[i]))
+			continue;
+		return(man_perr(m, ln, i, WNPRINT));
 	}
 
 	mac[j] = 0;