===================================================================
RCS file: /cvs/mandoc/mdoc_term.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- mandoc/mdoc_term.c	2009/07/20 19:30:46	1.49
+++ mandoc/mdoc_term.c	2009/07/21 12:47:52	1.50
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.49 2009/07/20 19:30:46 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
@@ -927,6 +926,13 @@ termp_it_pre(DECL_ARGS)
 	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;