===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/roff_term.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -c -r1.10 -r1.11
*** src/usr.bin/mandoc/roff_term.c	2017/06/08 12:54:40	1.10
--- src/usr.bin/mandoc/roff_term.c	2017/06/14 13:00:13	1.11
***************
*** 1,4 ****
! /*	$OpenBSD: roff_term.c,v 1.10 2017/06/08 12:54:40 schwarze Exp $ */
  /*
   * Copyright (c) 2010, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: roff_term.c,v 1.11 2017/06/14 13:00:13 schwarze Exp $ */
  /*
   * Copyright (c) 2010, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
   *
***************
*** 42,47 ****
--- 42,48 ----
  	roff_term_pre_ft,  /* ft */
  	roff_term_pre_ll,  /* ll */
  	roff_term_pre_mc,  /* mc */
+ 	roff_term_pre_ce,  /* rj */
  	roff_term_pre_sp,  /* sp */
  	roff_term_pre_ta,  /* ta */
  	roff_term_pre_ti,  /* ti */
***************
*** 69,101 ****
  static void
  roff_term_pre_ce(ROFF_TERM_ARGS)
  {
! 	const struct roff_node	*nch;
  	size_t			 len, lm;
  
  	roff_term_pre_br(p, n);
  	lm = p->tcol->offset;
! 	n = n->child->next;
! 	while (n != NULL) {
! 		nch = n;
  		len = 0;
  		do {
! 			if (n->type == ROFFT_TEXT) {
  				if (len)
  					len++;
! 				len += term_strlen(p, nch->string);
  			}
! 			nch = nch->next;
! 		} while (nch != NULL && (n->type != ROFFT_TEXT ||
! 		    (n->flags & NODE_LINE) == 0));
  		p->tcol->offset = len >= p->tcol->rmargin ? 0 :
  		    lm + len >= p->tcol->rmargin ? p->tcol->rmargin - len :
  		    (lm + p->tcol->rmargin - len) / 2;
! 		while (n != nch) {
! 			if (n->type == ROFFT_TEXT)
! 				term_word(p, n->string);
  			else
! 				roff_term_pre(p, n);
! 			n = n->next;
  		}
  		p->flags |= TERMP_NOSPACE;
  		term_flushln(p);
--- 70,103 ----
  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;
! 	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);
  			else
! 				roff_term_pre(p, nc1);
! 			nc1 = nc1->next;
  		}
  		p->flags |= TERMP_NOSPACE;
  		term_flushln(p);