===================================================================
RCS file: /cvs/mandoc/mdoc_macro.c,v
retrieving revision 1.72
retrieving revision 1.74
diff -u -p -r1.72 -r1.74
--- mandoc/mdoc_macro.c	2010/05/30 21:41:46	1.72
+++ mandoc/mdoc_macro.c	2010/05/30 22:56:02	1.74
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_macro.c,v 1.72 2010/05/30 21:41:46 kristaps Exp $ */
+/*	$Id: mdoc_macro.c,v 1.74 2010/05/30 22:56:02 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -937,6 +937,7 @@ blk_full(MACRO_PROT_ARGS)
 #ifdef	UGLY
 	struct mdoc_node *n;
 #endif
+	enum mdoc_type	  mtt;
 	enum mdoct	  ntok;
 	enum margserr	  ac, lac;
 	enum margverr	  av;
@@ -1002,11 +1003,11 @@ blk_full(MACRO_PROT_ARGS)
 	} 
 
 	ac = ARGS_ERROR;
-	lac = ARGS_PHRASE;
 
 	for ( ; ; ) {
 		la = *pos;
-		lac = ac;
+		/* Initialise last-phrase-type with ARGS_PHRASE. */
+		lac = ARGS_ERROR == ac ? ARGS_PHRASE : ac;
 		ac = mdoc_args(m, line, pos, buf, tok, &p);
 
 		if (ARGS_ERROR == ac)
@@ -1014,7 +1015,10 @@ blk_full(MACRO_PROT_ARGS)
 		if (ARGS_EOLN == ac)
 			break;
 
-		/* Don't emit leading punct. for phrases. */
+		/* 
+		 * Emit leading punctuation (i.e., punctuation before
+		 * the MDOC_HEAD) for non-phrase types.
+		 */
 
 		if (NULL == head && 
 				ARGS_PEND != ac &&
@@ -1027,12 +1031,9 @@ blk_full(MACRO_PROT_ARGS)
 			continue;
 		}
 
-		/* Always re-open head for phrases. */
+		/* Open a head if one hasn't been opened. */
 
-		if (NULL == head || 
-				ARGS_PEND == ac ||
-				ARGS_PHRASE == ac || 
-				ARGS_PPHRASE == ac) {
+		if (NULL == head) {
 			if ( ! mdoc_head_alloc(m, line, ppos, tok))
 				return(0);
 			head = m->last;
@@ -1041,6 +1042,27 @@ blk_full(MACRO_PROT_ARGS)
 		if (ARGS_PHRASE == ac || 
 				ARGS_PEND == ac ||
 				ARGS_PPHRASE == ac) {
+			/*
+			 * If we haven't opened a body yet, rewind the
+			 * head; if we have, rewind that instead.
+			 */
+
+			mtt = body ? MDOC_BODY : MDOC_HEAD;
+			if ( ! rew_sub(mtt, m, tok, line, ppos))
+				return(0);
+			
+			/* Then allocate our body context. */
+
+			if ( ! mdoc_body_alloc(m, line, ppos, tok))
+				return(0);
+			body = m->last;
+
+			/*
+			 * Process phrases: set whether we're in a
+			 * partial-phrase (this effects line handling)
+			 * then call down into the phrase parser.
+			 */
+
 			if (ARGS_PPHRASE == ac)
 				m->flags |= MDOC_PPHRASE;
 			if (ARGS_PEND == ac && ARGS_PPHRASE == lac)
@@ -1053,9 +1075,6 @@ blk_full(MACRO_PROT_ARGS)
 				return(0);
 
 			m->flags &= ~MDOC_PPHRASE;
-
-			if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos))
-				return(0);
 			continue;
 		}