===================================================================
RCS file: /cvs/mandoc/mdoc_macro.c,v
retrieving revision 1.75
retrieving revision 1.78
diff -u -p -r1.75 -r1.78
--- mandoc/mdoc_macro.c	2010/05/31 10:28:04	1.75
+++ mandoc/mdoc_macro.c	2010/05/31 22:39:55	1.78
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_macro.c,v 1.75 2010/05/31 10:28:04 kristaps Exp $ */
+/*	$Id: mdoc_macro.c,v 1.78 2010/05/31 22:39:55 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -1118,7 +1118,7 @@ blk_full(MACRO_PROT_ARGS)
 	/* If we've already opened our body, exit now. */
 
 	if (NULL != body)
-		return(1);
+		goto out;
 
 #ifdef	UGLY
 	/*
@@ -1145,6 +1145,16 @@ blk_full(MACRO_PROT_ARGS)
 	if ( ! mdoc_body_alloc(m, line, ppos, tok))
 		return(0);
 
+out:
+	if ( ! (MDOC_FREECOL & m->flags))
+		return(1);
+
+	if ( ! rew_sub(MDOC_BODY, m, tok, line, ppos))
+		return(0);
+	if ( ! rew_sub(MDOC_BLOCK, m, tok, line, ppos))
+		return(0);
+
+	m->flags &= ~MDOC_FREECOL;
 	return(1);
 }
 
@@ -1690,23 +1700,6 @@ phrase_ta(MACRO_PROT_ARGS)
 	n = m->last;
 	if ( ! rew_sub(MDOC_BODY, m, MDOC_It, line, ppos))
 		return(0);
-
-	/* 
-	 * FIXME: this is necessary in bogus constructions like
-	 *  .Bl -column foo bar
-	 *  .Sy foo Ta bar
-	 * It is, however, an ugly way to do it.
-	 *
-	 * XXX; remove this when the above construct builds an implied
-	 * `It' marker.
-	 */ 
-	if (NULL == m->last || 
-			MDOC_BODY != m->last->type ||
-			MDOC_It != m->last->tok) {
-		swarn(m, tok, line, ppos, n);
-		return(0);
-	}
-
 	if ( ! mdoc_body_alloc(m, line, ppos, MDOC_It))
 		return(0);