===================================================================
RCS file: /cvs/mandoc/tbl_term.c,v
retrieving revision 1.41
retrieving revision 1.47
diff -u -p -r1.41 -r1.47
--- mandoc/tbl_term.c	2015/09/26 00:54:04	1.41
+++ mandoc/tbl_term.c	2017/06/12 19:05:47	1.47
@@ -1,7 +1,7 @@
-/*	$Id: tbl_term.c,v 1.41 2015/09/26 00:54:04 schwarze Exp $ */
+/*	$Id: tbl_term.c,v 1.47 2017/06/12 19:05:47 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011, 2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011,2012,2014,2015,2017 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -30,6 +30,7 @@
 
 static	size_t	term_tbl_len(size_t, void *);
 static	size_t	term_tbl_strlen(const char *, void *);
+static	size_t	term_tbl_sulen(const struct roffsu *, void *);
 static	void	tbl_char(struct termp *, char, size_t);
 static	void	tbl_data(struct termp *, const struct tbl_opts *,
 			const struct tbl_dat *,
@@ -44,17 +45,21 @@ static	void	tbl_word(struct termp *, const struct tbl_
 
 
 static size_t
-term_tbl_strlen(const char *p, void *arg)
+term_tbl_sulen(const struct roffsu *su, void *arg)
 {
+	return term_hspan((const struct termp *)arg, su) / 24;
+}
 
-	return(term_strlen((const struct termp *)arg, p));
+static size_t
+term_tbl_strlen(const char *p, void *arg)
+{
+	return term_strlen((const struct termp *)arg, p);
 }
 
 static size_t
 term_tbl_len(size_t sz, void *arg)
 {
-
-	return(term_len((const struct termp *)arg, sz));
+	return term_len((const struct termp *)arg, sz);
 }
 
 void
@@ -63,18 +68,13 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
 	const struct tbl_cell	*cp;
 	const struct tbl_dat	*dp;
 	static size_t		 offset;
-	size_t			 rmargin, maxrmargin, tsz;
-	int			 ic, horiz, spans, vert;
+	size_t			 coloff, tsz;
+	int			 ic, horiz, spans, vert, more;
+	char			 fc;
 
-	rmargin = tp->rmargin;
-	maxrmargin = tp->maxrmargin;
-
-	tp->rmargin = tp->maxrmargin = TERM_MAXMARGIN;
-
 	/* Inhibit printing of spaces: we do padding ourselves. */
 
-	tp->flags |= TERMP_NONOSPACE;
-	tp->flags |= TERMP_NOSPACE;
+	tp->flags |= TERMP_NOSPACE | TERMP_NONOSPACE;
 
 	/*
 	 * The first time we're invoked for a given table block,
@@ -84,23 +84,24 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
 	if (tp->tbl.cols == NULL) {
 		tp->tbl.len = term_tbl_len;
 		tp->tbl.slen = term_tbl_strlen;
+		tp->tbl.sulen = term_tbl_sulen;
 		tp->tbl.arg = tp;
 
-		tblcalc(&tp->tbl, sp, rmargin - tp->offset);
+		tblcalc(&tp->tbl, sp, tp->tcol->rmargin - tp->tcol->offset);
 
 		/* Center the table as a whole. */
 
-		offset = tp->offset;
+		offset = tp->tcol->offset;
 		if (sp->opts->opts & TBL_OPT_CENTRE) {
 			tsz = sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX)
 			    ? 2 : !!sp->opts->lvert + !!sp->opts->rvert;
 			for (ic = 0; ic < sp->opts->cols; ic++)
 				tsz += tp->tbl.cols[ic].width + 3;
 			tsz -= 3;
-			if (offset + tsz > rmargin)
+			if (offset + tsz > tp->tcol->rmargin)
 				tsz -= 1;
-			tp->offset = (offset + rmargin > tsz) ?
-			    (offset + rmargin - tsz) / 2 : 0;
+			tp->tcol->offset = offset + tp->tcol->rmargin > tsz ?
+			    (offset + tp->tcol->rmargin - tsz) / 2 : 0;
 		}
 
 		/* Horizontal frame at the start of boxed tables. */
@@ -111,82 +112,181 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
 			tbl_hrule(tp, sp, 1);
 	}
 
-	/* Vertical frame at the start of each row. */
+	/* Set up the columns. */
 
-	horiz = sp->pos == TBL_SPAN_HORIZ || sp->pos == TBL_SPAN_DHORIZ;
+	tp->flags |= TERMP_MULTICOL;
+	horiz = 0;
+	switch (sp->pos) {
+	case TBL_SPAN_HORIZ:
+	case TBL_SPAN_DHORIZ:
+		horiz = 1;
+		term_setcol(tp, 1);
+		break;
+	case TBL_SPAN_DATA:
+		term_setcol(tp, sp->opts->cols + 2);
+		coloff = tp->tcol->offset;
 
-	if (sp->layout->vert ||
-	    (sp->prev != NULL && sp->prev->layout->vert) ||
-	    sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX))
-		term_word(tp, horiz ? "+" : "|");
-	else if (sp->opts->lvert)
-		tbl_char(tp, horiz ? '-' : ASCII_NBRSP, 1);
+		/* Set up a column for a left vertical frame. */
 
-	/*
-	 * Now print the actual data itself depending on the span type.
-	 * Match data cells to column numbers.
-	 */
+		if (sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) ||
+		    sp->opts->lvert)
+			coloff++;
+		tp->tcol->rmargin = coloff;
 
-	if (sp->pos == TBL_SPAN_DATA) {
-		cp = sp->layout->first;
+		/* Set up the data columns. */
+
 		dp = sp->first;
 		spans = 0;
 		for (ic = 0; ic < sp->opts->cols; ic++) {
+			if (spans == 0) {
+				tp->tcol++;
+				tp->tcol->offset = coloff;
+			}
+			coloff += tp->tbl.cols[ic].width;
+			tp->tcol->rmargin = coloff;
+			coloff++;
+			if (ic + 1 < sp->opts->cols)
+				coloff += 2;
+			if (spans) {
+				spans--;
+				continue;
+			}
+			if (dp == NULL)
+				continue;
+			spans = dp->spans;
+			dp = dp->next;
+		}
 
-			/*
-			 * Remeber whether we need a vertical bar
-			 * after this cell.
-			 */
+		/* Set up a column for a right vertical frame. */
 
-			vert = cp == NULL ? 0 : cp->vert;
+		tp->tcol++;
+		tp->tcol->offset = coloff;
+		if (sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX) ||
+		    sp->opts->rvert)
+			coloff++;
+		tp->tcol->rmargin = coloff;
 
-			/*
-			 * Print the data and advance to the next cell.
-			 */
+		/* Spans may have reduced the number of columns. */
 
-			if (spans == 0) {
-				tbl_data(tp, sp->opts, dp, tp->tbl.cols + ic);
-				if (dp != NULL) {
-					spans = dp->spans;
-					dp = dp->next;
-				}
-			} else
-				spans--;
-			if (cp != NULL)
-				cp = cp->next;
+		tp->lasttcol = tp->tcol - tp->tcols;
 
-			/*
-			 * Separate columns, except in the middle
-			 * of spans and after the last cell.
-			 */
+		/* Fill the buffers for all data columns. */
 
-			if (ic + 1 == sp->opts->cols || spans)
+		tp->tcol = tp->tcols;
+		dp = sp->first;
+		spans = 0;
+		for (ic = 0; ic < sp->opts->cols; ic++) {
+			if (spans) {
+				spans--;
 				continue;
+			}
+			tp->tcol++;
+			tp->col = 0;
+			tbl_data(tp, sp->opts, dp, tp->tbl.cols + ic);
+			if (dp == NULL)
+				continue;
+			spans = dp->spans;
+			dp = dp->next;
+		}
+		break;
+	}
 
-			tbl_char(tp, ASCII_NBRSP, 1);
-			if (vert > 0)
-				tbl_char(tp, '|', vert);
-			if (vert < 2)
-				tbl_char(tp, ASCII_NBRSP, 2 - vert);
+	do {
+		/* Print the vertical frame at the start of each row. */
+
+		tp->tcol = tp->tcols;
+		fc = '\0';
+		if (sp->layout->vert ||
+		    (sp->prev != NULL && sp->prev->layout->vert) ||
+		    sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX))
+			fc = horiz ? '+' : '|';
+		else if (horiz && sp->opts->lvert)
+			fc = '-';
+		if (fc != '\0') {
+			(*tp->advance)(tp, tp->tcols->offset);
+			(*tp->letter)(tp, fc);
+			tp->viscol = tp->tcol->offset + 1;
 		}
-	} else if (horiz)
-		tbl_hrule(tp, sp, 0);
 
-	/* Vertical frame at the end of each row. */
+		/* Print the data cells. */
 
-	if (sp->layout->last->vert ||
-	    (sp->prev != NULL && sp->prev->layout->last->vert) ||
-	    (sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX)))
-		term_word(tp, horiz ? "+" : " |");
-	else if (sp->opts->rvert)
-		tbl_char(tp, horiz ? '-' : ASCII_NBRSP, 1);
-	term_flushln(tp);
+		more = 0;
+		if (horiz) {
+			tbl_hrule(tp, sp, 0);
+			term_flushln(tp);
+		} else {
+			cp = sp->layout->first;
+			dp = sp->first;
+			spans = 0;
+			for (ic = 0; ic < sp->opts->cols; ic++) {
+				if (spans == 0) {
+					tp->tcol++;
+					if (dp != NULL) {
+						spans = dp->spans;
+						dp = dp->next;
+					}
+					if (tp->tcol->col < tp->tcol->lastcol)
+						term_flushln(tp);
+					if (tp->tcol->col < tp->tcol->lastcol)
+						more = 1;
+					if (tp->tcol + 1 ==
+					    tp->tcols + tp->lasttcol)
+						continue;
+				} else
+					spans--;
 
+				/* Vertical frames between data cells. */
+
+				if (cp != NULL) {
+					vert = cp->vert;
+					cp = cp->next;
+				} else
+					vert = 0;
+				if (vert == 0)
+					continue;
+
+				if (tp->tcol->rmargin + 1 > tp->viscol) {
+					(*tp->advance)(tp, tp->tcol->rmargin
+					   + 1 - tp->viscol);
+					tp->viscol = tp->tcol->rmargin + 1;
+				}
+				while (vert--) {
+					(*tp->letter)(tp, '|');
+					tp->viscol++;
+				}
+			}
+		}
+
+		/* Print the vertical frame at the end of each row. */
+
+		fc = '\0';
+		if (sp->layout->last->vert ||
+		    (sp->prev != NULL && sp->prev->layout->last->vert) ||
+		    (sp->opts->opts & (TBL_OPT_BOX | TBL_OPT_DBOX)))
+			fc = horiz ? '+' : '|';
+		else if (horiz && sp->opts->rvert)
+			fc = '-';
+		if (fc != '\0') {
+			if (horiz == 0) {
+				tp->tcol++;
+				(*tp->advance)(tp,
+				    tp->tcol->offset > tp->viscol ?
+				    tp->tcol->offset - tp->viscol : 1);
+			}
+			(*tp->letter)(tp, fc);
+		}
+		(*tp->endline)(tp);
+		tp->viscol = 0;
+	} while (more);
+
 	/*
 	 * If we're the last row, clean up after ourselves: clear the
 	 * existing table configuration and set it to NULL.
 	 */
 
+	term_setcol(tp, 1);
+	tp->flags &= ~TERMP_MULTICOL;
+	tp->tcol->rmargin = tp->maxrmargin;
 	if (sp->next == NULL) {
 		if (sp->opts->opts & (TBL_OPT_DBOX | TBL_OPT_BOX)) {
 			tbl_hrule(tp, sp, 1);
@@ -199,12 +299,9 @@ term_tbl(struct termp *tp, const struct tbl_span *sp)
 		assert(tp->tbl.cols);
 		free(tp->tbl.cols);
 		tp->tbl.cols = NULL;
-		tp->offset = offset;
+		tp->tcol->offset = offset;
 	}
-
 	tp->flags &= ~TERMP_NONOSPACE;
-	tp->rmargin = rmargin;
-	tp->maxrmargin = maxrmargin;
 }
 
 /*
@@ -266,12 +363,10 @@ tbl_data(struct termp *tp, const struct tbl_opts *opts
 		tbl_char(tp, ASCII_NBRSP, col->width);
 		return;
 	case TBL_DATA_HORIZ:
-		/* FALLTHROUGH */
 	case TBL_DATA_NHORIZ:
 		tbl_char(tp, '-', col->width);
 		return;
 	case TBL_DATA_NDHORIZ:
-		/* FALLTHROUGH */
 	case TBL_DATA_DHORIZ:
 		tbl_char(tp, '=', col->width);
 		return;
@@ -287,11 +382,8 @@ tbl_data(struct termp *tp, const struct tbl_opts *opts
 		tbl_char(tp, '=', col->width);
 		break;
 	case TBL_CELL_LONG:
-		/* FALLTHROUGH */
 	case TBL_CELL_CENTRE:
-		/* FALLTHROUGH */
 	case TBL_CELL_LEFT:
-		/* FALLTHROUGH */
 	case TBL_CELL_RIGHT:
 		tbl_literal(tp, dp, col);
 		break;