===================================================================
RCS file: /cvs/mandoc/roff_term.c,v
retrieving revision 1.6
retrieving revision 1.12
diff -u -p -r1.6 -r1.12
--- mandoc/roff_term.c	2017/05/08 15:34:54	1.6
+++ mandoc/roff_term.c	2017/06/14 17:51:15	1.12
@@ -1,4 +1,4 @@
-/*	$OpenBSD: roff_term.c,v 1.6 2017/05/08 15:34:54 schwarze Exp $ */
+/*	$Id: roff_term.c,v 1.12 2017/06/14 17:51:15 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -28,16 +28,21 @@
 typedef	void	(*roff_term_pre_fp)(ROFF_TERM_ARGS);
 
 static	void	  roff_term_pre_br(ROFF_TERM_ARGS);
+static	void	  roff_term_pre_ce(ROFF_TERM_ARGS);
 static	void	  roff_term_pre_ft(ROFF_TERM_ARGS);
 static	void	  roff_term_pre_ll(ROFF_TERM_ARGS);
+static	void	  roff_term_pre_mc(ROFF_TERM_ARGS);
 static	void	  roff_term_pre_sp(ROFF_TERM_ARGS);
 static	void	  roff_term_pre_ta(ROFF_TERM_ARGS);
 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_ft,  /* ft */
-	roff_term_pre_ll,  /* 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 */
@@ -56,13 +61,51 @@ roff_term_pre_br(ROFF_TERM_ARGS)
 {
 	term_newln(p);
 	if (p->flags & TERMP_BRIND) {
-		p->offset = p->rmargin;
-		p->rmargin = p->maxrmargin;
+		p->tcol->offset = p->tcol->rmargin;
+		p->tcol->rmargin = p->maxrmargin;
 		p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND);
 	}
 }
 
 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);
+	}
+	p->tcol->offset = lm;
+}
+
+static void
 roff_term_pre_ft(ROFF_TERM_ARGS)
 {
 	switch (*n->child->string) {
@@ -95,13 +138,28 @@ roff_term_pre_ll(ROFF_TERM_ARGS)
 }
 
 static void
+roff_term_pre_mc(ROFF_TERM_ARGS)
+{
+	if (p->col) {
+		p->flags |= TERMP_NOBREAK;
+		term_flushln(p);
+		p->flags &= ~(TERMP_NOBREAK | TERMP_NOSPACE);
+	}
+	if (n->child != NULL) {
+		p->mc = n->child->string;
+		p->flags |= TERMP_NEWMC;
+	} else
+		p->flags |= TERMP_ENDMC;
+}
+
+static void
 roff_term_pre_sp(ROFF_TERM_ARGS)
 {
 	struct roffsu	 su;
 	int		 len;
 
 	if (n->child != NULL) {
-		if (a2roffsu(n->child->string, &su, SCALE_VS) == 0)
+		if (a2roffsu(n->child->string, &su, SCALE_VS) == NULL)
 			su.scale = 1.0;
 		len = term_vspan(p, &su);
 	} else
@@ -145,21 +203,21 @@ roff_term_pre_ti(ROFF_TERM_ARGS)
 	} else
 		sign = 0;
 
-	if (a2roffsu(cp, &su, SCALE_EM) == 0)
+	if (a2roffsu(cp, &su, SCALE_EM) == NULL)
 		return;
-	len = term_hspan(p, &su) / 24;
+	len = term_hen(p, &su);
 
 	if (sign == 0) {
-		p->ti = len - p->offset;
-		p->offset = len;
+		p->ti = len - p->tcol->offset;
+		p->tcol->offset = len;
 	} else if (sign == 1) {
 		p->ti = len;
-		p->offset += len;
-	} else if ((size_t)len < p->offset) {
+		p->tcol->offset += len;
+	} else if ((size_t)len < p->tcol->offset) {
 		p->ti = -len;
-		p->offset -= len;
+		p->tcol->offset -= len;
 	} else {
-		p->ti = -p->offset;
-		p->offset = 0;
+		p->ti = -p->tcol->offset;
+		p->tcol->offset = 0;
 	}
 }