===================================================================
RCS file: /cvs/mandoc/mdoc_man.c,v
retrieving revision 1.71
retrieving revision 1.73
diff -u -p -r1.71 -r1.73
--- mandoc/mdoc_man.c	2014/10/30 20:10:02	1.71
+++ mandoc/mdoc_man.c	2014/11/17 06:44:58	1.73
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_man.c,v 1.71 2014/10/30 20:10:02 schwarze Exp $ */
+/*	$Id: mdoc_man.c,v 1.73 2014/11/17 06:44:58 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -594,7 +594,11 @@ print_node(DECL_ARGS)
 			printf("\\&");
 			outflags &= ~MMAN_spc;
 		}
+		if (outflags & MMAN_Sm && ! (n->flags & MDOC_DELIMC))
+			outflags |= MMAN_spc_force;
 		print_word(n->string);
+		if (outflags & MMAN_Sm && ! (n->flags & MDOC_DELIMO))
+			outflags |= MMAN_spc;
 	} else {
 		/*
 		 * Conditionally run the pre-node action handler for a
@@ -1340,7 +1344,7 @@ pre_it(DECL_ARGS)
 			outflags |= MMAN_nl;
 			font_push('B');
 			if (LIST_bullet == bln->norm->Bl.type)
-				print_word("o");
+				print_word("\\(bu");
 			else
 				print_word("-");
 			font_pop();