===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_term.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -c -r1.41 -r1.42
*** src/usr.bin/mandoc/mdoc_term.c	2009/08/09 17:38:24	1.41
--- src/usr.bin/mandoc/mdoc_term.c	2009/08/09 18:43:28	1.42
***************
*** 1,4 ****
! /*	$Id: mdoc_term.c,v 1.41 2009/08/09 17:38:24 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
--- 1,4 ----
! /*	$Id: mdoc_term.c,v 1.42 2009/08/09 18:43:28 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
***************
*** 808,825 ****
  	 * while diagonal bodies need two.
  	 */
  
  	switch (type) {
  	case (MDOC_Inset):
  		if (MDOC_BODY == node->type) 
! 			p->flags &= ~TERMP_NOSPACE;
! 		else
! 			p->flags |= TERMP_NOSPACE;
  		break;
  	default:
- 		p->flags |= TERMP_NOSPACE;
  		break;
  	}
  
  	/*
  	 * Style flags.  Diagnostic heads need TTYPE_DIAG.
  	 */
--- 808,829 ----
  	 * while diagonal bodies need two.
  	 */
  
+ 	p->flags |= TERMP_NOSPACE;
+ 
  	switch (type) {
+ 	case (MDOC_Diag):
+ 		term_word(p, "\\ \\ ");
+ 		break;
  	case (MDOC_Inset):
  		if (MDOC_BODY == node->type) 
! 			term_word(p, "\\ ");
  		break;
  	default:
  		break;
  	}
  
+ 	p->flags |= TERMP_NOSPACE;
+ 
  	/*
  	 * Style flags.  Diagnostic heads need TTYPE_DIAG.
  	 */
***************
*** 865,871 ****
  		break;
  	case (MDOC_Tag):
  		if (MDOC_HEAD == node->type)
! 			p->flags |= TERMP_NOBREAK;
  		else
  			p->flags |= TERMP_NOLPAD;
  
--- 869,875 ----
  		break;
  	case (MDOC_Tag):
  		if (MDOC_HEAD == node->type)
! 			p->flags |= TERMP_NOBREAK | TERMP_TWOSPACE;
  		else
  			p->flags |= TERMP_NOLPAD;