===================================================================
RCS file: /cvs/mandoc/term.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- mandoc/term.c	2009/03/04 14:13:05	1.40
+++ mandoc/term.c	2009/03/04 14:41:40	1.41
@@ -1,4 +1,4 @@
-/* $Id: term.c,v 1.40 2009/03/04 14:13:05 kristaps Exp $ */
+/* $Id: term.c,v 1.41 2009/03/04 14:41:40 kristaps Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -536,6 +536,10 @@ termp_it_pre(DECL_ARGS)
 			p->flags |= TERMP_NOBREAK;
 		else
 			p->flags |= TERMP_NOLPAD;
+		if (MDOC_HEAD == node->type && MDOC_Tag == type)
+			if (NULL == node->next ||
+					NULL == node->next->child)
+				p->flags |= TERMP_NONOBREAK;
 		break;
 	case (MDOC_Diag):
 		if (MDOC_HEAD == node->type)
@@ -1662,6 +1666,7 @@ static int
 termp__t_pre(DECL_ARGS)
 {
 
+	/* FIXME: titles are underlined. */
 	word(p, "\"");
 	p->flags |= TERMP_NOSPACE;
 	return(1);
@@ -1674,6 +1679,7 @@ termp__t_post(DECL_ARGS)
 {
 
 	p->flags |= TERMP_NOSPACE;
+	/* FIXME: titles are underlined. */
 	word(p, "\"");
 	word(p, node->next ? "," : ".");
 }