===================================================================
RCS file: /cvs/mandoc/mdoc_term.c,v
retrieving revision 1.21
retrieving revision 1.24
diff -u -p -r1.21 -r1.24
--- mandoc/mdoc_term.c	2009/07/05 19:25:10	1.21
+++ mandoc/mdoc_term.c	2009/07/12 08:49:50	1.24
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.21 2009/07/05 19:25:10 kristaps Exp $ */
+/*	$Id: mdoc_term.c,v 1.24 2009/07/12 08:49:50 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -1134,8 +1134,16 @@ termp_ex_pre(DECL_ARGS)
 static int
 termp_nd_pre(DECL_ARGS)
 {
-
+	/* 
+	 * XXX: signed off by jmc@openbsd.org.  This technically
+	 * produces a minus sign after the Nd, which is wrong, but is
+	 * consistent with the historic OpenBSD tmac file.
+	 */
+#ifdef __OpenBSD__
 	term_word(p, "\\-");
+#else
+	term_word(p, "\\(em");
+#endif
 	return(1);
 }
 
@@ -1838,8 +1846,12 @@ static int
 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);
@@ -1854,9 +1866,16 @@ termp_in_post(DECL_ARGS)
 	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);
 }