===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/tbl_term.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -c -r1.43 -r1.44
*** src/usr.bin/mandoc/tbl_term.c	2017/06/27 18:23:29	1.43
--- src/usr.bin/mandoc/tbl_term.c	2017/07/08 13:43:09	1.44
***************
*** 1,4 ****
! /*	$OpenBSD: tbl_term.c,v 1.43 2017/06/27 18:23:29 schwarze Exp $ */
  /*
   * Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011,2012,2014,2015,2017 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: tbl_term.c,v 1.44 2017/07/08 13:43:09 schwarze Exp $ */
  /*
   * Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011,2012,2014,2015,2017 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 168,174 ****
  			if (dp == NULL)
  				continue;
  			spans = dp->spans;
! 			dp = dp->next;
  		}
  
  		/* Set up a column for a right vertical frame. */
--- 168,175 ----
  			if (dp == NULL)
  				continue;
  			spans = dp->spans;
! 			if (ic || sp->layout->first->pos != TBL_CELL_SPAN)
! 				dp = dp->next;
  		}
  
  		/* Set up a column for a right vertical frame. */
***************
*** 202,208 ****
  			if (dp == NULL)
  				continue;
  			spans = dp->spans;
! 			dp = dp->next;
  		}
  		break;
  	}
--- 203,210 ----
  			if (dp == NULL)
  				continue;
  			spans = dp->spans;
! 			if (cp->pos != TBL_CELL_SPAN)
! 				dp = dp->next;
  		}
  		break;
  	}
***************
*** 302,308 ****
  				}
  				if (dp != NULL) {
  					spans = dp->spans;
! 					dp = dp->next;
  				}
  
  				/*
--- 304,312 ----
  				}
  				if (dp != NULL) {
  					spans = dp->spans;
! 					if (ic || sp->layout->first->pos
! 					    != TBL_CELL_SPAN)
! 						dp = dp->next;
  				}
  
  				/*
***************
*** 512,525 ****
  		break;
  	}
  
! 	if (dp == NULL) {
! 		tbl_char(tp, ASCII_NBRSP, col->width);
  		return;
- 	}
  
  	switch (dp->pos) {
  	case TBL_DATA_NONE:
- 		tbl_char(tp, ASCII_NBRSP, col->width);
  		return;
  	case TBL_DATA_HORIZ:
  	case TBL_DATA_NHORIZ:
--- 516,526 ----
  		break;
  	}
  
! 	if (dp == NULL)
  		return;
  
  	switch (dp->pos) {
  	case TBL_DATA_NONE:
  		return;
  	case TBL_DATA_HORIZ:
  	case TBL_DATA_NHORIZ:
***************
*** 544,550 ****
  		tbl_number(tp, opts, dp, col);
  		break;
  	case TBL_CELL_DOWN:
! 		tbl_char(tp, ASCII_NBRSP, col->width);
  		break;
  	default:
  		abort();
--- 545,551 ----
  		tbl_number(tp, opts, dp, col);
  		break;
  	case TBL_CELL_DOWN:
! 	case TBL_CELL_SPAN:
  		break;
  	default:
  		abort();