===================================================================
RCS file: /cvs/mandoc/mdoc.c,v
retrieving revision 1.102
retrieving revision 1.104
diff -u -p -r1.102 -r1.104
--- mandoc/mdoc.c	2009/08/19 14:09:33	1.102
+++ mandoc/mdoc.c	2009/08/22 08:56:16	1.104
@@ -1,4 +1,4 @@
-/*	$Id: mdoc.c,v 1.102 2009/08/19 14:09:33 kristaps Exp $ */
+/*	$Id: mdoc.c,v 1.104 2009/08/22 08:56:16 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -682,7 +682,7 @@ macrowarn(struct mdoc *m, int ln, const char *buf)
 int
 parsemacro(struct mdoc *m, int ln, char *buf)
 {
-	int		  i, j, c, ppos;
+	int		  i, j, c;
 	char		  mac[5];
 
 	/* Empty lines are ignored. */
@@ -702,8 +702,6 @@ parsemacro(struct mdoc *m, int ln, char *buf)
 			return(1);
 	}
 
-	ppos = i;
-
 	/* Copy the first word into a nil-terminated buffer. */
 
 	for (j = 0; j < 4; j++, i++) {
@@ -711,6 +709,12 @@ parsemacro(struct mdoc *m, int ln, char *buf)
 			break;
 		else if (' ' == buf[i])
 			break;
+
+		/* Check for invalid characters. */
+
+		if (isgraph((u_char)buf[i]))
+			continue;
+		return(mdoc_perr(m, ln, i, EPRINT));
 	}
 
 	mac[j] = 0;
@@ -736,7 +740,7 @@ parsemacro(struct mdoc *m, int ln, char *buf)
 	 * Begin recursive parse sequence.  Since we're at the start of
 	 * the line, we don't need to do callable/parseable checks.
 	 */
-	if ( ! mdoc_macro(m, c, ln, ppos, &i, buf)) 
+	if ( ! mdoc_macro(m, c, ln, 1, &i, buf)) 
 		goto err;
 
 	return(1);