===================================================================
RCS file: /cvs/mandoc/mdoc_term.c,v
retrieving revision 1.46
retrieving revision 1.51
diff -u -p -r1.46 -r1.51
--- mandoc/mdoc_term.c	2009/07/19 08:18:28	1.46
+++ mandoc/mdoc_term.c	2009/07/21 13:34:13	1.51
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.46 2009/07/19 08:18:28 kristaps Exp $ */
+/*	$Id: mdoc_term.c,v 1.51 2009/07/21 13:34:13 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
@@ -672,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)
@@ -795,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;
@@ -808,18 +812,22 @@ termp_it_pre(DECL_ARGS)
 	 * while diagonal bodies need two.
 	 */
 
+	p->flags |= TERMP_NOSPACE;
+
 	switch (type) {
+	case (MDOC_Diag):
+		term_word(p, "\\ \\ ");
+		break;
 	case (MDOC_Inset):
 		if (MDOC_BODY == node->type) 
-			p->flags &= ~TERMP_NOSPACE;
-		else
-			p->flags |= TERMP_NOSPACE;
+			term_word(p, "\\ ");
 		break;
 	default:
-		p->flags |= TERMP_NOSPACE;
 		break;
 	}
 
+	p->flags |= TERMP_NOSPACE;
+
 	/*
 	 * Style flags.  Diagnostic heads need TTYPE_DIAG.
 	 */
@@ -865,7 +873,7 @@ termp_it_pre(DECL_ARGS)
 		break;
 	case (MDOC_Tag):
 		if (MDOC_HEAD == node->type)
-			p->flags |= TERMP_NOBREAK;
+			p->flags |= TERMP_NOBREAK | TERMP_TWOSPACE;
 		else
 			p->flags |= TERMP_NOLPAD;
 
@@ -913,13 +921,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;
@@ -996,9 +1013,6 @@ termp_it_post(DECL_ARGS)
 	assert(-1 != type);
 
 	switch (type) {
-	case (MDOC_Diag):
-		term_word(p, "\\ ");
-		/* FALLTHROUGH */
 	case (MDOC_Item):
 		/* FALLTHROUGH */
 	case (MDOC_Inset):
@@ -1569,7 +1583,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) {
@@ -1592,10 +1605,7 @@ termp_bd_post(DECL_ARGS)
 
 	if (MDOC_BODY != node->type) 
 		return;
-
 	term_flushln(p);
-	p->flags &= ~TERMP_LITERAL;
-	p->flags |= TERMP_NOSPACE;
 }