===================================================================
RCS file: /cvs/mandoc/mdoc_term.c,v
retrieving revision 1.45
retrieving revision 1.50
diff -u -p -r1.45 -r1.50
--- mandoc/mdoc_term.c	2009/07/17 12:40:48	1.45
+++ mandoc/mdoc_term.c	2009/07/21 12:47:52	1.50
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.45 2009/07/17 12:40:48 kristaps Exp $ */
+/*	$Id: mdoc_term.c,v 1.50 2009/07/21 12:47:52 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -27,7 +27,6 @@
 #include "mdoc.h"
 
 /* FIXME: macro arguments can be escaped. */
-/* FIXME: support more offset/width tokens. */
 
 #define	TTYPE_PROG	  0
 #define	TTYPE_CMD_FLAG	  1
@@ -364,6 +363,13 @@ print_node(DECL_ARGS)
 	npair.flag = 0;
 	npair.count = 0;
 
+	/*
+	 * Note on termpair.  This allows a pre function to set a termp
+	 * flag that is automatically unset after the body, but before
+	 * the post function.  Thus, if a pre uses a termpair flag, it
+	 * must be reapplied in the post for use.
+	 */
+
 	if (MDOC_TEXT != node->type) {
 		if (termacts[node->tok].pre)
 			if ( ! (*termacts[node->tok].pre)(p, &npair, meta, node))
@@ -378,6 +384,8 @@ print_node(DECL_ARGS)
 	if (dochild && node->child)
 		print_body(p, &npair, meta, node->child);
 
+	p->flags &= ~npair.flag;
+
 	/* Post-processing. */
 
 	if (MDOC_TEXT != node->type)
@@ -386,7 +394,6 @@ print_node(DECL_ARGS)
 
 	p->offset = offset;
 	p->rmargin = rmargin;
-	p->flags &= ~npair.flag;
 }
 
 
@@ -664,6 +671,9 @@ fmt_block_vspace(struct termp *p, 
 
 	if (arg_hasattr(MDOC_Compact, bl))
 		return(1);
+	/* XXX - not documented! */
+	else if (arg_hasattr(MDOC_Column, bl))
+		return(1);
 
 	for (n = node; n; n = n->parent) {
 		if (MDOC_BLOCK != n->type)
@@ -787,6 +797,8 @@ termp_it_pre(DECL_ARGS)
 		if (0 == width)
 			width = 8;
 		break;
+	case (MDOC_Column):
+		/* FALLTHROUGH */
 	case (MDOC_Tag):
 		if (0 == width)
 			width = 10;
@@ -905,13 +917,22 @@ termp_it_pre(DECL_ARGS)
 	case (MDOC_Hang):
 		/* FALLTHROUGH */
 	case (MDOC_Tag):
+		assert(width);
 		if (MDOC_HEAD == node->type)
 			p->rmargin = p->offset + width;
 		else 
 			p->offset += width;
 		break;
 	case (MDOC_Column):
+		assert(width);
 		p->rmargin = p->offset + width;
+		/* 
+		 * XXX - this behaviour is not documented: the
+		 * right-most column is filled to the right margin.
+		 */
+		if (MDOC_HEAD == node->type &&
+				MDOC_BODY == node->next->type)
+			p->rmargin = p->maxrmargin;
 		break;
 	default:
 		break;
@@ -1561,7 +1582,6 @@ termp_bd_pre(DECL_ARGS)
 	 * Ew.
 	 */
 
-	p->flags |= TERMP_LITERAL;
 	ln = node->child ? node->child->line : 0;
 
 	for (node = node->child; node; node = node->next) {
@@ -1584,10 +1604,7 @@ termp_bd_post(DECL_ARGS)
 
 	if (MDOC_BODY != node->type) 
 		return;
-
 	term_flushln(p);
-	p->flags &= ~TERMP_LITERAL;
-	p->flags |= TERMP_NOSPACE;
 }
 
 
@@ -1814,8 +1831,9 @@ static void
 termp_in_post(DECL_ARGS)
 {
 
-	p->flags |= TERMP_NOSPACE;
+	p->flags |= TERMP_NOSPACE | ttypes[TTYPE_INCLUDE];
 	term_word(p, ">");
+	p->flags &= ~ttypes[TTYPE_INCLUDE];
 
 	if (SEC_SYNOPSIS != node->sec)
 		return;