===================================================================
RCS file: /cvs/mandoc/mdoc_macro.c,v
retrieving revision 1.16
retrieving revision 1.22
diff -u -p -r1.16 -r1.22
--- mandoc/mdoc_macro.c	2009/07/06 13:04:52	1.16
+++ mandoc/mdoc_macro.c	2009/07/19 08:28:48	1.22
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_macro.c,v 1.16 2009/07/06 13:04:52 kristaps Exp $ */
+/*	$Id: mdoc_macro.c,v 1.22 2009/07/19 08:28:48 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 */
@@ -83,9 +83,9 @@ const	struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
 	{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Fn */ 
 	{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ft */ 
 	{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ic */ 
-	{ in_line_eoln, 0 }, /* In */  /* FIXME: historic usage! */
+	{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* In */
 	{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Li */
-	{ in_line_eoln, 0 }, /* Nd */ 
+	{ blk_full, 0 }, /* Nd */ 
 	{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Nm */ 
 	{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Op */
 	{ obsolete, 0 }, /* Ot */
@@ -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;
@@ -386,6 +388,8 @@ rew_dohalt(int tok, enum mdoc_type type, const struct 
 		if (type == p->type && tok == p->tok)
 			return(REWIND_REWIND);
 		break;
+	case (MDOC_Nd):
+		/* FALLTHROUGH */
 	case (MDOC_Ss):
 		assert(MDOC_TAIL != type);
 		if (type == p->type && tok == p->tok)
@@ -491,9 +495,13 @@ rew_dobreak(int tok, const struct mdoc_node *p)
 	switch (tok) {
 	case (MDOC_It):
 		return(MDOC_It == p->tok);
+	case (MDOC_Nd):
+		return(MDOC_Nd == p->tok);
 	case (MDOC_Ss):
 		return(MDOC_Ss == p->tok);
 	case (MDOC_Sh):
+		if (MDOC_Nd == p->tok)
+			return(1);
 		if (MDOC_Ss == p->tok)
 			return(1);
 		return(MDOC_Sh == p->tok);
@@ -654,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, ENOPARMS));
+
+		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))
@@ -734,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):
@@ -875,10 +879,26 @@ in_line(MACRO_PROT_ARGS)
 static int
 blk_full(MACRO_PROT_ARGS)
 {
-	int		  c, lastarg, reopen;
+	int		  c, lastarg, reopen, dohead;
 	struct mdoc_arg	 *arg;
 	char		 *p;
 
+	/* 
+	 * Whether to process a block-head section.  If this is
+	 * non-zero, then a head will be opened for all line arguments.
+	 * If not, then the head will always be empty and only a body
+	 * will be opened, which will stay open at the eoln.
+	 */
+
+	switch (tok) {
+	case (MDOC_Nd):
+		dohead = 0;
+		break;
+	default:
+		dohead = 1;
+		break;
+	}
+
 	if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) {
 		if ( ! rew_subblock(MDOC_BODY, mdoc, 
 					tok, line, ppos))
@@ -923,6 +943,16 @@ blk_full(MACRO_PROT_ARGS)
 
 	if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
 		return(0);
+
+	/* Immediately close out head and enter body, if applicable. */
+
+	if (0 == dohead) {
+		if ( ! rew_subblock(MDOC_HEAD, mdoc, tok, line, ppos))
+			return(0);
+		if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+			return(0);
+	} 
+
 	mdoc->next = MDOC_NEXT_CHILD;
 
 	for (reopen = 0;; ) {
@@ -934,6 +964,7 @@ blk_full(MACRO_PROT_ARGS)
 		if (ARGS_EOLN == c)
 			break;
 		if (ARGS_PHRASE == c) {
+			assert(dohead);
 			if (reopen && ! mdoc_head_alloc
 					(mdoc, line, ppos, tok))
 				return(0);
@@ -970,9 +1001,13 @@ blk_full(MACRO_PROT_ARGS)
 	
 	if (1 == ppos && ! append_delims(mdoc, line, pos, buf))
 		return(0);
+
+	/* If the body's already open, then just return. */
+	if (0 == dohead) 
+		return(1);
+
 	if ( ! rew_subblock(MDOC_HEAD, mdoc, tok, line, ppos))
 		return(0);
-
 	if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
 		return(0);
 	mdoc->next = MDOC_NEXT_CHILD;
@@ -1382,7 +1417,7 @@ phrase(struct mdoc *mdoc, int line, int ppos, char *bu
 				else if ('\\' != buf[i - 1])
 					break;
 			if (0 == buf[i]) 
-				return(mdoc_perr(mdoc, line, la, EQUOT));
+				return(mdoc_perr(mdoc, line, la, EQUOTPHR));
 			quoted = 1;
 		} else
 			for ( ; buf[i]; i++)