===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_man.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/mandoc/mdoc_man.c	2012/07/07 13:51:03	1.9
--- src/usr.bin/mandoc/mdoc_man.c	2012/07/07 13:56:19	1.10
***************
*** 1,4 ****
! /*	$Id: mdoc_man.c,v 1.9 2012/07/07 13:51:03 schwarze Exp $ */
  /*
   * Copyright (c) 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>
   *
--- 1,4 ----
! /*	$Id: mdoc_man.c,v 1.10 2012/07/07 13:56:19 schwarze Exp $ */
  /*
   * Copyright (c) 2011, 2012 Ingo Schwarze <schwarze@openbsd.org>
   *
***************
*** 31,36 ****
--- 31,37 ----
  struct	mman {
  	int		  mode_space; /* spacing mode: 1 = on */
  	int		  need_space; /* next word needs prior ws */
+ 	int		  mode_keep; /* currently inside a keep */
  	int		  need_nl; /* next word needs prior nl */
  };
  
***************
*** 45,50 ****
--- 46,52 ----
  static	int	  cond_body(DECL_ARGS);
  static	int	  cond_head(DECL_ARGS);
  static	void	  post_bd(DECL_ARGS);
+ static	void	  post_bk(DECL_ARGS);
  static	void	  post_dl(DECL_ARGS);
  static	void	  post_enc(DECL_ARGS);
  static	void	  post_nm(DECL_ARGS);
***************
*** 54,59 ****
--- 56,62 ----
  static	void	  post_sp(DECL_ARGS);
  static	int	  pre_ap(DECL_ARGS);
  static	int	  pre_bd(DECL_ARGS);
+ static	int	  pre_bk(DECL_ARGS);
  static	int	  pre_br(DECL_ARGS);
  static	int	  pre_bx(DECL_ARGS);
  static	int	  pre_dl(DECL_ARGS);
***************
*** 178,185 ****
  	{ NULL, NULL, NULL, NULL, NULL }, /* _Fc */
  	{ cond_body, pre_enc, post_enc, "[", "]" }, /* Oo */
  	{ NULL, NULL, NULL, NULL, NULL }, /* Oc */
! 	{ NULL, NULL, NULL, NULL, NULL }, /* _Bk */
! 	{ NULL, NULL, NULL, NULL, NULL }, /* _Ek */
  	{ NULL, pre_ux, NULL, "is currently in beta test.", NULL }, /* Bt */
  	{ NULL, NULL, NULL, NULL, NULL }, /* Hf */
  	{ NULL, NULL, NULL, NULL, NULL }, /* Fr */
--- 181,188 ----
  	{ NULL, NULL, NULL, NULL, NULL }, /* _Fc */
  	{ cond_body, pre_enc, post_enc, "[", "]" }, /* Oo */
  	{ NULL, NULL, NULL, NULL, NULL }, /* Oc */
! 	{ NULL, pre_bk, post_bk, NULL, NULL }, /* Bk */
! 	{ NULL, NULL, NULL, NULL, NULL }, /* Ek */
  	{ NULL, pre_ux, NULL, "is currently in beta test.", NULL }, /* Bt */
  	{ NULL, NULL, NULL, NULL, NULL }, /* Hf */
  	{ NULL, NULL, NULL, NULL, NULL }, /* Fr */
***************
*** 221,228 ****
  		 * (2) a word that is non-punctuation; and
  		 * (3) if punctuation, non-terminating puncutation.
  		 */
! 		if (NULL == strchr(".,:;)]?!", s[0]) || '\0' != s[1])
! 			putchar(' ');
  
  	/*
  	 * Reassign needing space if we're not following opening
--- 224,236 ----
  		 * (2) a word that is non-punctuation; and
  		 * (3) if punctuation, non-terminating puncutation.
  		 */
! 		if (NULL == strchr(".,:;)]?!", s[0]) || '\0' != s[1]) {
! 			if (mm->mode_keep) {
! 				putchar('\\');
! 				putchar('~');
! 			} else 
! 				putchar(' ');
! 		}
  
  	/*
  	 * Reassign needing space if we're not following opening
***************
*** 498,503 ****
--- 506,534 ----
  		print_word(mm, ".fi");
  	}
  	mm->need_nl = 1;
+ }
+ 
+ static int
+ pre_bk(DECL_ARGS)
+ {
+ 
+ 	switch (n->type) {
+ 	case (MDOC_BLOCK):
+ 		return(1);
+ 	case (MDOC_BODY):
+ 		mm->mode_keep = 1;
+ 		return(1);
+ 	default:
+ 		return(0);
+ 	}
+ }
+ 
+ static void
+ post_bk(DECL_ARGS)
+ {
+ 
+ 	if (MDOC_BODY == n->type)
+ 		mm->mode_keep = 0;
  }
  
  static int