===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_term.c,v
retrieving revision 1.170
retrieving revision 1.171
diff -c -r1.170 -r1.171
*** src/usr.bin/mandoc/mdoc_term.c	2014/07/02 03:47:07	1.170
--- src/usr.bin/mandoc/mdoc_term.c	2014/07/02 19:54:39	1.171
***************
*** 1,4 ****
! /*	$Id: mdoc_term.c,v 1.170 2014/07/02 03:47:07 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$Id: mdoc_term.c,v 1.171 2014/07/02 19:54:39 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 2052,2064 ****
  termp_sm_pre(DECL_ARGS)
  {
  
! 	assert(n->child && MDOC_TEXT == n->child->type);
! 	if (0 == strcmp("on", n->child->string)) {
! 		if (p->col)
! 			p->flags &= ~TERMP_NOSPACE;
  		p->flags &= ~TERMP_NONOSPACE;
! 	} else
  		p->flags |= TERMP_NONOSPACE;
  
  	return(0);
  }
--- 2052,2066 ----
  termp_sm_pre(DECL_ARGS)
  {
  
! 	if (NULL == n->child)
! 		p->flags ^= TERMP_NONOSPACE;
! 	else if (0 == strcmp("on", n->child->string))
  		p->flags &= ~TERMP_NONOSPACE;
! 	else
  		p->flags |= TERMP_NONOSPACE;
+ 
+ 	if (p->col && ! (TERMP_NONOSPACE & p->flags))
+ 		p->flags &= ~TERMP_NOSPACE;
  
  	return(0);
  }