===================================================================
RCS file: /cvs/mandoc/man.c,v
retrieving revision 1.55
retrieving revision 1.58
diff -u -p -r1.55 -r1.58
--- mandoc/man.c	2010/03/27 10:04:56	1.55
+++ mandoc/man.c	2010/03/29 04:52:14	1.58
@@ -1,4 +1,4 @@
-/*	$Id: man.c,v 1.55 2010/03/27 10:04:56 kristaps Exp $ */
+/*	$Id: man.c,v 1.58 2010/03/29 04:52:14 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -478,23 +478,28 @@ macrowarn(struct man *m, int ln, const char *buf)
 int
 man_pmacro(struct man *m, int ln, char *buf)
 {
-	int		 i, j, ppos, fl;
+	int		 i, j, ppos;
 	enum mant	 tok;
 	char		 mac[5];
 	struct man_node	*n;
 
 	/* Comments and empties are quickly ignored. */
 
-	fl = m->flags;
+	if (MAN_BLINE & m->flags)
+		m->flags |= MAN_BPLINE;
 
 	if ('\0' == buf[1])
 		return(1);
 
 	i = 1;
 
-	if (' ' == buf[i]) {
+	/*
+	 * Skip whitespace between the control character and initial
+	 * text.  "Whitespace" is both spaces and tabs.
+	 */
+	if (' ' == buf[i] || '\t' == buf[i]) {
 		i++;
-		while (buf[i] && ' ' == buf[i])
+		while (buf[i] && (' ' == buf[i] || '\t' == buf[i]))
 			i++;
 		if ('\0' == buf[i])
 			goto out;
@@ -597,10 +602,11 @@ out:
 	 * family) within BLINE or ELINE systems.  This is annoying.
 	 */
 
-	if ( ! (MAN_BLINE & fl)) {
+	if ( ! (MAN_BPLINE & m->flags)) {
 		m->flags &= ~MAN_ILINE; 
 		return(1);
 	}
+	m->flags &= ~MAN_BPLINE;
 
 	/*
 	 * If we're in a block scope, then allow this macro to slip by