===================================================================
RCS file: /cvs/mandoc/roff_term.c,v
retrieving revision 1.5
retrieving revision 1.7
diff -u -p -r1.5 -r1.7
--- mandoc/roff_term.c	2017/05/07 17:31:45	1.5
+++ mandoc/roff_term.c	2017/06/04 22:44:15	1.7
@@ -1,4 +1,4 @@
-/*	$OpenBSD: roff_term.c,v 1.5 2017/05/07 17:31:45 schwarze Exp $ */
+/*	$Id: roff_term.c,v 1.7 2017/06/04 22:44:15 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -30,15 +30,19 @@ typedef	void	(*roff_term_pre_fp)(ROFF_TERM_ARGS);
 static	void	  roff_term_pre_br(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_ft,  /* ft */
-	roff_term_pre_ll,  /* ft */
+	roff_term_pre_ll,  /* ll */
+	roff_term_pre_mc,  /* mc */
 	roff_term_pre_sp,  /* sp */
 	roff_term_pre_ta,  /* ta */
+	roff_term_pre_ti,  /* ti */
 };
 
 
@@ -93,6 +97,21 @@ 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;
@@ -120,4 +139,44 @@ roff_term_pre_ta(ROFF_TERM_ARGS)
 	term_tab_set(p, NULL);
 	for (n = n->child; n != NULL; n = n->next)
 		term_tab_set(p, n->string);
+}
+
+static void
+roff_term_pre_ti(ROFF_TERM_ARGS)
+{
+	struct roffsu	 su;
+	const char	*cp;
+	int		 len, sign;
+
+	roff_term_pre_br(p, n);
+
+	if (n->child == NULL)
+		return;
+	cp = n->child->string;
+	if (*cp == '+') {
+		sign = 1;
+		cp++;
+	} else if (*cp == '-') {
+		sign = -1;
+		cp++;
+	} else
+		sign = 0;
+
+	if (a2roffsu(cp, &su, SCALE_EM) == 0)
+		return;
+	len = term_hspan(p, &su) / 24;
+
+	if (sign == 0) {
+		p->ti = len - p->offset;
+		p->offset = len;
+	} else if (sign == 1) {
+		p->ti = len;
+		p->offset += len;
+	} else if ((size_t)len < p->offset) {
+		p->ti = -len;
+		p->offset -= len;
+	} else {
+		p->ti = -p->offset;
+		p->offset = 0;
+	}
 }