===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_man.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -c -r1.99 -r1.100
*** src/usr.bin/mandoc/mdoc_man.c	2017/01/11 17:39:45	1.99
--- src/usr.bin/mandoc/mdoc_man.c	2017/02/06 03:41:44	1.100
***************
*** 1,4 ****
! /*	$OpenBSD: mdoc_man.c,v 1.99 2017/01/11 17:39:45 schwarze Exp $ */
  /*
   * Copyright (c) 2011-2017 Ingo Schwarze <schwarze@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: mdoc_man.c,v 1.100 2017/02/06 03:41:44 schwarze Exp $ */
  /*
   * Copyright (c) 2011-2017 Ingo Schwarze <schwarze@openbsd.org>
   *
***************
*** 1516,1522 ****
  	}
  	if (n->type != ROFFT_ELEM && n->type != ROFFT_HEAD)
  		return 1;
! 	name = n->child ? n->child->string : meta->name;
  	if (NULL == name)
  		return 0;
  	if (n->type == ROFFT_HEAD) {
--- 1516,1522 ----
  	}
  	if (n->type != ROFFT_ELEM && n->type != ROFFT_HEAD)
  		return 1;
! 	name = n->child == NULL ? NULL : n->child->string;
  	if (NULL == name)
  		return 0;
  	if (n->type == ROFFT_HEAD) {
***************
*** 1527,1534 ****
  		outflags |= MMAN_nl;
  	}
  	font_push('B');
- 	if (NULL == n->child)
- 		print_word(meta->name);
  	return 1;
  }
  
--- 1527,1532 ----
***************
*** 1542,1548 ****
  		break;
  	case ROFFT_HEAD:
  	case ROFFT_ELEM:
! 		if (n->child != NULL || meta->name != NULL)
  			font_pop();
  		break;
  	default:
--- 1540,1546 ----
  		break;
  	case ROFFT_HEAD:
  	case ROFFT_ELEM:
! 		if (n->child != NULL && n->child->string != NULL)
  			font_pop();
  		break;
  	default: