===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_term.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -c -r1.145 -r1.146
*** src/usr.bin/mandoc/mdoc_term.c	2012/07/11 16:55:29	1.145
--- src/usr.bin/mandoc/mdoc_term.c	2012/11/16 17:16:29	1.146
***************
*** 1,4 ****
! /*	$Id: mdoc_term.c,v 1.145 2012/07/11 16:55:29 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$Id: mdoc_term.c,v 1.146 2012/11/16 17:16:29 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 38,44 ****
  #define	DECL_ARGS struct termp *p, \
  		  struct termpair *pair, \
  	  	  const struct mdoc_meta *m, \
! 		  const struct mdoc_node *n
  
  struct	termact {
  	int	(*pre)(DECL_ARGS);
--- 38,44 ----
  #define	DECL_ARGS struct termp *p, \
  		  struct termpair *pair, \
  	  	  const struct mdoc_meta *m, \
! 		  struct mdoc_node *n
  
  struct	termact {
  	int	(*pre)(DECL_ARGS);
***************
*** 289,302 ****
  print_mdoc_node(DECL_ARGS)
  {
  	int		 chld;
- 	const void	*font;
  	struct termpair	 npair;
  	size_t		 offset, rmargin;
  
  	chld = 1;
  	offset = p->offset;
  	rmargin = p->rmargin;
! 	font = term_fontq(p);
  
  	memset(&npair, 0, sizeof(struct termpair));
  	npair.ppair = pair;
--- 289,301 ----
  print_mdoc_node(DECL_ARGS)
  {
  	int		 chld;
  	struct termpair	 npair;
  	size_t		 offset, rmargin;
  
  	chld = 1;
  	offset = p->offset;
  	rmargin = p->rmargin;
! 	n->prev_font = term_fontq(p);
  
  	memset(&npair, 0, sizeof(struct termpair));
  	npair.ppair = pair;
***************
*** 362,368 ****
  	if (chld && n->child)
  		print_mdoc_nodelist(p, &npair, m, n->child);
  
! 	term_fontpopq(p, font);
  
  	switch (n->type) {
  	case (MDOC_TEXT):
--- 361,368 ----
  	if (chld && n->child)
  		print_mdoc_nodelist(p, &npair, m, n->child);
  
! 	term_fontpopq(p,
! 	    (ENDBODY_NOT == n->end ? n : n->pending)->prev_font);
  
  	switch (n->type) {
  	case (MDOC_TEXT):
***************
*** 1602,1608 ****
  termp_bd_pre(DECL_ARGS)
  {
  	size_t			 tabwidth, rm, rmax;
! 	const struct mdoc_node	*nn;
  
  	if (MDOC_BLOCK == n->type) {
  		print_bvspace(p, n, n);
--- 1602,1608 ----
  termp_bd_pre(DECL_ARGS)
  {
  	size_t			 tabwidth, rm, rmax;
! 	struct mdoc_node	*nn;
  
  	if (MDOC_BLOCK == n->type) {
  		print_bvspace(p, n, n);
***************
*** 2071,2077 ****
  
  	if (MDOC_HEAD == n->type)
  		return(0);
! 	else if (MDOC_BLOCK != n->type)
  		return(1);
  
  	if (FONT_Em == n->norm->Bf.font) 
--- 2071,2077 ----
  
  	if (MDOC_HEAD == n->type)
  		return(0);
! 	else if (MDOC_BODY != n->type)
  		return(1);
  
  	if (FONT_Em == n->norm->Bf.font)