===================================================================
RCS file: /cvs/mandoc/mdoc_man.c,v
retrieving revision 1.43
retrieving revision 1.46
diff -u -p -r1.43 -r1.46
--- mandoc/mdoc_man.c	2012/11/18 18:02:23	1.43
+++ mandoc/mdoc_man.c	2012/11/19 02:14:45	1.46
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_man.c,v 1.43 2012/11/18 18:02:23 schwarze Exp $ */
+/*	$Id: mdoc_man.c,v 1.46 2012/11/19 02:14:45 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -251,8 +251,10 @@ static	int		outflags;
 #define	MMAN_PP		(1 << 5)  /* reset indentation etc. */
 #define	MMAN_Sm		(1 << 6)  /* horizontal spacing mode */
 #define	MMAN_Bk		(1 << 7)  /* word keep mode */
-#define	MMAN_An_split	(1 << 8)  /* author mode is "split" */
-#define	MMAN_An_nosplit	(1 << 9)  /* author mode is "nosplit" */
+#define	MMAN_Bk_susp	(1 << 8)  /* suspend this (after a macro) */
+#define	MMAN_An_split	(1 << 9)  /* author mode is "split" */
+#define	MMAN_An_nosplit	(1 << 10) /* author mode is "nosplit" */
+#define	MMAN_PD		(1 << 11) /* inter-paragraph spacing disabled */
 
 #define	BL_STACK_MAX	32
 
@@ -304,8 +306,15 @@ print_word(const char *s)
 		 * If we need a newline, print it now and start afresh.
 		 */
 		if (MMAN_PP & outflags) {
-			if ( ! (MMAN_sp & outflags))
-				printf("\n.sp -1v");
+			if (MMAN_sp & outflags) {
+				if (MMAN_PD & outflags) {
+					printf("\n.PD");
+					outflags &= ~MMAN_PD;
+				}
+			} else if ( ! (MMAN_PD & outflags)) {
+				printf("\n.PD 0");
+				outflags |= MMAN_PD;
+			}
 			printf("\n.PP\n");
 		} else if (MMAN_sp & outflags)
 			printf("\n.sp\n");
@@ -326,11 +335,10 @@ print_word(const char *s)
 		 */
 		if (MMAN_spc_force & outflags || '\0' == s[0] ||
 		    NULL == strchr(".,:;)]?!", s[0]) || '\0' != s[1]) {
-			if (MMAN_Bk & outflags) {
+			if (MMAN_Bk & outflags &&
+			    ! (MMAN_Bk_susp & outflags))
 				putchar('\\');
-				putchar('~');
-			} else 
-				putchar(' ');
+			putchar(' ');
 			if (TPremain)
 				TPremain--;
 		}
@@ -345,12 +353,12 @@ print_word(const char *s)
 		outflags |= MMAN_spc;
 	else
 		outflags &= ~MMAN_spc;
-	outflags &= ~MMAN_spc_force;
+	outflags &= ~(MMAN_spc_force | MMAN_Bk_susp);
 
 	for ( ; *s; s++) {
 		switch (*s) {
 		case (ASCII_NBRSP):
-			printf("\\~");
+			printf("\\ ");
 			break;
 		case (ASCII_HYPH):
 			putchar('-');
@@ -379,13 +387,17 @@ print_block(const char *s, int newflags)
 {
 
 	outflags &= ~MMAN_PP;
-	if (MMAN_sp & outflags)
+	if (MMAN_sp & outflags) {
 		outflags &= ~(MMAN_sp | MMAN_br);
-	else
-		print_line(".sp -1v", 0);
+		if (MMAN_PD & outflags) {
+			print_line(".PD", 0);
+			outflags &= ~MMAN_PD;
+		}
+	} else if (! (MMAN_PD & outflags))
+		print_line(".PD 0", MMAN_PD);
 	outflags |= MMAN_nl;
 	print_word(s);
-	outflags |= newflags;
+	outflags |= MMAN_Bk_susp | newflags;
 }
 
 static void
@@ -463,7 +475,7 @@ print_width(const char *v, const struct mdoc_node *chi
 	 * preserve its indentation.
 	 */
 	if (Bl_stack_len && Bl_stack[Bl_stack_len - 1]) {
-		print_line(".RS", 0);
+		print_line(".RS", MMAN_Bk_susp);
 		snprintf(buf, sizeof(buf), "%ldn",
 				Bl_stack[Bl_stack_len - 1]);
 		print_word(buf);
@@ -521,10 +533,13 @@ man_mdoc(void *arg, const struct mdoc *mdoc)
 	meta = mdoc_meta(mdoc);
 	n = mdoc_node(mdoc);
 
-	printf(".TH \"%s\" \"%s\" \"%s\" \"%s\" \"%s\"",
+	printf(".TH \"%s\" \"%s\" \"%s\" \"%s\" \"%s\"\n",
 			meta->title, meta->msec, meta->date,
 			meta->os, meta->vol);
 
+	/* Disable hyphenation and if nroff, disable justification. */
+	printf(".nh\n.if n .ad l");
+
 	outflags = MMAN_nl | MMAN_Sm;
 	if (0 == fontqueue.size) {
 		fontqueue.size = 8;
@@ -541,7 +556,7 @@ print_node(DECL_ARGS)
 	const struct mdoc_node	*prev, *sub;
 	const struct manact	*act;
 	int			 cond, do_sub;
-	
+
 	/*
 	 * Break the line if we were parsed subsequent the current node.
 	 * This makes the page structure be more consistent.
@@ -691,13 +706,25 @@ static int
 pre_sect(DECL_ARGS)
 {
 
-	if (MDOC_HEAD != n->type)
-		return(1);
-	outflags |= MMAN_sp;
-	print_block(manacts[n->tok].prefix, 0);
-	print_word("");
-	putchar('\"');
-	outflags &= ~MMAN_spc;
+	switch (n->type) {
+	case (MDOC_HEAD):
+		outflags |= MMAN_sp;
+		print_block(manacts[n->tok].prefix, 0);
+		print_word("");
+		putchar('\"');
+		outflags &= ~MMAN_spc;
+		break;
+	case (MDOC_BODY):
+		if (MDOC_Sh == n->tok) {
+			if (MDOC_SYNPRETTY & n->flags)
+				outflags |= MMAN_Bk;
+			else
+				outflags &= ~MMAN_Bk;
+		}
+		break;
+	default:
+		break;
+	}
 	return(1);
 }
 
@@ -802,7 +829,7 @@ pre_bd(DECL_ARGS)
 		print_line(".nf", 0);
 	if (0 == n->norm->Bd.comp && NULL != n->parent->prev)
 		outflags |= MMAN_sp;
-	print_line(".RS", 0);
+	print_line(".RS", MMAN_Bk_susp);
 	print_offs(n->norm->Bd.offs);
 	outflags |= MMAN_nl;
 	return(1);
@@ -826,7 +853,7 @@ post_bd(DECL_ARGS)
 	 */
 	if (NULL != n->parent->next &&
 	    Bl_stack_len && Bl_stack[Bl_stack_len - 1]) {
-		print_line(".RS", 0);
+		print_line(".RS", MMAN_Bk_susp);
 		snprintf(buf, sizeof(buf), "%ldn",
 				Bl_stack[Bl_stack_len - 1]);
 		print_word(buf);
@@ -1039,7 +1066,7 @@ pre_fl(DECL_ARGS)
 {
 
 	font_push('B');
-	print_word("-");
+	print_word("\\-");
 	outflags &= ~MMAN_spc;
 	return(1);
 }
@@ -1517,7 +1544,7 @@ pre_ux(DECL_ARGS)
 	if (NULL == n->child)
 		return(0);
 	outflags &= ~MMAN_spc;
-	print_word("\\~");
+	print_word("\\ ");
 	outflags &= ~MMAN_spc;
 	return(1);
 }