===================================================================
RCS file: /cvs/mandoc/man.c,v
retrieving revision 1.76
retrieving revision 1.85
diff -u -p -r1.76 -r1.85
--- mandoc/man.c	2010/06/19 20:46:28	1.76
+++ mandoc/man.c	2010/08/07 20:57:33	1.85
@@ -1,6 +1,6 @@
-/*	$Id: man.c,v 1.76 2010/06/19 20:46:28 kristaps Exp $ */
+/*	$Id: man.c,v 1.85 2010/08/07 20:57:33 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -21,7 +21,6 @@
 #include <sys/types.h>
 
 #include <assert.h>
-#include <ctype.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -41,6 +40,7 @@ const	char *const __man_macronames[MAN_MAX] = {		 
 	"nf",		"fi",		"r",		"RE",
 	"RS",		"DT",		"UC",		"PD",
 	"Sp",		"Vb",		"Ve",		"AT",
+	"in"
 	};
 
 const	char * const *man_macronames = __man_macronames;
@@ -94,7 +94,8 @@ man_free(struct man *man)
 
 
 struct man *
-man_alloc(void *data, int pflags, mandocmsg msg)
+man_alloc(struct regset *regs, void *data, 
+		int pflags, mandocmsg msg)
 {
 	struct man	*p;
 
@@ -104,6 +105,7 @@ man_alloc(void *data, int pflags, mandocmsg msg)
 	p->data = data;
 	p->pflags = pflags;
 	p->msg = msg;
+	p->regs = regs;
 
 	man_alloc1(p);
 	return(p);
@@ -407,7 +409,7 @@ man_ptext(struct man *m, int line, char *buf, int offs
 	 */
 
 	assert(i);
-	if (mandoc_eos(buf, (size_t)i))
+	if (mandoc_eos(buf, (size_t)i, 0))
 		m->last->flags |= MAN_EOS;
 
 descope:
@@ -480,20 +482,11 @@ man_pmacro(struct man *m, int ln, char *buf, int offs)
 
 	/* Copy the first word into a nil-terminated buffer. */
 
-	for (j = 0; j < 4; j++, i++) {
+	for (j = 0; j < 4; j++, i++)
 		if ('\0' == (mac[j] = buf[i]))
 			break;
 		else if (' ' == buf[i])
 			break;
-
-		/* Check for invalid characters. */
-
-		if (isgraph((u_char)buf[i]))
-			continue;
-		if ( ! man_pmsg(m, ln, i, MANDOCERR_BADCHAR))
-			return(0);
-		i--;
-	}
 
 	mac[j] = '\0';