===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/roff_term.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -c -r1.17 -r1.18
*** src/usr.bin/mandoc/roff_term.c	2018/12/15 23:33:20	1.17
--- src/usr.bin/mandoc/roff_term.c	2018/12/31 07:07:43	1.18
***************
*** 1,4 ****
! /*	$OpenBSD: roff_term.c,v 1.17 2018/12/15 23:33:20 schwarze Exp $ */
  /*
   * Copyright (c) 2010,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: roff_term.c,v 1.18 2018/12/31 07:07:43 schwarze Exp $ */
  /*
   * Copyright (c) 2010,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
   *
***************
*** 42,50 ****
--- 42,52 ----
  static	const roff_term_pre_fp roff_term_pre_acts[ROFF_MAX] = {
  	roff_term_pre_br,  /* br */
  	roff_term_pre_ce,  /* ce */
+ 	roff_term_pre_br,  /* fi */
  	roff_term_pre_ft,  /* ft */
  	roff_term_pre_ll,  /* ll */
  	roff_term_pre_mc,  /* mc */
+ 	roff_term_pre_br,  /* nf */
  	roff_term_pre_po,  /* po */
  	roff_term_pre_ce,  /* rj */
  	roff_term_pre_sp,  /* sp */
***************
*** 67,73 ****
--- 69,77 ----
  	if (p->flags & TERMP_BRIND) {
  		p->tcol->offset = p->tcol->rmargin;
  		p->tcol->rmargin = p->maxrmargin;
+ 		p->trailspace = 0;
  		p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND);
+ 		p->flags |= TERMP_NOSPACE;
  	}
  }