===================================================================
RCS file: /cvs/mandoc/man.c,v
retrieving revision 1.47
retrieving revision 1.50
diff -u -p -r1.47 -r1.50
--- mandoc/man.c	2010/01/01 17:14:27	1.47
+++ mandoc/man.c	2010/03/22 05:59:32	1.50
@@ -1,4 +1,4 @@
-/*	$Id: man.c,v 1.47 2010/01/01 17:14:27 kristaps Exp $ */
+/*	$Id: man.c,v 1.50 2010/03/22 05:59:32 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -365,6 +365,7 @@ static int
 man_ptext(struct man *m, int line, char *buf)
 {
 	int		 i, j;
+	char		 sv;
 
 	/* Literal free-form text whitespace is preserved. */
 
@@ -378,7 +379,12 @@ man_ptext(struct man *m, int line, char *buf)
 
 	for (i = 0; ' ' == buf[i]; i++)
 		/* Skip leading whitespace. */ ;
-	if (0 == buf[i]) {
+
+	if ('\0' == buf[i]) {
+		/* Trailing whitespace? */
+		if (i && ' ' == buf[i - 1])
+			if ( ! man_pwarn(m, line, i - 1, WTSPACE))
+				return(0);
 		if ( ! pstring(m, line, 0, &buf[i], 0))
 			return(0);
 		goto descope;
@@ -392,15 +398,30 @@ man_ptext(struct man *m, int line, char *buf)
 		if (i && ' ' == buf[i] && '\\' == buf[i - 1])
 			continue;
 
-		buf[i++] = 0;
+		sv = buf[i];
+		buf[i++] = '\0';
+
 		if ( ! pstring(m, line, j, &buf[j], (size_t)(i - j)))
 			return(0);
 
+		/* Trailing whitespace?  Check at overwritten byte. */
+
+		if (' ' == sv && '\0' == buf[i])
+			if ( ! man_pwarn(m, line, i - 1, WTSPACE))
+				return(0);
+
 		for ( ; ' ' == buf[i]; i++)
 			/* Skip trailing whitespace. */ ;
 
 		j = i;
-		if (0 == buf[i])
+
+		/* Trailing whitespace? */
+
+		if (' ' == buf[i - 1] && '\0' == buf[i])
+			if ( ! man_pwarn(m, line, i - 1, WTSPACE))
+				return(0);
+
+		if ('\0' == buf[i])
 			break;
 	}
 
@@ -463,7 +484,7 @@ man_pmacro(struct man *m, int ln, char *buf)
 		i++;
 		while (buf[i] && ' ' == buf[i])
 			i++;
-		if (0 == buf[i])
+		if ('\0' == buf[i])
 			goto out;
 	}
 
@@ -472,7 +493,7 @@ man_pmacro(struct man *m, int ln, char *buf)
 	/* Copy the first word into a nil-terminated buffer. */
 
 	for (j = 0; j < 4; j++, i++) {
-		if (0 == (mac[j] = buf[i]))
+		if ('\0' == (mac[j] = buf[i]))
 			break;
 		else if (' ' == buf[i])
 			break;
@@ -507,15 +528,35 @@ man_pmacro(struct man *m, int ln, char *buf)
 	while (buf[i] && ' ' == buf[i])
 		i++;
 
-	/* Remove prior ELINE macro, if applicable. */
+	/* Trailing whitespace? */
 
-	if (m->flags & MAN_ELINE) {
+	if ('\0' == buf[i] && ' ' == buf[i - 1])
+		if ( ! man_pwarn(m, ln, i - 1, WTSPACE))
+			goto err;
+
+	/* 
+	 * Remove prior ELINE macro, as a macro is clobbering it by
+	 * being invoked without prior text.  Note that NSCOPED macros
+	 * do not close out ELINE macros, as they print no text.
+	 */
+
+	if (m->flags & MAN_ELINE && 
+			! (MAN_NSCOPED & man_macros[c].flags)) {
 		n = m->last;
 		assert(NULL == n->child);
 		assert(0 == n->nchild);
 		if ( ! man_nwarn(m, n, WLNSCOPE))
 			return(0);
 
+		/* FIXME: when called as in:
+		 *
+		 * .B
+		 * .br
+		 * .B
+		 * .br
+		 * hello
+		 */
+
 		if (n->prev) {
 			assert(n != n->parent->child);
 			assert(n == n->prev->next);
@@ -541,8 +582,25 @@ man_pmacro(struct man *m, int ln, char *buf)
 		goto err;
 
 out:
-	if ( ! (MAN_BLINE & fl))
+	/* 
+	 * We weren't in a block-line scope when entering the
+	 * above-parsed macro, so return.
+	 */
+
+	if ( ! (MAN_BLINE & fl)) {
+		m->flags &= ~MAN_ILINE; 
 		return(1);
+	}
+
+	/*
+	 * If we're in a block scope, then allow this macro to slip by
+	 * without closing scope around it.
+	 */
+
+	if (MAN_ILINE & m->flags) {
+		m->flags &= ~MAN_ILINE;
+		return(1);
+	}
 
 	/* 
 	 * If we've opened a new next-line element scope, then return