===================================================================
RCS file: /cvs/mandoc/mdoc_term.c,v
retrieving revision 1.49
retrieving revision 1.54
diff -u -p -r1.49 -r1.54
--- mandoc/mdoc_term.c	2009/07/20 19:30:46	1.49
+++ mandoc/mdoc_term.c	2009/07/21 15:03:37	1.54
@@ -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.54 2009/07/21 15:03:37 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
@@ -66,7 +65,7 @@ const	int ttypes[TTYPE_NMAX] = {
 	TERMP_UNDER, 		/* TTYPE_FUNC_ARG */
 	TERMP_UNDER, 		/* TTYPE_LINK */
 	TERMP_BOLD,	 	/* TTYPE_SSECTION */
-	TERMP_UNDER, 		/* TTYPE_FILE */
+	0, 			/* TTYPE_FILE */
 	TERMP_UNDER, 		/* TTYPE_EMPH */
 	TERMP_BOLD,	 	/* TTYPE_CONFIG */
 	TERMP_BOLD,	 	/* TTYPE_CMD */
@@ -155,7 +154,6 @@ static	int	  termp_nd_pre(DECL_ARGS);
 static	int	  termp_nm_pre(DECL_ARGS);
 static	int	  termp_ns_pre(DECL_ARGS);
 static	int	  termp_op_pre(DECL_ARGS);
-static	int	  termp_pa_pre(DECL_ARGS);
 static	int	  termp_pf_pre(DECL_ARGS);
 static	int	  termp_pp_pre(DECL_ARGS);
 static	int	  termp_pq_pre(DECL_ARGS);
@@ -211,7 +209,7 @@ static const struct termact termacts[MDOC_MAX] = {
 	{ termp_nm_pre, NULL }, /* Nm */ 
 	{ termp_op_pre, termp_op_post }, /* Op */
 	{ NULL, NULL }, /* Ot */
-	{ termp_pa_pre, NULL }, /* Pa */
+	{ NULL, NULL }, /* Pa */
 	{ termp_rv_pre, NULL }, /* Rv */
 	{ NULL, NULL }, /* St */ 
 	{ termp_va_pre, NULL }, /* Va */
@@ -310,7 +308,7 @@ static	int	  arg_getattr(int, const struct mdoc_node *
 static	size_t	  arg_offset(const struct mdoc_argv *);
 static	size_t	  arg_width(const struct mdoc_argv *, int);
 static	int	  arg_listtype(const struct mdoc_node *);
-static	int	  fmt_block_vspace(struct termp *,
+static	void	  fmt_block_vspace(struct termp *,
 			const struct mdoc_node *,
 			const struct mdoc_node *);
 static	void  	  print_node(DECL_ARGS);
@@ -661,7 +659,7 @@ arg_getattrs(const int *keys, int *vals, 
 
 
 /* ARGSUSED */
-static int
+static void
 fmt_block_vspace(struct termp *p, 
 		const struct mdoc_node *bl, 
 		const struct mdoc_node *node)
@@ -671,25 +669,35 @@ fmt_block_vspace(struct termp *p, 
 	term_newln(p);
 
 	if (arg_hasattr(MDOC_Compact, bl))
-		return(1);
-	/* XXX - not documented! */
-	else if (arg_hasattr(MDOC_Column, bl))
-		return(1);
+		return;
 
+	/*
+	 * Search through our prior nodes.  If we follow a `Ss' or `Sh',
+	 * then don't vspace.
+	 */
+
 	for (n = node; n; n = n->parent) {
 		if (MDOC_BLOCK != n->type)
 			continue;
 		if (MDOC_Ss == n->tok)
-			break;
+			return;
 		if (MDOC_Sh == n->tok)
-			break;
+			return;
 		if (NULL == n->prev)
 			continue;
-		term_vspace(p);
 		break;
 	}
 
-	return(1);
+	/* 
+	 * XXX - not documented: a `-column' does not ever assert
+	 * vertical space within the list.
+	 */
+
+	if (arg_hasattr(MDOC_Column, bl))
+		if (node->prev && MDOC_It == node->prev->tok)
+			return;
+
+	term_vspace(p);
 }
 
 
@@ -729,8 +737,10 @@ termp_it_pre(DECL_ARGS)
 	int		        i, type, keys[3], vals[3];
 	size_t		        width, offset;
 
-	if (MDOC_BLOCK == node->type)
-		return(fmt_block_vspace(p, node->parent->parent, node));
+	if (MDOC_BLOCK == node->type) {
+		fmt_block_vspace(p, node->parent->parent, node);
+		return(1);
+	}
 
 	bl = node->parent->parent->parent;
 
@@ -813,18 +823,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.
 	 */
@@ -870,7 +884,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;
 
@@ -927,6 +941,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;
@@ -1003,11 +1024,10 @@ termp_it_post(DECL_ARGS)
 	assert(-1 != type);
 
 	switch (type) {
-	case (MDOC_Diag):
-		term_word(p, "\\ ");
-		/* FALLTHROUGH */
 	case (MDOC_Item):
 		/* FALLTHROUGH */
+	case (MDOC_Diag):
+		/* FALLTHROUGH */
 	case (MDOC_Inset):
 		if (MDOC_BODY == node->type)
 			term_flushln(p);
@@ -1523,10 +1543,11 @@ termp_bd_pre(DECL_ARGS)
 	 * line.  Blank lines are allowed.
 	 */
 
-	if (MDOC_BLOCK == node->type)
-		return(fmt_block_vspace(p, node, node));
-	else if (MDOC_BODY != node->type)
+	if (MDOC_BLOCK == node->type) {
+		fmt_block_vspace(p, node, node);
 		return(1);
+	} else if (MDOC_BODY != node->type)
+		return(1);
 
 	/* FIXME: display type should be mandated by parser. */
 
@@ -1749,16 +1770,6 @@ termp_ss_post(DECL_ARGS)
 
 	if (MDOC_HEAD == node->type)
 		term_newln(p);
-}
-
-
-/* ARGSUSED */
-static int
-termp_pa_pre(DECL_ARGS)
-{
-
-	pair->flag |= ttypes[TTYPE_FILE];
-	return(1);
 }