===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_man.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -c -r1.82 -r1.83
*** src/usr.bin/mandoc/mdoc_man.c	2015/02/01 23:10:15	1.82
--- src/usr.bin/mandoc/mdoc_man.c	2015/02/06 03:31:11	1.83
***************
*** 1,4 ****
! /*	$OpenBSD: mdoc_man.c,v 1.82 2015/02/01 23:10:15 schwarze Exp $ */
  /*
   * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: mdoc_man.c,v 1.83 2015/02/06 03:31:11 schwarze Exp $ */
  /*
   * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
   *
***************
*** 1282,1293 ****
  		pre_syn(n);
  		break;
  	case MDOC_HEAD:
  		if (MDOC_SYNPRETTY & n->flags)
  			print_block(".HP 4n", MMAN_nl);
  		font_push('B');
  		break;
  	case MDOC_BODY:
! 		outflags &= ~MMAN_spc;
  		print_word("(");
  		outflags &= ~MMAN_spc;
  		break;
--- 1282,1295 ----
  		pre_syn(n);
  		break;
  	case MDOC_HEAD:
+ 		if (n->child == NULL)
+ 			return(0);
  		if (MDOC_SYNPRETTY & n->flags)
  			print_block(".HP 4n", MMAN_nl);
  		font_push('B');
  		break;
  	case MDOC_BODY:
! 		outflags &= ~(MMAN_spc | MMAN_nl);
  		print_word("(");
  		outflags &= ~MMAN_spc;
  		break;
***************
*** 1303,1309 ****
  
  	switch (n->type) {
  	case MDOC_HEAD:
! 		font_pop();
  		break;
  	case MDOC_BODY:
  		post_fn(meta, n);
--- 1305,1312 ----
  
  	switch (n->type) {
  	case MDOC_HEAD:
! 		if (n->child != NULL)
! 			font_pop();
  		break;
  	case MDOC_BODY:
  		post_fn(meta, n);