===================================================================
RCS file: /cvs/mandoc/roff_term.c,v
retrieving revision 1.17
retrieving revision 1.19
diff -u -p -r1.17 -r1.19
--- mandoc/roff_term.c	2018/12/16 00:17:02	1.17
+++ mandoc/roff_term.c	2019/01/04 03:24:33	1.19
@@ -1,6 +1,6 @@
-/*	$Id: roff_term.c,v 1.17 2018/12/16 00:17:02 schwarze Exp $ */
+/*	$Id: roff_term.c,v 1.19 2019/01/04 03:24:33 schwarze Exp $ */
 /*
- * Copyright (c) 2010,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010,2014,2015,2017-2019 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -42,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 */
@@ -67,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;
 	}
 }
 
@@ -75,27 +79,16 @@ static void
 roff_term_pre_ce(ROFF_TERM_ARGS)
 {
 	const struct roff_node	*nc1, *nc2;
-	size_t			 len, lm;
 
 	roff_term_pre_br(p, n);
-	lm = p->tcol->offset;
+	p->flags |= n->tok == ROFF_ce ? TERMP_CENTER : TERMP_RIGHT;
 	nc1 = n->child->next;
 	while (nc1 != NULL) {
 		nc2 = nc1;
-		len = 0;
 		do {
-			if (nc2->type == ROFFT_TEXT) {
-				if (len)
-					len++;
-				len += term_strlen(p, nc2->string);
-			}
 			nc2 = nc2->next;
 		} while (nc2 != NULL && (nc2->type != ROFFT_TEXT ||
 		    (nc2->flags & NODE_LINE) == 0));
-		p->tcol->offset = len >= p->tcol->rmargin ? 0 :
-		    lm + len >= p->tcol->rmargin ? p->tcol->rmargin - len :
-		    n->tok == ROFF_rj ? p->tcol->rmargin - len :
-		    (lm + p->tcol->rmargin - len) / 2;
 		while (nc1 != nc2) {
 			if (nc1->type == ROFFT_TEXT)
 				term_word(p, nc1->string);
@@ -106,7 +99,7 @@ roff_term_pre_ce(ROFF_TERM_ARGS)
 		p->flags |= TERMP_NOSPACE;
 		term_flushln(p);
 	}
-	p->tcol->offset = lm;
+	p->flags &= ~(TERMP_CENTER | TERMP_RIGHT);
 }
 
 static void