===================================================================
RCS file: /cvs/mandoc/man_macro.c,v
retrieving revision 1.28
retrieving revision 1.32
diff -u -p -r1.28 -r1.32
--- mandoc/man_macro.c	2009/08/22 09:10:38	1.28
+++ mandoc/man_macro.c	2010/03/23 11:30:48	1.32
@@ -1,4 +1,4 @@
-/*	$Id: man_macro.c,v 1.28 2009/08/22 09:10:38 kristaps Exp $ */
+/*	$Id: man_macro.c,v 1.32 2010/03/23 11:30:48 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -14,6 +14,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <assert.h>
 #include <ctype.h>
 #include <stdlib.h>
@@ -36,7 +40,7 @@ static	int		 rew_block(int, enum man_type, 
 				const struct man_node *);
 
 const	struct man_macro __man_macros[MAN_MAX] = {
-	{ in_line_eoln, 0 }, /* br */
+	{ in_line_eoln, MAN_NSCOPED }, /* br */
 	{ in_line_eoln, 0 }, /* TH */
 	{ blk_imp, MAN_SCOPED }, /* SH */
 	{ blk_imp, MAN_SCOPED }, /* SS */
@@ -57,9 +61,9 @@ const	struct man_macro __man_macros[MAN_MAX] = {
 	{ in_line_eoln, MAN_SCOPED }, /* I */
 	{ in_line_eoln, 0 }, /* IR */
 	{ in_line_eoln, 0 }, /* RI */
-	{ in_line_eoln, 0 }, /* na */
+	{ in_line_eoln, MAN_NSCOPED }, /* na */
 	{ in_line_eoln, 0 }, /* i */
-	{ in_line_eoln, 0 }, /* sp */
+	{ in_line_eoln, MAN_NSCOPED }, /* sp */
 	{ in_line_eoln, 0 }, /* nf */
 	{ in_line_eoln, 0 }, /* fi */
 	{ in_line_eoln, 0 }, /* r */
@@ -67,6 +71,10 @@ const	struct man_macro __man_macros[MAN_MAX] = {
 	{ blk_imp, MAN_EXPLICIT }, /* RS */
 	{ in_line_eoln, 0 }, /* DT */
 	{ in_line_eoln, 0 }, /* UC */
+	{ in_line_eoln, 0 }, /* PD */
+	{ in_line_eoln, MAN_NSCOPED }, /* Sp */
+	{ in_line_eoln, 0 }, /* Vb */
+	{ in_line_eoln, 0 }, /* Ve */
 };
 
 const	struct man_macro * const man_macros = __man_macros;
@@ -311,18 +319,37 @@ in_line_eoln(MACRO_PROT_ARGS)
 		if (0 == w)
 			break;
 
+		/* XXX ignore Vb arguments for now */
+		if (MAN_Vb == tok)
+			continue;
+
 		if ( ! man_word_alloc(m, line, la, p))
 			return(0);
 	}
 
+	/*
+	 * If no arguments are specified and this is MAN_SCOPED (i.e.,
+	 * next-line scoped), then set our mode to indicate that we're
+	 * waiting for terms to load into our context.
+	 */
+
 	if (n == m->last && MAN_SCOPED & man_macros[tok].flags) {
+		assert( ! (MAN_NSCOPED & man_macros[tok].flags));
 		m->flags |= MAN_ELINE;
 		return(1);
 	} 
 
+	/* Set ignorable context, if applicable. */
+
+	if (MAN_NSCOPED & man_macros[tok].flags) {
+		assert( ! (MAN_SCOPED & man_macros[tok].flags));
+		m->flags |= MAN_ILINE;
+	}
+	
 	/*
-	 * Note that when TH is pruned, we'll be back at the root, so
-	 * make sure that we don't clobber as its sibling.
+	 * Rewind our element scope.  Note that when TH is pruned, we'll
+	 * be back at the root, so make sure that we don't clobber as
+	 * its sibling.
 	 */
 
 	for ( ; m->last; m->last = m->last->parent) {