===================================================================
RCS file: /cvs/mandoc/roff_term.c,v
retrieving revision 1.8
retrieving revision 1.10
diff -u -p -r1.8 -r1.10
--- mandoc/roff_term.c	2017/06/06 15:01:04	1.8
+++ mandoc/roff_term.c	2017/06/08 12:54:58	1.10
@@ -1,4 +1,4 @@
-/*	$Id: roff_term.c,v 1.8 2017/06/06 15:01:04 schwarze Exp $ */
+/*	$Id: roff_term.c,v 1.10 2017/06/08 12:54:58 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -60,8 +60,8 @@ 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);
 	}
 }
@@ -73,7 +73,7 @@ roff_term_pre_ce(ROFF_TERM_ARGS)
 	size_t			 len, lm;
 
 	roff_term_pre_br(p, n);
-	lm = p->offset;
+	lm = p->tcol->offset;
 	n = n->child->next;
 	while (n != NULL) {
 		nch = n;
@@ -87,9 +87,9 @@ roff_term_pre_ce(ROFF_TERM_ARGS)
 			nch = nch->next;
 		} while (nch != NULL && (n->type != ROFFT_TEXT ||
 		    (n->flags & NODE_LINE) == 0));
-		p->offset = len >= p->rmargin ? 0 :
-		    lm + len >= p->rmargin ? p->rmargin - len :
-		    (lm + p->rmargin - len) / 2;
+		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);
@@ -100,7 +100,7 @@ roff_term_pre_ce(ROFF_TERM_ARGS)
 		p->flags |= TERMP_NOSPACE;
 		term_flushln(p);
 	}
-	p->offset = lm;
+	p->tcol->offset = lm;
 }
 
 static void
@@ -157,7 +157,7 @@ roff_term_pre_sp(ROFF_TERM_ARGS)
 	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
@@ -201,21 +201,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;
 
 	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;
 	}
 }