===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/tbl_term.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- src/usr.bin/mandoc/tbl_term.c	2018/08/19 23:10:16	1.48
+++ src/usr.bin/mandoc/tbl_term.c	2018/11/25 19:23:59	1.49
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tbl_term.c,v 1.48 2018/08/19 23:10:16 schwarze Exp $ */
+/*	$OpenBSD: tbl_term.c,v 1.49 2018/11/25 19:23:59 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -75,7 +75,7 @@
 	const struct tbl_dat	*dp;
 	static size_t		 offset;
 	size_t			 coloff, tsz;
-	int			 ic, horiz, spans, vert, more;
+	int			 ic, horiz, hspans, vert, more;
 	char			 fc;
 
 	/* Inhibit printing of spaces: we do padding ourselves. */
@@ -155,9 +155,9 @@
 		/* Set up the data columns. */
 
 		dp = sp->first;
-		spans = 0;
+		hspans = 0;
 		for (ic = 0; ic < sp->opts->cols; ic++) {
-			if (spans == 0) {
+			if (hspans == 0) {
 				tp->tcol++;
 				tp->tcol->offset = coloff;
 			}
@@ -165,13 +165,13 @@
 			tp->tcol->rmargin = coloff;
 			if (ic + 1 < sp->opts->cols)
 				coloff += tp->tbl.cols[ic].spacing;
-			if (spans) {
-				spans--;
+			if (hspans) {
+				hspans--;
 				continue;
 			}
 			if (dp == NULL)
 				continue;
-			spans = dp->spans;
+			hspans = dp->hspans;
 			if (ic || sp->layout->first->pos != TBL_CELL_SPAN)
 				dp = dp->next;
 		}
@@ -191,14 +191,14 @@
 		tp->tcol = tp->tcols;
 		cp = cpn = sp->layout->first;
 		dp = sp->first;
-		spans = 0;
+		hspans = 0;
 		for (ic = 0; ic < sp->opts->cols; ic++) {
 			if (cpn != NULL) {
 				cp = cpn;
 				cpn = cpn->next;
 			}
-			if (spans) {
-				spans--;
+			if (hspans) {
+				hspans--;
 				continue;
 			}
 			tp->tcol++;
@@ -206,7 +206,7 @@
 			tbl_data(tp, sp->opts, cp, dp, tp->tbl.cols + ic);
 			if (dp == NULL)
 				continue;
-			spans = dp->spans;
+			hspans = dp->hspans;
 			if (cp->pos != TBL_CELL_SPAN)
 				dp = dp->next;
 		}
@@ -247,7 +247,7 @@
 			cpp = sp->prev == NULL ? NULL :
 			    sp->prev->layout->first;
 			dp = sp->first;
-			spans = 0;
+			hspans = 0;
 			for (ic = 0; ic < sp->opts->cols; ic++) {
 
 				/*
@@ -302,12 +302,12 @@
 				 * and advance to next data cell.
 				 */
 
-				if (spans) {
-					spans--;
+				if (hspans) {
+					hspans--;
 					continue;
 				}
 				if (dp != NULL) {
-					spans = dp->spans;
+					hspans = dp->hspans;
 					if (ic || sp->layout->first->pos
 					    != TBL_CELL_SPAN)
 						dp = dp->next;
@@ -590,14 +590,14 @@
 		const struct roffcol *col)
 {
 	size_t		 len, padl, padr, width;
-	int		 ic, spans;
+	int		 ic, hspans;
 
 	assert(dp->string);
 	len = term_strlen(tp, dp->string);
 	width = col->width;
 	ic = dp->layout->col;
-	spans = dp->spans;
-	while (spans--)
+	hspans = dp->hspans;
+	while (hspans--)
 		width += tp->tbl.cols[++ic].width + 3;
 
 	padr = width > len ? width - len : 0;