===================================================================
RCS file: /cvs/mandoc/man_macro.c,v
retrieving revision 1.22
retrieving revision 1.30
diff -u -p -r1.22 -r1.30
--- mandoc/man_macro.c	2009/08/19 12:15:58	1.22
+++ mandoc/man_macro.c	2010/01/01 17:14:28	1.30
@@ -1,4 +1,4 @@
-/*	$Id: man_macro.c,v 1.22 2009/08/19 12:15:58 kristaps Exp $ */
+/*	$Id: man_macro.c,v 1.30 2010/01/01 17:14:28 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>
@@ -38,9 +42,9 @@ static	int		 rew_block(int, enum man_type, 
 const	struct man_macro __man_macros[MAN_MAX] = {
 	{ in_line_eoln, 0 }, /* br */
 	{ in_line_eoln, 0 }, /* TH */
-	{ blk_imp, 0 }, /* SH */
-	{ blk_imp, 0 }, /* SS */
-	{ blk_imp, MAN_SCOPED }, /* TP */
+	{ blk_imp, MAN_SCOPED }, /* SH */
+	{ blk_imp, MAN_SCOPED }, /* SS */
+	{ blk_imp, MAN_SCOPED | MAN_FSCOPED }, /* TP */
 	{ blk_imp, 0 }, /* LP */
 	{ blk_imp, 0 }, /* PP */
 	{ blk_imp, 0 }, /* P */
@@ -65,6 +69,9 @@ const	struct man_macro __man_macros[MAN_MAX] = {
 	{ in_line_eoln, 0 }, /* r */
 	{ blk_close, 0 }, /* RE */
 	{ blk_imp, MAN_EXPLICIT }, /* RS */
+	{ in_line_eoln, 0 }, /* DT */
+	{ in_line_eoln, 0 }, /* UC */
+	{ in_line_eoln, 0 }, /* PD */
 };
 
 const	struct man_macro * const man_macros = __man_macros;
@@ -235,6 +242,7 @@ blk_imp(MACRO_PROT_ARGS)
 {
 	int		 w, la;
 	char		*p;
+	struct man_node	*n;
 
 	/* Close out prior scopes. */
 
@@ -250,6 +258,8 @@ blk_imp(MACRO_PROT_ARGS)
 	if ( ! man_head_alloc(m, line, ppos, tok))
 		return(0);
 
+	n = m->last;
+
 	/* Add line arguments. */
 
 	for (;;) {
@@ -268,9 +278,17 @@ blk_imp(MACRO_PROT_ARGS)
 	/* Close out head and open body (unless MAN_SCOPE). */
 
 	if (MAN_SCOPED & man_macros[tok].flags) {
-		m->flags |= MAN_BLINE;
-		return(1);
-	} else if ( ! rew_scope(MAN_HEAD, m, tok))
+		/* If we're forcing scope (`TP'), keep it open. */
+		if (MAN_FSCOPED & man_macros[tok].flags) {
+			m->flags |= MAN_BLINE;
+			return(1);
+		} else if (n == m->last) {
+			m->flags |= MAN_BLINE;
+			return(1);
+		}
+	}
+
+	if ( ! rew_scope(MAN_HEAD, m, tok))
 		return(0);
 
 	return(man_body_alloc(m, line, ppos, tok));
@@ -302,7 +320,7 @@ in_line_eoln(MACRO_PROT_ARGS)
 			return(0);
 	}
 
-	if (n == m->last && (MAN_SCOPED & man_macros[tok].flags)) {
+	if (n == m->last && MAN_SCOPED & man_macros[tok].flags) {
 		m->flags |= MAN_ELINE;
 		return(1);
 	} 
@@ -353,7 +371,8 @@ man_macroend(struct man *m)
 			continue;
 		if ( ! (MAN_EXPLICIT & man_macros[n->tok].flags))
 			continue;
-		return(man_nerr(m, n, WEXITSCOPE));
+		if ( ! man_nwarn(m, n, WEXITSCOPE))
+			return(0);
 	}
 
 	return(man_unscope(m, m->first));