===================================================================
RCS file: /cvs/mandoc/main.c,v
retrieving revision 1.129
retrieving revision 1.134
diff -u -p -r1.129 -r1.134
--- mandoc/main.c	2011/01/01 15:45:18	1.129
+++ mandoc/main.c	2011/01/04 12:06:21	1.134
@@ -1,6 +1,6 @@
-/*	$Id: main.c,v 1.129 2011/01/01 15:45:18 kristaps Exp $ */
+/*	$Id: main.c,v 1.134 2011/01/04 12:06:21 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -153,6 +153,7 @@ static	const char * const	mandocerrs[MANDOCERR_MAX] = 
 
 	/* related to missing macro arguments */
 	"skipping empty macro",
+	"argument count wrong",
 	"missing display type",
 	"list type must come first",
 	"tag lists require a width argument",
@@ -176,14 +177,20 @@ static	const char * const	mandocerrs[MANDOCERR_MAX] = 
 	"bad comment style",
 	"unknown escape sequence",
 	"unterminated quoted string",
+	
+	/* related to tables */
+	"extra data cells",
 
 	"generic error",
 
+	/* related to tables */
 	"bad table syntax",
 	"bad table option",
 	"bad table layout",
 	"no table layout cells specified",
 	"no table data cells specified",
+	"ignore data in cell",
+
 	"input stack limit exceeded, infinite loop?",
 	"skipping bad character",
 	"skipping text before the first section header",
@@ -527,10 +534,7 @@ fdesc(struct curparse *curp)
 	}
 
 	assert(curp->roff);
-	if ( ! roff_endparse(curp->roff)) {
-		assert(MANDOCLEVEL_FATAL <= file_status);
-		goto cleanup;
-	}
+	roff_endparse(curp->roff);
 
 	/*
 	 * With -Wstop and warnings or errors of at least
@@ -802,6 +806,14 @@ rerun:
 		default:
 			break;
 		}
+
+		/*
+		 * If we encounter errors in the recursive parsebuf()
+		 * call, make sure we don't continue parsing.
+		 */
+
+		if (MANDOCLEVEL_FATAL <= file_status)
+			break;
 
 		/*
 		 * If input parsers have not been allocated, do so now.