===================================================================
RCS file: /cvs/mandoc/main.c,v
retrieving revision 1.139
retrieving revision 1.147
diff -u -p -r1.139 -r1.147
--- mandoc/main.c	2011/01/22 13:16:02	1.139
+++ mandoc/main.c	2011/03/07 01:35:51	1.147
@@ -1,7 +1,7 @@
-/*	$Id: main.c,v 1.139 2011/01/22 13:16:02 schwarze Exp $ */
+/*	$Id: main.c,v 1.147 2011/03/07 01:35:51 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -128,7 +128,8 @@ static	const char * const	mandocerrs[MANDOCERR_MAX] = 
 	"no title in document",
 	"document title should be all caps",
 	"unknown manual section",
-	"cannot parse date argument",
+	"date missing, using today's date",
+	"cannot parse date, using it verbatim",
 	"prologue macros out of order",
 	"duplicate prologue macro",
 	"macro not allowed in prologue",
@@ -146,6 +147,7 @@ static	const char * const	mandocerrs[MANDOCERR_MAX] = 
 	/* related to macros and nesting */
 	"skipping obsolete macro",
 	"skipping paragraph macro",
+	"skipping no-space macro",
 	"blocks badly nested",
 	"child violates parent syntax",
 	"nested displays are not portable",
@@ -656,6 +658,7 @@ pdesc(struct curparse *curp)
 static void
 parsebuf(struct curparse *curp, struct buf blk, int start)
 {
+	const struct tbl_span	*span;
 	struct buf	 ln;
 	enum rofferr	 rr;
 	int		 i, of, rc;
@@ -684,6 +687,16 @@ parsebuf(struct curparse *curp, struct buf blk, int st
 		}
 
 		while (i < (int)blk.sz && (start || '\0' != blk.buf[i])) {
+
+			/*
+			 * When finding an unescaped newline character,
+			 * leave the character loop to process the line.
+			 * Skip a preceding carriage return, if any.
+			 */
+
+			if ('\r' == blk.buf[i] && i + 1 < (int)blk.sz &&
+			    '\n' == blk.buf[i + 1])
+				++i;
 			if ('\n' == blk.buf[i]) {
 				++i;
 				++lnn;
@@ -718,11 +731,18 @@ parsebuf(struct curparse *curp, struct buf blk, int st
 				continue;
 			}
 
-			/* Found escape & at least one other char. */
+			/*
+			 * Found escape and at least one other character.
+			 * When it's a newline character, skip it.
+			 * When there is a carriage return in between,
+			 * skip that one as well.
+			 */
 
+			if ('\r' == blk.buf[i + 1] && i + 2 < (int)blk.sz &&
+			    '\n' == blk.buf[i + 2])
+				++i;
 			if ('\n' == blk.buf[i + 1]) {
 				i += 2;
-				/* Escaped newlines are skipped over */
 				++lnn;
 				continue;
 			}
@@ -834,26 +854,35 @@ rerun:
 		 * currently open parse.  Since we only get here if
 		 * there does exist data (see tbl_data.c), we're
 		 * guaranteed that something's been allocated.
+		 * Do the same for ROFF_EQN.
 		 */
 
-		if (ROFF_TBL == rr) {
-			assert(curp->man || curp->mdoc);
-			if (curp->man)
-				man_addspan(curp->man, roff_span(curp->roff));
-			else
-				mdoc_addspan(curp->mdoc, roff_span(curp->roff));
+		rc = -1;
 
-		} else if (curp->man || curp->mdoc) {
+		if (ROFF_TBL == rr)
+			while (NULL != (span = roff_span(curp->roff))) {
+				rc = curp->man ?
+					man_addspan(curp->man, span) :
+					mdoc_addspan(curp->mdoc, span);
+				if (0 == rc)
+					break;
+			}
+		else if (ROFF_EQN == rr)
+			rc = curp->mdoc ? 
+				mdoc_addeqn(curp->mdoc, 
+					roff_eqn(curp->roff)) :
+				man_addeqn(curp->man,
+					roff_eqn(curp->roff));
+		else if (curp->man || curp->mdoc)
 			rc = curp->man ?
 				man_parseln(curp->man, 
 					curp->line, ln.buf, of) :
 				mdoc_parseln(curp->mdoc, 
 					curp->line, ln.buf, of);
 
-			if ( ! rc) {
-				assert(MANDOCLEVEL_FATAL <= file_status);
-				break;
-			}
+		if (0 == rc) {
+			assert(MANDOCLEVEL_FATAL <= file_status);
+			break;
 		}
 
 		/* Temporary buffers typically are not full. */