===================================================================
RCS file: /cvs/mandoc/roff_term.c,v
retrieving revision 1.15
retrieving revision 1.18
diff -u -p -r1.15 -r1.18
--- mandoc/roff_term.c	2018/08/10 20:40:45	1.15
+++ mandoc/roff_term.c	2018/12/31 07:08:12	1.18
@@ -1,4 +1,4 @@
-/*	$Id: roff_term.c,v 1.15 2018/08/10 20:40:45 schwarze Exp $ */
+/*	$Id: roff_term.c,v 1.18 2018/12/31 07:08:12 schwarze Exp $ */
 /*
  * Copyright (c) 2010,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -17,7 +17,8 @@
 #include <sys/types.h>
 
 #include <assert.h>
-#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
 
 #include "mandoc.h"
 #include "roff.h"
@@ -41,9 +42,11 @@ static	void	  roff_term_pre_ti(ROFF_TERM_ARGS);
 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 */
@@ -66,7 +69,9 @@ roff_term_pre_br(ROFF_TERM_ARGS)
 	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;
 	}
 }
 
@@ -113,25 +118,22 @@ roff_term_pre_ft(ROFF_TERM_ARGS)
 {
 	const char	*cp;
 
-	if (*(cp = n->child->string) == 'C')
-		cp++;
-
-	switch (*cp) {
-	case '4':
-	case '3':
-	case 'B':
+	cp = n->child->string;
+	switch (mandoc_font(cp, (int)strlen(cp))) {
+	case ESCAPE_FONTBOLD:
 		term_fontrepl(p, TERMFONT_BOLD);
 		break;
-	case '2':
-	case 'I':
+	case ESCAPE_FONTITALIC:
 		term_fontrepl(p, TERMFONT_UNDER);
 		break;
-	case 'P':
+	case ESCAPE_FONTBI:
+		term_fontrepl(p, TERMFONT_BI);
+		break;
+	case ESCAPE_FONTPREV:
 		term_fontlast(p);
 		break;
-	case '1':
-	case 'C':
-	case 'R':
+	case ESCAPE_FONTROMAN:
+	case ESCAPE_FONTCW:
 		term_fontrepl(p, TERMFONT_NONE);
 		break;
 	default: