===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_term.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- src/usr.bin/mandoc/mdoc_term.c	2009/07/07 00:42:04	1.22
+++ src/usr.bin/mandoc/mdoc_term.c	2009/07/12 23:19:48	1.23
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.22 2009/07/07 00:42:04 schwarze Exp $ */
+/*	$Id: mdoc_term.c,v 1.23 2009/07/12 23:19:48 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -1833,8 +1833,12 @@
 termp_in_pre(DECL_ARGS)
 {
 
+	/* XXX This conforms to new-groff style. */
 	TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_INCLUDE]);
-	term_word(p, "#include");
+
+	if (SEC_SYNOPSIS == node->sec)
+		term_word(p, "#include");
+
 	term_word(p, "<");
 	p->flags |= TERMP_NOSPACE;
 	return(1);
@@ -1849,9 +1853,16 @@
 	p->flags |= TERMP_NOSPACE;
 	term_word(p, ">");
 
-	term_newln(p);
 	if (SEC_SYNOPSIS != node->sec)
 		return;
+
+	term_newln(p);
+	/* 
+	 * XXX Not entirely correct.  If `.In foo bar' is specified in
+	 * the SYNOPSIS section, then it produces a single break after
+	 * the <foo>; mandoc asserts a vertical space.  Since this
+	 * construction is rarely used, I think it's fine.
+	 */
 	if (node->next && MDOC_In != node->next->tok)
 		term_vspace(p);
 }