===================================================================
RCS file: /cvs/mandoc/mdoc_term.c,v
retrieving revision 1.58
retrieving revision 1.60
diff -u -p -r1.58 -r1.60
--- mandoc/mdoc_term.c	2009/07/23 08:36:32	1.58
+++ mandoc/mdoc_term.c	2009/07/24 11:54:54	1.60
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.58 2009/07/23 08:36:32 kristaps Exp $ */
+/*	$Id: mdoc_term.c,v 1.60 2009/07/24 11:54:54 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -670,7 +670,7 @@ fmt_block_vspace(struct termp *p, 
 
 	term_newln(p);
 
-	if (arg_hasattr(MDOC_Compact, bl))
+	if (MDOC_Bl == bl->tok && arg_hasattr(MDOC_Compact, bl))
 		return;
 
 	/*
@@ -695,7 +695,7 @@ fmt_block_vspace(struct termp *p, 
 	 * within the list.
 	 */
 
-	if (arg_hasattr(MDOC_Column, bl))
+	if (MDOC_Bl == bl->tok && arg_hasattr(MDOC_Column, bl))
 		if (node->prev && MDOC_It == node->prev->tok)
 			return;
 
@@ -703,7 +703,7 @@ fmt_block_vspace(struct termp *p, 
 	 * XXX - not documented: a `-diag' without a body does not
 	 * assert a vspace prior to the next element. 
 	 */
-	if (arg_hasattr(MDOC_Diag, bl)) 
+	if (MDOC_Bl == bl->tok && arg_hasattr(MDOC_Diag, bl)) 
 		if (node->prev && MDOC_It == node->prev->tok) {
 			assert(node->prev->body);
 			if (NULL == node->prev->body->child)
@@ -908,7 +908,21 @@ termp_it_pre(DECL_ARGS)
 		else
 			p->flags |= TERMP_NOLPAD;
 
-		if (MDOC_HEAD == node->type)
+		if (MDOC_HEAD != node->type)
+			break;
+
+		/*
+		 * This is ugly.  If `-hang' is specified and the body
+		 * is a `Bl' or `Bd', then we want basically to nullify
+		 * the "overstep" effect in term_flushln() and treat
+		 * this as a `-ohang' list instead.
+		 */
+		if (node->next->child && 
+				(MDOC_Bl == node->next->child->tok ||
+				 MDOC_Bd == node->next->child->tok)) {
+			p->flags &= ~TERMP_NOBREAK;
+			p->flags &= ~TERMP_NOLPAD;
+		} else
 			p->flags |= TERMP_HANG;
 		break;
 	case (MDOC_Tag):
@@ -950,6 +964,17 @@ termp_it_pre(DECL_ARGS)
 	p->offset += offset;
 
 	switch (type) {
+	case (MDOC_Hang):
+		/*
+		 * Same stipulation as above, regarding `-hang'.  We
+		 * don't want to recalculate rmargin and offsets when
+		 * using `Bd' or `Bl' within `-hang' overstep lists.
+		 */
+		if (MDOC_HEAD == node->type && node->next->child &&
+				(MDOC_Bl == node->next->child->tok || 
+				 MDOC_Bd == node->next->child->tok))
+			break;
+		/* FALLTHROUGH */
 	case (MDOC_Bullet):
 		/* FALLTHROUGH */
 	case (MDOC_Dash):
@@ -958,8 +983,6 @@ termp_it_pre(DECL_ARGS)
 		/* FALLTHROUGH */
 	case (MDOC_Hyphen):
 		/* FALLTHROUGH */
-	case (MDOC_Hang):
-		/* FALLTHROUGH */
 	case (MDOC_Tag):
 		assert(width);
 		if (MDOC_HEAD == node->type)
@@ -1559,7 +1582,7 @@ termp_va_pre(DECL_ARGS)
 static int
 termp_bd_pre(DECL_ARGS)
 {
-	int	         i, type, ln;
+	int	         i, type;
 
 	/*
 	 * This is fairly tricky due primarily to crappy documentation.
@@ -1578,12 +1601,9 @@ termp_bd_pre(DECL_ARGS)
 	} else if (MDOC_BODY != node->type)
 		return(1);
 
-	/* FIXME: display type should be mandated by parser. */
+	assert(node->parent->args);
 
-	if (NULL == node->parent->args)
-		errx(1, "missing display type");
-
-	for (type = -1, i = 0; 
+	for (type = -1, i = 0; -1 == type && 
 			i < (int)node->parent->args->argc; i++) {
 		switch (node->parent->args->argv[i].arg) {
 		case (MDOC_Ragged):
@@ -1594,22 +1614,17 @@ termp_bd_pre(DECL_ARGS)
 			/* FALLTHROUGH */
 		case (MDOC_Literal):
 			type = node->parent->args->argv[i].arg;
-			i = (int)node->parent->args->argc;
 			break;
 		default:
 			break;
 		}
 	}
+	
+	assert(type > -1);
 
-	if (NULL == node->parent->args)
-		errx(1, "missing display type");
-
 	i = arg_getattr(MDOC_Offset, node->parent);
-	if (-1 != i) {
-		if (1 != node->parent->args->argv[i].sz)
-			errx(1, "expected single value");
+	if (-1 != i)
 		p->offset += arg_offset(&node->parent->args->argv[i]);
-	}
 
 	switch (type) {
 	case (MDOC_Literal):
@@ -1620,21 +1635,11 @@ termp_bd_pre(DECL_ARGS)
 		return(1);
 	}
 
-	/*
-	 * Tricky.  Iterate through all children.  If we're on a
-	 * different parse line, append a newline and then the contents.
-	 * Ew.
-	 */
-
-	ln = node->child ? node->child->line : 0;
-
 	for (node = node->child; node; node = node->next) {
-		if (ln < node->line) {
-			term_flushln(p);
-			p->flags |= TERMP_NOSPACE;
-		}
-		ln = node->line;
+		p->flags |= TERMP_NOSPACE;
 		print_node(p, pair, meta, node);
+		if (node->next)
+			term_flushln(p);
 	}
 
 	return(0);
@@ -1648,6 +1653,7 @@ termp_bd_post(DECL_ARGS)
 
 	if (MDOC_BODY != node->type) 
 		return;
+	p->flags |= TERMP_NOSPACE;
 	term_flushln(p);
 }