===================================================================
RCS file: /cvs/mandoc/mdoc_macro.c,v
retrieving revision 1.19
retrieving revision 1.23
diff -u -p -r1.19 -r1.23
--- mandoc/mdoc_macro.c	2009/07/12 16:34:16	1.19
+++ mandoc/mdoc_macro.c	2009/07/19 09:17:42	1.23
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_macro.c,v 1.19 2009/07/12 16:34:16 kristaps Exp $ */
+/*	$Id: mdoc_macro.c,v 1.23 2009/07/19 09:17:42 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -60,7 +60,7 @@ const	struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
 	{ in_line_eoln, MDOC_PROLOGUE }, /* Os */
 	{ blk_full, 0 }, /* Sh */
 	{ blk_full, 0 }, /* Ss */ 
-	{ in_line, 0 }, /* Pp */ 
+	{ in_line_eoln, 0 }, /* Pp */ 
 	{ blk_part_imp, MDOC_PARSED }, /* D1 */
 	{ blk_part_imp, MDOC_PARSED }, /* Dl */
 	{ blk_full, MDOC_EXPLICIT }, /* Bd */
@@ -71,7 +71,7 @@ const	struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
 	{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ad */ 
 	{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* An */
 	{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ar */
-	{ in_line_eoln, MDOC_CALLABLE }, /* Cd */
+	{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Cd */
 	{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Cm */
 	{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Dv */ 
 	{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Er */ 
@@ -161,7 +161,7 @@ const	struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
 	{ obsolete, 0 }, /* Fr */
 	{ in_line_eoln, 0 }, /* Ud */
 	{ in_line_eoln, 0 }, /* Lb */
-	{ in_line, 0 }, /* Lp */ 
+	{ in_line_eoln, 0 }, /* Lp */ 
 	{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Lk */ 
 	{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Mt */ 
 	{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Brq */
@@ -172,6 +172,8 @@ const	struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
 	{ obsolete, 0 }, /* En */
 	{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Dx */
 	{ in_line_eoln, 0 }, /* %Q */
+	{ in_line_eoln, 0 }, /* br */
+	{ in_line_eoln, 0 }, /* sp */
 };
 
 const	struct mdoc_macro * const mdoc_macros = __mdoc_macros;
@@ -660,13 +662,13 @@ blk_exp_close(MACRO_PROT_ARGS)
 	}
 
 	if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) {
-		if (0 == buf[*pos]) {
-			if ( ! rew_subblock(MDOC_BODY, mdoc, 
-						tok, line, ppos))
+		if (buf[*pos]) 
+			if ( ! mdoc_pwarn(mdoc, line, ppos, ENOLINE))
 				return(0);
-			return(rew_expblock(mdoc, tok, line, ppos));
-		}
-		return(mdoc_perr(mdoc, line, ppos, ENOLINE));
+
+		if ( ! rew_subblock(MDOC_BODY, mdoc, tok, line, ppos))
+			return(0);
+		return(rew_expblock(mdoc, tok, line, ppos));
 	}
 
 	if ( ! rew_subblock(MDOC_BODY, mdoc, tok, line, ppos))
@@ -740,10 +742,6 @@ in_line(MACRO_PROT_ARGS)
 	 * usually because of reserved words) to squeak by.
 	 */
 	switch (tok) {
-	case (MDOC_Lp):
-		/* FALLTHROUGH */
-	case (MDOC_Pp):
-		/* FALLTHROUGH */
 	case (MDOC_Nm):
 		/* FALLTHROUGH */
 	case (MDOC_Fl):