===================================================================
RCS file: /cvs/mandoc/mdoc.c,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -p -r1.143 -r1.144
--- mandoc/mdoc.c	2010/05/31 15:50:48	1.143
+++ mandoc/mdoc.c	2010/05/31 20:14:10	1.144
@@ -1,6 +1,6 @@
-/*	$Id: mdoc.c,v 1.143 2010/05/31 15:50:48 kristaps Exp $ */
+/*	$Id: mdoc.c,v 1.144 2010/05/31 20:14:10 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -561,14 +561,15 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int of
 	n = m->last;
 
 	/*
-	 * Diver directly into list processing if we're encountering a
+	 * Divert directly to list processing if we're encountering a
 	 * columnar MDOC_BLOCK with or without a prior MDOC_BLOCK entry
-	 * (if it's a MDOC_BODY that means it's open, in which case we
-	 * should process within its context).
+	 * (a MDOC_BODY means it's already open, in which case we should
+	 * process within its context in the normal way).
 	 */
 
 	if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&
 			LIST_column == n->data.list) {
+		/* `Bl' is open without any children. */
 		m->flags |= MDOC_FREECOL;
 		return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf));
 	}
@@ -577,6 +578,7 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int of
 			NULL != n->parent &&
 			MDOC_Bl == n->parent->tok &&
 			LIST_column == n->parent->data.list) {
+		/* `Bl' has block-level `It' children. */
 		m->flags |= MDOC_FREECOL;
 		return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf));
 	}
@@ -677,6 +679,7 @@ macrowarn(struct mdoc *m, int ln, const char *buf, int
 			buf, strlen(buf) > 3 ? "..." : "");
 
 	/* FIXME: logic should be in driver. */
+	/* FIXME: broken, will error out and not omit a message. */
 	return(MDOC_IGN_MACRO & m->pflags ? rc : 0);
 }
 
@@ -688,9 +691,10 @@ macrowarn(struct mdoc *m, int ln, const char *buf, int
 int
 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
 {
-	enum mdoct	tok;
-	int		i, j, sv;
-	char		mac[5];
+	enum mdoct	  tok;
+	int		  i, j, sv;
+	char		  mac[5];
+	struct mdoc_node *n;
 
 	/* Empty lines are ignored. */
 
@@ -758,10 +762,51 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off
 		if ( ! mdoc_pmsg(m, ln, i - 1, MANDOCERR_EOLNSPACE))
 			goto err;
 
-	/* 
-	 * Begin recursive parse sequence.  Since we're at the start of
-	 * the line, we don't need to do callable/parseable checks.
+	/*
+	 * If an initial macro or a list invocation, divert directly
+	 * into macro processing.
 	 */
+
+	if (NULL == m->last || MDOC_It == tok || MDOC_El == tok) {
+		if ( ! mdoc_macro(m, tok, ln, sv, &i, buf)) 
+			goto err;
+		return(1);
+	}
+
+	n = m->last;
+	assert(m->last);
+
+	/*
+	 * If the first macro of a `Bl -column', open an `It' block
+	 * context around the parsed macro.
+	 */
+
+	if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&
+			LIST_column == n->data.list) {
+		m->flags |= MDOC_FREECOL;
+		if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) 
+			goto err;
+		return(1);
+	}
+
+	/*
+	 * If we're following a block-level `It' within a `Bl -column'
+	 * context (perhaps opened in the above block or in ptext()),
+	 * then open an `It' block context around the parsed macro.
+	 */
+
+	if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&
+			NULL != n->parent &&
+			MDOC_Bl == n->parent->tok &&
+			LIST_column == n->parent->data.list) {
+		m->flags |= MDOC_FREECOL;
+		if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) 
+			goto err;
+		return(1);
+	}
+
+	/* Normal processing of a macro. */
+
 	if ( ! mdoc_macro(m, tok, ln, sv, &i, buf)) 
 		goto err;