===================================================================
RCS file: /cvs/mandoc/mdoc_macro.c,v
retrieving revision 1.69
retrieving revision 1.71
diff -u -p -r1.69 -r1.71
--- mandoc/mdoc_macro.c	2010/05/26 09:35:35	1.69
+++ mandoc/mdoc_macro.c	2010/05/30 21:28:30	1.71
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_macro.c,v 1.69 2010/05/26 09:35:35 kristaps Exp $ */
+/*	$Id: mdoc_macro.c,v 1.71 2010/05/30 21:28:30 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -754,7 +754,7 @@ blk_exp_close(MACRO_PROT_ARGS)
 static int
 in_line(MACRO_PROT_ARGS)
 {
-	int		 la, lastpunct, cnt, nc, nl;
+	int		 la, scope, cnt, nc, nl;
 	enum margverr	 av;
 	enum mdoct	 ntok;
 	enum margserr	 ac;
@@ -805,7 +805,7 @@ in_line(MACRO_PROT_ARGS)
 		return(0);
 	}
 
-	for (cnt = 0, lastpunct = 1;; ) {
+	for (cnt = scope = 0;; ) {
 		la = *pos;
 		ac = mdoc_args(m, line, pos, buf, tok, &p);
 
@@ -826,7 +826,7 @@ in_line(MACRO_PROT_ARGS)
 		 */
 
 		if (MDOC_MAX != ntok) {
-			if (0 == lastpunct && ! rew_elem(m, tok))
+			if (scope && ! rew_elem(m, tok))
 				return(0);
 			if (nc && 0 == cnt) {
 				if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg))
@@ -853,14 +853,35 @@ in_line(MACRO_PROT_ARGS)
 
 		d = ARGS_QWORD == ac ? DELIM_NONE : mdoc_isdelim(p);
 
-		if (ARGS_QWORD != ac && DELIM_NONE != d) {
-			if (0 == lastpunct && ! rew_elem(m, tok))
+		if (DELIM_NONE != d) {
+			/*
+			 * If we encounter closing punctuation, no word
+			 * has been omitted, no scope is open, and we're
+			 * allowed to have an empty element, then start
+			 * a new scope.  `Ar', `Fl', and `Li', only do
+			 * this once per invocation.  There may be more
+			 * of these (all of them?).
+			 */
+			if (0 == cnt && (nc || MDOC_Li == tok) && 
+					DELIM_CLOSE == d && ! scope) {
+				if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg))
+					return(0);
+				if (MDOC_Ar == tok || MDOC_Li == tok || 
+						MDOC_Fl == tok)
+					cnt++;
+				scope = 1;
+			}
+			/*
+			 * Close out our scope, if one is open, before
+			 * any punctuation.
+			 */
+			if (scope && ! rew_elem(m, tok))
 				return(0);
-			lastpunct = 1;
-		} else if (lastpunct) {
+			scope = 0;
+		} else if ( ! scope) {
 			if ( ! mdoc_elem_alloc(m, line, ppos, tok, arg))
 				return(0);
-			lastpunct = 0;
+			scope = 1;
 		}
 
 		if (DELIM_NONE == d)
@@ -873,14 +894,14 @@ in_line(MACRO_PROT_ARGS)
 		 * word so that the `-' can be added to each one without
 		 * having to parse out spaces.
 		 */
-		if (0 == lastpunct && MDOC_Fl == tok) {
+		if (scope && MDOC_Fl == tok) {
 			if ( ! rew_elem(m, tok))
 				return(0);
-			lastpunct = 1;
+			scope = 0;
 		}
 	}
 
-	if (0 == lastpunct && ! rew_elem(m, tok))
+	if (scope && ! rew_elem(m, tok))
 		return(0);
 
 	/*
@@ -981,6 +1002,7 @@ blk_full(MACRO_PROT_ARGS)
 	} 
 
 	ac = ARGS_ERROR;
+	lac = ARGS_PHRASE;
 
 	for ( ; ; ) {
 		la = *pos;
@@ -992,16 +1014,10 @@ blk_full(MACRO_PROT_ARGS)
 		if (ARGS_EOLN == ac)
 			break;
 
-		if (ARGS_PEND == ac) {
-			if (ARGS_PPHRASE == lac)
-				ac = ARGS_PPHRASE;
-			else
-				ac = ARGS_PHRASE;
-		}
-
 		/* Don't emit leading punct. for phrases. */
 
 		if (NULL == head && 
+				ARGS_PEND != ac &&
 				ARGS_PHRASE != ac &&
 				ARGS_PPHRASE != ac &&
 				ARGS_QWORD != ac &&
@@ -1014,6 +1030,7 @@ blk_full(MACRO_PROT_ARGS)
 		/* Always re-open head for phrases. */
 
 		if (NULL == head || 
+				ARGS_PEND == ac ||
 				ARGS_PHRASE == ac || 
 				ARGS_PPHRASE == ac) {
 			if ( ! mdoc_head_alloc(m, line, ppos, tok))
@@ -1024,9 +1041,17 @@ blk_full(MACRO_PROT_ARGS)
 		if (ARGS_PHRASE == ac || ARGS_PPHRASE == ac) {
 			if (ARGS_PPHRASE == ac)
 				m->flags |= MDOC_PPHRASE;
-			if ( ! phrase(m, line, la, buf, ac))
+			if (ARGS_PEND == ac && ARGS_PPHRASE == lac)
+				m->flags |= MDOC_PPHRASE;
+
+			if (ARGS_PEND == ac) {
+				if ( ! phrase(m, line, la, buf, lac))
+					return(0);
+			} else if ( ! phrase(m, line, la, buf, ac))
 				return(0);
+
 			m->flags &= ~MDOC_PPHRASE;
+
 			if ( ! rew_sub(MDOC_HEAD, m, tok, line, ppos))
 				return(0);
 			continue;