===================================================================
RCS file: /cvs/mandoc/man.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- mandoc/man.c	2010/05/15 20:51:40	1.69
+++ mandoc/man.c	2010/05/15 22:44:04	1.70
@@ -1,4 +1,4 @@
-/*	$Id: man.c,v 1.69 2010/05/15 20:51:40 kristaps Exp $ */
+/*	$Id: man.c,v 1.70 2010/05/15 22:44:04 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -49,8 +49,6 @@ const	char *const __man_merrnames[WERRMAX] = {		 
 	"no scope context", /* WNOSCOPE */
 	"literal context already open", /* WOLITERAL */
 	"no literal context open", /* WNLITERAL */
-	"invalid nesting of roff declarations", /* WROFFNEST */
-	"scope in roff instructions broken", /* WROFFSCOPE */
 	"document title should be uppercase", /* WTITLECASE */
 	"deprecated comment style", /* WBADCOMMENT */
 };
@@ -64,8 +62,7 @@ const	char *const __man_macronames[MAN_MAX] = {		 
 	"RI",		"na",		"i",		"sp",
 	"nf",		"fi",		"r",		"RE",
 	"RS",		"DT",		"UC",		"PD",
-	"Sp",		"Vb",		"Ve",		"de",
-	"dei",		"am",		"ami",		".",
+	"Sp",		"Vb",		"Ve",
 	};
 
 const	char * const *man_macronames = __man_macronames;
@@ -548,9 +545,6 @@ man_pmacro(struct man *m, int ln, char *buf)
 	 * Remove prior ELINE macro, as it's being clobbering by a new
 	 * macro.  Note that NSCOPED macros do not close out ELINE
 	 * macros---they don't print text---so we let those slip by.
-	 * NOTE: we don't allow roff blocks (NOCLOSE) to be embedded
-	 * here because that would stipulate blocks as children of
-	 * elements!
 	 */
 
 	if ( ! (MAN_NSCOPED & man_macros[tok].flags) &&