===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_man.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -c -r1.52 -r1.53
*** src/usr.bin/mandoc/mdoc_man.c	2013/10/07 22:21:56	1.52
--- src/usr.bin/mandoc/mdoc_man.c	2013/12/24 20:45:21	1.53
***************
*** 1,4 ****
! /*	$Id: mdoc_man.c,v 1.52 2013/10/07 22:21:56 schwarze Exp $ */
  /*
   * Copyright (c) 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
   *
--- 1,4 ----
! /*	$Id: mdoc_man.c,v 1.53 2013/12/24 20:45:21 schwarze Exp $ */
  /*
   * Copyright (c) 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
   *
***************
*** 701,724 ****
  pre_sect(DECL_ARGS)
  {
  
! 	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);
  }
--- 701,712 ----
  pre_sect(DECL_ARGS)
  {
  
! 	if (MDOC_HEAD == n->type) {
  		outflags |= MMAN_sp;
  		print_block(manacts[n->tok].prefix, 0);
  		print_word("");
  		putchar('\"');
  		outflags &= ~MMAN_spc;
  	}
  	return(1);
  }
***************
*** 896,902 ****
  post_bk(DECL_ARGS)
  {
  
! 	if (MDOC_BODY == n->type && ! (MDOC_SYNPRETTY & n->flags))
  		outflags &= ~MMAN_Bk;
  }
  
--- 884,890 ----
  post_bk(DECL_ARGS)
  {
  
! 	if (MDOC_BODY == n->type)
  		outflags &= ~MMAN_Bk;
  }
  
***************
*** 1404,1411 ****
  {
  	char	*name;
  
! 	if (MDOC_BLOCK == n->type)
  		pre_syn(n);
  	if (MDOC_ELEM != n->type && MDOC_HEAD != n->type)
  		return(1);
  	name = n->child ? n->child->string : meta->name;
--- 1392,1401 ----
  {
  	char	*name;
  
! 	if (MDOC_BLOCK == n->type) {
! 		outflags |= MMAN_Bk;
  		pre_syn(n);
+ 	}
  	if (MDOC_ELEM != n->type && MDOC_HEAD != n->type)
  		return(1);
  	name = n->child ? n->child->string : meta->name;
***************
*** 1428,1436 ****
  post_nm(DECL_ARGS)
  {
  
! 	if (MDOC_ELEM != n->type && MDOC_HEAD != n->type)
! 		return;
! 	font_pop();
  }
  
  static int
--- 1418,1435 ----
  post_nm(DECL_ARGS)
  {
  
! 	switch (n->type) {
! 	case (MDOC_BLOCK):
! 		outflags &= ~MMAN_Bk;
! 		break;
! 	case (MDOC_HEAD):
! 		/* FALLTHROUGH */
! 	case (MDOC_ELEM):
! 		font_pop();
! 		break;
! 	default:
! 		break;
! 	}
  }
  
  static int